Merge branch 'linux-2.6' into for-2.6.24

1 files changed, 4 insertions, 0 deletions

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 2ea027dda215..892be9b4d1f3 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -372,6 +372,10 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
 
         /* 2000 big enough to fit max user, domain, NOS name etc. */
         str_area = kmalloc(2000, GFP_KERNEL);
+        if (str_area == NULL) {
+                cifs_small_buf_release(smb_buf);
+                return -ENOMEM;
+        }
         bcc_ptr = str_area;
 
         ses->flags &= ~CIFS_SES_LANMAN;