diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 17:02:01 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 17:02:01 +0100 |
| commit | 36f8a53ff2626dbfc3c0a809fe1d2290937ddc96 (patch) | |
| tree | be3d72d55e4bc39a40c55b33e60ba4d942b48367 /fs | |
| parent | ray_cs: Fix copy_from_user handling (diff) | |
| parent | [CIFS] Fixing to avoid invalid kfree() in cifs_get_tcp_session() (diff) | |
| download | linux-36f8a53ff2626dbfc3c0a809fe1d2290937ddc96.tar.xz linux-36f8a53ff2626dbfc3c0a809fe1d2290937ddc96.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] Fixing to avoid invalid kfree() in cifs_get_tcp_session()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/connect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 43003e0bef18..b09098079916 100644 --- 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); |