From: Fabian Frederick Date: Thu, 26 Jun 2014 00:42:19 +0000 (+1000) Subject: fs/cifs/smb2file.c: replace count*size kzalloc by kcalloc X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5d9530f42daa29b2f9b5661e6d6fd9f5422b3106;p=karo-tx-linux.git fs/cifs/smb2file.c: replace count*size kzalloc by kcalloc kcalloc manages count*sizeof overflow. Signed-off-by: Fabian Frederick Cc: Steve French Signed-off-by: Andrew Morton --- diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c index 3f17b4550831..e5100b8fb3a0 100644 --- a/fs/cifs/smb2file.c +++ b/fs/cifs/smb2file.c @@ -111,7 +111,7 @@ smb2_unlock_range(struct cifsFileInfo *cfile, struct file_lock *flock, return -EINVAL; max_num = max_buf / sizeof(struct smb2_lock_element); - buf = kzalloc(max_num * sizeof(struct smb2_lock_element), GFP_KERNEL); + buf = kcalloc(max_num, sizeof(struct smb2_lock_element), GFP_KERNEL); if (!buf) return -ENOMEM; @@ -247,7 +247,7 @@ smb2_push_mandatory_locks(struct cifsFileInfo *cfile) } max_num = max_buf / sizeof(struct smb2_lock_element); - buf = kzalloc(max_num * sizeof(struct smb2_lock_element), GFP_KERNEL); + buf = kcalloc(max_num, sizeof(struct smb2_lock_element), GFP_KERNEL); if (!buf) { free_xid(xid); return -ENOMEM;