From: Pavel Shilovsky <pshilov...@samba.org>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

commit 663a962151593c69374776e8651238d0da072459 upstream.

Signed-off-by: Pavel Shilovsky <pshilov...@samba.org>
Reviewed-by: Shirish Pargaonkar <spargaon...@suse.com>
Signed-off-by: Steve French <smfre...@gmail.com>
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
---
 fs/cifs/smb2pdu.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 5818d2ca66f1..829ad35f98d4 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -1085,6 +1085,7 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms 
*oparms, __le16 *path,
        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");
 
@@ -1151,6 +1152,7 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms 
*oparms, __le16 *path,
                        kfree(copy_path);
                        return rc;
                }
+               lc_buf = iov[num_iovecs-1].iov_base;
        }
 
        if (*oplock == SMB2_OPLOCK_LEVEL_BATCH) {
@@ -1165,9 +1167,10 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms 
*oparms, __le16 *path,
                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);
@@ -1199,6 +1202,8 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms 
*oparms, __le16 *path,
                *oplock = rsp->OplockLevel;
 creat_exit:
        kfree(copy_path);
+       kfree(lc_buf);
+       kfree(dhc_buf);
        free_rsp_buf(resp_buftype, rsp);
        return rc;
 }
-- 
2.0.0

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to