git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
575c9ed
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
author
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 29 Oct 2009 16:02:01 +0000
(09:02 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 29 Oct 2009 16:02:01 +0000
(09:02 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] Fixing to avoid invalid kfree() in cifs_get_tcp_session()
fs/cifs/connect.c
patch
|
blob
|
history
diff --git
a/fs/cifs/connect.c
b/fs/cifs/connect.c
index
43003e0
..
b090980
100644
(file)
--- a/
fs/cifs/connect.c
+++ b/
fs/cifs/connect.c
@@
-1577,7
+1577,8
@@
cifs_get_tcp_session(struct smb_vol *volume_info)
out_err:
if (tcp_ses) {
- kfree(tcp_ses->hostname);
+ if (!IS_ERR(tcp_ses->hostname))
+ kfree(tcp_ses->hostname);
if (tcp_ses->ssocket)
sock_release(tcp_ses->ssocket);
kfree(tcp_ses);