diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-12-10 18:41:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 20:41:02 -0500 |
commit | 662e9b2b98a0b8e172c392f3d3437d354a6c4067 (patch) | |
tree | 32e580c66dadf8adba1bb59b1b069defdc8db371 /fs | |
parent | 4b99d39b1b2890a178d840f7a068305c7890faee (diff) |
fs/cifs/smb2file.c: replace count*size kzalloc by kcalloc
kcalloc manages count*sizeof overflow.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Steve French <sfrench@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/smb2file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c index 45992944e238..7198eac5dddd 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, | |||
111 | return -EINVAL; | 111 | return -EINVAL; |
112 | 112 | ||
113 | max_num = max_buf / sizeof(struct smb2_lock_element); | 113 | max_num = max_buf / sizeof(struct smb2_lock_element); |
114 | buf = kzalloc(max_num * sizeof(struct smb2_lock_element), GFP_KERNEL); | 114 | buf = kcalloc(max_num, sizeof(struct smb2_lock_element), GFP_KERNEL); |
115 | if (!buf) | 115 | if (!buf) |
116 | return -ENOMEM; | 116 | return -ENOMEM; |
117 | 117 | ||
@@ -247,7 +247,7 @@ smb2_push_mandatory_locks(struct cifsFileInfo *cfile) | |||
247 | } | 247 | } |
248 | 248 | ||
249 | max_num = max_buf / sizeof(struct smb2_lock_element); | 249 | max_num = max_buf / sizeof(struct smb2_lock_element); |
250 | buf = kzalloc(max_num * sizeof(struct smb2_lock_element), GFP_KERNEL); | 250 | buf = kcalloc(max_num, sizeof(struct smb2_lock_element), GFP_KERNEL); |
251 | if (!buf) { | 251 | if (!buf) { |
252 | free_xid(xid); | 252 | free_xid(xid); |
253 | return -ENOMEM; | 253 | return -ENOMEM; |