Commit 5fd0a1df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.19rc8-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb client fixes from Steve French:
 "Two small client memory leak fixes"

* tag 'v6.19rc8-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  smb/client: fix memory leak in SendReceive()
  smb/client: fix memory leak in smb2_open_file()
parents de0674d9 67b3da8d

fs/smb/client/cifstransport.c

+3 −1
Original line number Diff line number Diff line
@@ -251,13 +251,15 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, 
	rc = cifs_send_recv(xid, ses, ses->server,

			    &rqst, &resp_buf_type, flags, &resp_iov);

	if (rc < 0)

		return rc;

		goto out;



	if (out_buf) {

		*pbytes_returned = resp_iov.iov_len;

		if (resp_iov.iov_len)

			memcpy(out_buf, resp_iov.iov_base, resp_iov.iov_len);

	}



out:

	free_rsp_buf(resp_buf_type, resp_iov.iov_base);

	return rc;

}

fs/smb/client/smb2file.c

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ int smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms, 
	rc = SMB2_open(xid, oparms, smb2_path, &smb2_oplock, smb2_data, NULL, &err_iov,

		       &err_buftype);

	if (rc == -EACCES && retry_without_read_attributes) {

		free_rsp_buf(err_buftype, err_iov.iov_base);

		oparms->desired_access &= ~FILE_READ_ATTRIBUTES;

		rc = SMB2_open(xid, oparms, smb2_path, &smb2_oplock, smb2_data, NULL, &err_iov,

			       &err_buftype);