---

yaml --- r: 232945 b: refs/heads/master c: 8132b65 h: refs/heads/master i: 232943: 1ce3057 v: v3
git-mirror · Feb 6, 2011 · 13f074d · 13f074d
1 parent 1f654da
commit 13f074d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 247ec9b418ba50c9022280035330059364d54540
+refs/heads/master: 8132b65bc6ce6d9a4baafdfc28c7cd9c258ed6e4
diff --git a/trunk/fs/cifs/cifsacl.c b/trunk/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);