summaryrefslogtreecommitdiff
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-09-28 06:53:39 +0000
committerSteve French <sfrench@us.ibm.com>2007-09-28 06:53:39 +0000
commit407f61a2b482ab9a6d03549ab9513e4a823ae4a2 (patch)
treed118f0ed7aea5a0002cbd58ff69fd0fa36b5be1b /fs/cifs
parent65874007c36930317c7a56d814a6a3e2966daaa8 (diff)
downloadlinux-3.10-407f61a2b482ab9a6d03549ab9513e4a823ae4a2.tar.gz
linux-3.10-407f61a2b482ab9a6d03549ab9513e4a823ae4a2.tar.bz2
linux-3.10-407f61a2b482ab9a6d03549ab9513e4a823ae4a2.zip
[CIFS] Fix memory leak in statfs to very old servers
We were allocating request buffers twice in the statfs path when mounted to very old (Windows 9x) servers. Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/CHANGES5
-rw-r--r--fs/cifs/cifssmb.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES
index 41e3b6a9397..ea359a0038d 100644
--- a/fs/cifs/CHANGES
+++ b/fs/cifs/CHANGES
@@ -1,3 +1,8 @@
+Version 1.51
+------------
+Fix memory leak in statfs when mounted to very old servers (e.g.
+Windows 9x)
+
Version 1.50
------------
Fix NTLMv2 signing. NFS server mounted over cifs works (if cifs mount is
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index cc05a26ab07..a6ff324bc13 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -4045,10 +4045,6 @@ oldQFSInfoRetry:
(void **) &pSMBr);
if (rc)
return rc;
- rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,
- (void **) &pSMBr);
- if (rc)
- return rc;
params = 2; /* level */
pSMB->TotalDataCount = 0;