Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04faac10 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '4.19-rc-smb3' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:
 "Three small SMB3 fixes, one for stable"

* tag '4.19-rc-smb3' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: update internal module version number for cifs.ko to 2.12
  cifs: check kmalloc before use
  cifs: check if SMB2 PDU size has been padded and suppress the warning
  cifs: create a define for how many iovs we need for an SMB2_open()
parents 1b2de5d0 7753e382

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -148,5 +148,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); 
extern const struct export_operations cifs_export_ops;

#endif /* CONFIG_CIFS_NFSD_EXPORT */



#define CIFS_VERSION   "2.12"

#define CIFS_VERSION   "2.13"

#endif				/* _CIFSFS_H */

fs/cifs/sess.c

+6 −0
Original line number Diff line number Diff line
@@ -398,6 +398,12 @@ int build_ntlmssp_auth_blob(unsigned char **pbuffer, 
		goto setup_ntlmv2_ret;

	}

	*pbuffer = kmalloc(size_of_ntlmssp_blob(ses), GFP_KERNEL);

	if (!*pbuffer) {

		rc = -ENOMEM;

		cifs_dbg(VFS, "Error %d during NTLMSSP allocation\n", rc);

		*buflen = 0;

		goto setup_ntlmv2_ret;

	}

	sec_blob = (AUTHENTICATE_MESSAGE *)*pbuffer;



	memcpy(sec_blob->Signature, NTLMSSP_SIGNATURE, 8);

fs/cifs/smb2misc.c

+7 −0
Original line number Diff line number Diff line
@@ -237,6 +237,13 @@ smb2_check_message(char *buf, unsigned int len, struct TCP_Server_Info *srvr) 
		if (clc_len == len + 1)

			return 0;



		/*

		 * Some windows servers (win2016) will pad also the final

		 * PDU in a compound to 8 bytes.

		 */

		if (((clc_len + 7) & ~7) == len)

			return 0;



		/*

		 * MacOS server pads after SMB2.1 write response with 3 bytes

		 * of junk. Other servers match RFC1001 len to actual

fs/cifs/smb2ops.c

+2 −2
Original line number Diff line number Diff line
@@ -1582,7 +1582,7 @@ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon, 
	struct smb_rqst rqst[3];

	int resp_buftype[3];

	struct kvec rsp_iov[3];

	struct kvec open_iov[5]; /* 4 + potential padding. */

	struct kvec open_iov[SMB2_CREATE_IOV_SIZE];

	struct kvec qi_iov[1];

	struct kvec close_iov[1];

	struct cifs_ses *ses = tcon->ses;
@@ -1603,7 +1603,7 @@ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon, 


	memset(&open_iov, 0, sizeof(open_iov));

	rqst[0].rq_iov = open_iov;

	rqst[0].rq_nvec = 4;

	rqst[0].rq_nvec = SMB2_CREATE_IOV_SIZE;



	oparms.tcon = tcon;

	oparms.desired_access = FILE_READ_ATTRIBUTES;

fs/cifs/smb2pdu.c

+2 −2
Original line number Diff line number Diff line
@@ -2256,7 +2256,7 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path, 
	struct TCP_Server_Info *server;

	struct cifs_tcon *tcon = oparms->tcon;

	struct cifs_ses *ses = tcon->ses;

	struct kvec iov[5]; /* make sure at least one for each open context */

	struct kvec iov[SMB2_CREATE_IOV_SIZE];

	struct kvec rsp_iov = {NULL, 0};

	int resp_buftype;

	int rc = 0;
@@ -2274,7 +2274,7 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path, 
	memset(&rqst, 0, sizeof(struct smb_rqst));

	memset(&iov, 0, sizeof(iov));

	rqst.rq_iov = iov;

	rqst.rq_nvec = 5;

	rqst.rq_nvec = SMB2_CREATE_IOV_SIZE;



	rc = SMB2_open_init(tcon, &rqst, oplock, oparms, path);

	if (rc)