From 13f074ddb0e9305f99809e2c2a1ac64e05f16565 Mon Sep 17 00:00:00 2001
From: Stanislav Fomichev <kernel@fomichev.me>
Date: Sun, 6 Feb 2011 02:05:28 +0300
Subject: [PATCH] --- yaml --- r: 232945 b: refs/heads/master c:
 8132b65bc6ce6d9a4baafdfc28c7cd9c258ed6e4 h: refs/heads/master i:   232943:
 1ce3057cc62d261bfc593bd2b93e785e8e2274ba v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/cifsacl.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 843352181cb0..3c738ab98d0c 100644
--- 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
index 1e7636b145a8..beeebf194234 100644
--- 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);