Commit 10cc3e9a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.19-rc-part2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb client fixes from Steve French:

 - Fix incorrect error code defines

 - Add missing error code definitions

 - Add parenthesis around NT_STATUS code defines to fix checkpatch
   warnings

 - Remove some duplicated protocol definitions, moving to common code
   shared by client and server

 - Add missing protocol documentation reference (for change notify)

 - Correct struct definition (for duplicate_extents_to_file_ex)

* tag 'v6.19-rc-part2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  smb/client: remove DeviceType Flags and Device Characteristics definitions
  smb: move File Attributes definitions into common/fscc.h
  smb: update struct duplicate_extents_to_file_ex
  smb: move file_notify_information to common/fscc.h
  smb: move SMB2 Notify Action Flags into common/smb2pdu.h
  smb: move notify completion filter flags into common/smb2pdu.h
  smb/client: add parentheses to NT error code definitions containing bitwise OR operator
  smb: add documentation references for smb2 change notify definitions
  smb/client: add 4 NT error code definitions
  smb/client: fix NT_STATUS_UNABLE_TO_FREE_VM value
  smb/client: fix NT_STATUS_DEVICE_DOOR_OPEN value
  smb/client: fix NT_STATUS_NO_DATA_DETECTED value
parents 6bb34aff ab0347e6

fs/smb/client/cifspdu.h

+0 −65
Original line number Diff line number Diff line
@@ -1357,37 +1357,6 @@ typedef struct smb_com_transaction_change_notify_rsp { 
	__u16 ByteCount;

	/* __u8 Pad[3]; */

} __packed TRANSACT_CHANGE_NOTIFY_RSP;

/* Completion Filter flags for Notify */

#define FILE_NOTIFY_CHANGE_FILE_NAME    0x00000001

#define FILE_NOTIFY_CHANGE_DIR_NAME     0x00000002

#define FILE_NOTIFY_CHANGE_NAME         0x00000003

#define FILE_NOTIFY_CHANGE_ATTRIBUTES   0x00000004

#define FILE_NOTIFY_CHANGE_SIZE         0x00000008

#define FILE_NOTIFY_CHANGE_LAST_WRITE   0x00000010

#define FILE_NOTIFY_CHANGE_LAST_ACCESS  0x00000020

#define FILE_NOTIFY_CHANGE_CREATION     0x00000040

#define FILE_NOTIFY_CHANGE_EA           0x00000080

#define FILE_NOTIFY_CHANGE_SECURITY     0x00000100

#define FILE_NOTIFY_CHANGE_STREAM_NAME  0x00000200

#define FILE_NOTIFY_CHANGE_STREAM_SIZE  0x00000400

#define FILE_NOTIFY_CHANGE_STREAM_WRITE 0x00000800



#define FILE_ACTION_ADDED		0x00000001

#define FILE_ACTION_REMOVED		0x00000002

#define FILE_ACTION_MODIFIED		0x00000003

#define FILE_ACTION_RENAMED_OLD_NAME	0x00000004

#define FILE_ACTION_RENAMED_NEW_NAME	0x00000005

#define FILE_ACTION_ADDED_STREAM	0x00000006

#define FILE_ACTION_REMOVED_STREAM	0x00000007

#define FILE_ACTION_MODIFIED_STREAM	0x00000008



/* response contains array of the following structures */

struct file_notify_information {

	__le32 NextEntryOffset;

	__le32 Action;

	__le32 FileNameLength;

	__u8  FileName[];

} __packed;



struct cifs_quota_data {

