Commit 172a9d94 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '6.15-rc6-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb client fixes from Steve French:

 - Fix memory leak in mkdir error path

 - Fix max rsize miscalculation after channel reconnect

* tag '6.15-rc6-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  smb: client: fix zero rsize error messages
  smb: client: fix memory leak during error handling for POSIX mkdir
parents 12b6c62c 3965c237

fs/smb/client/file.c

+4 −2
Original line number Diff line number Diff line
@@ -160,8 +160,10 @@ static int cifs_prepare_read(struct netfs_io_subrequest *subreq) 
	server = cifs_pick_channel(tlink_tcon(req->cfile->tlink)->ses);

	rdata->server = server;



	if (cifs_sb->ctx->rsize == 0) {

		cifs_negotiate_rsize(server, cifs_sb->ctx,

				     tlink_tcon(req->cfile->tlink));

	}



	rc = server->ops->wait_mtu_credits(server, cifs_sb->ctx->rsize,

					   &size, &rdata->credits);

fs/smb/client/smb2pdu.c

+1 −1
Original line number Diff line number Diff line
@@ -2968,7 +2968,7 @@ int smb311_posix_mkdir(const unsigned int xid, struct inode *inode, 
	/* Eventually save off posix specific response info and timestamps */



err_free_rsp_buf:

	free_rsp_buf(resp_buftype, rsp);

	free_rsp_buf(resp_buftype, rsp_iov.iov_base);

	kfree(pc_buf);

err_free_req:

	cifs_small_buf_release(req);