| From 663a962151593c69374776e8651238d0da072459 Mon Sep 17 00:00:00 2001 |
| From: Pavel Shilovsky <pshilovsky@samba.org> |
| Date: Sat, 24 May 2014 16:42:02 +0400 |
| Subject: CIFS: Fix memory leaks in SMB2_open |
| |
| From: Pavel Shilovsky <pshilovsky@samba.org> |
| |
| commit 663a962151593c69374776e8651238d0da072459 upstream. |
| |
| Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org> |
| Reviewed-by: Shirish Pargaonkar <spargaonkar@suse.com> |
| Signed-off-by: Steve French <smfrench@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/cifs/smb2pdu.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| --- a/fs/cifs/smb2pdu.c |
| +++ b/fs/cifs/smb2pdu.c |
| @@ -1089,6 +1089,7 @@ SMB2_open(const unsigned int xid, struct |
| int rc = 0; |
| unsigned int num_iovecs = 2; |
| __u32 file_attributes = 0; |
| + char *dhc_buf = NULL, *lc_buf = NULL; |
| |
| cifs_dbg(FYI, "create/open\n"); |
| |
| @@ -1155,6 +1156,7 @@ SMB2_open(const unsigned int xid, struct |
| kfree(copy_path); |
| return rc; |
| } |
| + lc_buf = iov[num_iovecs-1].iov_base; |
| } |
| |
| if (*oplock == SMB2_OPLOCK_LEVEL_BATCH) { |
| @@ -1169,9 +1171,10 @@ SMB2_open(const unsigned int xid, struct |
| if (rc) { |
| cifs_small_buf_release(req); |
| kfree(copy_path); |
| - kfree(iov[num_iovecs-1].iov_base); |
| + kfree(lc_buf); |
| return rc; |
| } |
| + dhc_buf = iov[num_iovecs-1].iov_base; |
| } |
| |
| rc = SendReceive2(xid, ses, iov, num_iovecs, &resp_buftype, 0); |
| @@ -1203,6 +1206,8 @@ SMB2_open(const unsigned int xid, struct |
| *oplock = rsp->OplockLevel; |
| creat_exit: |
| kfree(copy_path); |
| + kfree(lc_buf); |
| + kfree(dhc_buf); |
| free_rsp_buf(resp_buftype, rsp); |
| return rc; |
| } |
