From 17239a74ebbe7c23d735ecb0dc55ca3929d61185 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Mon, 12 May 2008 19:56:05 -0700 Subject: [PATCH] --- yaml --- r: 97131 b: refs/heads/master c: 6353450a2deefaa79cdb4fd2b72830c7db610256 h: refs/heads/master i: 97129: f93694b64c14ab8f0b023caf5e729a34fd078d19 97127: 6b84a2a346bc719877420c8c53f277262742db1c v: v3 --- [refs] | 2 +- trunk/fs/cifs/CHANGES | 3 ++- trunk/fs/cifs/cifssmb.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4658e6696f8b..e2339abd69fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0a9c078db4769f7305ff9774558776d12bfb25b +refs/heads/master: 6353450a2deefaa79cdb4fd2b72830c7db610256 diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES index 8355e918fddf..502a4c2b8414 100644 --- a/trunk/fs/cifs/CHANGES +++ b/trunk/fs/cifs/CHANGES @@ -12,7 +12,8 @@ Add ability to modify cifs acls for handling chmod (when mounted with cifsacl flag). Fix prefixpath path separator so we can handle mounts with prefixpaths longer than one directory (one path component) when mounted to Windows servers. Fix slow file open when cifsacl -enabled. +enabled. Fix memory leak in FindNext when the SMB call returns -EBADF. + Version 1.51 ------------ diff --git a/trunk/fs/cifs/cifssmb.c b/trunk/fs/cifs/cifssmb.c index 95fbba4ea7d4..641cc8ffc51b 100644 --- a/trunk/fs/cifs/cifssmb.c +++ b/trunk/fs/cifs/cifssmb.c @@ -3679,6 +3679,7 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon, if (rc) { if (rc == -EBADF) { psrch_inf->endOfSearch = true; + cifs_buf_release(pSMB); rc = 0; /* search probably was closed at end of search*/ } else cFYI(1, ("FindNext returned = %d", rc));