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

Commit 3c68319b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull CIFS fixes from Steve French:
 "Two fixes for problems pointed out by automated tools.

  Thanks PaX/grsecurity team and Dan Carpenter (and the Smatch tool)"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  [CIFS] Update cifs version number
  [SMB3] Do not fall back to SMBWriteX in set_file_size error cases
  [SMB3] Missing null tcon check
parents 049e6dde 616a5399

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -136,5 +136,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.07"

#define CIFS_VERSION   "2.08"

#endif				/* _CIFSFS_H */

fs/cifs/inode.c

+0 −34
Original line number Diff line number Diff line
@@ -2034,7 +2034,6 @@ cifs_set_file_size(struct inode *inode, struct iattr *attrs, 
	struct tcon_link *tlink = NULL;

	struct cifs_tcon *tcon = NULL;

	struct TCP_Server_Info *server;

	struct cifs_io_parms io_parms;



	/*

	 * To avoid spurious oplock breaks from server, in the case of
@@ -2056,18 +2055,6 @@ cifs_set_file_size(struct inode *inode, struct iattr *attrs, 
			rc = -ENOSYS;

		cifsFileInfo_put(open_file);

		cifs_dbg(FYI, "SetFSize for attrs rc = %d\n", rc);

		if ((rc == -EINVAL) || (rc == -EOPNOTSUPP)) {

			unsigned int bytes_written;



			io_parms.netfid = open_file->fid.netfid;

			io_parms.pid = open_file->pid;

			io_parms.tcon = tcon;

			io_parms.offset = 0;

			io_parms.length = attrs->ia_size;

			rc = CIFSSMBWrite(xid, &io_parms, &bytes_written,

					  NULL, NULL, 1);

			cifs_dbg(FYI, "Wrt seteof rc %d\n", rc);

		}

	} else

		rc = -EINVAL;
@@ -2093,28 +2080,7 @@ cifs_set_file_size(struct inode *inode, struct iattr *attrs, 
	else

		rc = -ENOSYS;

	cifs_dbg(FYI, "SetEOF by path (setattrs) rc = %d\n", rc);

	if ((rc == -EINVAL) || (rc == -EOPNOTSUPP)) {

		__u16 netfid;

		int oplock = 0;



		rc = SMBLegacyOpen(xid, tcon, full_path, FILE_OPEN,

				   GENERIC_WRITE, CREATE_NOT_DIR, &netfid,

				   &oplock, NULL, cifs_sb->local_nls,

				   cifs_remap(cifs_sb));

		if (rc == 0) {

			unsigned int bytes_written;



			io_parms.netfid = netfid;

			io_parms.pid = current->tgid;

			io_parms.tcon = tcon;

			io_parms.offset = 0;

			io_parms.length = attrs->ia_size;

			rc = CIFSSMBWrite(xid, &io_parms, &bytes_written, NULL,

					  NULL,  1);

			cifs_dbg(FYI, "wrt seteof rc %d\n", rc);

			CIFSSMBClose(xid, tcon, netfid);

		}

	}

	if (tlink)

		cifs_put_tlink(tlink);

fs/cifs/smb2pdu.c

+1 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree, 
	if (tcon && tcon->bad_network_name)

		return -ENOENT;



	if ((tcon->seal) &&

	if ((tcon && tcon->seal) &&

	    ((ses->server->capabilities & SMB2_GLOBAL_CAP_ENCRYPTION) == 0)) {

		cifs_dbg(VFS, "encryption requested but no server support");

		return -EOPNOTSUPP;