Commit 58288813 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull cifs fixes from Steve French:
 "Four small CIFS/SMB3 fixes (witness protocol and reconnect related),
  and two that add ability to get and set auditing information in the
  security descriptor (SACL), which can be helpful not just for backup
  scenarios ("smbinfo secdesc" etc.) but also for improving security"

* tag '5.11-rc-smb3-part2' of git://git.samba.org/sfrench/cifs-2.6:
  Add SMB 2 support for getting and setting SACLs
  SMB3: Add support for getting and setting SACLs
  cifs: Avoid error pointer dereference
  cifs: Re-indent cifs_swn_reconnect()
  cifs: Unlock on errors in cifs_swn_reconnect()
  cifs: Delete a stray unlock in cifs_swn_reconnect()
parents 48342fc0 9541b813

fs/cifs/cifs_swn.c

+37 −36
Original line number Diff line number Diff line
@@ -285,8 +285,6 @@ static struct cifs_swn_reg *cifs_find_swn_reg(struct cifs_tcon *tcon) 
			continue;

		}



		mutex_unlock(&cifs_swnreg_idr_mutex);



		cifs_dbg(FYI, "Existing swn registration for %s:%s found\n", swnreg->net_name,

				swnreg->share_name);
@@ -482,16 +480,18 @@ static int cifs_swn_store_swn_addr(const struct sockaddr_storage *new, 


static int cifs_swn_reconnect(struct cifs_tcon *tcon, struct sockaddr_storage *addr)

{

	int ret = 0;



	/* Store the reconnect address */

	mutex_lock(&tcon->ses->server->srv_mutex);

	if (!cifs_sockaddr_equal(&tcon->ses->server->dstaddr, addr)) {

		int ret;

	if (cifs_sockaddr_equal(&tcon->ses->server->dstaddr, addr))

		goto unlock;



	ret = cifs_swn_store_swn_addr(addr, &tcon->ses->server->dstaddr,

				      &tcon->ses->server->swn_dstaddr);

	if (ret < 0) {

		cifs_dbg(VFS, "%s: failed to store address: %d\n", __func__, ret);

			return ret;

		goto unlock;

	}

	tcon->ses->server->use_swn_dstaddr = true;
@@ -502,7 +502,7 @@ static int cifs_swn_reconnect(struct cifs_tcon *tcon, struct sockaddr_storage *a 
	if (ret < 0) {

		cifs_dbg(VFS, "%s: Failed to unregister for witness notifications: %d\n",

			 __func__, ret);

			return ret;

		goto unlock;

	}



	/*
@@ -513,17 +513,18 @@ static int cifs_swn_reconnect(struct cifs_tcon *tcon, struct sockaddr_storage *a 
	if (ret < 0) {

		cifs_dbg(VFS, "%s: Failed to register for witness notifications: %d\n",

			 __func__, ret);

			return ret;

		goto unlock;

	}



	spin_lock(&GlobalMid_Lock);

	if (tcon->ses->server->tcpStatus != CifsExiting)

		tcon->ses->server->tcpStatus = CifsNeedReconnect;

	spin_unlock(&GlobalMid_Lock);

	}



unlock:

	mutex_unlock(&tcon->ses->server->srv_mutex);



	return 0;

	return ret;

}



static int cifs_swn_client_move(struct cifs_swn_reg *swnreg, struct sockaddr_storage *addr)

fs/cifs/cifsacl.c

+9 −6
Original line number Diff line number Diff line
@@ -1195,7 +1195,8 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd, 
}



struct cifs_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb,

		const struct cifs_fid *cifsfid, u32 *pacllen)

				      const struct cifs_fid *cifsfid, u32 *pacllen,

				      u32 __maybe_unused unused)

{

	struct cifs_ntsd *pntsd = NULL;

	unsigned int xid;
@@ -1263,7 +1264,7 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
/* Retrieve an ACL from the server */

struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *cifs_sb,

				      struct inode *inode, const char *path,

				      u32 *pacllen)

			       u32 *pacllen, u32 info)

{

	struct cifs_ntsd *pntsd = NULL;

	struct cifsFileInfo *open_file = NULL;
@@ -1273,7 +1274,7 @@ struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *cifs_sb, 
	if (!open_file)

		return get_cifs_acl_by_path(cifs_sb, path, pacllen);



	pntsd = get_cifs_acl_by_fid(cifs_sb, &open_file->fid, pacllen);

	pntsd = get_cifs_acl_by_fid(cifs_sb, &open_file->fid, pacllen, info);

	cifsFileInfo_put(open_file);

	return pntsd;

}
@@ -1338,6 +1339,7 @@ cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb, struct cifs_fattr *fattr, 
	int rc = 0;

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);

	struct smb_version_operations *ops;

	const u32 info = 0;



	cifs_dbg(NOISY, "converting ACL to mode for %s\n", path);
@@ -1347,9 +1349,9 @@ cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb, struct cifs_fattr *fattr, 
	ops = tlink_tcon(tlink)->ses->server->ops;



	if (pfid && (ops->get_acl_by_fid))

		pntsd = ops->get_acl_by_fid(cifs_sb, pfid, &acllen);

		pntsd = ops->get_acl_by_fid(cifs_sb, pfid, &acllen, info);

	else if (ops->get_acl)

		pntsd = ops->get_acl(cifs_sb, inode, path, &acllen);

		pntsd = ops->get_acl(cifs_sb, inode, path, &acllen, info);

	else {

		cifs_put_tlink(tlink);

		return -EOPNOTSUPP;
@@ -1388,6 +1390,7 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode, 
	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);

	struct smb_version_operations *ops;

	bool mode_from_sid, id_from_sid;

	const u32 info = 0;



	if (IS_ERR(tlink))

		return PTR_ERR(tlink);
@@ -1403,7 +1406,7 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode, 
		return -EOPNOTSUPP;

	}



	pntsd = ops->get_acl(cifs_sb, inode, path, &secdesclen);

	pntsd = ops->get_acl(cifs_sb, inode, path, &secdesclen, info);

	if (IS_ERR(pntsd)) {

		rc = PTR_ERR(pntsd);

		cifs_dbg(VFS, "%s: error %d getting sec desc\n", __func__, rc);

fs/cifs/cifsglob.h

+2 −2
Original line number Diff line number Diff line
@@ -456,9 +456,9 @@ struct smb_version_operations { 
			const char *, const void *, const __u16,

			const struct nls_table *, struct cifs_sb_info *);

	struct cifs_ntsd * (*get_acl)(struct cifs_sb_info *, struct inode *,

			const char *, u32 *);

			const char *, u32 *, u32);

	struct cifs_ntsd * (*get_acl_by_fid)(struct cifs_sb_info *,

			const struct cifs_fid *, u32 *);

			const struct cifs_fid *, u32 *, u32);

	int (*set_acl)(struct cifs_ntsd *, __u32, struct inode *, const char *,

			int);

	/* writepages retry size */

fs/cifs/cifspdu.h

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ 
#define SYNCHRONIZE           0x00100000  /* The file handle can waited on to */

					  /* synchronize with the completion  */

					  /* of an input/output request       */

#define SYSTEM_SECURITY       0x01000000  /* The system access control list   */

					  /* can be read and changed          */

#define GENERIC_ALL           0x10000000

#define GENERIC_EXECUTE       0x20000000

#define GENERIC_WRITE         0x40000000

fs/cifs/cifsproto.h

+2 −2
Original line number Diff line number Diff line
@@ -218,9 +218,9 @@ extern int cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb, 
extern int id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode,

					kuid_t uid, kgid_t gid);

extern struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *, struct inode *,

					const char *, u32 *);

				      const char *, u32 *, u32);

extern struct cifs_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *,

						const struct cifs_fid *, u32 *);

				const struct cifs_fid *, u32 *, u32);

extern int set_cifs_acl(struct cifs_ntsd *, __u32, struct inode *,

				const char *, int);

extern unsigned int setup_authusers_ACE(struct cifs_ace *pace);

CRA Git | Maintained and supported by SUSTech CRA and CCSE