From aea285793c5dcb0005ddc16e35a7823545f07994 Mon Sep 17 00:00:00 2001 From: Steve French Date: Wed, 18 Mar 2009 05:57:22 +0000 Subject: [PATCH] --- yaml --- r: 133618 b: refs/heads/master c: b363b3304bcf68c4541683b2eff70b29f0446a5b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/CHANGES | 3 +++ trunk/fs/cifs/connect.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d7b786deb9fb..dadd201ec566 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6c00919ab16717f228aac20ee72dc83c4430537 +refs/heads/master: b363b3304bcf68c4541683b2eff70b29f0446a5b diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES index fc977dfe9593..65984006192c 100644 --- a/trunk/fs/cifs/CHANGES +++ b/trunk/fs/cifs/CHANGES @@ -13,6 +13,9 @@ parameter to allow user to disable sending the (slow) SMB flush on fsync if desired (fsync still flushes all cached write data to the server). Posix file open support added (turned off after one attempt if server fails to support it properly, as with Samba server versions prior to 3.3.2) +Fix "redzone overwritten" bug in cifs_put_tcon (CIFSTcon may allocate too +little memory for the "nativeFileSystem" field returned by the server +during mount). Version 1.56 ------------ diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index cd4ccc8ce471..0de3b5615a22 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/fs/cifs/connect.c @@ -3674,7 +3674,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, BCC(smb_buffer_response)) { kfree(tcon->nativeFileSystem); tcon->nativeFileSystem = - kzalloc(length + 2, GFP_KERNEL); + kzalloc(2*(length + 1), GFP_KERNEL); if (tcon->nativeFileSystem) cifs_strfromUCS_le( tcon->nativeFileSystem,