diff --git a/[refs] b/[refs]
index cecd7bf2360d..89a06aaa6ec7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ccd48025fe64cf01782ba3c7037654d25bd1950
+refs/heads/master: f55fdcca6bf1c17e86a270a8c0d81c6677c61222
diff --git a/trunk/fs/cifs/readdir.c b/trunk/fs/cifs/readdir.c
index daf1753af674..d5e591fab475 100644
--- a/trunk/fs/cifs/readdir.c
+++ b/trunk/fs/cifs/readdir.c
@@ -847,6 +847,11 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
 		end_of_smb = cifsFile->srch_inf.ntwrk_buf_start + max_len;
 
 		tmp_buf = kmalloc(UNICODE_NAME_MAX, GFP_KERNEL);
+		if (tmp_buf == NULL) {
+			rc = -ENOMEM;
+			break;
+		}
+
 		for (i = 0; (i < num_to_fill) && (rc == 0); i++) {
 			if (current_entry == NULL) {
 				/* evaluate whether this case is an error */