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

Merge tag '4.17-rc1-SMB3-CIFS' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:
 "Various SMB3/CIFS fixes.

  There are three more security related fixes in progress that are not
  included in this set but they are still being tested and reviewed, so
  sending this unrelated set of smaller fixes now"

* tag '4.17-rc1-SMB3-CIFS' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: fix typo in cifs_dbg
  cifs: do not allow creating sockets except with SMB1 posix exensions
  cifs: smbd: Dump SMB packet when configured
  cifs: smbd: Check for iov length on sending the last iov
  fs: cifs: Adding new return type vm_fault_t
  cifs: smb2ops: Fix NULL check in smb2_query_symlink
parents d54b5c13 596632de

fs/cifs/cifs_debug.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ do { \ 
		pr_debug_ ## ratefunc("%s: "			\

				fmt, __FILE__, ##__VA_ARGS__);	\

	} else if ((type) & VFS) {				\

		pr_err_ ## ratefunc("CuIFS VFS: "		\

		pr_err_ ## ratefunc("CIFS VFS: "		\

				 fmt, ##__VA_ARGS__);		\

	} else if ((type) & NOISY && (NOISY != 0)) {		\

		pr_debug_ ## ratefunc(fmt, ##__VA_ARGS__);	\

fs/cifs/dir.c

+5 −4
Original line number Diff line number Diff line
@@ -684,6 +684,9 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode, 
		goto mknod_out;

	}



	if (!S_ISCHR(mode) && !S_ISBLK(mode))

		goto mknod_out;



	if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL))

		goto mknod_out;
@@ -692,10 +695,8 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode, 


	buf = kmalloc(sizeof(FILE_ALL_INFO), GFP_KERNEL);

	if (buf == NULL) {

		kfree(full_path);

		rc = -ENOMEM;

		free_xid(xid);

		return rc;

		goto mknod_out;

	}



	if (backup_cred(cifs_sb))
@@ -742,7 +743,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode, 
		pdev->minor = cpu_to_le64(MINOR(device_number));

		rc = tcon->ses->server->ops->sync_write(xid, &fid, &io_parms,

							&bytes_written, iov, 1);

	} /* else if (S_ISFIFO) */

	}

	tcon->ses->server->ops->close(xid, tcon, &fid);

	d_drop(direntry);

fs/cifs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -3462,7 +3462,7 @@ cifs_read(struct file *file, char *read_data, size_t read_size, loff_t *offset) 
 * If the page is mmap'ed into a process' page tables, then we need to make

 * sure that it doesn't change while being written back.

 */

static int

static vm_fault_t

cifs_page_mkwrite(struct vm_fault *vmf)

{

	struct page *page = vmf->page;

fs/cifs/smb2ops.c

+2 −2
Original line number Diff line number Diff line
@@ -1452,7 +1452,7 @@ smb2_query_symlink(const unsigned int xid, struct cifs_tcon *tcon, 
	struct cifs_open_parms oparms;

	struct cifs_fid fid;

	struct kvec err_iov = {NULL, 0};

	struct smb2_err_rsp *err_buf = NULL;

	struct smb2_err_rsp *err_buf;

	struct smb2_symlink_err_rsp *symlink;

	unsigned int sub_len;

	unsigned int sub_offset;
@@ -1476,7 +1476,7 @@ smb2_query_symlink(const unsigned int xid, struct cifs_tcon *tcon, 


	rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, &err_iov);



	if (!rc || !err_buf) {

	if (!rc || !err_iov.iov_base) {

		kfree(utf16_path);

		return -ENOENT;

	}

fs/cifs/smbdirect.c

+7 −1
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ static int smbd_post_send(struct smbd_connection *info, 
	for (i = 0; i < request->num_sge; i++) {

		log_rdma_send(INFO,

			"rdma_request sge[%d] addr=%llu length=%u\n",

			i, request->sge[0].addr, request->sge[0].length);

			i, request->sge[i].addr, request->sge[i].length);

		ib_dma_sync_single_for_device(

			info->id->device,

			request->sge[i].addr,
@@ -2139,6 +2139,10 @@ int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst) 
		goto done;

	}



	cifs_dbg(FYI, "Sending smb (RDMA): smb_len=%u\n", buflen);

	for (i = 0; i < rqst->rq_nvec-1; i++)

		dump_smb(iov[i].iov_base, iov[i].iov_len);



	remaining_data_length = buflen;



	log_write(INFO, "rqst->rq_nvec=%d rqst->rq_npages=%d rq_pagesz=%d "
@@ -2194,6 +2198,8 @@ int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst) 
						goto done;

				}

				i++;

				if (i == rqst->rq_nvec)

					break;

			}

			start = i;

			buflen = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE