Commit 5466f4df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 

Pull more CIFS fixes from Steve French:
 "As promised, here is the remaining set of cifs/smb3 fixes for stable
  (and a fix for one regression) now that they have had additional
  review and testing"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Fix SMB3 mount without specifying a security mechanism
  CIFS: store results of cifs_reopen_file to avoid infinite wait
  CIFS: remove bad_network_name flag
  CIFS: reconnect thread reschedule itself
  CIFS: handle guest access errors to Windows shares
  CIFS: Fix null pointer deref during read resp processing
parents 82f1faa8 67dbea2c

fs/cifs/cifsglob.h

+0 −1
Original line number Diff line number Diff line
@@ -948,7 +948,6 @@ struct cifs_tcon { 
	bool use_persistent:1; /* use persistent instead of durable handles */

#ifdef CONFIG_CIFS_SMB2

	bool print:1;		/* set if connection to printer share */

	bool bad_network_name:1; /* set if ret status STATUS_BAD_NETWORK_NAME */

	__le32 capabilities;

	__u32 share_flags;

	__u32 maximal_access;

fs/cifs/cifsproto.h

+1 −2
Original line number Diff line number Diff line
@@ -79,8 +79,7 @@ extern void cifs_delete_mid(struct mid_q_entry *mid); 
extern void cifs_wake_up_task(struct mid_q_entry *mid);

extern int cifs_handle_standard(struct TCP_Server_Info *server,

				struct mid_q_entry *mid);

extern int cifs_discard_remaining_data(struct TCP_Server_Info *server,

				       char *buf);

extern int cifs_discard_remaining_data(struct TCP_Server_Info *server);

extern int cifs_call_async(struct TCP_Server_Info *server,

			struct smb_rqst *rqst,

			mid_receive_t *receive, mid_callback_t *callback,

fs/cifs/cifssmb.c

+8 −7
Original line number Diff line number Diff line
@@ -1400,9 +1400,9 @@ openRetry: 
 * current bigbuf.

 */

int

cifs_discard_remaining_data(struct TCP_Server_Info *server, char *buf)

cifs_discard_remaining_data(struct TCP_Server_Info *server)

{

	unsigned int rfclen = get_rfc1002_length(buf);

	unsigned int rfclen = get_rfc1002_length(server->smallbuf);

	int remaining = rfclen + 4 - server->total_read;



	while (remaining > 0) {
@@ -1426,8 +1426,10 @@ cifs_readv_discard(struct TCP_Server_Info *server, struct mid_q_entry *mid) 
	int length;

	struct cifs_readdata *rdata = mid->callback_data;



	length = cifs_discard_remaining_data(server, mid->resp_buf);

	length = cifs_discard_remaining_data(server);

	dequeue_mid(mid, rdata->result);

	mid->resp_buf = server->smallbuf;

	server->smallbuf = NULL;

	return length;

}
@@ -1459,7 +1461,7 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid) 


	if (server->ops->is_status_pending &&

	    server->ops->is_status_pending(buf, server, 0)) {

		cifs_discard_remaining_data(server, buf);

		cifs_discard_remaining_data(server);

		return -1;

	}
@@ -1519,9 +1521,6 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid) 
	cifs_dbg(FYI, "0: iov_base=%p iov_len=%u\n",

		 rdata->iov[0].iov_base, server->total_read);



	mid->resp_buf = server->smallbuf;

	server->smallbuf = NULL;



	/* how much data is in the response? */

	data_len = server->ops->read_data_length(buf);

	if (data_offset + data_len > buflen) {
@@ -1544,6 +1543,8 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid) 
		return cifs_readv_discard(server, mid);



	dequeue_mid(mid, false);

	mid->resp_buf = server->smallbuf;

	server->smallbuf = NULL;

	return length;

}

fs/cifs/connect.c

+3 −0
Original line number Diff line number Diff line
@@ -3753,6 +3753,9 @@ try_mount_again: 
	if (IS_ERR(tcon)) {

		rc = PTR_ERR(tcon);

		tcon = NULL;

		if (rc == -EACCES)

			goto mount_fail_check;



		goto remote_path_check;

	}

fs/cifs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -2597,7 +2597,7 @@ cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from, 
		wdata->credits = credits;



		if (!wdata->cfile->invalidHandle ||

		    !cifs_reopen_file(wdata->cfile, false))

		    !(rc = cifs_reopen_file(wdata->cfile, false)))

			rc = server->ops->async_writev(wdata,

					cifs_uncached_writedata_release);

		if (rc) {
@@ -3022,7 +3022,7 @@ cifs_send_async_read(loff_t offset, size_t len, struct cifsFileInfo *open_file, 
		rdata->credits = credits;



		if (!rdata->cfile->invalidHandle ||

		    !cifs_reopen_file(rdata->cfile, true))

		    !(rc = cifs_reopen_file(rdata->cfile, true)))

			rc = server->ops->async_readv(rdata);

error:

		if (rc) {
@@ -3617,7 +3617,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, 
		}



		if (!rdata->cfile->invalidHandle ||

		    !cifs_reopen_file(rdata->cfile, true))

		    !(rc = cifs_reopen_file(rdata->cfile, true)))

			rc = server->ops->async_readv(rdata);

		if (rc) {

			add_credits_and_wake_if(server, rdata->credits, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE