Commit 7edee522 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more cifs updates from Steve French:
 "Fixes from the recent SMB3 Test events and Storage Developer
  Conference (held the last two weeks).

  Here are nine smb3 patches including an important patch for debugging
  traces with wireshark, with three patches marked for stable.

  Additional fixes from last week to better handle some newly discovered
  reparse points, and a fix the create/mkdir path for setting the mode
  more atomically (in SMB3 Create security descriptor context), and one
  for path name processing are still being tested so are not included
  here"

* tag '5.4-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Fix oplock handling for SMB 2.1+ protocols
  smb3: missing ACL related flags
  smb3: pass mode bits into create calls
  smb3: Add missing reparse tags
  CIFS: fix max ea value size
  fs/cifs/sess.c: Remove set but not used variable 'capabilities'
  fs/cifs/smb2pdu.c: Make SMB2_notify_init static
  smb3: fix leak in "open on server" perf counter
  smb3: allow decryption keys to be dumped by admin for debugging
parents 3f2dc279 a016e279

fs/cifs/cifs_ioctl.h

+9 −0
Original line number Diff line number Diff line
@@ -57,9 +57,18 @@ struct smb_query_info { 
	/* char buffer[]; */

} __packed;



struct smb3_key_debug_info {

	__u64	Suid;

	__u16	cipher_type;

	__u8	auth_key[16]; /* SMB2_NTLMV2_SESSKEY_SIZE */

	__u8	smb3encryptionkey[SMB3_SIGN_KEY_SIZE];

	__u8	smb3decryptionkey[SMB3_SIGN_KEY_SIZE];

} __packed;



#define CIFS_IOCTL_MAGIC	0xCF

#define CIFS_IOC_COPYCHUNK_FILE	_IOW(CIFS_IOCTL_MAGIC, 3, int)

#define CIFS_IOC_SET_INTEGRITY  _IO(CIFS_IOCTL_MAGIC, 4)

#define CIFS_IOC_GET_MNT_INFO _IOR(CIFS_IOCTL_MAGIC, 5, struct smb_mnt_fs_info)

#define CIFS_ENUMERATE_SNAPSHOTS _IOR(CIFS_IOCTL_MAGIC, 6, struct smb_snapshot_array)

#define CIFS_QUERY_INFO _IOWR(CIFS_IOCTL_MAGIC, 7, struct smb_query_info)

#define CIFS_DUMP_KEY _IOWR(CIFS_IOCTL_MAGIC, 8, struct smb3_key_debug_info)

fs/cifs/cifsacl.h

+80 −1
Original line number Diff line number Diff line
@@ -90,14 +90,93 @@ struct cifs_acl { 
	__le32 num_aces;

} __attribute__((packed));



/* ACE types - see MS-DTYP 2.4.4.1 */

#define ACCESS_ALLOWED_ACE_TYPE	0x00

#define ACCESS_DENIED_ACE_TYPE	0x01

#define SYSTEM_AUDIT_ACE_TYPE	0x02

#define SYSTEM_ALARM_ACE_TYPE	0x03

#define ACCESS_ALLOWED_COMPOUND_ACE_TYPE 0x04

#define ACCESS_ALLOWED_OBJECT_ACE_TYPE	0x05

#define ACCESS_DENIED_OBJECT_ACE_TYPE	0x06

#define SYSTEM_AUDIT_OBJECT_ACE_TYPE	0x07

#define SYSTEM_ALARM_OBJECT_ACE_TYPE	0x08

#define ACCESS_ALLOWED_CALLBACK_ACE_TYPE 0x09

#define ACCESS_DENIED_CALLBACK_ACE_TYPE	0x0A

#define ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE 0x0B

#define ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE  0x0C

#define SYSTEM_AUDIT_CALLBACK_ACE_TYPE	0x0D

#define SYSTEM_ALARM_CALLBACK_ACE_TYPE	0x0E /* Reserved */

#define SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE 0x0F

#define SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE 0x10 /* reserved */

#define SYSTEM_MANDATORY_LABEL_ACE_TYPE	0x11

#define SYSTEM_RESOURCE_ATTRIBUTE_ACE_TYPE 0x12

#define SYSTEM_SCOPED_POLICY_ID_ACE_TYPE 0x13



/* ACE flags */

#define OBJECT_INHERIT_ACE	0x01

#define CONTAINER_INHERIT_ACE	0x02

#define NO_PROPAGATE_INHERIT_ACE 0x04

#define INHERIT_ONLY_ACE	0x08

#define INHERITED_ACE		0x10

#define SUCCESSFUL_ACCESS_ACE_FLAG 0x40

#define FAILED_ACCESS_ACE_FLAG	0x80



struct cifs_ace {

	__u8 type;

	__u8 type; /* see above and MS-DTYP 2.4.4.1 */

	__u8 flags;

	__le16 size;

	__le32 access_req;

	struct cifs_sid sid; /* ie UUID of user or group who gets these perms */

} __attribute__((packed));



