aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-09-28 02:53:39 -0400
committerSteve French <sfrench@us.ibm.com>2007-09-28 02:53:39 -0400
commit407f61a2b482ab9a6d03549ab9513e4a823ae4a2 (patch)
treed118f0ed7aea5a0002cbd58ff69fd0fa36b5be1b
parent65874007c36930317c7a56d814a6a3e2966daaa8 (diff)
[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>
-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 41e3b6a9397c..ea359a0038d9 100644
--- a/fs/cifs/CHANGES
+++ b/fs/cifs/CHANGES
@@ -1,3 +1,8 @@
1Version 1.51
2------------
3Fix memory leak in statfs when mounted to very old servers (e.g.
4Windows 9x)
5
1Version 1.50 6Version 1.50
2------------ 7------------
3Fix NTLMv2 signing. NFS server mounted over cifs works (if cifs mount is 8Fix 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 cc05a26ab07a..a6ff324bc135 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -4045,10 +4045,6 @@ oldQFSInfoRetry:
4045 (void **) &pSMBr); 4045 (void **) &pSMBr);
4046 if (rc) 4046 if (rc)
4047 return rc; 4047 return rc;
4048 rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,
4049 (void **) &pSMBr);
4050 if (rc)
4051 return rc;
4052 4048
4053 params = 2; /* level */ 4049 params = 2; /* level */
4054 pSMB->TotalDataCount = 0; 4050 pSMB->TotalDataCount = 0;