diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-23 11:47:04 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-25 19:25:19 +0300 |
| commit | ddbe4b02aeca52900bb6965c533044b59924e37c (patch) | |
| tree | 73fef6d6da7bc4177c09ac5af6a63c15b95836cf /fs | |
| parent | c65f75512cad37a5ae1936344296869b69d6109f (diff) | |
| download | linux-ddbe4b02aeca52900bb6965c533044b59924e37c.tar.xz | |
Revert "cifs: fix memory leak in SMB2_read"
This reverts commit c54a881d793e3eea2a1b1460c5778b22128821ea which is
commit 05fd5c2c61732152a6bddc318aae62d7e436629b upstream.
Lars writes:
This patch should not be in 4.14-stable because
088aaf17aa79300cab14dbee2569c58cfafd7d6e was for 4.18+.
Now we have a double-free crash in SMB2_read because there are 2
calls to cifs_small_buf_release in the error path.
It was a mistake to backport it this far, so let's revert it.
Reported-by: Lars Persson <lists@bofh.nu>
Cc: Ronnie Sahlberg <lsahlber@redhat.com>
Cc: Pavel Shilovsky <pshilov@microsoft.com>
Cc: Steve French <stfrench@microsoft.com>
Cc: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/smb2pdu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 7936eac5a38a..fd2d199dd413 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -2699,7 +2699,6 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms, cifs_dbg(VFS, "Send error in read = %d\n", rc); } free_rsp_buf(resp_buftype, rsp_iov.iov_base); - cifs_small_buf_release(req); return rc == -ENODATA ? 0 : rc; } |