Skip to contentSkip to conversation

ALSA: ctxf: Use kcalloc instead of kzalloc to allocate array

PATCH Applied Thomas Meyer 2 participants 2 messages Nov 29, 2011 – Dec 6, 2011 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: ctxf: Use kcalloc instead of kzalloc to allocate array

The advantage of kcalloc is, that will prevent integer overflows which could result from the multiplication of number of elements and size and it is also a bit nicer to read.

The semantic patch that makes this change is available in https://lkml.org/lkml/2011/11/25/107

---

sound/pci/ctxfi/ctsrc.c 2011-11-28 20:14:46.651112893 +0100 renamed from sound/pci/ctxfi/ctsrc.c 2011-11-13 11:08:15.090921741 +0100 +1 -1
diff -u -p a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c
@@ -437,7 +437,7 @@ get_src_rsc(struct src_mgr *mgr, const s
 
 	/* Allocate mem for master src resource */
 	if (MEMRD == desc->mode)
-		src = kzalloc(sizeof(*src)*desc->multi, GFP_KERNEL);
+		src = kcalloc(desc->multi, sizeof(*src), GFP_KERNEL);
 	else
 		src = kzalloc(sizeof(*src), GFP_KERNEL);
 
Applied
#1 lore raw

At Tue, 29 Nov 2011 22:08:00 +0100,

Quoted 9 lines · Thomas Meyer

The advantage of kcalloc is, that will prevent integer overflows which could result from the multiplication of number of elements and size and it is also a bit nicer to read.

The semantic patch that makes this change is available in https://lkml.org/lkml/2011/11/25/107

Thanks, applied both this and asihpi patches.

Takashi

Quoted 15 lines

---

diff -u -p a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c

sound/pci/ctxfi/ctsrc.c 2011-11-28 20:14:46.651112893 +0100 renamed from sound/pci/ctxfi/ctsrc.c 2011-11-13 11:08:15.090921741 +0100 +1 -1
@@ -437,7 +437,7 @@ get_src_rsc(struct src_mgr *mgr, const s
 
 	/* Allocate mem for master src resource */
 	if (MEMRD == desc->mode)
-		src = kzalloc(sizeof(*src)*desc->multi, GFP_KERNEL);
+		src = kcalloc(desc->multi, sizeof(*src), GFP_KERNEL);
 	else
 		src = kzalloc(sizeof(*src), GFP_KERNEL);