Skip to contentSkip to conversation

cifs: Use kcalloc instead of kzalloc to allocate array

PATCH In review Thomas Meyer 2 participants 2 messages Nov 29, 2011 – Dec 5, 2011

Subsystems (2)
SMB client (CIFS) Kernel SMB3 server (ksmbd)
lore
Share & tools
lore

Thomas Meyer

author
#0 lore raw

PATCH 1/1 cifs: 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

Signed-off-by Thomas Meyer <[email protected]>

---

fs/cifs/cifssmb.c 2011-11-28 19:47:15.006997976 +0100 renamed from fs/cifs/cifssmb.c 2011-11-13 11:07:56.343959560 +0100 +1 -1
diff -u -p a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
@@ -2140,7 +2140,7 @@ cifs_async_writev(struct cifs_writedata
 		goto async_writev_out;
 
 	/* 1 iov per page + 1 for header */
-	iov = kzalloc((wdata->nr_pages + 1) * sizeof(*iov), GFP_NOFS);
+	iov = kcalloc(wdata->nr_pages + 1, sizeof(*iov), GFP_NOFS);
 	if (iov == NULL) {
 		rc = -ENOMEM;
 		goto async_writev_out;
Reviewed-by on v1 1/1
#1 lore raw
Quoted 23 lines · On Tue, 29 Nov 2011 22:08:00 +0100 Thomas Meyer <[email protected]> wrote:

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

Signed-off-by Thomas Meyer <[email protected]>

---

diff -u -p a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c

fs/cifs/cifssmb.c 2011-11-28 19:47:15.006997976 +0100 renamed from fs/cifs/cifssmb.c 2011-11-13 11:07:56.343959560 +0100 +1 -2
@@ -2140,7 +2140,7 @@ cifs_async_writev(struct cifs_writedata
 		goto async_writev_out;
 
 	/* 1 iov per page + 1 for header */
-	iov = kzalloc((wdata->nr_pages + 1) * sizeof(*iov), GFP_NOFS);
+	iov = kcalloc(wdata->nr_pages + 1, sizeof(*iov), GFP_NOFS);
 	if (iov == NULL) {
 		rc = -ENOMEM;
 		goto async_writev_out;
--
Quoted 3 lines

To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Looks correct.

Reviewed-by Jeff Layton <[email protected]>