Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 25a6e13

Browse files
namjaejeonSteve French
authored andcommitted
ksmbd: return FILE_DEVICE_DISK instead of super magic
MS-SMB2 specification describes setting ->DeviceType to FILE_DEVICE_DISK or FILE_DEVICE_CD_ROM. Set FILE_DEVICE_DISK instead of super magic in FS_DEVICE_INFORMATION. And Set FILE_READ_ONLY_DEVICE for read-only share. Signed-off-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 22a40d1 commit 25a6e13

File tree

2 files changed

+41
-2
lines changed

2 files changed

+41
-2
lines changed

fs/smb/common/smb2pdu.h

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -917,6 +917,40 @@ struct smb2_query_directory_rsp {
917917
__u8 Buffer[];
918918
} __packed;
919919

920+
/* DeviceType Flags */
921+
#define FILE_DEVICE_CD_ROM 0x00000002
922+
#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003
923+
#define FILE_DEVICE_DFS 0x00000006
924+
#define FILE_DEVICE_DISK 0x00000007
925+
#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008
926+
#define FILE_DEVICE_FILE_SYSTEM 0x00000009
927+
#define FILE_DEVICE_NAMED_PIPE 0x00000011
928+
#define FILE_DEVICE_NETWORK 0x00000012
929+
#define FILE_DEVICE_NETWORK_FILE_SYSTEM 0x00000014
930+
#define FILE_DEVICE_NULL 0x00000015
931+
#define FILE_DEVICE_PARALLEL_PORT 0x00000016
932+
#define FILE_DEVICE_PRINTER 0x00000018
933+
#define FILE_DEVICE_SERIAL_PORT 0x0000001b
934+
#define FILE_DEVICE_STREAMS 0x0000001e
935+
#define FILE_DEVICE_TAPE 0x0000001f
936+
#define FILE_DEVICE_TAPE_FILE_SYSTEM 0x00000020
937+
#define FILE_DEVICE_VIRTUAL_DISK 0x00000024
938+
#define FILE_DEVICE_NETWORK_REDIRECTOR 0x00000028
939+
940+
/* Device Characteristics */
941+
#define FILE_REMOVABLE_MEDIA 0x00000001
942+
#define FILE_READ_ONLY_DEVICE 0x00000002
943+
#define FILE_FLOPPY_DISKETTE 0x00000004
944+
#define FILE_WRITE_ONCE_MEDIA 0x00000008
945+
#define FILE_REMOTE_DEVICE 0x00000010
946+
#define FILE_DEVICE_IS_MOUNTED 0x00000020
947+
#define FILE_VIRTUAL_VOLUME 0x00000040
948+
#define FILE_DEVICE_SECURE_OPEN 0x00000100
949+
#define FILE_CHARACTERISTIC_TS_DEVICE 0x00001000
950+
#define FILE_CHARACTERISTIC_WEBDAV_DEVICE 0x00002000
951+
#define FILE_PORTABLE_DEVICE 0x00004000
952+
#define FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL 0x00020000
953+
920954
/*
921955
* Maximum number of iovs we need for a set-info request.
922956
* The largest one is rename/hardlink

fs/smb/server/smb2pdu.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5314,8 +5314,13 @@ static int smb2_get_info_filesystem(struct ksmbd_work *work,
53145314

53155315
info = (struct filesystem_device_info *)rsp->Buffer;
53165316

5317-
info->DeviceType = cpu_to_le32(stfs.f_type);
5318-
info->DeviceCharacteristics = cpu_to_le32(0x00000020);
5317+
info->DeviceType = cpu_to_le32(FILE_DEVICE_DISK);
5318+
info->DeviceCharacteristics =
5319+
cpu_to_le32(FILE_DEVICE_IS_MOUNTED);
5320+
if (!test_tree_conn_flag(work->tcon,
5321+
KSMBD_TREE_CONN_FLAG_WRITABLE))
5322+
info->DeviceCharacteristics |=
5323+
cpu_to_le32(FILE_READ_ONLY_DEVICE);
53195324
rsp->OutputBufferLength = cpu_to_le32(8);
53205325
break;
53215326
}

0 commit comments

Comments
 (0)