summaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsacl.c
diff options
context:
space:
mode:
authorStanislav Fomichev <kernel@fomichev.me>2011-02-06 00:05:28 +0100
committerSteve French <sfrench@us.ibm.com>2011-02-06 01:36:23 +0100
commit8132b65bc6ce6d9a4baafdfc28c7cd9c258ed6e4 (patch)
tree4cd9821416932e264dfeb0d472fcb23aa0e20032 /fs/cifs/cifsacl.c
parentcifs: don't send an echo request unless NegProt has been done (diff)
downloadlinux-8132b65bc6ce6d9a4baafdfc28c7cd9c258ed6e4.tar.xz
linux-8132b65bc6ce6d9a4baafdfc28c7cd9c258ed6e4.zip
cifs: add check for kmalloc in parse_dacl
Exit from parse_dacl if no memory returned from the call to kmalloc. Signed-off-by: Stanislav Fomichev <kernel@fomichev.me> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsacl.c')
-rw-r--r--fs/cifs/cifsacl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 1e7636b145a8..beeebf194234 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -372,6 +372,10 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl,
ppace = kmalloc(num_aces * sizeof(struct cifs_ace *),
GFP_KERNEL);
+ if (!ppace) {
+ cERROR(1, "DACL memory allocation error");
+ return;
+ }
for (i = 0; i < num_aces; ++i) {
ppace[i] = (struct cifs_ace *) (acl_base + acl_size);