	__u32	rsrvd1;  /* 0 */
@@ -2034,40 +2003,6 @@ typedef struct { 


#define CIFS_POSIX_EXTENSIONS           0x00000010 /* support for new QFSInfo */



/* DeviceType Flags */

#define FILE_DEVICE_CD_ROM              0x00000002

#define FILE_DEVICE_CD_ROM_FILE_SYSTEM  0x00000003

#define FILE_DEVICE_DFS                 0x00000006

#define FILE_DEVICE_DISK                0x00000007

#define FILE_DEVICE_DISK_FILE_SYSTEM    0x00000008

#define FILE_DEVICE_FILE_SYSTEM         0x00000009

#define FILE_DEVICE_NAMED_PIPE          0x00000011

#define FILE_DEVICE_NETWORK             0x00000012

#define FILE_DEVICE_NETWORK_FILE_SYSTEM 0x00000014

#define FILE_DEVICE_NULL                0x00000015

#define FILE_DEVICE_PARALLEL_PORT       0x00000016

#define FILE_DEVICE_PRINTER             0x00000018

#define FILE_DEVICE_SERIAL_PORT         0x0000001b

#define FILE_DEVICE_STREAMS             0x0000001e

#define FILE_DEVICE_TAPE                0x0000001f

#define FILE_DEVICE_TAPE_FILE_SYSTEM    0x00000020

#define FILE_DEVICE_VIRTUAL_DISK        0x00000024

#define FILE_DEVICE_NETWORK_REDIRECTOR  0x00000028



/* Device Characteristics */

#define FILE_REMOVABLE_MEDIA			0x00000001

#define FILE_READ_ONLY_DEVICE			0x00000002

#define FILE_FLOPPY_DISKETTE			0x00000004

#define FILE_WRITE_ONCE_MEDIA			0x00000008

#define FILE_REMOTE_DEVICE			0x00000010

#define FILE_DEVICE_IS_MOUNTED			0x00000020

#define FILE_VIRTUAL_VOLUME			0x00000040

#define FILE_DEVICE_SECURE_OPEN			0x00000100

#define FILE_CHARACTERISTIC_TS_DEVICE		0x00001000

#define FILE_CHARACTERISTIC_WEBDAV_DEVICE	0x00002000

#define FILE_PORTABLE_DEVICE			0x00004000

#define FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL 0x00020000



/******************************************************************************/

/* QueryFileInfo/QueryPathinfo (also for SetPath/SetFile) data buffer formats */

/******************************************************************************/

fs/smb/client/nterr.c

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


const struct nt_err_code_struct nt_errs[] = {

	{"NT_STATUS_OK", NT_STATUS_OK},

	{"NT_STATUS_PENDING", NT_STATUS_PENDING},

	{"NT_STATUS_MEDIA_CHANGED", NT_STATUS_MEDIA_CHANGED},

	{"NT_STATUS_END_OF_MEDIA", NT_STATUS_END_OF_MEDIA},

	{"NT_STATUS_MEDIA_CHECK", NT_STATUS_MEDIA_CHECK},
@@ -544,6 +545,7 @@ const struct nt_err_code_struct nt_errs[] = { 
	{"NT_STATUS_DOMAIN_TRUST_INCONSISTENT",

	 NT_STATUS_DOMAIN_TRUST_INCONSISTENT},

	{"NT_STATUS_FS_DRIVER_REQUIRED", NT_STATUS_FS_DRIVER_REQUIRED},

	{"NT_STATUS_INVALID_LOCK_RANGE", NT_STATUS_INVALID_LOCK_RANGE},

	{"NT_STATUS_NO_USER_SESSION_KEY", NT_STATUS_NO_USER_SESSION_KEY},

	{"NT_STATUS_USER_SESSION_DELETED", NT_STATUS_USER_SESSION_DELETED},

	{"NT_STATUS_RESOURCE_LANG_NOT_FOUND",
@@ -675,9 +677,12 @@ const struct nt_err_code_struct nt_errs[] = { 
	 NT_STATUS_QUOTA_LIST_INCONSISTENT},

	{"NT_STATUS_FILE_IS_OFFLINE", NT_STATUS_FILE_IS_OFFLINE},

	{"NT_STATUS_NOT_A_REPARSE_POINT", NT_STATUS_NOT_A_REPARSE_POINT},

	{"NT_STATUS_NETWORK_SESSION_EXPIRED", NT_STATUS_NETWORK_SESSION_EXPIRED},

	{"NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES},

	{"NT_STATUS_MORE_ENTRIES", NT_STATUS_MORE_ENTRIES},

	{"NT_STATUS_SOME_UNMAPPED", NT_STATUS_SOME_UNMAPPED},

	{"NT_STATUS_NO_SUCH_JOB", NT_STATUS_NO_SUCH_JOB},

	{"NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP",

	 NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP},

	{NULL, 0}

};

fs/smb/client/nterr.h

+509 −505

File changed.

Preview size limit exceeded, changes collapsed.

fs/smb/common/fscc.h

+56 −0
Original line number Diff line number Diff line
@@ -144,6 +144,62 @@ typedef struct { 
	__le32 DeviceCharacteristics;

} __packed FILE_SYSTEM_DEVICE_INFO; /* device info level 0x104 */



/*

 * File Attributes

 * See MS-FSCC 2.6

 */

#define FILE_ATTRIBUTE_READONLY			0x00000001

#define FILE_ATTRIBUTE_HIDDEN			0x00000002

#define FILE_ATTRIBUTE_SYSTEM			0x00000004

#define FILE_ATTRIBUTE_DIRECTORY		0x00000010

#define FILE_ATTRIBUTE_ARCHIVE			0x00000020

#define FILE_ATTRIBUTE_NORMAL			0x00000080

#define FILE_ATTRIBUTE_TEMPORARY		0x00000100

#define FILE_ATTRIBUTE_SPARSE_FILE		0x00000200

#define FILE_ATTRIBUTE_REPARSE_POINT		0x00000400

#define FILE_ATTRIBUTE_COMPRESSED		0x00000800

#define FILE_ATTRIBUTE_OFFLINE			0x00001000

#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED	0x00002000

#define FILE_ATTRIBUTE_ENCRYPTED		0x00004000

#define FILE_ATTRIBUTE_INTEGRITY_STREAM		0x00008000

#define FILE_ATTRIBUTE_NO_SCRUB_DATA		0x00020000

#define FILE_ATTRIBUTE_MASK (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \

		FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | \

		FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_NORMAL | \

		FILE_ATTRIBUTE_TEMPORARY | FILE_ATTRIBUTE_SPARSE_FILE | \

		FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED | \

		FILE_ATTRIBUTE_OFFLINE | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED | \

		FILE_ATTRIBUTE_ENCRYPTED | FILE_ATTRIBUTE_INTEGRITY_STREAM | \

		FILE_ATTRIBUTE_NO_SCRUB_DATA)



#define FILE_ATTRIBUTE_READONLY_LE		cpu_to_le32(FILE_ATTRIBUTE_READONLY)

#define FILE_ATTRIBUTE_HIDDEN_LE		cpu_to_le32(FILE_ATTRIBUTE_HIDDEN)

#define FILE_ATTRIBUTE_SYSTEM_LE		cpu_to_le32(FILE_ATTRIBUTE_SYSTEM)

#define FILE_ATTRIBUTE_DIRECTORY_LE		cpu_to_le32(FILE_ATTRIBUTE_DIRECTORY)

#define FILE_ATTRIBUTE_ARCHIVE_LE		cpu_to_le32(FILE_ATTRIBUTE_ARCHIVE)

#define FILE_ATTRIBUTE_NORMAL_LE		cpu_to_le32(FILE_ATTRIBUTE_NORMAL)

#define FILE_ATTRIBUTE_TEMPORARY_LE		cpu_to_le32(FILE_ATTRIBUTE_TEMPORARY)

#define FILE_ATTRIBUTE_SPARSE_FILE_LE		cpu_to_le32(FILE_ATTRIBUTE_SPARSE_FILE)

#define FILE_ATTRIBUTE_REPARSE_POINT_LE		cpu_to_le32(FILE_ATTRIBUTE_REPARSE_POINT)

#define FILE_ATTRIBUTE_COMPRESSED_LE		cpu_to_le32(FILE_ATTRIBUTE_COMPRESSED)

#define FILE_ATTRIBUTE_OFFLINE_LE		cpu_to_le32(FILE_ATTRIBUTE_OFFLINE)

#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED_LE	cpu_to_le32(FILE_ATTRIBUTE_NOT_CONTENT_INDEXED)

#define FILE_ATTRIBUTE_ENCRYPTED_LE		cpu_to_le32(FILE_ATTRIBUTE_ENCRYPTED)

#define FILE_ATTRIBUTE_INTEGRITY_STREAM_LE	cpu_to_le32(FILE_ATTRIBUTE_INTEGRITY_STREAM)

#define FILE_ATTRIBUTE_NO_SCRUB_DATA_LE		cpu_to_le32(FILE_ATTRIBUTE_NO_SCRUB_DATA)

#define FILE_ATTRIBUTE_MASK_LE			cpu_to_le32(FILE_ATTRIBUTE_MASK)



/*

 * Response contains array of the following structures

 * See MS-FSCC 2.7.1

 */

struct file_notify_information {

	__le32 NextEntryOffset;

	__le32 Action;

	__le32 FileNameLength;

	__u8  FileName[];

} __packed;



/*

 * See POSIX Extensions to MS-FSCC 2.3.2.1

 * Link: https://gitlab.com/samba-team/smb3-posix-spec/-/blob/master/fscc_posix_extensions.md

fs/smb/common/smb2pdu.h

+11 −37
Original line number Diff line number Diff line
@@ -991,6 +991,7 @@ struct smb2_set_info_rsp { 
/* notify completion filter flags. See MS-FSCC 2.6 and MS-SMB2 2.2.35 */

#define FILE_NOTIFY_CHANGE_FILE_NAME		0x00000001

#define FILE_NOTIFY_CHANGE_DIR_NAME		0x00000002

#define FILE_NOTIFY_CHANGE_NAME			0x00000003

#define FILE_NOTIFY_CHANGE_ATTRIBUTES		0x00000004

#define FILE_NOTIFY_CHANGE_SIZE			0x00000008

#define FILE_NOTIFY_CHANGE_LAST_WRITE		0x00000010
@@ -1002,7 +1003,10 @@ struct smb2_set_info_rsp { 
#define FILE_NOTIFY_CHANGE_STREAM_SIZE		0x00000400

#define FILE_NOTIFY_CHANGE_STREAM_WRITE		0x00000800



/* SMB2 Notify Action Flags */

/*

 * SMB2 Notify Action Flags

 * See MS-FSCC 2.7.1

 */

#define FILE_ACTION_ADDED                       0x00000001

#define FILE_ACTION_REMOVED                     0x00000002

#define FILE_ACTION_MODIFIED                    0x00000003
@@ -1012,7 +1016,10 @@ struct smb2_set_info_rsp { 
#define FILE_ACTION_REMOVED_STREAM              0x00000007

#define FILE_ACTION_MODIFIED_STREAM             0x00000008

#define FILE_ACTION_REMOVED_BY_DELETE           0x00000009

#define FILE_ACTION_ID_NOT_TUNNELLED            0x0000000A

#define FILE_ACTION_TUNNELLED_ID_COLLISION      0x0000000B



/* See MS-SMB2 2.2.35 */

struct smb2_change_notify_req {

	struct smb2_hdr hdr;

	__le16	StructureSize;
@@ -1024,6 +1031,7 @@ struct smb2_change_notify_req { 
	__u32	Reserved;

} __packed;



/* See MS-SMB2 2.2.36 */

struct smb2_change_notify_rsp {

	struct smb2_hdr hdr;

	__le16	StructureSize;  /* Must be 9 */
@@ -1064,41 +1072,6 @@ struct smb2_server_client_notification { 
#define IL_IMPERSONATION	cpu_to_le32(0x00000002)

#define IL_DELEGATE		cpu_to_le32(0x00000003)



/* File Attributes */

#define FILE_ATTRIBUTE_READONLY			0x00000001

#define FILE_ATTRIBUTE_HIDDEN			0x00000002

#define FILE_ATTRIBUTE_SYSTEM			0x00000004

#define FILE_ATTRIBUTE_DIRECTORY		0x00000010

#define FILE_ATTRIBUTE_ARCHIVE			0x00000020

#define FILE_ATTRIBUTE_NORMAL			0x00000080

#define FILE_ATTRIBUTE_TEMPORARY		0x00000100

#define FILE_ATTRIBUTE_SPARSE_FILE		0x00000200

#define FILE_ATTRIBUTE_REPARSE_POINT		0x00000400

#define FILE_ATTRIBUTE_COMPRESSED		0x00000800

#define FILE_ATTRIBUTE_OFFLINE			0x00001000

#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED	0x00002000

#define FILE_ATTRIBUTE_ENCRYPTED		0x00004000

#define FILE_ATTRIBUTE_INTEGRITY_STREAM		0x00008000

#define FILE_ATTRIBUTE_NO_SCRUB_DATA		0x00020000

#define FILE_ATTRIBUTE__MASK			0x00007FB7



#define FILE_ATTRIBUTE_READONLY_LE              cpu_to_le32(0x00000001)

#define FILE_ATTRIBUTE_HIDDEN_LE		cpu_to_le32(0x00000002)

#define FILE_ATTRIBUTE_SYSTEM_LE		cpu_to_le32(0x00000004)

#define FILE_ATTRIBUTE_DIRECTORY_LE		cpu_to_le32(0x00000010)

#define FILE_ATTRIBUTE_ARCHIVE_LE		cpu_to_le32(0x00000020)

#define FILE_ATTRIBUTE_NORMAL_LE		cpu_to_le32(0x00000080)

#define FILE_ATTRIBUTE_TEMPORARY_LE		cpu_to_le32(0x00000100)

#define FILE_ATTRIBUTE_SPARSE_FILE_LE		cpu_to_le32(0x00000200)

#define FILE_ATTRIBUTE_REPARSE_POINT_LE		cpu_to_le32(0x00000400)

#define FILE_ATTRIBUTE_COMPRESSED_LE		cpu_to_le32(0x00000800)

#define FILE_ATTRIBUTE_OFFLINE_LE		cpu_to_le32(0x00001000)

#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED_LE	cpu_to_le32(0x00002000)

#define FILE_ATTRIBUTE_ENCRYPTED_LE		cpu_to_le32(0x00004000)

#define FILE_ATTRIBUTE_INTEGRITY_STREAM_LE	cpu_to_le32(0x00008000)

#define FILE_ATTRIBUTE_NO_SCRUB_DATA_LE		cpu_to_le32(0x00020000)

#define FILE_ATTRIBUTE_MASK_LE			cpu_to_le32(0x00007FB7)



/* Desired Access Flags */

#define FILE_READ_DATA_LE		cpu_to_le32(0x00000001)

#define FILE_LIST_DIRECTORY_LE		cpu_to_le32(0x00000001)
@@ -1537,9 +1510,10 @@ struct duplicate_extents_to_file { 
	__le64 ByteCount;  /* Bytes to be copied */

} __packed;



/* See MS-FSCC 2.3.8 */

/* See MS-FSCC 2.3.9 */

#define DUPLICATE_EXTENTS_DATA_EX_SOURCE_ATOMIC	0x00000001

struct duplicate_extents_to_file_ex {

	__le64 StructureSize; /* MUST be set to 0x30 */

	__u64 PersistentFileHandle; /* source file handle, opaque endianness */

	__u64 VolatileFileHandle;

	__le64 SourceFileOffset;