/*

 * The current SMB3 form of security descriptor is similar to what was used for

 * cifs (see above) but some fields are split, and fields in the struct below

 * matches names of fields to the the spec, MS-DTYP (see sections 2.4.5 and

 * 2.4.6). Note that "CamelCase" fields are used in this struct in order to

 * match the MS-DTYP and MS-SMB2 specs which define the wire format.

 */

struct smb3_sd {

	__u8 Revision; /* revision level, MUST be one */

	__u8 Sbz1; /* only meaningful if 'RM' flag set below */

	__le16 Control;

	__le32 OffsetOwner;

	__le32 OffsetGroup;

	__le32 OffsetSacl;

	__le32 OffsetDacl;

} __packed;



/* Meaning of 'Control' field flags */

#define ACL_CONTROL_SR	0x0001	/* Self relative */

#define ACL_CONTROL_RM	0x0002	/* Resource manager control bits */

#define ACL_CONTROL_PS	0x0004	/* SACL protected from inherits */

#define ACL_CONTROL_PD	0x0008	/* DACL protected from inherits */

#define ACL_CONTROL_SI	0x0010	/* SACL Auto-Inherited */

#define ACL_CONTROL_DI	0x0020	/* DACL Auto-Inherited */

#define ACL_CONTROL_SC	0x0040	/* SACL computed through inheritance */

#define ACL_CONTROL_DC	0x0080	/* DACL computed through inheritence */

#define ACL_CONTROL_SS	0x0100	/* Create server ACL */

#define ACL_CONTROL_DT	0x0200	/* DACL provided by trusteed source */

#define ACL_CONTROL_SD	0x0400	/* SACL defaulted */

#define ACL_CONTROL_SP	0x0800	/* SACL is present on object */

#define ACL_CONTROL_DD	0x1000	/* DACL defaulted */

#define ACL_CONTROL_DP	0x2000	/* DACL is present on object */

#define ACL_CONTROL_GD	0x4000	/* Group was defaulted */

#define ACL_CONTROL_OD	0x8000	/* User was defaulted */



/* Meaning of AclRevision flags */

#define ACL_REVISION	0x02 /* See section 2.4.4.1 of MS-DTYP */

#define ACL_REVISION_DS	0x04 /* Additional AceTypes allowed */



struct smb3_acl {

	u8 AclRevision; /* revision level */

	u8 Sbz1; /* MBZ */

	__le16 AclSize;

	__le16 AceCount;

	__le16 Sbz2; /* MBZ */

} __packed;





/*

 * Minimum security identifier can be one for system defined Users

 * and Groups such as NULL SID and World or Built-in accounts such

fs/cifs/cifsglob.h

+4 −2
Original line number Diff line number Diff line
@@ -331,8 +331,9 @@ struct smb_version_operations { 
			umode_t mode, struct cifs_tcon *tcon,

			const char *full_path,

			struct cifs_sb_info *cifs_sb);

	int (*mkdir)(const unsigned int, struct cifs_tcon *, const char *,

		     struct cifs_sb_info *);

	int (*mkdir)(const unsigned int xid, struct inode *inode, umode_t mode,

		     struct cifs_tcon *tcon, const char *name,

		     struct cifs_sb_info *sb);

	/* set info on created directory */

	void (*mkdir_setinfo)(struct inode *, const char *,

			      struct cifs_sb_info *, struct cifs_tcon *,
@@ -1209,6 +1210,7 @@ struct cifs_search_info { 
	bool smallBuf:1; /* so we know which buf_release function to call */

};



#define ACL_NO_MODE	-1

struct cifs_open_parms {

	struct cifs_tcon *tcon;

	struct cifs_sb_info *cifs_sb;

fs/cifs/cifsproto.h

+2 −1
Original line number Diff line number Diff line
@@ -372,7 +372,8 @@ extern int CIFSSMBUnixSetPathInfo(const unsigned int xid, 
				  const struct nls_table *nls_codepage,

				  int remap);



extern int CIFSSMBMkDir(const unsigned int xid, struct cifs_tcon *tcon,

extern int CIFSSMBMkDir(const unsigned int xid, struct inode *inode,

			umode_t mode, struct cifs_tcon *tcon,

			const char *name, struct cifs_sb_info *cifs_sb);

extern int CIFSSMBRmDir(const unsigned int xid, struct cifs_tcon *tcon,

			const char *name, struct cifs_sb_info *cifs_sb);

fs/cifs/cifssmb.c

+2 −1
Original line number Diff line number Diff line
@@ -1078,7 +1078,8 @@ RmDirRetry: 
}



int

CIFSSMBMkDir(const unsigned int xid, struct cifs_tcon *tcon, const char *name,

CIFSSMBMkDir(const unsigned int xid, struct inode *inode, umode_t mode,

	     struct cifs_tcon *tcon, const char *name,

	     struct cifs_sb_info *cifs_sb)

{

	int rc = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE