* [GIT PULL] ksmbd server fixes
@ 2022-06-28 22:07 Steve French
2022-06-29 16:44 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2022-06-28 22:07 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS, Namjae Jeon
Please pull the following changes since commit
f2906aa863381afb0015a9eb7fefad885d4e5a56:
Linux 5.19-rc1 (2022-06-05 17:18:54 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/5.19-rc4-ksmbd-server-fixes
for you to fetch changes up to 067baa9a37b32b95fdeabccde4b0cb6a2cf95f96:
ksmbd: use vfs_llseek instead of dereferencing NULL (2022-06-25
19:52:49 -0500)
----------------------------------------------------------------
Six ksmbd server fixes, including 3 for stable fixing:
- seek null check
- offset validation in FSCTL_SET_ZERO_DATA
- fallocate fix (relates e.g. to xfstests generic/091 and 263)
- two cleanup fixes
- fix socket settings on some arch
----------------------------------------------------------------
Christophe JAILLET (1):
ksmbd: smbd: Remove useless license text when
SPDX-License-Identifier is already used
Hyunchul Lee (1):
ksmbd: remove duplicate flag set in smb2_write
Jason A. Donenfeld (1):
ksmbd: use vfs_llseek instead of dereferencing NULL
Namjae Jeon (3):
ksmbd: use SOCK_NONBLOCK type for kernel_accept()
ksmbd: set the range of bytes to zero without extending file
size in FSCTL_ZERO_DATA
ksmbd: check invalid FileOffset and BeyondFinalZero in FSCTL_ZERO_DATA
fs/ksmbd/smb2pdu.c | 32 ++++++++++++++++++--------------
fs/ksmbd/transport_rdma.c | 10 ----------
fs/ksmbd/transport_tcp.c | 2 +-
fs/ksmbd/vfs.c | 8 +++++---
4 files changed, 24 insertions(+), 28 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2024-04-22 23:20 Steve French
2024-04-22 23:51 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2024-04-22 23:20 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, Namjae Jeon, CIFS
Please pull the following changes since commit
0bbac3facb5d6cc0171c45c9873a2dc96bea9680:
Linux 6.9-rc4 (2024-04-14 13:38:39 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.9-rc5-ksmbd-fixes
for you to fetch changes up to e9d8c2f95ab8acaf3f4d4a53682a4afa3c263692:
ksmbd: add continuous availability share parameter (2024-04-19 20:48:47 -0500)
----------------------------------------------------------------
Five ksmbd server fixes, most also for stable
- rename fix
- fix for two potential out of bounds
- fix for connections from MacOS (padding in close response)
- fix for when to enable persistent handles
----------------------------------------------------------------
Marios Makassikis (1):
ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
Namjae Jeon (4):
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
ksmbd: common: use struct_group_attr instead of struct_group for
network_open_info
ksmbd: add continuous availability share parameter
fs/smb/common/smb2pdu.h | 2 +-
fs/smb/server/ksmbd_netlink.h | 35 ++++++++++++++++++-----------------
fs/smb/server/server.c | 13 +++++--------
fs/smb/server/smb2pdu.c | 15 +++++++++++++--
fs/smb/server/vfs.c | 5 +++++
5 files changed, 42 insertions(+), 28 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2024-04-05 3:15 Steve French
2024-04-05 17:09 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2024-04-05 3:15 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS, Namjae Jeon
Please pull the following changes since commit
39cd87c4eb2b893354f3b850f916353f2658ae6f:
Linux 6.9-rc2 (2024-03-31 14:32:39 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.9-rc2-ksmbd-server-fixes
for you to fetch changes up to 5ed11af19e56f0434ce0959376d136005745a936:
ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1
(2024-04-02 09:21:25 -0500)
----------------------------------------------------------------
3 ksmbd changesets, all also for stable
- encryption fix
- memory overrun fix
- oplock break fix
----------------------------------------------------------------
Namjae Jeon (3):
ksmbd: don't send oplock break if rename fails
ksmbd: validate payload size in ipc response
ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1
fs/smb/server/ksmbd_netlink.h | 3 ++-
fs/smb/server/mgmt/share_config.c | 7 ++++++-
fs/smb/server/smb2ops.c | 10 +++++-----
fs/smb/server/smb2pdu.c | 3 ++-
fs/smb/server/transport_ipc.c | 37 +++++++++++++++++++++++++++++++++++++
5 files changed, 52 insertions(+), 8 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2024-03-20 17:06 Steve French
2024-03-20 23:46 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2024-03-20 17:06 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, Namjae Jeon
Please pull the following changes since commit
e8f897f4afef0031fe618a8e94127a0934896aba:
Linux 6.8 (2024-03-10 13:38:09 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/v6.9-rc-smb3-server-fixes
for you to fetch changes up to def30e72d8abaf68da10682767e584519c234c4c:
ksmbd: remove module version (2024-03-18 21:21:38 -0500)
----------------------------------------------------------------
Nine ksmbd server changesets:
- Two patches that add support for durable file handles (an important
data integrity feature)
- Fixes for two potential out of bounds issues
- FIx possible null dereference in close
- Two getattr fixes
- Trivial typo fix and a minor cleanup fix
----------------------------------------------------------------
Colin Ian King (1):
ksmbd: Fix spelling mistake "connction" -> "connection"
Marios Makassikis (3):
ksmbd: replace generic_fillattr with vfs_getattr
ksmbd: retrieve number of blocks using vfs_getattr in
set_file_allocation_info
ksmbd: fix possible null-deref in smb_lazy_parent_lease_break_close
Namjae Jeon (5):
ksmbd: mark SMB2_SESSION_EXPIRED to session when destroying
previous session
ksmbd: add support for durable handles v1/v2
ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
ksmbd: fix potencial out-of-bounds when buffer offset is invalid
ksmbd: remove module version
fs/smb/server/glob.h | 2 -
fs/smb/server/ksmbd_netlink.h | 1 +
fs/smb/server/mgmt/user_session.c | 28 ++-
fs/smb/server/mgmt/user_session.h | 3 +
fs/smb/server/oplock.c | 96 +++++++--
fs/smb/server/oplock.h | 7 +-
fs/smb/server/server.c | 1 -
fs/smb/server/smb2misc.c | 26 ++-
fs/smb/server/smb2ops.c | 6 +
fs/smb/server/smb2pdu.c | 509
++++++++++++++++++++++++++++++++++++----------
fs/smb/server/smb2pdu.h | 15 ++
fs/smb/server/smb_common.c | 11 +-
fs/smb/server/vfs.c | 12 +-
fs/smb/server/vfs_cache.c | 137 ++++++++++++-
fs/smb/server/vfs_cache.h | 9 +
15 files changed, 716 insertions(+), 147 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2024-02-10 1:45 Steve French
2024-02-10 16:26 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2024-02-10 1:45 UTC (permalink / raw)
To: Linus Torvalds; +Cc: CIFS, Namjae Jeon, LKML
Please pull the following changes since commit
54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478:
Linux 6.8-rc3 (2024-02-04 12:20:36 +0000)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.8-rc3-ksmbd-server-fixes
for you to fetch changes up to 108a020c64434fed4b69762879d78cd24088b4c7:
ksmbd: free aux buffer if ksmbd_iov_pin_rsp_read fails (2024-02-07
20:23:37 -0600)
----------------------------------------------------------------
Two small ksmbd server fixes:
- one for a memory leak
- the other a minor kernel-doc fix
----------------------------------------------------------------
Fedor Pchelkin (1):
ksmbd: free aux buffer if ksmbd_iov_pin_rsp_read fails
Yang Li (1):
ksmbd: Add kernel-doc for ksmbd_extract_sharename() function
fs/smb/server/misc.c | 1 +
fs/smb/server/smb2pdu.c | 8 ++++++--
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2024-01-27 7:20 Steve French
2024-01-27 17:21 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2024-01-27 7:20 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS, Namjae Jeon
Please pull the following changes since commit
6613476e225e090cc9aad49be7fa504e290dd33d:
Linux 6.8-rc1 (2024-01-21 14:11:32 -0800)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.8-rc2-smb3-server-fixes
for you to fetch changes up to ebeae8adf89d9a82359f6659b1663d09beec2faa:
ksmbd: fix global oob in ksmbd_nl_policy (2024-01-25 00:16:54 -0600)
----------------------------------------------------------------
2 ksmbd fixes, including one for stable
- Fix netlink OOB
- Minor kernel doc fix
----------------------------------------------------------------
Lin Ma (1):
ksmbd: fix global oob in ksmbd_nl_policy
Yang Li (1):
smb: Fix some kernel-doc comments
fs/smb/server/ksmbd_netlink.h | 3 ++-
fs/smb/server/transport_ipc.c | 4 ++--
fs/smb/server/transport_tcp.c | 2 ++
3 files changed, 6 insertions(+), 3 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2024-01-18 0:39 Steve French
2024-01-19 18:03 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2024-01-18 0:39 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, Namjae Jeon, CIFS
Please pull the following changes since commit
6a31658aa1c0b757df652f6fcf3a001f90fda302:
Merge tag '6.8-rc-smb-server-fixes' of git://git.samba.org/ksmbd
(2024-01-11 20:27:41 -0800)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.8-rc-smb-server-fixes-part2
for you to fetch changes up to 77bebd186442a7d703b796784db7495129cc3e70:
ksmbd: only v2 leases handle the directory (2024-01-14 22:14:56 -0600)
----------------------------------------------------------------
Four ksmbd server fixes
- Fix for incorrect oplock break on directories when leases disabled
- UAF fix for race between create and destroy of tcp connection
- Important session setup SPNEGO fix
- Update ksmbd feature status summary
----------------------------------------------------------------
Namjae Jeon (4):
ksmbd: update feature status in documentation
ksmbd: validate mech token in session setup
ksmbd: fix UAF issue in ksmbd_tcp_new_connection()
ksmbd: only v2 leases handle the directory
Documentation/filesystems/smb/ksmbd.rst | 9 ++++++---
fs/smb/server/asn1.c | 5 +++++
fs/smb/server/connection.c | 6 ------
fs/smb/server/connection.h | 2 +-
fs/smb/server/oplock.c | 6 ++++++
fs/smb/server/smb2pdu.c | 22 +++++++++++++++++-----
fs/smb/server/transport_rdma.c | 11 ++++++-----
fs/smb/server/transport_tcp.c | 13 +++++++------
8 files changed, 48 insertions(+), 26 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2024-01-11 14:20 Steve French
2024-01-12 5:07 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2024-01-11 14:20 UTC (permalink / raw)
To: Linus Torvalds; +Cc: CIFS, Namjae Jeon, LKML
Please pull the following changes since commit
0dd3ee31125508cd67f7e7172247f05b7fd1753a:
Linux 6.7 (2024-01-07 12:18:38 -0800)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.8-rc-smb-server-fixes
for you to fetch changes up to 8fb7b723924cc9306bc161f45496497aec733904:
ksmbd: Add missing set_freezable() for freezable kthread (2024-01-09
20:01:16 -0600)
----------------------------------------------------------------
11 ksmbd server fixes
- memory allocation fix
- Three lease fixes, including important rename fix
- read only share fix
- thread freeze fix
- Three cleanup fixes (two kernel doc related)
- locking fix in setting EAs
- packet header validation fix
----------------------------------------------------------------
Christophe JAILLET (1):
ksmbd: Remove usage of the deprecated ida_simple_xx() API
Fedor Pchelkin (1):
ksmbd: free ppace array on error in parse_dacl
Kevin Hao (1):
ksmbd: Add missing set_freezable() for freezable kthread
Li Nan (1):
ksmbd: validate the zero field of packet header
Namjae Jeon (5):
ksmbd: set v2 lease version on lease upgrade
ksmbd: fix potential circular locking issue in smb2_set_ea()
ksmbd: don't increment epoch if current state and request state are same
ksmbd: don't allow O_TRUNC open on read-only share
ksmbd: send lease break notification on FILE_RENAME_INFORMATION
Randy Dunlap (2):
ksmbd: auth: fix most kernel-doc warnings
ksmbd: vfs: fix all kernel-doc warnings
fs/smb/server/auth.c | 14 ++++++++------
fs/smb/server/connection.c | 1 +
fs/smb/server/mgmt/ksmbd_ida.c | 21 ++++++---------------
fs/smb/server/oplock.c | 16 +++++++++++-----
fs/smb/server/smb2pdu.c | 31 ++++++++++++++-----------------
fs/smb/server/smb_common.c | 6 +++++-
fs/smb/server/smbacl.c | 11 +++++++----
fs/smb/server/vfs.c | 28 ++++++++++++++++++----------
8 files changed, 70 insertions(+), 58 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-11-27 21:00 Steve French
2023-11-28 1:26 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-11-27 21:00 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS, Namjae Jeon
[resending due to email bounce]
Please pull the following changes since commit
98b1cc82c4affc16f5598d4fa14b1858671b2263:
Linux 6.7-rc2 (2023-11-19 15:02:14 -0800)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.7-rc3-smb3-server-fixes
for you to fetch changes up to cd80ce7e68f1624ac29cd0a6b057789d1236641e:
ksmbd: don't update ->op_state as OPLOCK_STATE_NONE on error
(2023-11-23 20:50:45 -0600)
----------------------------------------------------------------
Seven ksmbd server fixes:
- Memory leak fix
- Fix possible deadlock in open
- Multiple SMB3 leasing (caching) fixes including:
incorrect open count (found via xfstest generic/002 with leases)
lease breaking incorrect serialization
lease break error handling fix
fix sending async response when lease pending
- Async command fix
----------------------------------------------------------------
Namjae Jeon (6):
ksmbd: fix possible deadlock in smb2_open
ksmbd: separately allocate ci per dentry
ksmbd: move oplock handling after unlock parent dir
ksmbd: release interim response after sending status pending response
ksmbd: move setting SMB2_FLAGS_ASYNC_COMMAND and AsyncId
ksmbd: don't update ->op_state as OPLOCK_STATE_NONE on error
Zongmin Zhou (1):
ksmbd: prevent memory leak on error return
fs/smb/server/ksmbd_work.c | 10 ++-
fs/smb/server/oplock.c | 3 +-
fs/smb/server/smb2pdu.c | 162 +++++++++++++++++++++++----------------------
fs/smb/server/smbacl.c | 7 +-
fs/smb/server/smbacl.h | 2 +-
fs/smb/server/vfs.c | 70 ++++++++++++--------
fs/smb/server/vfs.h | 10 ++-
fs/smb/server/vfs_cache.c | 33 ++++-----
fs/smb/server/vfs_cache.h | 6 +-
9 files changed, 162 insertions(+), 141 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-11-10 7:16 Steve French
2023-11-10 18:47 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-11-10 7:16 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, LKML, CIFS
Please pull the following changes since commit
766e9cf3bd64c45fcace3acc6f8b3df815448ea3:
Merge tag '6.7-rc-smb3-client-fixes-part1' of
git://git.samba.org/sfrench/cifs-2.6 (2023-11-04 09:13:50 -1000)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.7-rc-smb3-server-part2
for you to fetch changes up to 5a5409d90bd05f87fe5623a749ccfbf3f7c7d400:
ksmbd: handle malformed smb1 message (2023-11-07 18:54:25 -0600)
----------------------------------------------------------------
Three ksmbd server fixes (two also for stable):
- slab out of bounds fix in ACL handling
- fix malformed request oops
- minor doc fix
----------------------------------------------------------------
Namjae Jeon (3):
ksmbd: fix slab out of bounds write in smb_inherit_dacl()
ksmbd: fix kernel-doc comment of ksmbd_vfs_kern_path_locked()
ksmbd: handle malformed smb1 message
fs/smb/server/smb_common.c | 11 +++++++++++
fs/smb/server/smbacl.c | 29 ++++++++++++++++++++++++++---
fs/smb/server/vfs.c | 7 ++++---
3 files changed, 41 insertions(+), 6 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-11-02 2:46 Steve French
2023-11-02 18:38 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-11-02 2:46 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, CIFS, LKML
Please pull the following changes since commit
05d3ef8bba77c1b5f98d941d8b2d4aeab8118ef1:
Linux 6.6-rc7 (2023-10-22 12:11:21 -1000)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.7-rc-ksmbd-server-fixes
for you to fetch changes up to 67797da8a4b82446d42c52b6ee1419a3100d78ff:
ksmbd: no need to wait for binded connection termination at logoff
(2023-10-30 21:58:12 -0500)
----------------------------------------------------------------
Seven ksmbd server fixes
- logoff improvement for multichannel bound connections
- unicode fix for surrogate pairs
- RDMA (smbdirect) fix for IB devices
- fix locking deadlock in kern_path_create during rename
- iov memory allocation fix
- Two minor cleanup patches (doc cleanup, and unused variable)
----------------------------------------------------------------
Cheng-Han Wu (1):
ksmbd: Remove unused field in ksmbd_user struct
Kangjing Huang (1):
ksmbd: fix missing RDMA-capable flag for IPoIB device in
ksmbd_rdma_capable_netdev()
Marios Makassikis (1):
ksmbd: fix recursive locking in vfs helpers
Namjae Jeon (4):
ksmbd: reorganize ksmbd_iov_pin_rsp()
ksmbd: fix kernel-doc comment of ksmbd_vfs_setxattr()
ksmbd: add support for surrogate pair conversion
ksmbd: no need to wait for binded connection termination at logoff
fs/smb/server/connection.c | 16 ----
fs/smb/server/ksmbd_work.c | 43 ++++-----
fs/smb/server/mgmt/user_config.h | 1 -
fs/smb/server/transport_rdma.c | 40 ++++++---
fs/smb/server/unicode.c | 187 +++++++++++++++++++++++++++++----------
fs/smb/server/vfs.c | 25 +-----
6 files changed, 194 insertions(+), 118 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-10-15 2:46 Steve French
2023-10-15 2:52 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-10-15 2:46 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS, Namjae Jeon
Please pull the following changes since commit
94f6f0550c625fab1f373bb86a6669b45e9748b3:
Linux 6.6-rc5 (2023-10-08 13:49:43 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git 6.6-rc5-ksmbd-server-fixes
for you to fetch changes up to 1903e6d0578118e9aab1ee23f4a9de55737d1d05:
ksmbd: fix potential double free on smb2_read_pipe() error path
(2023-10-12 22:44:11 -0500)
----------------------------------------------------------------
Four SMB3 server fixes
- Fix for possible double free in RPC read
- Add additional check to clarify smb2_open path and quiet Coverity
- Fix incorrect error rsp in a compounding path
- Fix to properly fail open of file with pending delete on close
----------------------------------------------------------------
Namjae Jeon (4):
ksmbd: not allow to open file if delelete on close bit is set
ksmbd: fix wrong error response status by using set_smb2_rsp_status()
ksmbd: fix Null pointer dereferences in ksmbd_update_fstate()
ksmbd: fix potential double free on smb2_read_pipe() error path
fs/smb/server/smb2pdu.c | 11 ++++++-----
fs/smb/server/vfs_cache.c | 7 +++++--
2 files changed, 11 insertions(+), 7 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-10-08 4:27 Steve French
2023-10-08 18:06 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-10-08 4:27 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, CIFS, LKML
Please pull the following changes since commit
8a749fd1a8720d4619c91c8b6e7528c0a355c0aa:
Linux 6.6-rc4 (2023-10-01 14:15:13 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.6-rc4-ksmbd-server-fixes
for you to fetch changes up to 33b235a6e6ebe0f05f3586a71e8d281d00f71e2e:
ksmbd: fix race condition between tree conn lookup and disconnect
(2023-10-04 21:56:28 -0500)
----------------------------------------------------------------
Six SMB3 server fixes for various races found by RO0T Lab of Huawei:
- Fix oops when race between oplock break ack and freeing file
- Simultaneous request fixes:for parallel logoffs, and for parallel
lock requests
- Fixes for tree disconnect race, session expire race, and close/open race
----------------------------------------------------------------
Namjae Jeon (5):
ksmbd: fix race condition between session lookup and expire
ksmbd: fix race condition with fp
ksmbd: fix race condition from parallel smb2 logoff requests
ksmbd: fix race condition from parallel smb2 lock requests
ksmbd: fix race condition between tree conn lookup and disconnect
luosili (1):
ksmbd: fix uaf in smb20_oplock_break_ack
fs/smb/server/connection.c | 2 +
fs/smb/server/connection.h | 1 +
fs/smb/server/mgmt/tree_connect.c | 42 +++++++++++++++--
fs/smb/server/mgmt/tree_connect.h | 11 ++++-
fs/smb/server/mgmt/user_session.c | 11 +++--
fs/smb/server/mgmt/user_session.h | 1 +
fs/smb/server/server.c | 2 +
fs/smb/server/smb2pdu.c | 94 +++++++++++++++++++++++++--------------
fs/smb/server/vfs_cache.c | 23 ++++++++--
fs/smb/server/vfs_cache.h | 9 ++++
10 files changed, 151 insertions(+), 45 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-09-29 22:11 Steve French
2023-09-29 23:59 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-09-29 22:11 UTC (permalink / raw)
To: Linus Torvalds; +Cc: CIFS, Namjae Jeon
Please pull the following changes since commit
ce9ecca0238b140b88f43859b211c9fdfd8e5b70:
Linux 6.6-rc2 (2023-09-17 14:40:24 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.6-rc3-ksmbd-server-fixes
for you to fetch changes up to 73f949ea87c7d697210653501ca21efe57295327:
ksmbd: check iov vector index in ksmbd_conn_write() (2023-09-21
14:41:06 -0500)
----------------------------------------------------------------
Two SMB3 server fixes for null pointer dereferences
- one for invalid SMB3 request case (fixes issue found in testing the
read compound patch)
- one for handling null iovec error case in response processing
----------------------------------------------------------------
Namjae Jeon (2):
ksmbd: return invalid parameter error response if smb2 request is invalid
ksmbd: check iov vector index in ksmbd_conn_write()
fs/smb/server/connection.c | 3 +++
fs/smb/server/server.c | 4 +++-
fs/smb/server/smb2misc.c | 4 +---
3 files changed, 7 insertions(+), 4 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-09-17 1:55 Steve French
2023-09-17 18:24 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-09-17 1:55 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS, Namjae Jeon
Please pull the following changes since commit
0bb80ecc33a8fb5a682236443c1e740d5c917d1d:
Linux 6.6-rc1 (2023-09-10 16:28:41 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.6-rc1-ksmbd
for you to fetch changes up to 59d8d24f4610333560cf2e8fe3f44cafe30322eb:
ksmbd: fix passing freed memory 'aux_payload_buf' (2023-09-13 10:21:05 -0500)
----------------------------------------------------------------
Two small ksmbd server fixes
- quiet smatch warning, clarifying aux_payload_buf freed
(set explicitly to NULL)
- avoid duplicate call to mark_inode_dirty (when setting ACLs)
----------------------------------------------------------------
Namjae Jeon (2):
ksmbd: remove unneeded mark_inode_dirty in set_info_sec()
ksmbd: fix passing freed memory 'aux_payload_buf'
fs/smb/server/smb2pdu.c | 2 +-
fs/smb/server/smbacl.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-08-09 23:11 Steve French
2023-08-10 5:02 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-08-09 23:11 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS, Namjae Jeon
Please pull the following changes since commit
5d0c230f1de8c7515b6567d9afba1f196fb4e2f4:
Linux 6.5-rc4 (2023-07-30 13:23:47 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.5-rc5-ksmbd-server
for you to fetch changes up to 79ed288cef201f1f212dfb934bcaac75572fb8f6:
ksmbd: fix wrong next length validation of ea buffer in
smb2_set_ea() (2023-08-05 20:57:00 -0500)
----------------------------------------------------------------
Two ksmbd server fixes, both also for stable
- improve buffer validation when multiple EAs returned
- missing check for command payload size
----------------------------------------------------------------
Long Li (1):
ksmbd: validate command request size
Namjae Jeon (1):
ksmbd: fix wrong next length validation of ea buffer in smb2_set_ea()
fs/smb/server/smb2misc.c | 10 +++++-----
fs/smb/server/smb2pdu.c | 9 ++++++++-
2 files changed, 13 insertions(+), 6 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-07-26 6:17 Steve French
2023-07-26 18:42 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-07-26 6:17 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, LKML, CIFS
Please pull the following changes since commit
06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5:
Linux 6.5-rc1 (2023-07-09 13:53:13 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.5-rc3-ksmbd-server-fixes
for you to fetch changes up to 536bb492d39bb6c080c92f31e8a55fe9934f452b:
ksmbd: fix out of bounds in init_smb2_rsp_hdr() (2023-07-23 10:25:11 -0500)
----------------------------------------------------------------
Six ksmbd server fixes including for stable, and four reported by ZDI
- fixes for two possible out of bounds access (in negotiate, and in decrypt msg)
- fix unsigned compared to zero warning
- fix path lookup crossing a mountpoint
- fix case when first compound request is a tree connect
- fix memory leak if reads are compounded
----------------------------------------------------------------
Namjae Jeon (5):
ksmbd: check if a mount point is crossed during path lookup
ksmbd: fix out of bounds in smb3_decrypt_req()
ksmbd: validate session id and tree id in compound request
ksmbd: no response from compound read
ksmbd: fix out of bounds in init_smb2_rsp_hdr()
Wang Ming (1):
ksmbd: Fix unsigned expression compared with zero
fs/smb/server/ksmbd_netlink.h | 3 ++-
fs/smb/server/server.c | 7 ++++++-
fs/smb/server/smb2pdu.c | 47
+++++++++++++++++++++++++++------------------
fs/smb/server/smb_common.c | 19 +++++++++++--------
fs/smb/server/smb_common.h | 2 +-
fs/smb/server/vfs.c | 65
++++++++++++++++++++++++++++++++++++---------------------------
fs/smb/server/vfs.h | 4 ++--
7 files changed, 88 insertions(+), 59 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-06-30 5:59 Steve French
2023-07-01 5:04 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-06-30 5:59 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, CIFS, LKML
Please pull the following changes since commit
6995e2de6891c724bfeb2db33d7b87775f913ad1:
Linux 6.4 (2023-06-25 16:29:58 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.5-rc-ksmbd-server-fixes-part1
for you to fetch changes up to 9cedc58bdbe9fff9aacd0ca19ee5777659f28fd7:
ksmbd: avoid field overflow warning (2023-06-28 22:58:28 -0500)
----------------------------------------------------------------
11 ksmbd server fixes
- two fixes for compounding bugs (make sure no out of bound reads with
less common combinations of commands in the compound)
- eight minor cleanup patches (e.g. simplifying return values, replace one
element array, use of kzalloc where simpler)
- fix for clang warning on possible overflow in filename conversion
----------------------------------------------------------------
Arnd Bergmann (1):
ksmbd: avoid field overflow warning
Gustavo A. R. Silva (2):
ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect()
ksmbd: Replace one-element array with flexible-array member
Lu Hongfei (2):
ksmbd: Change the return value of ksmbd_vfs_query_maximal_access to void
ksmbd: Replace the ternary conditional operator with min()
Namjae Jeon (6):
ksmbd: remove unused ksmbd_tree_conn_share function
ksmbd: use kzalloc() instead of __GFP_ZERO
ksmbd: return a literal instead of 'err' in ksmbd_vfs_kern_path_locked()
ksmbd: use kvzalloc instead of kvmalloc
ksmbd: fix out of bounds read in smb2_sess_setup
ksmbd: add missing compound request handing in some commands
fs/smb/server/mgmt/tree_connect.c | 11 ----------
fs/smb/server/mgmt/tree_connect.h | 3 ---
fs/smb/server/smb2pdu.c | 121
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
fs/smb/server/smb_common.c | 8 ++++----
fs/smb/server/smb_common.h | 2 +-
fs/smb/server/smbacl.c | 2 +-
fs/smb/server/transport_ipc.c | 4 ++--
fs/smb/server/vfs.c | 12 ++++-------
fs/smb/server/vfs.h | 2 +-
9 files changed, 88 insertions(+), 77 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-06-20 4:45 Steve French
2023-06-20 19:01 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-06-20 4:45 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS, Namjae Jeon
Please pull the following changes since commit
858fd168a95c5b9669aac8db6c14a9aeab446375:
Linux 6.4-rc6 (2023-06-11 14:35:30 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.4-rc6-smb3-server-fixes
for you to fetch changes up to 5005bcb4219156f1bf7587b185080ec1da08518e:
ksmbd: validate session id and tree id in the compound request
(2023-06-16 21:04:51 -0500)
----------------------------------------------------------------
Four smb3 server fixes, all also for stable
- fix potential oops in parsing compounded requests
- fix various paths (mkdir, create etc) where mnt_want_write was not
checked first
- fix slab out of bounds in check_message and write
----------------------------------------------------------------
Namjae Jeon (4):
ksmbd: validate command payload size
ksmbd: add mnt_want_write to ksmbd vfs functions
ksmbd: fix out-of-bound read in smb2_write
ksmbd: validate session id and tree id in the compound request
fs/smb/server/server.c | 33 +++++++++++++---------
fs/smb/server/smb2misc.c | 33 +++++++++++++---------
fs/smb/server/smb2pdu.c | 70 ++++++++++++++++++++++++++++++++-------------
fs/smb/server/smbacl.c | 10 +++----
fs/smb/server/vfs.c | 117
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------
fs/smb/server/vfs.h | 17 ++++++-----
fs/smb/server/vfs_cache.c | 2 +-
7 files changed, 196 insertions(+), 86 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-06-11 1:59 Steve French
2023-06-11 17:43 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-06-11 1:59 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, LKML, CIFS
Please pull the following changes since commit
8828003759391029fc45c15ac346622cdae19b6d:
Merge tag '6.4-rc4-smb3-server-fixes' of git://git.samba.org/ksmbd
(2023-06-01 08:27:34 -0400)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.4-rc5-smb3-server-fixes
for you to fetch changes up to 1c1bcf2d3ea061613119b534f57507c377df20f9:
ksmbd: validate smb request protocol id (2023-06-02 12:30:57 -0500)
----------------------------------------------------------------
Five smb3 server fixes, all also for stable
- Fix four slab out of bounds warnings: improve checks for protocol id,
and for small packet length, and for create context parsing,
and for negotiate context parsing
- Fix for incorrect dereferencing POSIX ACLs
----------------------------------------------------------------
Namjae Jeon (5):
ksmbd: fix out-of-bound read in deassemble_neg_contexts()
ksmbd: fix out-of-bound read in parse_lease_state()
ksmbd: fix posix_acls and acls dereferencing possible ERR_PTR()
ksmbd: check the validation of pdu_size in ksmbd_conn_handler_loop
ksmbd: validate smb request protocol id
fs/smb/server/connection.c | 17 +++++++++++++++--
fs/smb/server/oplock.c | 66
++++++++++++++++++++++++------------------------------------------
fs/smb/server/smb2pdu.c | 13 ++++++-------
fs/smb/server/smb_common.c | 14 +++++++++++++-
fs/smb/server/smbacl.c | 4 ++--
fs/smb/server/vfs.c | 4 ++--
6 files changed, 62 insertions(+), 56 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-05-21 5:14 Steve French
2023-05-21 18:06 ` Linus Torvalds
2023-05-21 18:09 ` pr-tracker-bot
0 siblings, 2 replies; 94+ messages in thread
From: Steve French @ 2023-05-21 5:14 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, LKML, CIFS
Please pull the following changes since commit
f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6:
Linux 6.4-rc2 (2023-05-14 12:51:40 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.4-rc2-ksmbd-server-fixes
for you to fetch changes up to e7b8b8ed9960bf699bf4029f482d9e869c094ed6:
ksmbd: smb2: Allow messages padded to 8byte boundary (2023-05-16
10:26:14 -0500)
----------------------------------------------------------------
Four ksmbd server fixes:
- two fixes for incorrect SMB3 message validation (one for client
which uses 8 byte padding, and one for empty bcc)
- two fixes for out of bounds bugs: one for username offset checks (in
session setup) and the other for create context name length checks (in
open requests)
----------------------------------------------------------------
Chih-Yen Chang (3):
ksmbd: fix global-out-of-bounds in smb2_find_context_vals
ksmbd: fix wrong UserName check in session_user
ksmbd: allocate one more byte for implied bcc[0]
Gustav Johansson (1):
ksmbd: smb2: Allow messages padded to 8byte boundary
fs/ksmbd/connection.c | 3 ++-
fs/ksmbd/oplock.c | 5 +++--
fs/ksmbd/oplock.h | 2 +-
fs/ksmbd/smb2misc.c | 5 ++++-
fs/ksmbd/smb2pdu.c | 19 +++++++++----------
5 files changed, 19 insertions(+), 15 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2023-05-21 5:14 Steve French
@ 2023-05-21 18:06 ` Linus Torvalds
2023-05-21 18:32 ` Linus Torvalds
2023-05-21 19:03 ` Steve French
2023-05-21 18:09 ` pr-tracker-bot
1 sibling, 2 replies; 94+ messages in thread
From: Linus Torvalds @ 2023-05-21 18:06 UTC (permalink / raw)
To: Steve French; +Cc: Namjae Jeon, LKML, CIFS
On Sat, May 20, 2023 at 10:14 PM Steve French <smfrench@gmail.com> wrote:
>
> Four ksmbd server fixes:
This reply is not really directly related to this pull (which I just
did), but more of a reaction to getting the cifs and ksmbd pulls next
to each other again.
We talked about directory layout issues some time ago, and there's
kind of beginnings of it, but it never happened, and the parts that
*did* happen I'm not super-happy about. That "fs/smbfs_common/"
subdirectory is just fairly ugly.
Would you mind horribly to just bite the bullet, and rename things,
and put it all under "smbfs". Something like
mkdir fs/smbfs
git mv fs/cifs fs/smbfs/client
git mv fs/ksmbd fs/smbfs/server
git mv fs/smbfs_common fs/smbfs/common
plus the required Makefile editing to just make it all build right?
And if you prefer just "fs/smb" over "fs/smbfs", that sounds fine to
me too, but I guess this all really does just the filesystem part
(rather than all the printing and whatever other stuff that smb also
contains).
I dunno. I just feel like the current organization and naming is this
odd half-way state, and we could just fairly easily do the above.
I could do it myself, of course, and git will sort out any rename
issues. But me doing it seems silly when you maintain all three
pieces.
Linus
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2023-05-21 18:06 ` Linus Torvalds
@ 2023-05-21 18:32 ` Linus Torvalds
2023-05-21 19:03 ` Steve French
1 sibling, 0 replies; 94+ messages in thread
From: Linus Torvalds @ 2023-05-21 18:32 UTC (permalink / raw)
To: Steve French; +Cc: Namjae Jeon, LKML, CIFS
[-- Attachment #1: Type: text/plain, Size: 1627 bytes --]
On Sun, May 21, 2023 at 11:06 AM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> Would you mind horribly to just bite the bullet, and rename things,
> and put it all under "smbfs". Something like
>
> mkdir fs/smbfs
> git mv fs/cifs fs/smbfs/client
> git mv fs/ksmbd fs/smbfs/server
> git mv fs/smbfs_common fs/smbfs/common
>
> plus the required Makefile editing to just make it all build right?
Just because I wanted to test it, here's a patch that is based on the
above directory moves, with the (tiny) extra work to set up the
Kconfig and Makefile changes, and some trivial "fix up include file
paths".
It's "tested" in the sense that it passes an "allmodconfig" build for
me, but that's literally all I checked.
I *did* end up changing the Kconfig variable name for SMBFS_COMMON to
be just SMBFS. It made more sense that way with the re-org. And I
think the patch looks pretty good, with things like
-#include "../smbfs_common/arc4.h"
+#include "../common/arc4.h"
just looking better as a result of this all. No?
But what I did *not* do was to fix up things like paths in the
documentation build etc. The location of the resulting module.ko files
obviously change, for example, and I find a reference to
fs/cifs/ioctl.c in the ioctl list etc.
Again - I'm not at all saying that you *have* to do this. And I am
*not* going to commit this diff to my own tree, for example.
I'm just sending the diff out to make it really easy for you to try it
out if you happen to agree with what I'm suggesting.
What do you think?
Linus
[-- Attachment #2: patch.diff --]
[-- Type: text/x-patch, Size: 36565 bytes --]
MAINTAINERS | 8 ++++----
fs/Kconfig | 10 +---------
fs/Makefile | 4 +---
fs/smbfs/Kconfig | 12 ++++++++++++
fs/smbfs/Makefile | 5 +++++
fs/{cifs => smbfs/client}/Kconfig | 0
fs/{cifs => smbfs/client}/Makefile | 0
fs/{cifs => smbfs/client}/asn1.c | 0
fs/{cifs => smbfs/client}/cached_dir.c | 0
fs/{cifs => smbfs/client}/cached_dir.h | 0
fs/{cifs => smbfs/client}/cifs_debug.c | 0
fs/{cifs => smbfs/client}/cifs_debug.h | 0
fs/{cifs => smbfs/client}/cifs_dfs_ref.c | 0
fs/{cifs => smbfs/client}/cifs_fs_sb.h | 0
fs/{cifs => smbfs/client}/cifs_ioctl.h | 0
fs/{cifs => smbfs/client}/cifs_spnego.c | 0
fs/{cifs => smbfs/client}/cifs_spnego.h | 0
fs/{cifs => smbfs/client}/cifs_spnego_negtokeninit.asn1 | 0
fs/{cifs => smbfs/client}/cifs_swn.c | 0
fs/{cifs => smbfs/client}/cifs_swn.h | 0
fs/{cifs => smbfs/client}/cifs_unicode.c | 0
fs/{cifs => smbfs/client}/cifs_unicode.h | 0
fs/{cifs => smbfs/client}/cifs_uniupr.h | 0
fs/{cifs => smbfs/client}/cifsacl.c | 0
fs/{cifs => smbfs/client}/cifsacl.h | 0
fs/{cifs => smbfs/client}/cifsencrypt.c | 2 +-
fs/{cifs => smbfs/client}/cifsfs.c | 0
fs/{cifs => smbfs/client}/cifsfs.h | 0
fs/{cifs => smbfs/client}/cifsglob.h | 2 +-
fs/{cifs => smbfs/client}/cifspdu.h | 2 +-
fs/{cifs => smbfs/client}/cifsproto.h | 0
fs/{cifs => smbfs/client}/cifsroot.c | 0
fs/{cifs => smbfs/client}/cifssmb.c | 0
fs/{cifs => smbfs/client}/connect.c | 0
fs/{cifs => smbfs/client}/dfs.c | 0
fs/{cifs => smbfs/client}/dfs.h | 0
fs/{cifs => smbfs/client}/dfs_cache.c | 0
fs/{cifs => smbfs/client}/dfs_cache.h | 0
fs/{cifs => smbfs/client}/dir.c | 0
fs/{cifs => smbfs/client}/dns_resolve.c | 0
fs/{cifs => smbfs/client}/dns_resolve.h | 0
fs/{cifs => smbfs/client}/export.c | 0
fs/{cifs => smbfs/client}/file.c | 0
fs/{cifs => smbfs/client}/fs_context.c | 0
fs/{cifs => smbfs/client}/fs_context.h | 0
fs/{cifs => smbfs/client}/fscache.c | 0
fs/{cifs => smbfs/client}/fscache.h | 0
fs/{cifs => smbfs/client}/inode.c | 0
fs/{cifs => smbfs/client}/ioctl.c | 0
fs/{cifs => smbfs/client}/link.c | 0
fs/{cifs => smbfs/client}/misc.c | 0
fs/{cifs => smbfs/client}/netlink.c | 0
fs/{cifs => smbfs/client}/netlink.h | 0
fs/{cifs => smbfs/client}/netmisc.c | 0
fs/{cifs => smbfs/client}/nterr.c | 0
fs/{cifs => smbfs/client}/nterr.h | 0
fs/{cifs => smbfs/client}/ntlmssp.h | 0
fs/{cifs => smbfs/client}/readdir.c | 0
fs/{cifs => smbfs/client}/rfc1002pdu.h | 0
fs/{cifs => smbfs/client}/sess.c | 0
fs/{cifs => smbfs/client}/smb1ops.c | 0
fs/{cifs => smbfs/client}/smb2file.c | 0
fs/{cifs => smbfs/client}/smb2glob.h | 0
fs/{cifs => smbfs/client}/smb2inode.c | 0
fs/{cifs => smbfs/client}/smb2maperror.c | 0
fs/{cifs => smbfs/client}/smb2misc.c | 0
fs/{cifs => smbfs/client}/smb2ops.c | 0
fs/{cifs => smbfs/client}/smb2pdu.c | 0
fs/{cifs => smbfs/client}/smb2pdu.h | 0
fs/{cifs => smbfs/client}/smb2proto.h | 0
fs/{cifs => smbfs/client}/smb2status.h | 0
fs/{cifs => smbfs/client}/smb2transport.c | 0
fs/{cifs => smbfs/client}/smbdirect.c | 0
fs/{cifs => smbfs/client}/smbdirect.h | 0
fs/{cifs => smbfs/client}/smbencrypt.c | 2 +-
fs/{cifs => smbfs/client}/smberr.h | 0
fs/{cifs => smbfs/client}/trace.c | 0
fs/{cifs => smbfs/client}/trace.h | 0
fs/{cifs => smbfs/client}/transport.c | 0
fs/{cifs => smbfs/client}/unc.c | 0
fs/{cifs => smbfs/client}/winucase.c | 0
fs/{cifs => smbfs/client}/xattr.c | 0
fs/{smbfs_common => smbfs/common}/Makefile | 4 ++--
fs/{smbfs_common => smbfs/common}/arc4.h | 0
fs/{smbfs_common => smbfs/common}/cifs_arc4.c | 0
fs/{smbfs_common => smbfs/common}/cifs_md4.c | 0
fs/{smbfs_common => smbfs/common}/md4.h | 0
fs/{smbfs_common => smbfs/common}/smb2pdu.h | 0
fs/{smbfs_common => smbfs/common}/smbfsctl.h | 0
fs/{ksmbd => smbfs/server}/Kconfig | 0
fs/{ksmbd => smbfs/server}/Makefile | 0
fs/{ksmbd => smbfs/server}/asn1.c | 0
fs/{ksmbd => smbfs/server}/asn1.h | 0
fs/{ksmbd => smbfs/server}/auth.c | 2 +-
fs/{ksmbd => smbfs/server}/auth.h | 0
fs/{ksmbd => smbfs/server}/connection.c | 0
fs/{ksmbd => smbfs/server}/connection.h | 0
fs/{ksmbd => smbfs/server}/crypto_ctx.c | 0
fs/{ksmbd => smbfs/server}/crypto_ctx.h | 0
fs/{ksmbd => smbfs/server}/glob.h | 0
fs/{ksmbd => smbfs/server}/ksmbd_netlink.h | 0
fs/{ksmbd => smbfs/server}/ksmbd_spnego_negtokeninit.asn1 | 0
fs/{ksmbd => smbfs/server}/ksmbd_spnego_negtokentarg.asn1 | 0
fs/{ksmbd => smbfs/server}/ksmbd_work.c | 0
fs/{ksmbd => smbfs/server}/ksmbd_work.h | 0
fs/{ksmbd => smbfs/server}/mgmt/ksmbd_ida.c | 0
fs/{ksmbd => smbfs/server}/mgmt/ksmbd_ida.h | 0
fs/{ksmbd => smbfs/server}/mgmt/share_config.c | 0
fs/{ksmbd => smbfs/server}/mgmt/share_config.h | 0
fs/{ksmbd => smbfs/server}/mgmt/tree_connect.c | 0
fs/{ksmbd => smbfs/server}/mgmt/tree_connect.h | 0
fs/{ksmbd => smbfs/server}/mgmt/user_config.c | 0
fs/{ksmbd => smbfs/server}/mgmt/user_config.h | 0
fs/{ksmbd => smbfs/server}/mgmt/user_session.c | 0
fs/{ksmbd => smbfs/server}/mgmt/user_session.h | 0
fs/{ksmbd => smbfs/server}/misc.c | 0
fs/{ksmbd => smbfs/server}/misc.h | 0
fs/{ksmbd => smbfs/server}/ndr.c | 0
fs/{ksmbd => smbfs/server}/ndr.h | 0
fs/{ksmbd => smbfs/server}/nterr.h | 0
fs/{ksmbd => smbfs/server}/ntlmssp.h | 0
fs/{ksmbd => smbfs/server}/oplock.c | 0
fs/{ksmbd => smbfs/server}/oplock.h | 0
fs/{ksmbd => smbfs/server}/server.c | 0
fs/{ksmbd => smbfs/server}/server.h | 0
fs/{ksmbd => smbfs/server}/smb2misc.c | 0
fs/{ksmbd => smbfs/server}/smb2ops.c | 0
fs/{ksmbd => smbfs/server}/smb2pdu.c | 0
fs/{ksmbd => smbfs/server}/smb2pdu.h | 0
fs/{ksmbd => smbfs/server}/smb_common.c | 0
fs/{ksmbd => smbfs/server}/smb_common.h | 2 +-
fs/{ksmbd => smbfs/server}/smbacl.c | 0
fs/{ksmbd => smbfs/server}/smbacl.h | 0
fs/{ksmbd => smbfs/server}/smbfsctl.h | 0
fs/{ksmbd => smbfs/server}/smbstatus.h | 0
fs/{ksmbd => smbfs/server}/transport_ipc.c | 0
fs/{ksmbd => smbfs/server}/transport_ipc.h | 0
fs/{ksmbd => smbfs/server}/transport_rdma.c | 0
fs/{ksmbd => smbfs/server}/transport_rdma.h | 0
fs/{ksmbd => smbfs/server}/transport_tcp.c | 0
fs/{ksmbd => smbfs/server}/transport_tcp.h | 0
fs/{ksmbd => smbfs/server}/unicode.c | 0
fs/{ksmbd => smbfs/server}/unicode.h | 0
fs/{ksmbd => smbfs/server}/uniupr.h | 0
fs/{ksmbd => smbfs/server}/vfs.c | 0
fs/{ksmbd => smbfs/server}/vfs.h | 0
fs/{ksmbd => smbfs/server}/vfs_cache.c | 0
fs/{ksmbd => smbfs/server}/vfs_cache.h | 0
fs/{ksmbd => smbfs/server}/xattr.h | 0
149 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 27ef11624748..6eef3f1787c1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5140,8 +5140,8 @@ S: Supported
W: https://wiki.samba.org/index.php/LinuxCIFS
T: git git://git.samba.org/sfrench/cifs-2.6.git
F: Documentation/admin-guide/cifs/
-F: fs/cifs/
-F: fs/smbfs_common/
+F: fs/smbfs/client/
+F: fs/smbfs/common/
F: include/uapi/linux/cifs
COMPACTPCI HOTPLUG CORE
@@ -11301,8 +11301,8 @@ L: linux-cifs@vger.kernel.org
S: Maintained
T: git git://git.samba.org/ksmbd.git
F: Documentation/filesystems/cifs/ksmbd.rst
-F: fs/ksmbd/
-F: fs/smbfs_common/
+F: fs/smbfs/common/
+F: fs/smbfs/server/
KERNEL UNIT TESTING FRAMEWORK (KUnit)
M: Brendan Higgins <brendanhiggins@google.com>
diff --git a/fs/Kconfig b/fs/Kconfig
index cc07a0cd3172..9f4d4df943be 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -367,15 +367,7 @@ config NFS_V4_2_SSC_HELPER
source "net/sunrpc/Kconfig"
source "fs/ceph/Kconfig"
-
-source "fs/cifs/Kconfig"
-source "fs/ksmbd/Kconfig"
-
-config SMBFS_COMMON
- tristate
- default y if CIFS=y || SMB_SERVER=y
- default m if CIFS=m || SMB_SERVER=m
-
+source "fs/smbfs/Kconfig"
source "fs/coda/Kconfig"
source "fs/afs/Kconfig"
source "fs/9p/Kconfig"
diff --git a/fs/Makefile b/fs/Makefile
index 834f1c3dba46..1fa48aab2602 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -95,9 +95,7 @@ obj-$(CONFIG_LOCKD) += lockd/
obj-$(CONFIG_NLS) += nls/
obj-y += unicode/
obj-$(CONFIG_SYSV_FS) += sysv/
-obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/
-obj-$(CONFIG_CIFS) += cifs/
-obj-$(CONFIG_SMB_SERVER) += ksmbd/
+obj-$(CONFIG_SMBFS) += smbfs/
obj-$(CONFIG_HPFS_FS) += hpfs/
obj-$(CONFIG_NTFS_FS) += ntfs/
obj-$(CONFIG_NTFS3_FS) += ntfs3/
diff --git a/fs/smbfs/Kconfig b/fs/smbfs/Kconfig
new file mode 100644
index 000000000000..18ccf9c4be08
--- /dev/null
+++ b/fs/smbfs/Kconfig
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# smbfs configuration
+
+source "fs/smbfs/client/Kconfig"
+source "fs/smbfs/server/Kconfig"
+
+config SMBFS
+ tristate
+ default y if CIFS=y || SMB_SERVER=y
+ default m if CIFS=m || SMB_SERVER=m
+
diff --git a/fs/smbfs/Makefile b/fs/smbfs/Makefile
new file mode 100644
index 000000000000..9a1bf59a1a65
--- /dev/null
+++ b/fs/smbfs/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_SMBFS) += common/
+obj-$(CONFIG_CIFS) += client/
+obj-$(CONFIG_SMB_SERVER) += server/
diff --git a/fs/cifs/Kconfig b/fs/smbfs/client/Kconfig
similarity index 100%
rename from fs/cifs/Kconfig
rename to fs/smbfs/client/Kconfig
diff --git a/fs/cifs/Makefile b/fs/smbfs/client/Makefile
similarity index 100%
rename from fs/cifs/Makefile
rename to fs/smbfs/client/Makefile
diff --git a/fs/cifs/asn1.c b/fs/smbfs/client/asn1.c
similarity index 100%
rename from fs/cifs/asn1.c
rename to fs/smbfs/client/asn1.c
diff --git a/fs/cifs/cached_dir.c b/fs/smbfs/client/cached_dir.c
similarity index 100%
rename from fs/cifs/cached_dir.c
rename to fs/smbfs/client/cached_dir.c
diff --git a/fs/cifs/cached_dir.h b/fs/smbfs/client/cached_dir.h
similarity index 100%
rename from fs/cifs/cached_dir.h
rename to fs/smbfs/client/cached_dir.h
diff --git a/fs/cifs/cifs_debug.c b/fs/smbfs/client/cifs_debug.c
similarity index 100%
rename from fs/cifs/cifs_debug.c
rename to fs/smbfs/client/cifs_debug.c
diff --git a/fs/cifs/cifs_debug.h b/fs/smbfs/client/cifs_debug.h
similarity index 100%
rename from fs/cifs/cifs_debug.h
rename to fs/smbfs/client/cifs_debug.h
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/smbfs/client/cifs_dfs_ref.c
similarity index 100%
rename from fs/cifs/cifs_dfs_ref.c
rename to fs/smbfs/client/cifs_dfs_ref.c
diff --git a/fs/cifs/cifs_fs_sb.h b/fs/smbfs/client/cifs_fs_sb.h
similarity index 100%
rename from fs/cifs/cifs_fs_sb.h
rename to fs/smbfs/client/cifs_fs_sb.h
diff --git a/fs/cifs/cifs_ioctl.h b/fs/smbfs/client/cifs_ioctl.h
similarity index 100%
rename from fs/cifs/cifs_ioctl.h
rename to fs/smbfs/client/cifs_ioctl.h
diff --git a/fs/cifs/cifs_spnego.c b/fs/smbfs/client/cifs_spnego.c
similarity index 100%
rename from fs/cifs/cifs_spnego.c
rename to fs/smbfs/client/cifs_spnego.c
diff --git a/fs/cifs/cifs_spnego.h b/fs/smbfs/client/cifs_spnego.h
similarity index 100%
rename from fs/cifs/cifs_spnego.h
rename to fs/smbfs/client/cifs_spnego.h
diff --git a/fs/cifs/cifs_spnego_negtokeninit.asn1 b/fs/smbfs/client/cifs_spnego_negtokeninit.asn1
similarity index 100%
rename from fs/cifs/cifs_spnego_negtokeninit.asn1
rename to fs/smbfs/client/cifs_spnego_negtokeninit.asn1
diff --git a/fs/cifs/cifs_swn.c b/fs/smbfs/client/cifs_swn.c
similarity index 100%
rename from fs/cifs/cifs_swn.c
rename to fs/smbfs/client/cifs_swn.c
diff --git a/fs/cifs/cifs_swn.h b/fs/smbfs/client/cifs_swn.h
similarity index 100%
rename from fs/cifs/cifs_swn.h
rename to fs/smbfs/client/cifs_swn.h
diff --git a/fs/cifs/cifs_unicode.c b/fs/smbfs/client/cifs_unicode.c
similarity index 100%
rename from fs/cifs/cifs_unicode.c
rename to fs/smbfs/client/cifs_unicode.c
diff --git a/fs/cifs/cifs_unicode.h b/fs/smbfs/client/cifs_unicode.h
similarity index 100%
rename from fs/cifs/cifs_unicode.h
rename to fs/smbfs/client/cifs_unicode.h
diff --git a/fs/cifs/cifs_uniupr.h b/fs/smbfs/client/cifs_uniupr.h
similarity index 100%
rename from fs/cifs/cifs_uniupr.h
rename to fs/smbfs/client/cifs_uniupr.h
diff --git a/fs/cifs/cifsacl.c b/fs/smbfs/client/cifsacl.c
similarity index 100%
rename from fs/cifs/cifsacl.c
rename to fs/smbfs/client/cifsacl.c
diff --git a/fs/cifs/cifsacl.h b/fs/smbfs/client/cifsacl.h
similarity index 100%
rename from fs/cifs/cifsacl.h
rename to fs/smbfs/client/cifsacl.h
diff --git a/fs/cifs/cifsencrypt.c b/fs/smbfs/client/cifsencrypt.c
similarity index 99%
rename from fs/cifs/cifsencrypt.c
rename to fs/smbfs/client/cifsencrypt.c
index 357bd27a7fd1..ef4c2e3c9fa6 100644
--- a/fs/cifs/cifsencrypt.c
+++ b/fs/smbfs/client/cifsencrypt.c
@@ -21,7 +21,7 @@
#include <linux/random.h>
#include <linux/highmem.h>
#include <linux/fips.h>
-#include "../smbfs_common/arc4.h"
+#include "../common/arc4.h"
#include <crypto/aead.h>
/*
diff --git a/fs/cifs/cifsfs.c b/fs/smbfs/client/cifsfs.c
similarity index 100%
rename from fs/cifs/cifsfs.c
rename to fs/smbfs/client/cifsfs.c
diff --git a/fs/cifs/cifsfs.h b/fs/smbfs/client/cifsfs.h
similarity index 100%
rename from fs/cifs/cifsfs.h
rename to fs/smbfs/client/cifsfs.h
diff --git a/fs/cifs/cifsglob.h b/fs/smbfs/client/cifsglob.h
similarity index 99%
rename from fs/cifs/cifsglob.h
rename to fs/smbfs/client/cifsglob.h
index 5f8fd20951af..0d84bb1a8cd9 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/smbfs/client/cifsglob.h
@@ -24,7 +24,7 @@
#include "cifsacl.h"
#include <crypto/internal/hash.h>
#include <uapi/linux/cifs/cifs_mount.h>
-#include "../smbfs_common/smb2pdu.h"
+#include "../common/smb2pdu.h"
#include "smb2pdu.h"
#include <linux/filelock.h>
diff --git a/fs/cifs/cifspdu.h b/fs/smbfs/client/cifspdu.h
similarity index 99%
rename from fs/cifs/cifspdu.h
rename to fs/smbfs/client/cifspdu.h
index 445e3eaebcc1..e17222fec9d2 100644
--- a/fs/cifs/cifspdu.h
+++ b/fs/smbfs/client/cifspdu.h
@@ -11,7 +11,7 @@
#include <net/sock.h>
#include <asm/unaligned.h>
-#include "../smbfs_common/smbfsctl.h"
+#include "../common/smbfsctl.h"
#define CIFS_PROT 0
#define POSIX_PROT (CIFS_PROT+1)
diff --git a/fs/cifs/cifsproto.h b/fs/smbfs/client/cifsproto.h
similarity index 100%
rename from fs/cifs/cifsproto.h
rename to fs/smbfs/client/cifsproto.h
diff --git a/fs/cifs/cifsroot.c b/fs/smbfs/client/cifsroot.c
similarity index 100%
rename from fs/cifs/cifsroot.c
rename to fs/smbfs/client/cifsroot.c
diff --git a/fs/cifs/cifssmb.c b/fs/smbfs/client/cifssmb.c
similarity index 100%
rename from fs/cifs/cifssmb.c
rename to fs/smbfs/client/cifssmb.c
diff --git a/fs/cifs/connect.c b/fs/smbfs/client/connect.c
similarity index 100%
rename from fs/cifs/connect.c
rename to fs/smbfs/client/connect.c
diff --git a/fs/cifs/dfs.c b/fs/smbfs/client/dfs.c
similarity index 100%
rename from fs/cifs/dfs.c
rename to fs/smbfs/client/dfs.c
diff --git a/fs/cifs/dfs.h b/fs/smbfs/client/dfs.h
similarity index 100%
rename from fs/cifs/dfs.h
rename to fs/smbfs/client/dfs.h
diff --git a/fs/cifs/dfs_cache.c b/fs/smbfs/client/dfs_cache.c
similarity index 100%
rename from fs/cifs/dfs_cache.c
rename to fs/smbfs/client/dfs_cache.c
diff --git a/fs/cifs/dfs_cache.h b/fs/smbfs/client/dfs_cache.h
similarity index 100%
rename from fs/cifs/dfs_cache.h
rename to fs/smbfs/client/dfs_cache.h
diff --git a/fs/cifs/dir.c b/fs/smbfs/client/dir.c
similarity index 100%
rename from fs/cifs/dir.c
rename to fs/smbfs/client/dir.c
diff --git a/fs/cifs/dns_resolve.c b/fs/smbfs/client/dns_resolve.c
similarity index 100%
rename from fs/cifs/dns_resolve.c
rename to fs/smbfs/client/dns_resolve.c
diff --git a/fs/cifs/dns_resolve.h b/fs/smbfs/client/dns_resolve.h
similarity index 100%
rename from fs/cifs/dns_resolve.h
rename to fs/smbfs/client/dns_resolve.h
diff --git a/fs/cifs/export.c b/fs/smbfs/client/export.c
similarity index 100%
rename from fs/cifs/export.c
rename to fs/smbfs/client/export.c
diff --git a/fs/cifs/file.c b/fs/smbfs/client/file.c
similarity index 100%
rename from fs/cifs/file.c
rename to fs/smbfs/client/file.c
diff --git a/fs/cifs/fs_context.c b/fs/smbfs/client/fs_context.c
similarity index 100%
rename from fs/cifs/fs_context.c
rename to fs/smbfs/client/fs_context.c
diff --git a/fs/cifs/fs_context.h b/fs/smbfs/client/fs_context.h
similarity index 100%
rename from fs/cifs/fs_context.h
rename to fs/smbfs/client/fs_context.h
diff --git a/fs/cifs/fscache.c b/fs/smbfs/client/fscache.c
similarity index 100%
rename from fs/cifs/fscache.c
rename to fs/smbfs/client/fscache.c
diff --git a/fs/cifs/fscache.h b/fs/smbfs/client/fscache.h
similarity index 100%
rename from fs/cifs/fscache.h
rename to fs/smbfs/client/fscache.h
diff --git a/fs/cifs/inode.c b/fs/smbfs/client/inode.c
similarity index 100%
rename from fs/cifs/inode.c
rename to fs/smbfs/client/inode.c
diff --git a/fs/cifs/ioctl.c b/fs/smbfs/client/ioctl.c
similarity index 100%
rename from fs/cifs/ioctl.c
rename to fs/smbfs/client/ioctl.c
diff --git a/fs/cifs/link.c b/fs/smbfs/client/link.c
similarity index 100%
rename from fs/cifs/link.c
rename to fs/smbfs/client/link.c
diff --git a/fs/cifs/misc.c b/fs/smbfs/client/misc.c
similarity index 100%
rename from fs/cifs/misc.c
rename to fs/smbfs/client/misc.c
diff --git a/fs/cifs/netlink.c b/fs/smbfs/client/netlink.c
similarity index 100%
rename from fs/cifs/netlink.c
rename to fs/smbfs/client/netlink.c
diff --git a/fs/cifs/netlink.h b/fs/smbfs/client/netlink.h
similarity index 100%
rename from fs/cifs/netlink.h
rename to fs/smbfs/client/netlink.h
diff --git a/fs/cifs/netmisc.c b/fs/smbfs/client/netmisc.c
similarity index 100%
rename from fs/cifs/netmisc.c
rename to fs/smbfs/client/netmisc.c
diff --git a/fs/cifs/nterr.c b/fs/smbfs/client/nterr.c
similarity index 100%
rename from fs/cifs/nterr.c
rename to fs/smbfs/client/nterr.c
diff --git a/fs/cifs/nterr.h b/fs/smbfs/client/nterr.h
similarity index 100%
rename from fs/cifs/nterr.h
rename to fs/smbfs/client/nterr.h
diff --git a/fs/cifs/ntlmssp.h b/fs/smbfs/client/ntlmssp.h
similarity index 100%
rename from fs/cifs/ntlmssp.h
rename to fs/smbfs/client/ntlmssp.h
diff --git a/fs/cifs/readdir.c b/fs/smbfs/client/readdir.c
similarity index 100%
rename from fs/cifs/readdir.c
rename to fs/smbfs/client/readdir.c
diff --git a/fs/cifs/rfc1002pdu.h b/fs/smbfs/client/rfc1002pdu.h
similarity index 100%
rename from fs/cifs/rfc1002pdu.h
rename to fs/smbfs/client/rfc1002pdu.h
diff --git a/fs/cifs/sess.c b/fs/smbfs/client/sess.c
similarity index 100%
rename from fs/cifs/sess.c
rename to fs/smbfs/client/sess.c
diff --git a/fs/cifs/smb1ops.c b/fs/smbfs/client/smb1ops.c
similarity index 100%
rename from fs/cifs/smb1ops.c
rename to fs/smbfs/client/smb1ops.c
diff --git a/fs/cifs/smb2file.c b/fs/smbfs/client/smb2file.c
similarity index 100%
rename from fs/cifs/smb2file.c
rename to fs/smbfs/client/smb2file.c
diff --git a/fs/cifs/smb2glob.h b/fs/smbfs/client/smb2glob.h
similarity index 100%
rename from fs/cifs/smb2glob.h
rename to fs/smbfs/client/smb2glob.h
diff --git a/fs/cifs/smb2inode.c b/fs/smbfs/client/smb2inode.c
similarity index 100%
rename from fs/cifs/smb2inode.c
rename to fs/smbfs/client/smb2inode.c
diff --git a/fs/cifs/smb2maperror.c b/fs/smbfs/client/smb2maperror.c
similarity index 100%
rename from fs/cifs/smb2maperror.c
rename to fs/smbfs/client/smb2maperror.c
diff --git a/fs/cifs/smb2misc.c b/fs/smbfs/client/smb2misc.c
similarity index 100%
rename from fs/cifs/smb2misc.c
rename to fs/smbfs/client/smb2misc.c
diff --git a/fs/cifs/smb2ops.c b/fs/smbfs/client/smb2ops.c
similarity index 100%
rename from fs/cifs/smb2ops.c
rename to fs/smbfs/client/smb2ops.c
diff --git a/fs/cifs/smb2pdu.c b/fs/smbfs/client/smb2pdu.c
similarity index 100%
rename from fs/cifs/smb2pdu.c
rename to fs/smbfs/client/smb2pdu.c
diff --git a/fs/cifs/smb2pdu.h b/fs/smbfs/client/smb2pdu.h
similarity index 100%
rename from fs/cifs/smb2pdu.h
rename to fs/smbfs/client/smb2pdu.h
diff --git a/fs/cifs/smb2proto.h b/fs/smbfs/client/smb2proto.h
similarity index 100%
rename from fs/cifs/smb2proto.h
rename to fs/smbfs/client/smb2proto.h
diff --git a/fs/cifs/smb2status.h b/fs/smbfs/client/smb2status.h
similarity index 100%
rename from fs/cifs/smb2status.h
rename to fs/smbfs/client/smb2status.h
diff --git a/fs/cifs/smb2transport.c b/fs/smbfs/client/smb2transport.c
similarity index 100%
rename from fs/cifs/smb2transport.c
rename to fs/smbfs/client/smb2transport.c
diff --git a/fs/cifs/smbdirect.c b/fs/smbfs/client/smbdirect.c
similarity index 100%
rename from fs/cifs/smbdirect.c
rename to fs/smbfs/client/smbdirect.c
diff --git a/fs/cifs/smbdirect.h b/fs/smbfs/client/smbdirect.h
similarity index 100%
rename from fs/cifs/smbdirect.h
rename to fs/smbfs/client/smbdirect.h
diff --git a/fs/cifs/smbencrypt.c b/fs/smbfs/client/smbencrypt.c
similarity index 98%
rename from fs/cifs/smbencrypt.c
rename to fs/smbfs/client/smbencrypt.c
index 4a0487753869..f0ce26414f17 100644
--- a/fs/cifs/smbencrypt.c
+++ b/fs/smbfs/client/smbencrypt.c
@@ -24,7 +24,7 @@
#include "cifsglob.h"
#include "cifs_debug.h"
#include "cifsproto.h"
-#include "../smbfs_common/md4.h"
+#include "../common/md4.h"
#ifndef false
#define false 0
diff --git a/fs/cifs/smberr.h b/fs/smbfs/client/smberr.h
similarity index 100%
rename from fs/cifs/smberr.h
rename to fs/smbfs/client/smberr.h
diff --git a/fs/cifs/trace.c b/fs/smbfs/client/trace.c
similarity index 100%
rename from fs/cifs/trace.c
rename to fs/smbfs/client/trace.c
diff --git a/fs/cifs/trace.h b/fs/smbfs/client/trace.h
similarity index 100%
rename from fs/cifs/trace.h
rename to fs/smbfs/client/trace.h
diff --git a/fs/cifs/transport.c b/fs/smbfs/client/transport.c
similarity index 100%
rename from fs/cifs/transport.c
rename to fs/smbfs/client/transport.c
diff --git a/fs/cifs/unc.c b/fs/smbfs/client/unc.c
similarity index 100%
rename from fs/cifs/unc.c
rename to fs/smbfs/client/unc.c
diff --git a/fs/cifs/winucase.c b/fs/smbfs/client/winucase.c
similarity index 100%
rename from fs/cifs/winucase.c
rename to fs/smbfs/client/winucase.c
diff --git a/fs/cifs/xattr.c b/fs/smbfs/client/xattr.c
similarity index 100%
rename from fs/cifs/xattr.c
rename to fs/smbfs/client/xattr.c
diff --git a/fs/smbfs_common/Makefile b/fs/smbfs/common/Makefile
similarity index 59%
rename from fs/smbfs_common/Makefile
rename to fs/smbfs/common/Makefile
index cafc61a3bfc3..c66dbbc1469c 100644
--- a/fs/smbfs_common/Makefile
+++ b/fs/smbfs/common/Makefile
@@ -3,5 +3,5 @@
# Makefile for Linux filesystem routines that are shared by client and server.
#
-obj-$(CONFIG_SMBFS_COMMON) += cifs_arc4.o
-obj-$(CONFIG_SMBFS_COMMON) += cifs_md4.o
+obj-$(CONFIG_SMBFS) += cifs_arc4.o
+obj-$(CONFIG_SMBFS) += cifs_md4.o
diff --git a/fs/smbfs_common/arc4.h b/fs/smbfs/common/arc4.h
similarity index 100%
rename from fs/smbfs_common/arc4.h
rename to fs/smbfs/common/arc4.h
diff --git a/fs/smbfs_common/cifs_arc4.c b/fs/smbfs/common/cifs_arc4.c
similarity index 100%
rename from fs/smbfs_common/cifs_arc4.c
rename to fs/smbfs/common/cifs_arc4.c
diff --git a/fs/smbfs_common/cifs_md4.c b/fs/smbfs/common/cifs_md4.c
similarity index 100%
rename from fs/smbfs_common/cifs_md4.c
rename to fs/smbfs/common/cifs_md4.c
diff --git a/fs/smbfs_common/md4.h b/fs/smbfs/common/md4.h
similarity index 100%
rename from fs/smbfs_common/md4.h
rename to fs/smbfs/common/md4.h
diff --git a/fs/smbfs_common/smb2pdu.h b/fs/smbfs/common/smb2pdu.h
similarity index 100%
rename from fs/smbfs_common/smb2pdu.h
rename to fs/smbfs/common/smb2pdu.h
diff --git a/fs/smbfs_common/smbfsctl.h b/fs/smbfs/common/smbfsctl.h
similarity index 100%
rename from fs/smbfs_common/smbfsctl.h
rename to fs/smbfs/common/smbfsctl.h
diff --git a/fs/ksmbd/Kconfig b/fs/smbfs/server/Kconfig
similarity index 100%
rename from fs/ksmbd/Kconfig
rename to fs/smbfs/server/Kconfig
diff --git a/fs/ksmbd/Makefile b/fs/smbfs/server/Makefile
similarity index 100%
rename from fs/ksmbd/Makefile
rename to fs/smbfs/server/Makefile
diff --git a/fs/ksmbd/asn1.c b/fs/smbfs/server/asn1.c
similarity index 100%
rename from fs/ksmbd/asn1.c
rename to fs/smbfs/server/asn1.c
diff --git a/fs/ksmbd/asn1.h b/fs/smbfs/server/asn1.h
similarity index 100%
rename from fs/ksmbd/asn1.h
rename to fs/smbfs/server/asn1.h
diff --git a/fs/ksmbd/auth.c b/fs/smbfs/server/auth.c
similarity index 99%
rename from fs/ksmbd/auth.c
rename to fs/smbfs/server/auth.c
index df8fb076f6f1..5e5e120edcc2 100644
--- a/fs/ksmbd/auth.c
+++ b/fs/smbfs/server/auth.c
@@ -29,7 +29,7 @@
#include "mgmt/user_config.h"
#include "crypto_ctx.h"
#include "transport_ipc.h"
-#include "../smbfs_common/arc4.h"
+#include "../common/arc4.h"
/*
* Fixed format data defining GSS header and fixed string
diff --git a/fs/ksmbd/auth.h b/fs/smbfs/server/auth.h
similarity index 100%
rename from fs/ksmbd/auth.h
rename to fs/smbfs/server/auth.h
diff --git a/fs/ksmbd/connection.c b/fs/smbfs/server/connection.c
similarity index 100%
rename from fs/ksmbd/connection.c
rename to fs/smbfs/server/connection.c
diff --git a/fs/ksmbd/connection.h b/fs/smbfs/server/connection.h
similarity index 100%
rename from fs/ksmbd/connection.h
rename to fs/smbfs/server/connection.h
diff --git a/fs/ksmbd/crypto_ctx.c b/fs/smbfs/server/crypto_ctx.c
similarity index 100%
rename from fs/ksmbd/crypto_ctx.c
rename to fs/smbfs/server/crypto_ctx.c
diff --git a/fs/ksmbd/crypto_ctx.h b/fs/smbfs/server/crypto_ctx.h
similarity index 100%
rename from fs/ksmbd/crypto_ctx.h
rename to fs/smbfs/server/crypto_ctx.h
diff --git a/fs/ksmbd/glob.h b/fs/smbfs/server/glob.h
similarity index 100%
rename from fs/ksmbd/glob.h
rename to fs/smbfs/server/glob.h
diff --git a/fs/ksmbd/ksmbd_netlink.h b/fs/smbfs/server/ksmbd_netlink.h
similarity index 100%
rename from fs/ksmbd/ksmbd_netlink.h
rename to fs/smbfs/server/ksmbd_netlink.h
diff --git a/fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 b/fs/smbfs/server/ksmbd_spnego_negtokeninit.asn1
similarity index 100%
rename from fs/ksmbd/ksmbd_spnego_negtokeninit.asn1
rename to fs/smbfs/server/ksmbd_spnego_negtokeninit.asn1
diff --git a/fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 b/fs/smbfs/server/ksmbd_spnego_negtokentarg.asn1
similarity index 100%
rename from fs/ksmbd/ksmbd_spnego_negtokentarg.asn1
rename to fs/smbfs/server/ksmbd_spnego_negtokentarg.asn1
diff --git a/fs/ksmbd/ksmbd_work.c b/fs/smbfs/server/ksmbd_work.c
similarity index 100%
rename from fs/ksmbd/ksmbd_work.c
rename to fs/smbfs/server/ksmbd_work.c
diff --git a/fs/ksmbd/ksmbd_work.h b/fs/smbfs/server/ksmbd_work.h
similarity index 100%
rename from fs/ksmbd/ksmbd_work.h
rename to fs/smbfs/server/ksmbd_work.h
diff --git a/fs/ksmbd/mgmt/ksmbd_ida.c b/fs/smbfs/server/mgmt/ksmbd_ida.c
similarity index 100%
rename from fs/ksmbd/mgmt/ksmbd_ida.c
rename to fs/smbfs/server/mgmt/ksmbd_ida.c
diff --git a/fs/ksmbd/mgmt/ksmbd_ida.h b/fs/smbfs/server/mgmt/ksmbd_ida.h
similarity index 100%
rename from fs/ksmbd/mgmt/ksmbd_ida.h
rename to fs/smbfs/server/mgmt/ksmbd_ida.h
diff --git a/fs/ksmbd/mgmt/share_config.c b/fs/smbfs/server/mgmt/share_config.c
similarity index 100%
rename from fs/ksmbd/mgmt/share_config.c
rename to fs/smbfs/server/mgmt/share_config.c
diff --git a/fs/ksmbd/mgmt/share_config.h b/fs/smbfs/server/mgmt/share_config.h
similarity index 100%
rename from fs/ksmbd/mgmt/share_config.h
rename to fs/smbfs/server/mgmt/share_config.h
diff --git a/fs/ksmbd/mgmt/tree_connect.c b/fs/smbfs/server/mgmt/tree_connect.c
similarity index 100%
rename from fs/ksmbd/mgmt/tree_connect.c
rename to fs/smbfs/server/mgmt/tree_connect.c
diff --git a/fs/ksmbd/mgmt/tree_connect.h b/fs/smbfs/server/mgmt/tree_connect.h
similarity index 100%
rename from fs/ksmbd/mgmt/tree_connect.h
rename to fs/smbfs/server/mgmt/tree_connect.h
diff --git a/fs/ksmbd/mgmt/user_config.c b/fs/smbfs/server/mgmt/user_config.c
similarity index 100%
rename from fs/ksmbd/mgmt/user_config.c
rename to fs/smbfs/server/mgmt/user_config.c
diff --git a/fs/ksmbd/mgmt/user_config.h b/fs/smbfs/server/mgmt/user_config.h
similarity index 100%
rename from fs/ksmbd/mgmt/user_config.h
rename to fs/smbfs/server/mgmt/user_config.h
diff --git a/fs/ksmbd/mgmt/user_session.c b/fs/smbfs/server/mgmt/user_session.c
similarity index 100%
rename from fs/ksmbd/mgmt/user_session.c
rename to fs/smbfs/server/mgmt/user_session.c
diff --git a/fs/ksmbd/mgmt/user_session.h b/fs/smbfs/server/mgmt/user_session.h
similarity index 100%
rename from fs/ksmbd/mgmt/user_session.h
rename to fs/smbfs/server/mgmt/user_session.h
diff --git a/fs/ksmbd/misc.c b/fs/smbfs/server/misc.c
similarity index 100%
rename from fs/ksmbd/misc.c
rename to fs/smbfs/server/misc.c
diff --git a/fs/ksmbd/misc.h b/fs/smbfs/server/misc.h
similarity index 100%
rename from fs/ksmbd/misc.h
rename to fs/smbfs/server/misc.h
diff --git a/fs/ksmbd/ndr.c b/fs/smbfs/server/ndr.c
similarity index 100%
rename from fs/ksmbd/ndr.c
rename to fs/smbfs/server/ndr.c
diff --git a/fs/ksmbd/ndr.h b/fs/smbfs/server/ndr.h
similarity index 100%
rename from fs/ksmbd/ndr.h
rename to fs/smbfs/server/ndr.h
diff --git a/fs/ksmbd/nterr.h b/fs/smbfs/server/nterr.h
similarity index 100%
rename from fs/ksmbd/nterr.h
rename to fs/smbfs/server/nterr.h
diff --git a/fs/ksmbd/ntlmssp.h b/fs/smbfs/server/ntlmssp.h
similarity index 100%
rename from fs/ksmbd/ntlmssp.h
rename to fs/smbfs/server/ntlmssp.h
diff --git a/fs/ksmbd/oplock.c b/fs/smbfs/server/oplock.c
similarity index 100%
rename from fs/ksmbd/oplock.c
rename to fs/smbfs/server/oplock.c
diff --git a/fs/ksmbd/oplock.h b/fs/smbfs/server/oplock.h
similarity index 100%
rename from fs/ksmbd/oplock.h
rename to fs/smbfs/server/oplock.h
diff --git a/fs/ksmbd/server.c b/fs/smbfs/server/server.c
similarity index 100%
rename from fs/ksmbd/server.c
rename to fs/smbfs/server/server.c
diff --git a/fs/ksmbd/server.h b/fs/smbfs/server/server.h
similarity index 100%
rename from fs/ksmbd/server.h
rename to fs/smbfs/server/server.h
diff --git a/fs/ksmbd/smb2misc.c b/fs/smbfs/server/smb2misc.c
similarity index 100%
rename from fs/ksmbd/smb2misc.c
rename to fs/smbfs/server/smb2misc.c
diff --git a/fs/ksmbd/smb2ops.c b/fs/smbfs/server/smb2ops.c
similarity index 100%
rename from fs/ksmbd/smb2ops.c
rename to fs/smbfs/server/smb2ops.c
diff --git a/fs/ksmbd/smb2pdu.c b/fs/smbfs/server/smb2pdu.c
similarity index 100%
rename from fs/ksmbd/smb2pdu.c
rename to fs/smbfs/server/smb2pdu.c
diff --git a/fs/ksmbd/smb2pdu.h b/fs/smbfs/server/smb2pdu.h
similarity index 100%
rename from fs/ksmbd/smb2pdu.h
rename to fs/smbfs/server/smb2pdu.h
diff --git a/fs/ksmbd/smb_common.c b/fs/smbfs/server/smb_common.c
similarity index 100%
rename from fs/ksmbd/smb_common.c
rename to fs/smbfs/server/smb_common.c
diff --git a/fs/ksmbd/smb_common.h b/fs/smbfs/server/smb_common.h
similarity index 99%
rename from fs/ksmbd/smb_common.h
rename to fs/smbfs/server/smb_common.h
index 9130d2e3cd78..6b0d5f1fe85c 100644
--- a/fs/ksmbd/smb_common.h
+++ b/fs/smbfs/server/smb_common.h
@@ -10,7 +10,7 @@
#include "glob.h"
#include "nterr.h"
-#include "../smbfs_common/smb2pdu.h"
+#include "../common/smb2pdu.h"
#include "smb2pdu.h"
/* ksmbd's Specific ERRNO */
diff --git a/fs/ksmbd/smbacl.c b/fs/smbfs/server/smbacl.c
similarity index 100%
rename from fs/ksmbd/smbacl.c
rename to fs/smbfs/server/smbacl.c
diff --git a/fs/ksmbd/smbacl.h b/fs/smbfs/server/smbacl.h
similarity index 100%
rename from fs/ksmbd/smbacl.h
rename to fs/smbfs/server/smbacl.h
diff --git a/fs/ksmbd/smbfsctl.h b/fs/smbfs/server/smbfsctl.h
similarity index 100%
rename from fs/ksmbd/smbfsctl.h
rename to fs/smbfs/server/smbfsctl.h
diff --git a/fs/ksmbd/smbstatus.h b/fs/smbfs/server/smbstatus.h
similarity index 100%
rename from fs/ksmbd/smbstatus.h
rename to fs/smbfs/server/smbstatus.h
diff --git a/fs/ksmbd/transport_ipc.c b/fs/smbfs/server/transport_ipc.c
similarity index 100%
rename from fs/ksmbd/transport_ipc.c
rename to fs/smbfs/server/transport_ipc.c
diff --git a/fs/ksmbd/transport_ipc.h b/fs/smbfs/server/transport_ipc.h
similarity index 100%
rename from fs/ksmbd/transport_ipc.h
rename to fs/smbfs/server/transport_ipc.h
diff --git a/fs/ksmbd/transport_rdma.c b/fs/smbfs/server/transport_rdma.c
similarity index 100%
rename from fs/ksmbd/transport_rdma.c
rename to fs/smbfs/server/transport_rdma.c
diff --git a/fs/ksmbd/transport_rdma.h b/fs/smbfs/server/transport_rdma.h
similarity index 100%
rename from fs/ksmbd/transport_rdma.h
rename to fs/smbfs/server/transport_rdma.h
diff --git a/fs/ksmbd/transport_tcp.c b/fs/smbfs/server/transport_tcp.c
similarity index 100%
rename from fs/ksmbd/transport_tcp.c
rename to fs/smbfs/server/transport_tcp.c
diff --git a/fs/ksmbd/transport_tcp.h b/fs/smbfs/server/transport_tcp.h
similarity index 100%
rename from fs/ksmbd/transport_tcp.h
rename to fs/smbfs/server/transport_tcp.h
diff --git a/fs/ksmbd/unicode.c b/fs/smbfs/server/unicode.c
similarity index 100%
rename from fs/ksmbd/unicode.c
rename to fs/smbfs/server/unicode.c
diff --git a/fs/ksmbd/unicode.h b/fs/smbfs/server/unicode.h
similarity index 100%
rename from fs/ksmbd/unicode.h
rename to fs/smbfs/server/unicode.h
diff --git a/fs/ksmbd/uniupr.h b/fs/smbfs/server/uniupr.h
similarity index 100%
rename from fs/ksmbd/uniupr.h
rename to fs/smbfs/server/uniupr.h
diff --git a/fs/ksmbd/vfs.c b/fs/smbfs/server/vfs.c
similarity index 100%
rename from fs/ksmbd/vfs.c
rename to fs/smbfs/server/vfs.c
diff --git a/fs/ksmbd/vfs.h b/fs/smbfs/server/vfs.h
similarity index 100%
rename from fs/ksmbd/vfs.h
rename to fs/smbfs/server/vfs.h
diff --git a/fs/ksmbd/vfs_cache.c b/fs/smbfs/server/vfs_cache.c
similarity index 100%
rename from fs/ksmbd/vfs_cache.c
rename to fs/smbfs/server/vfs_cache.c
diff --git a/fs/ksmbd/vfs_cache.h b/fs/smbfs/server/vfs_cache.h
similarity index 100%
rename from fs/ksmbd/vfs_cache.h
rename to fs/smbfs/server/vfs_cache.h
diff --git a/fs/ksmbd/xattr.h b/fs/smbfs/server/xattr.h
similarity index 100%
rename from fs/ksmbd/xattr.h
rename to fs/smbfs/server/xattr.h
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2023-05-21 18:06 ` Linus Torvalds
2023-05-21 18:32 ` Linus Torvalds
@ 2023-05-21 19:03 ` Steve French
2023-05-21 19:21 ` Linus Torvalds
1 sibling, 1 reply; 94+ messages in thread
From: Steve French @ 2023-05-21 19:03 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, LKML, CIFS, samba-technical
On Sun, May 21, 2023 at 1:06 PM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
<...>
> We talked about directory layout issues some time ago, and there's
> kind of beginnings of it, but it never happened, and the parts that
> *did* happen I'm not super-happy about. That "fs/smbfs_common/"
> subdirectory is just fairly ugly.
>
> Would you mind horribly to just bite the bullet, and rename things,
> and put it all under "smbfs". Something like
>
> mkdir fs/smbfs
> git mv fs/cifs fs/smbfs/client
> git mv fs/ksmbd fs/smbfs/server
> git mv fs/smbfs_common fs/smbfs/common
>
> plus the required Makefile editing to just make it all build right?
>
> And if you prefer just "fs/smb" over "fs/smbfs", that sounds fine to
> me too, but I guess this all really does just the filesystem part
> (rather than all the printing and whatever other stuff that smb also
> contains).
Should be easy to move and more intuitive, although I would prefer
that we use fs/smb or fs/smb3 as the directory name instead of
fs/smbfs (since that old filesystem fs/smbfs was removed in 2.6.27.
So reusing the fs/smbfs directory name could confuse people looking
at git logs). I am fine with doing (and related Kconfig and trivial
include path changes):
git mv fs/cifs fs/smb/client
git mv fs/ksmbd fs/smb/server
git mv fs/smbfs_common fs/smb/common
This also might be a good time to take another step toward
moving people away from the old, less secure, SMB1 ("cifs")
dialect by adding a second .ko file to the client (e.g. add
"smb3.ko" in fs/smb/client) which would have support for the old
SMB1/CIFS dialect removed. We would keep cifs.ko for
compatibility purposes (cifs.ko would still have its current
config options so would have SMB1/CIFS enabled by default
but smb3.ko would only support modern, more secure dialects
and also would be smaller than cifs.ko since it would build with
CIFS_ALLOW_INSECURE_LEGACY disabled). There is a
precedent for something somewhat similar to this e.g. the NFS
client has four kernel modules in the fs/nfs directory. On a
somewhat related note - at the Storage Developer Conference
last fall there was an interesting set of discussions around splitting
out the RDMA mapping layer ("smbdirect") by removing RDMA
related code from ksmbd.ko and cifs.ko and creating an
"smbdirect.ko" module for various RDMA use cases (not just cifs.ko
and ksmbd but perhaps also could help some user space apps,
Samba etc. in the future) - this "smbdirect.ko" (RDMA mapping
layer) could also go in fs/smb/common in the future.
I would be happy to do the move (to fs/smb) of the directories and
update the config soon (seems reasonably low risk) - let me know if you
want me to send it this week or wait till 6.5-rc
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2023-05-21 19:03 ` Steve French
@ 2023-05-21 19:21 ` Linus Torvalds
2023-05-22 4:38 ` Steve French
0 siblings, 1 reply; 94+ messages in thread
From: Linus Torvalds @ 2023-05-21 19:21 UTC (permalink / raw)
To: Steve French; +Cc: Namjae Jeon, LKML, CIFS, samba-technical
On Sun, May 21, 2023 at 12:03 PM Steve French <smfrench@gmail.com> wrote:
>
> I would be happy to do the move (to fs/smb) of the directories and
> update the config soon (seems reasonably low risk) - let me know if you
> want me to send it this week or wait till 6.5-rc
So I think the "do it now or wait until the 6.5 merge window" is
entirely up to you.
We've often intentionally done big renames during the "quiet time"
after the merge window is oven, just because doing them during the
merge window can be somewhat painful with unnecessary conflicts.
I would *not* want to do it during the last week of the release, just
in case there are small details that need to be fixed up, but doing it
now during the rc3/rc4 kind of timeframe is not only fairly quiet, but
also gives us time to find any surprises.
So in that sense, doing it now is likely one of the better times, and
a pure rename should not be risky from a code standpoint.
At the same time, doing it during the merge window isn't *wrong*
either. Despite the somewhat painful merge with folio changes, I
don't think fs/cifs/ or fs/ksmbd/ normally have a lot of conflicts,
and git does handle rename conflicts fairly well unless there's just
lots of complexity.
So it's really fine either way. The normal kind of "big changes"
should obviously always be merge window things, but pure renames
really are different and are often done outside of the merge window
(the same way I intentionally did the MAINTAINERS re-ordering just
*after* the merge window)
But we don't do renames often enough to have any kind of strict rules
about things like this.
So I think "whenever is most convenient for you" is the thing to aim
for here. This is *not* a "only during merge window" kind of thing.
Linus
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2023-05-21 19:21 ` Linus Torvalds
@ 2023-05-22 4:38 ` Steve French
2023-05-22 8:04 ` ronnie sahlberg
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-05-22 4:38 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, LKML, CIFS, samba-technical, linux-fsdevel
[-- Attachment #1: Type: text/plain, Size: 2691 bytes --]
On Sun, May 21, 2023 at 2:21 PM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> On Sun, May 21, 2023 at 12:03 PM Steve French <smfrench@gmail.com> wrote:
> >
> > I would be happy to do the move (to fs/smb) of the directories and
> > update the config soon (seems reasonably low risk) - let me know if you
> > want me to send it this week or wait till 6.5-rc
>
> So I think the "do it now or wait until the 6.5 merge window" is
> entirely up to you.
>
> We've often intentionally done big renames during the "quiet time"
> after the merge window is oven, just because doing them during the
> merge window can be somewhat painful with unnecessary conflicts.
>
> I would *not* want to do it during the last week of the release, just
> in case there are small details that need to be fixed up, but doing it
> now during the rc3/rc4 kind of timeframe is not only fairly quiet, but
> also gives us time to find any surprises.
>
> So in that sense, doing it now is likely one of the better times, and
> a pure rename should not be risky from a code standpoint.
>
> At the same time, doing it during the merge window isn't *wrong*
> either. Despite the somewhat painful merge with folio changes, I
> don't think fs/cifs/ or fs/ksmbd/ normally have a lot of conflicts,
> and git does handle rename conflicts fairly well unless there's just
> lots of complexity.
>
> So it's really fine either way. The normal kind of "big changes"
> should obviously always be merge window things, but pure renames
> really are different and are often done outside of the merge window
> (the same way I intentionally did the MAINTAINERS re-ordering just
> *after* the merge window)
>
> But we don't do renames often enough to have any kind of strict rules
> about things like this.
>
> So I think "whenever is most convenient for you" is the thing to aim
> for here. This is *not* a "only during merge window" kind of thing.
>
> Linus
Here are two patches:
1) Move CIFS/SMB3 related client and server files (cifs.ko and ksmbd.ko
and helper modules) to new fs/smb subdirectory (fs/smbfs was not used
to avoid confusion with the directory of the same name removed in 2.6.27
release and we also avoid using CONFIG_SMB_FS for the same reason)
fs/cifs --> fs/smb/client
fs/ksmbd --> fs/smb/server
fs/smbfs_common --> fs/smb/common
2) With the fs/cifs directory moved to fs/smb/client, correct mentions
of this in Documentation and comments.
Follow on patch can change Documentation/filesystems/cifs -->
Documentation/filesystems/smb (since it contains both server
and client documentation)
--
Thanks,
Steve
[-- Attachment #2: 0001-smb-move-client-and-server-files-to-common-directory.patch --]
[-- Type: application/x-patch, Size: 43387 bytes --]
[-- Attachment #3: 0002-cifs-correct-references-in-Documentation-to-old-fs-c.patch --]
[-- Type: application/x-patch, Size: 5631 bytes --]
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [GIT PULL] ksmbd server fixes
2023-05-22 4:38 ` Steve French
@ 2023-05-22 8:04 ` ronnie sahlberg
0 siblings, 0 replies; 94+ messages in thread
From: ronnie sahlberg @ 2023-05-22 8:04 UTC (permalink / raw)
To: Steve French
Cc: Linus Torvalds, linux-fsdevel, CIFS, samba-technical, Namjae Jeon, LKML
Sounds like a good plan.
On Mon, 22 May 2023 at 14:39, Steve French via samba-technical
<samba-technical@lists.samba.org> wrote:
>
> On Sun, May 21, 2023 at 2:21 PM Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
> >
> > On Sun, May 21, 2023 at 12:03 PM Steve French <smfrench@gmail.com> wrote:
> > >
> > > I would be happy to do the move (to fs/smb) of the directories and
> > > update the config soon (seems reasonably low risk) - let me know if you
> > > want me to send it this week or wait till 6.5-rc
> >
> > So I think the "do it now or wait until the 6.5 merge window" is
> > entirely up to you.
> >
> > We've often intentionally done big renames during the "quiet time"
> > after the merge window is oven, just because doing them during the
> > merge window can be somewhat painful with unnecessary conflicts.
> >
> > I would *not* want to do it during the last week of the release, just
> > in case there are small details that need to be fixed up, but doing it
> > now during the rc3/rc4 kind of timeframe is not only fairly quiet, but
> > also gives us time to find any surprises.
> >
> > So in that sense, doing it now is likely one of the better times, and
> > a pure rename should not be risky from a code standpoint.
> >
> > At the same time, doing it during the merge window isn't *wrong*
> > either. Despite the somewhat painful merge with folio changes, I
> > don't think fs/cifs/ or fs/ksmbd/ normally have a lot of conflicts,
> > and git does handle rename conflicts fairly well unless there's just
> > lots of complexity.
> >
> > So it's really fine either way. The normal kind of "big changes"
> > should obviously always be merge window things, but pure renames
> > really are different and are often done outside of the merge window
> > (the same way I intentionally did the MAINTAINERS re-ordering just
> > *after* the merge window)
> >
> > But we don't do renames often enough to have any kind of strict rules
> > about things like this.
> >
> > So I think "whenever is most convenient for you" is the thing to aim
> > for here. This is *not* a "only during merge window" kind of thing.
> >
> > Linus
>
> Here are two patches:
> 1) Move CIFS/SMB3 related client and server files (cifs.ko and ksmbd.ko
> and helper modules) to new fs/smb subdirectory (fs/smbfs was not used
> to avoid confusion with the directory of the same name removed in 2.6.27
> release and we also avoid using CONFIG_SMB_FS for the same reason)
>
> fs/cifs --> fs/smb/client
> fs/ksmbd --> fs/smb/server
> fs/smbfs_common --> fs/smb/common
>
> 2) With the fs/cifs directory moved to fs/smb/client, correct mentions
> of this in Documentation and comments.
>
> Follow on patch can change Documentation/filesystems/cifs -->
> Documentation/filesystems/smb (since it contains both server
> and client documentation)
>
>
> --
> Thanks,
>
> Steve
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [GIT PULL] ksmbd server fixes
2023-05-21 5:14 Steve French
2023-05-21 18:06 ` Linus Torvalds
@ 2023-05-21 18:09 ` pr-tracker-bot
1 sibling, 0 replies; 94+ messages in thread
From: pr-tracker-bot @ 2023-05-21 18:09 UTC (permalink / raw)
To: Steve French; +Cc: Linus Torvalds, Namjae Jeon, LKML, CIFS
The pull request you sent on Sun, 21 May 2023 00:14:35 -0500:
> git://git.samba.org/ksmbd.git tags/6.4-rc2-ksmbd-server-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/e2065b8c1b0120d47b327364a1a09090bdc11f31
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [flat|nested] 94+ messages in thread
* [GIT PULL] ksmbd server fixes
@ 2023-05-06 0:19 Steve French
2023-05-06 2:20 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-05-06 0:19 UTC (permalink / raw)
To: Linus Torvalds; +Cc: CIFS, LKML, Namjae Jeon
Please pull the following changes since commit
1ae78a14516b9372e4c90a89ac21b259339a3a3a:
Merge tag '6.4-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd
(2023-04-29 11:10:39 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.4-rc-ksmbd-server-fixes-part2
for you to fetch changes up to eb307d09fe15844fdaebeb8cc8c9b9e925430aa5:
ksmbd: call rcu_barrier() in ksmbd_server_exit() (2023-05-03 23:03:02 -0500)
----------------------------------------------------------------
Ten ksmbd server fixes, including some important security fixes
- Two use after free fixes
- Fix RCU callback race
- Deadlock fix
- Three patches to prevent session setup attacks
- Prevent guest users from establishing multichannel sessions
- Fix null pointer dereference in query FS info
- Memleak fix
----------------------------------------------------------------
Namjae Jeon (10):
ksmbd: fix memleak in session setup
ksmbd: fix NULL pointer dereference in smb2_get_info_filesystem()
ksmbd: fix racy issue from session setup and logoff
ksmbd: destroy expired sessions
ksmbd: block asynchronous requests when making a delay on session setup
ksmbd: fix deadlock in ksmbd_find_crypto_ctx()
ksmbd: not allow guest user on multichannel
ksmbd: fix racy issue from smb2 close and logoff with multichannel
ksmbd: fix racy issue under cocurrent smb2 tree disconnect
ksmbd: call rcu_barrier() in ksmbd_server_exit()
fs/ksmbd/auth.c | 19 +++++++++++--------
fs/ksmbd/connection.c | 68
++++++++++++++++++++++++++++++++++++++++++++++++--------------------
fs/ksmbd/connection.h | 58
+++++++++++++++++++++++++++++++++++++++-------------------
fs/ksmbd/mgmt/tree_connect.c | 13 ++++++++++++-
fs/ksmbd/mgmt/tree_connect.h | 3 +++
fs/ksmbd/mgmt/user_session.c | 81
++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------
fs/ksmbd/mgmt/user_session.h | 1 +
fs/ksmbd/server.c | 4 +++-
fs/ksmbd/smb2pdu.c | 109
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
fs/ksmbd/smb2pdu.h | 2 ++
fs/ksmbd/transport_tcp.c | 2 +-
11 files changed, 250 insertions(+), 110 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-04-27 2:11 Steve French
2023-04-29 18:19 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-04-27 2:11 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, Al Viro, CIFS, linux-fsdevel, LKML
Please pull the following changes since commit
457391b0380335d5e9a5babdec90ac53928b23b4:
Linux 6.3 (2023-04-23 12:02:52 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.4-rc-ksmbd-server-fixes
for you to fetch changes up to 74d7970febf7e9005375aeda0df821d2edffc9f7:
ksmbd: fix racy issue from using ->d_parent and ->d_name (2023-04-24
00:09:20 -0500)
----------------------------------------------------------------
- three SMB3.1.1 negotiate context fixes and cleanup
- new lock_rename_child VFS helper
- ksmbd fix to avoid unlink race and to use the new VFS helper to
avoid rename race
----------------------------------------------------------------
Al Viro (1):
fs: introduce lock_rename_child() helper
David Disseldorp (3):
ksmbd: set NegotiateContextCount once instead of every inc
ksmbd: avoid duplicate negotiate ctx offset increments
ksmbd: remove unused compression negotiate ctx packing
Namjae Jeon (2):
ksmbd: remove internal.h include
ksmbd: fix racy issue from using ->d_parent and ->d_name
Steve French (1):
Merge tag 'pull-lock_rename_child' of
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into
ksmbd-for-next
fs/internal.h | 2 -
fs/ksmbd/smb2pdu.c | 203 ++++++++++++--------------------------------------
fs/ksmbd/vfs.c | 437
++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------
fs/ksmbd/vfs.h | 19 ++---
fs/ksmbd/vfs_cache.c | 5 +-
fs/namei.c | 125 +++++++++++++++++++++++++------
include/linux/namei.h | 9 +++
7 files changed, 357 insertions(+), 443 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-04-07 4:16 Steve French
2023-04-07 20:56 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-04-07 4:16 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS, Namjae Jeon
Please pull the following changes since commit
90c8ce31dbe93f277fc1157e34740e841094c254:
Merge tag '6.3-rc3-ksmbd-smb3-server-fixes' of
git://git.samba.org/ksmbd (2023-03-24 17:59:00 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.3-rc5-ksmbd-server-fixes
for you to fetch changes up to dc8289f912387c3bcfbc5d2db29c8947fa207c11:
ksmbd: fix slab-out-of-bounds in init_smb2_rsp_hdr (2023-04-02 23:08:56 -0500)
----------------------------------------------------------------
four ksmbd server fixes, including three for stable
- slab out of bounds fix
- lock cancellation fix
- minor cleanup to address clang warning
- fix for xfstest 551 (wrong parms passed to kvmalloc)
----------------------------------------------------------------
Marios Makassikis (1):
ksmbd: do not call kvmalloc() with __GFP_NORETRY | __GFP_NO_WARN
Namjae Jeon (2):
ksmbd: delete asynchronous work from list
ksmbd: fix slab-out-of-bounds in init_smb2_rsp_hdr
Tom Rix (1):
ksmbd: remove unused is_char_allowed function
fs/ksmbd/connection.c | 17 ++++-------
fs/ksmbd/ksmbd_work.h | 2 +-
fs/ksmbd/server.c | 5 +---
fs/ksmbd/smb2pdu.c | 36 ++++++++++++++----------
fs/ksmbd/smb2pdu.h | 1 +
fs/ksmbd/smb_common.c | 138
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------
fs/ksmbd/smb_common.h | 2 +-
fs/ksmbd/unicode.c | 18 ------------
8 files changed, 140 insertions(+), 79 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-03-25 0:00 Steve French
2023-03-25 1:18 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-03-25 0:00 UTC (permalink / raw)
To: Linus Torvalds; +Cc: CIFS, LKML, Namjae Jeon
Please pull the following changes since commit
e8d018dd0257f744ca50a729e3d042cf2ec9da65:
Linux 6.3-rc3 (2023-03-19 13:27:55 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.3-rc3-ksmbd-smb3-server-fixes
for you to fetch changes up to 39b291b86b5988bf8753c3874d5c773399d09b96:
ksmbd: return unsupported error on smb1 mount (2023-03-24 00:23:13 -0500)
----------------------------------------------------------------
eight smb3 server fixes (also for stable)
- two fixes to return less confusing messages on unsupported dialects
(STATUS_NOT_SUPPORTED instead of I/O error)
- fix for overly frequent inactive session termination
- fix refcount leak
- fix two bounds check problems found by static checkers
- fix to advertise named stream support correctly
- Fix AES256 signing bug when connected to from MacOS
(Also FYI I have a slightly larger cifs P/R coming in the next day or
so with various client fixes)
----------------------------------------------------------------
ChenXiaoSong (1):
ksmbd: fix possible refcount leak in smb2_open()
Namjae Jeon (7):
ksmbd: fix wrong signingkey creation when encryption is AES256
ksmbd: set FILE_NAMED_STREAMS attribute in FS_ATTRIBUTE_INFORMATION
ksmbd: add low bound validation to FSCTL_SET_ZERO_DATA
ksmbd: add low bound validation to FSCTL_QUERY_ALLOCATED_RANGES
ksmbd: don't terminate inactive sessions after a few seconds
ksmbd: return STATUS_NOT_SUPPORTED on unsupported smb2.0 dialect
ksmbd: return unsupported error on smb1 mount
fs/ksmbd/auth.c | 5 +++--
fs/ksmbd/connection.c | 11 ++++-------
fs/ksmbd/connection.h | 3 ++-
fs/ksmbd/smb2pdu.c | 20 +++++++++++++++-----
fs/ksmbd/smb_common.c | 27 ++++++++++++++++++++++-----
fs/ksmbd/smb_common.h | 30 ++++++++----------------------
fs/ksmbd/transport_rdma.c | 2 +-
fs/ksmbd/transport_tcp.c | 35 +++++++++++++++++++++++------------
8 files changed, 78 insertions(+), 55 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-02-22 4:15 Steve French
2023-02-22 22:26 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-02-22 4:15 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, CIFS, LKML
Please pull the following changes since commit
6d796c50f84ca79f1722bb131799e5a5710c4700:
Linux 6.2-rc6 (2023-01-29 13:59:43 -0800)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.3-rc-ksmbd-fixes
for you to fetch changes up to d3ca9f7aeba793d74361d88a8800b2f205c9236b:
ksmbd: fix possible memory leak in smb2_lock() (2023-02-19 17:57:25 -0600)
----------------------------------------------------------------
Ten ksmbd smb3 server fixes, including three for stable
- Fix for memory leak
- Two important fixes for frame length checks (which are also now stricter)
- four minor cleanup fixes
- Fix to clarify ksmbd/Kconfig to indent properl
- Conversion of the channel list and rpc handle list to xarrays
----------------------------------------------------------------
Colin Ian King (1):
ksmbd: Fix spelling mistake "excceed" -> "exceeded"
Dawei Li (4):
ksmbd: Implements sess->ksmbd_chann_list as xarray
ksmbd: Implements sess->rpc_handle_list as xarray
ksmbd: fix typo, syncronous->synchronous
ksmbd: Remove duplicated codes
Hangyu Hua (1):
ksmbd: fix possible memory leak in smb2_lock()
Jiapeng Chong (1):
ksmbd: Fix parameter name and comment mismatch
Namjae Jeon (2):
ksmbd: fix wrong data area length for smb2 lock request
ksmbd: do not allow the actual frame length to be smaller than
the rfc1002 length
Steve French (1):
ksmbd: update Kconfig to note Kerberos support and fix indentation
fs/ksmbd/Kconfig | 8 ++++++--
fs/ksmbd/asn1.c | 23 +++++++++++------------
fs/ksmbd/connection.c | 6 +++---
fs/ksmbd/ksmbd_work.h | 2 +-
fs/ksmbd/mgmt/user_session.c | 98
++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------
fs/ksmbd/mgmt/user_session.h | 6 ++----
fs/ksmbd/smb2misc.c | 31 +++++++++++++------------------
fs/ksmbd/smb2pdu.c | 66
++++++++++++++++++++---------------------------------------------
fs/ksmbd/vfs.c | 6 +++---
fs/ksmbd/vfs_cache.c | 5 ++---
10 files changed, 99 insertions(+), 152 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-01-28 1:45 Steve French
2023-01-28 19:33 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-01-28 1:45 UTC (permalink / raw)
To: Linus Torvalds; +Cc: CIFS, LKML, Namjae Jeon
Please pull the following changes since commit
5dc4c995db9eb45f6373a956eb1f69460e69e6d4:
Linux 6.2-rc4 (2023-01-15 09:22:43 -0600)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.2-rc5-ksmbd-server-fixes
for you to fetch changes up to a34dc4a9b9e2fb3a45c179a60bb0b26539c96189:
ksmbd: downgrade ndr version error message to debug (2023-01-25
18:31:18 -0600)
----------------------------------------------------------------
4 smb3 server fixes, all also for stable
- fix for signing bug
- fix to more strictly check packet length
- add a max connections parm to limit simultaneous connections
- fix error message flood that can occur with newer Samba xattr format
----------------------------------------------------------------
Marios Makassikis (1):
ksmbd: do not sign response to session request for guest login
Namjae Jeon (3):
ksmbd: add max connections parameter
ksmbd: limit pdu length size according to connection status
ksmbd: downgrade ndr version error message to debug
fs/ksmbd/connection.c | 17 +++++++++++++++--
fs/ksmbd/ksmbd_netlink.h | 3 ++-
fs/ksmbd/ndr.c | 8 ++++----
fs/ksmbd/server.h | 1 +
fs/ksmbd/smb2pdu.c | 2 ++
fs/ksmbd/smb2pdu.h | 5 +++--
fs/ksmbd/transport_ipc.c | 3 +++
fs/ksmbd/transport_tcp.c | 17 ++++++++++++++++-
8 files changed, 46 insertions(+), 10 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2023-01-10 3:13 Steve French
2023-01-10 11:36 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2023-01-10 3:13 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS, Namjae Jeon
Please pull the following changes since commit
88603b6dc419445847923fcb7fe5080067a30f98:
Linux 6.2-rc2 (2023-01-01 13:53:16 -0800)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.2-rc3-ksmbd-server-fixes
for you to fetch changes up to 83dcedd5540d4ac61376ddff5362f7d9f866a6ec:
ksmbd: fix infinite loop in ksmbd_conn_handler_loop() (2023-01-01
22:49:24 -0600)
----------------------------------------------------------------
3 ksmbd server fixes, 2 important ones for stable
- fix possible infinite loop in socket handler
- fix possible panic in ntlmv2 authentication
- fix error handling on tree connect
----------------------------------------------------------------
Marios Makassikis (1):
ksmbd: send proper error response in smb2_tree_connect()
Namjae Jeon (1):
ksmbd: fix infinite loop in ksmbd_conn_handler_loop()
William Liu (1):
ksmbd: check nt_len to be at least CIFS_ENCPWD_SIZE in
ksmbd_decode_ntlmssp_auth_blob
fs/ksmbd/auth.c | 3 ++-
fs/ksmbd/connection.c | 7 +++++--
fs/ksmbd/smb2pdu.c | 7 +++++--
fs/ksmbd/transport_tcp.c | 5 ++++-
4 files changed, 16 insertions(+), 6 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2022-12-15 3:18 Steve French
2022-12-15 17:32 ` Linus Torvalds
2022-12-15 18:28 ` pr-tracker-bot
0 siblings, 2 replies; 94+ messages in thread
From: Steve French @ 2022-12-15 3:18 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, CIFS, LKML
Please pull the following changes since commit
76dcd734eca23168cb008912c0f69ff408905235:
Linux 6.1-rc8 (2022-12-04 14:48:12 -0800)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.2-rc-ksmbd-server-fixes
for you to fetch changes up to 72ee45fd46d0d3578c4e6046f66fae3218543ce3:
ksmbd: Convert to use sysfs_emit()/sysfs_emit_at() APIs (2022-12-11
08:33:32 -0600)
Note that this P/R includes one commit ("ksmbd: replace
one-element arrays with flexible-array members") which you just merged
from a different unrelated P/R a few days ago. Let me know if you
want me to rebase the ksmbd tree and resend the server P/R.
I can also send the client (cifs.ko) P/R tomorrow if it is easier but
have been working on testing some important fixes which are not in
linux-next yet, so not sure if it is easier to send the client fixes
as two P/Rs, or wait and send the client fixes all together as one
P/R later in the merge window.
----------------------------------------------------------------
six ksmbd server fixes:
- two resource leak fixes
- two cleanup
- a file unlock fix
- a fix for configuring packet encryption properly
----------------------------------------------------------------
Gustavo A. R. Silva (1):
ksmbd: replace one-element arrays with flexible-array members
Jeff Layton (1):
ksmbd: use F_SETLK when unlocking a file
Marios Makassikis (1):
ksmbd: Fix resource leak in smb2_lock()
Namjae Jeon (1):
ksmbd: set SMB2_SESSION_FLAG_ENCRYPT_DATA when enforcing data
encryption for this share
Xiu Jianfeng (1):
ksmbd: Fix resource leak in ksmbd_session_rpc_open()
ye xingchen (1):
ksmbd: Convert to use sysfs_emit()/sysfs_emit_at() APIs
fs/ksmbd/ksmbd_netlink.h | 1 +
fs/ksmbd/mgmt/user_session.c | 8 +++++---
fs/ksmbd/server.c | 20 ++++++--------------
fs/ksmbd/smb2ops.c | 10 ++++++++--
fs/ksmbd/smb2pdu.c | 20 +++++++++++++-------
fs/ksmbd/smb2pdu.h | 2 +-
fs/ksmbd/smb_common.h | 12 ++++++------
7 files changed, 40 insertions(+), 33 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2022-12-15 3:18 Steve French
@ 2022-12-15 17:32 ` Linus Torvalds
2022-12-15 18:28 ` pr-tracker-bot
1 sibling, 0 replies; 94+ messages in thread
From: Linus Torvalds @ 2022-12-15 17:32 UTC (permalink / raw)
To: Steve French; +Cc: Namjae Jeon, CIFS, LKML
On Wed, Dec 14, 2022 at 7:18 PM Steve French <smfrench@gmail.com> wrote:
>
> I can also send the client (cifs.ko) P/R tomorrow if it is easier but
> have been working on testing some important fixes which are not in
> linux-next yet, so not sure if it is easier to send the client fixes
> as two P/Rs, or wait and send the client fixes all together as one
> P/R later in the merge window.
I'd like to get the bulk early.
I'm traveling tomorrow (and to make this merge window *extra* fun,
Xfinity was messing with my home network yesterday), so if you have
the first batch that has been in linux-next ready to go, please get
that to me asap.
The less I have to look at while traveling, the better. I'm only on
the road for a couple of days, but then it's xmas week, so...
Linus
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2022-12-15 3:18 Steve French
2022-12-15 17:32 ` Linus Torvalds
@ 2022-12-15 18:28 ` pr-tracker-bot
1 sibling, 0 replies; 94+ messages in thread
From: pr-tracker-bot @ 2022-12-15 18:28 UTC (permalink / raw)
To: Steve French; +Cc: Linus Torvalds, Namjae Jeon, CIFS, LKML
The pull request you sent on Wed, 14 Dec 2022 21:18:14 -0600:
> git://git.samba.org/ksmbd.git tags/6.2-rc-ksmbd-server-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/504a73d46bad8964be2cdaa63a2bedaef198ea3b
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [flat|nested] 94+ messages in thread
* [GIT PULL] ksmbd server fixes
@ 2022-10-06 23:53 Steve French
2022-10-07 17:00 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2022-10-06 23:53 UTC (permalink / raw)
To: Linus Torvalds; +Cc: CIFS, LKML, Namjae Jeon
Please pull the following changes since commit
4fe89d07dcc2804c8b562f6c7896a45643d34b2f:
Linux 6.0 (2022-10-02 14:09:07 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.1-rc-ksmbd-fixes
for you to fetch changes up to f5ba1cdaf5eb380e148183bda06d4844b457d095:
ksmbd: validate share name from share config response (2022-10-05
01:15:44 -0500)
----------------------------------------------------------------
24 ksmbd server fixes, including 4 for stable
- RDMA (smbdirect fixes)
- Fixes for SMB3.1.1 POSIX Extensions (especially for id mapping)
- various casemapping fixes for mount and lookup
- UID mapping fixes
- Fix confusing error message
- Negotiate protocol fixes, including NTLMSSP fix
- Two encryption fixes
- directory listing fix
- some cleanup fixes
----------------------------------------------------------------
Al Viro (3):
ksmbd: don't open-code file_path()
ksmbd: don't open-code %pD
ksmbd: constify struct path
Atte Heikkilä (3):
ksmbd: casefold utf-8 share names and fix ascii lowercase conversion
ksmbd: make utf-8 file name comparison work in __caseless_lookup()
ksmbd: validate share name from share config response
Christian Brauner (1):
ksmbd: port to vfs{g,u}id_t and associated helpers
Hyunchul Lee (1):
MAINTAINERS: remove Hyunchul Lee from ksmbd maintainers
Mickaël Salaün (1):
ksmbd: Fix user namespace mapping
Namjae Jeon (12):
ksmbd: remove generic_fillattr use in smb2_open()
MAINTAINERS: Add Tom Talpey as ksmbd reviewer
ksmbd: fix incorrect handling of iterate_dir
ksmbd: update documentation
ksmbd: change security id to the one samba used for posix extension
ksmbd: set file permission mode to match Samba server posix
extension behavior
ksmbd: fill sids in SMB_FIND_FILE_POSIX_INFO response
ksmbd: fix endless loop when encryption for response fails
ksmbd: fix encryption failure issue for session logoff response
ksmbd: set NTLMSSP_NEGOTIATE_SEAL flag to challenge blob
ksmbd: hide socket error message when ipv6 config is disable
ksmbd: call ib_drain_qp when disconnected
Tom Talpey (2):
ksmbd: decrease the number of SMB3 smbdirect server SGEs
ksmbd: reduce server smbdirect max send/receive segment sizes
Zhang Xiaoxu (1):
ksmbd: Fix wrong return value and message length check in smb2_ioctl()
Documentation/filesystems/cifs/ksmbd.rst | 42 +++++++++++++++-------
MAINTAINERS | 2 +-
fs/ksmbd/auth.c | 15 +++++---
fs/ksmbd/auth.h | 3 +-
fs/ksmbd/connection.c | 8 +++++
fs/ksmbd/connection.h | 2 ++
fs/ksmbd/ksmbd_netlink.h | 3 +-
fs/ksmbd/mgmt/share_config.c | 36 +++++++++++--------
fs/ksmbd/mgmt/share_config.h | 4 ++-
fs/ksmbd/mgmt/tree_connect.c | 6 ++--
fs/ksmbd/mgmt/tree_connect.h | 2 +-
fs/ksmbd/misc.c | 46 +++++++++++++++++++-----
fs/ksmbd/misc.h | 5 +--
fs/ksmbd/ndr.c | 8 +++--
fs/ksmbd/oplock.c | 27 +++++++++-----
fs/ksmbd/server.c | 4 +--
fs/ksmbd/smb2pdu.c | 126
+++++++++++++++++++++++++++++++++++++---------------------------
fs/ksmbd/smb2pdu.h | 7 ++--
fs/ksmbd/smb_common.c | 6 ++--
fs/ksmbd/smbacl.c | 12 ++++---
fs/ksmbd/smbacl.h | 18 +++++-----
fs/ksmbd/transport_rdma.c | 8 +++--
fs/ksmbd/transport_tcp.c | 3 +-
fs/ksmbd/unicode.h | 3 +-
fs/ksmbd/vfs.c | 36 ++++++++++++-------
fs/ksmbd/vfs.h | 4 ++-
26 files changed, 284 insertions(+), 152 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2022-08-19 5:03 Steve French
2022-08-19 21:14 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2022-08-19 5:03 UTC (permalink / raw)
To: Linus Torvalds; +Cc: CIFS, LKML, Namjae Jeon
Please pull the following changes since commit
eb555cb5b794f4e12a9897f3d46d5a72104cd4a7:
Merge tag '5.20-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd
(2022-08-08 20:15:13 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/5.20-rc2-ksmbd-smb3-server-fixes
for you to fetch changes up to 17661ecf6a64eb11ae7f1108fe88686388b2acd5:
ksmbd: don't remove dos attribute xattr on O_TRUNC open (2022-08-15
21:07:01 -0500)
----------------------------------------------------------------
4 ksmbd server fixes:
- important sparse file fix
- allocation size fix
- fix incorrect rc on bad share
- share config fix
----------------------------------------------------------------
Atte Heikkilä (1):
ksmbd: request update to stale share config
Hyunchul Lee (1):
ksmbd: remove unnecessary generic_fillattr in smb2_open
Namjae Jeon (2):
ksmbd: return STATUS_BAD_NETWORK_NAME error status if share is
not configured
ksmbd: don't remove dos attribute xattr on O_TRUNC open
fs/ksmbd/ksmbd_netlink.h | 2 ++
fs/ksmbd/mgmt/share_config.c | 6 +++++-
fs/ksmbd/mgmt/share_config.h | 1 +
fs/ksmbd/mgmt/tree_connect.c | 16 +++++++++++++++-
fs/ksmbd/smb2pdu.c | 35 ++++++++++++++++-------------------
5 files changed, 39 insertions(+), 21 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2022-08-08 20:00 Steve French
2022-08-09 3:20 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2022-08-08 20:00 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, CIFS
Please pull the following changes since commit
ff6992735ade75aae3e35d16b17da1008d753d28:
Linux 5.19-rc7 (2022-07-17 13:30:22 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/5.20-rc-ksmbd-server-fixes
for you to fetch changes up to 8f0541186e9ad1b62accc9519cc2b7a7240272a7:
ksmbd: fix heap-based overflow in set_ntacl_dacl() (2022-08-04 09:51:38 -0500)
----------------------------------------------------------------
12 ksmbd server fixes
- six fixes for memory access bugs (out of bounds access, oops, leak)
- two multichannel fixes
- session disconnect performance improvement, and session register improvement
- cleanup
----------------------------------------------------------------
Hyunchul Lee (2):
ksmbd: prevent out of bound read for SMB2_WRITE
ksmbd: prevent out of bound read for SMB2_TREE_CONNNECT
Namjae Jeon (10):
ksmbd: remove unused ksmbd_share_configs_cleanup function
MAINTAINERS: ksmbd: add entry for documentation
ksmbd: replace sessions list in connection with xarray
ksmbd: add channel rwlock
ksmbd: fix kernel oops from idr_remove()
ksmbd: use wait_event instead of schedule_timeout()
ksmbd: fix racy issue while destroying session on multichannel
ksmbd: fix memory leak in smb2_handle_negotiate
ksmbd: fix use-after-free bug in smb2_tree_disconect
ksmbd: fix heap-based overflow in set_ntacl_dacl()
MAINTAINERS | 1 +
fs/ksmbd/auth.c | 56 ++++++++++---------
fs/ksmbd/auth.h | 11 ++--
fs/ksmbd/connection.c | 9 +--
fs/ksmbd/connection.h | 10 +---
fs/ksmbd/mgmt/share_config.c | 14 -----
fs/ksmbd/mgmt/share_config.h | 2 -
fs/ksmbd/mgmt/tree_connect.c | 5 +-
fs/ksmbd/mgmt/tree_connect.h | 4 +-
fs/ksmbd/mgmt/user_session.c | 95 +++++++++++++++++--------------
fs/ksmbd/mgmt/user_session.h | 13 ++---
fs/ksmbd/oplock.c | 46 +++++++++------
fs/ksmbd/server.c | 8 ++-
fs/ksmbd/smb2misc.c | 12 ++--
fs/ksmbd/smb2pdu.c | 112 ++++++++++++++++++++++++-------------
fs/ksmbd/smb_common.h | 2 +-
fs/ksmbd/smbacl.c | 130 +++++++++++++++++++++++++++++--------------
fs/ksmbd/smbacl.h | 2 +-
fs/ksmbd/vfs.c | 8 ++-
fs/ksmbd/vfs_cache.c | 2 +-
20 files changed, 322 insertions(+), 220 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2022-06-01 6:20 Steve French
2022-06-01 19:34 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2022-06-01 6:20 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, CIFS, LKML
Please pull the following changes since commit
c5eb0a61238dd6faf37f58c9ce61c9980aaffd7a:
Linux 5.18-rc6 (2022-05-08 13:54:17 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/5.19-rc-ksmbd-server-fixes
for you to fetch changes up to 621433b7e25d6d42e5f75bd8c4a62d6c7251511b:
ksmbd: smbd: relax the count of sges required (2022-05-27 21:31:20 -0500)
----------------------------------------------------------------
fourteen smb3 server fixes:
- 8 RDMA (smbdirect) fixes, cleanup and optimizations
- crediting (flow control) fix for mounts from Windows client
- ACL fix
- 2 cleanup fix
- Windows client query dir fix
- Write validation fix
----------------------------------------------------------------
Hyunchul Lee (8):
ksmbd: smbd: change prototypes of RDMA read/write related functions
ksmbd: smbd: introduce read/write credits for RDMA read/write
ksmbd: smbd: simplify tracking pending packets
ksmbd: smbd: change the return value of get_sg_list
ksmbd: smbd: handle multiple Buffer descriptors
ksmbd: smbd: fix connection dropped issue
ksmbd: fix outstanding credits related bugs
ksmbd: smbd: relax the count of sges required
Marios Makassikis (1):
ksmbd: validate length in smb2_write()
Namjae Jeon (3):
ksmbd: handle smb2 query dir request for OutputBufferLength that
is too small
ksmbd: add smbd max io size parameter
ksmbd: fix wrong smbd max read/write size check
Xin Xiong (1):
ksmbd: fix reference count leak in smb_check_perm_dacl()
Yang Li (1):
ksmbd: Fix some kernel-doc comments
fs/ksmbd/connection.c | 22 ++--
fs/ksmbd/connection.h | 27 ++--
fs/ksmbd/ksmbd_netlink.h | 3 +-
fs/ksmbd/misc.c | 10 +-
fs/ksmbd/smb2misc.c | 2 +-
fs/ksmbd/smb2pdu.c | 126 ++++++++++---------
fs/ksmbd/smb_common.c | 4 +-
fs/ksmbd/smbacl.c | 1 +
fs/ksmbd/transport_ipc.c | 3 +
fs/ksmbd/transport_rdma.c | 363
++++++++++++++++++++++++++++++++----------------------
fs/ksmbd/transport_rdma.h | 8 ++
11 files changed, 325 insertions(+), 244 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2022-04-24 0:10 Steve French
2022-04-24 0:32 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2022-04-24 0:10 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS, Namjae Jeon
Please pull the following changes since commit
ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e:
Linux 5.18-rc2 (2022-04-10 14:21:36 -1000)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/5.18-rc3-ksmbd-fixes
for you to fetch changes up to 02655a70b7cc0f534531ee65fa72692f4d31a944:
ksmbd: set fixed sector size to FS_SECTOR_SIZE_INFORMATION
(2022-04-14 20:56:13 -0500)
----------------------------------------------------------------
3 fixes to ksmbd server
- cap maximum sector size reported to avoid mount problems
- reference count fix
- fix filename rename race
----------------------------------------------------------------
Namjae Jeon (3):
ksmbd: remove filename in ksmbd_file
ksmbd: increment reference count of parent fp
ksmbd: set fixed sector size to FS_SECTOR_SIZE_INFORMATION
fs/ksmbd/misc.c | 40 +++++++++++++++++++++++++++++++---------
fs/ksmbd/misc.h | 3 ++-
fs/ksmbd/oplock.c | 30 ------------------------------
fs/ksmbd/oplock.h | 2 --
fs/ksmbd/smb2pdu.c | 34 ++++++++++++++++------------------
fs/ksmbd/vfs.c | 6 ++----
fs/ksmbd/vfs_cache.c | 2 +-
fs/ksmbd/vfs_cache.h | 1 -
8 files changed, 52 insertions(+), 66 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2022-04-01 18:40 Steve French
2022-04-01 21:41 ` Linus Torvalds
2022-04-01 21:45 ` pr-tracker-bot
0 siblings, 2 replies; 94+ messages in thread
From: Steve French @ 2022-04-01 18:40 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS
Please pull the following changes since commit
ffb217a13a2eaf6d5bd974fc83036a53ca69f1e2:
Linux 5.17-rc7 (2022-03-06 14:28:31 -0800)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/5.18-rc-ksmbd-server-fixes
for you to fetch changes up to edf5f0548fbb77e20b898460dc25281b0f4d974d:
ksmbd: replace usage of found with dedicated list iterator variable
(2022-03-30 08:17:55 -0500)
----------------------------------------------------------------
six ksmbd SMB3 server fixes
- three cleanup fixes
- shorten module load warning
- two documentation fixes
Does not include the dentry race related changes which
are being reworked by Namjae.
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [GIT PULL] ksmbd server fixes
2022-04-01 18:40 Steve French
@ 2022-04-01 21:41 ` Linus Torvalds
2022-04-01 21:45 ` pr-tracker-bot
1 sibling, 0 replies; 94+ messages in thread
From: Linus Torvalds @ 2022-04-01 21:41 UTC (permalink / raw)
To: Steve French; +Cc: LKML, CIFS
On Fri, Apr 1, 2022 at 11:40 AM Steve French <smfrench@gmail.com> wrote:
>
> six ksmbd SMB3 server fixes
>
> - three cleanup fixes
> - shorten module load warning
> - two documentation fixes
>
> Does not include the dentry race related changes which
> are being reworked by Namjae.
Thanks. An updated diffstat would still have been nice, though...
But I've pulled it, no worries.
Linus
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2022-04-01 18:40 Steve French
2022-04-01 21:41 ` Linus Torvalds
@ 2022-04-01 21:45 ` pr-tracker-bot
1 sibling, 0 replies; 94+ messages in thread
From: pr-tracker-bot @ 2022-04-01 21:45 UTC (permalink / raw)
To: Steve French; +Cc: Linus Torvalds, LKML, CIFS
The pull request you sent on Fri, 1 Apr 2022 13:40:40 -0500:
> git://git.samba.org/ksmbd.git tags/5.18-rc-ksmbd-server-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7a3ecddc571cc3294e5d6bb5948ff2b0cfa12735
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [flat|nested] 94+ messages in thread
* [GIT PULL] ksmbd server fixes
@ 2022-03-29 1:39 Steve French
2022-03-30 1:48 ` Linus Torvalds
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2022-03-29 1:39 UTC (permalink / raw)
To: Linus Torvalds; +Cc: CIFS, Namjae Jeon
Please pull the following changes since commit
ffb217a13a2eaf6d5bd974fc83036a53ca69f1e2:
Linux 5.17-rc7 (2022-03-06 14:28:31 -0800)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/5.18-ksmbd-server-fixes
for you to fetch changes up to 5d4c2759d83bad3041bf16d0b0e2ff6df11200bb:
ksmbd: replace usage of found with dedicated list iterator variable
(2022-03-26 12:45:50 -0500)
----------------------------------------------------------------
10 smb3 server fixes
- three cleanup fixes
- shorten module load warning
- two documentation fixes
- four patches relating to dentry race
-----------------------------------------------------------------
Christophe JAILLET (1):
ksmbd: Remove a redundant zeroing of memory
Jakob Koschel (1):
ksmbd: replace usage of found with dedicated list iterator variable
Namjae Jeon (6):
Documentation: ksmbd: update Feature Status table
ksmbd: remove internal.h include
ksmbd: remove filename in ksmbd_file
ksmbd: fix racy issue from using ->d_parent and ->d_name
ksmbd: increment reference count of parent fp
MAINTAINERS: ksmbd: switch Sergey to reviewer
Steve French (1):
ksmbd: shorten experimental warnign on loading the module
Tobias Klauser (1):
ksmbd: use netif_is_bridge_port
Documentation/filesystems/cifs/ksmbd.rst | 4 +-
MAINTAINERS | 2 +-
fs/internal.h | 2 -
fs/ksmbd/misc.c | 40 +++++--
fs/ksmbd/misc.h | 3 +-
fs/ksmbd/oplock.c | 30 ------
fs/ksmbd/oplock.h | 2 -
fs/ksmbd/server.c | 2 +-
fs/ksmbd/smb2pdu.c | 147 +++++--------------------
fs/ksmbd/transport_tcp.c | 4 +-
fs/ksmbd/vfs.c | 262
++++++++++++++++++++-------------------------
fs/ksmbd/vfs.h | 7 +-
fs/ksmbd/vfs_cache.c | 7 +-
fs/ksmbd/vfs_cache.h | 1 -
fs/namei.c | 41 +++++--
include/linux/namei.h | 7 ++
16 files changed, 231 insertions(+), 330 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2022-03-29 1:39 Steve French
@ 2022-03-30 1:48 ` Linus Torvalds
2022-03-30 1:57 ` Steve French
` (3 more replies)
0 siblings, 4 replies; 94+ messages in thread
From: Linus Torvalds @ 2022-03-30 1:48 UTC (permalink / raw)
To: Steve French, Al Viro; +Cc: CIFS, Namjae Jeon
On Mon, Mar 28, 2022 at 6:39 PM Steve French <smfrench@gmail.com> wrote:
>
> - four patches relating to dentry race
I took a look at this, and I absolutely hate it.
You are basically exporting vfs-internal functions (__lookup_hash() in
particular) that really shouldn't be exported.
And the _reason_ you are exporting them seems to be that you have
copied most of do_renameat2() as ksmbd_vfs_rename() but then made
various small changes.
This all makes me _very_ uncomfortable.
I really get the feeling that we'd be much better off exporting
something that is just a bigger part of that rename logic, not that
really low-level __lookup_hash() thing.
From what I can tell, almost everything between that __lookup_hash()
and the final vfs_rename() call is shared, even to the point of error
label names (ok, you call it "out5", the vfs layer calls it "exit5".
The main exception is that odd
parent_fp = ksmbd_lookup_fd_inode(old_parent->d_inode);
if (parent_fp) {
...
sequence, but that looks like it could have been done before the
__lookup_hash() too.
I'd be even happier if we could actually hjave some common helper
starting at that
trap = lock_rename(...);
because that whole locking and 'trap' logic is kind of a big deal, and
the locking is the only thing that makes __lookup_hash() work.
Adding Al to the cc in case he has any ideas. Maybe he's ok with this
whole thing, and with his blessing I'll take this pull as-is, but as
it is I'm not comfortable with it.
Linus
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2022-03-30 1:48 ` Linus Torvalds
@ 2022-03-30 1:57 ` Steve French
2022-03-30 2:23 ` Linus Torvalds
` (2 subsequent siblings)
3 siblings, 0 replies; 94+ messages in thread
From: Steve French @ 2022-03-30 1:57 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Al Viro, CIFS, Namjae Jeon
On Tue, Mar 29, 2022 at 8:49 PM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> On Mon, Mar 28, 2022 at 6:39 PM Steve French <smfrench@gmail.com> wrote:
> >
> > - four patches relating to dentry race
<...>
>
> This all makes me _very_ uncomfortable.
>
> I really get the feeling that we'd be much better off exporting
> something that is just a bigger part of that rename logic, not that
> really low-level __lookup_hash() thing.
>
<...>
> I'd be even happier if we could actually hjave some common helper
> starting at that
>
> trap = lock_rename(...);
>
> because that whole locking and 'trap' logic is kind of a big deal, and
> the locking is the only thing that makes __lookup_hash() work.
>
> Adding Al to the cc in case he has any ideas. Maybe he's ok with this
> whole thing, and with his blessing I'll take this pull as-is, but as
> it is I'm not comfortable with it.
Depending on what Al's opinion is, we can remove those four and resubmit.
Also FYI - I have some cleanup patches for ksmbd/cifs common code
(that will be in the next cifs.ko P/R) that I am holding off
on for a few days to reduce change of merge conflict.
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2022-03-30 1:48 ` Linus Torvalds
2022-03-30 1:57 ` Steve French
@ 2022-03-30 2:23 ` Linus Torvalds
2022-03-30 9:18 ` Christoph Hellwig
2022-03-30 9:17 ` Christoph Hellwig
2022-04-01 1:20 ` Al Viro
3 siblings, 1 reply; 94+ messages in thread
From: Linus Torvalds @ 2022-03-30 2:23 UTC (permalink / raw)
To: Steve French, Al Viro; +Cc: CIFS, Namjae Jeon
On Tue, Mar 29, 2022 at 6:48 PM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> I'd be even happier if we could actually have some common helper
> starting at that
>
> trap = lock_rename(...);
>
> because that whole locking and 'trap' logic is kind of a big deal, and
> the locking is the only thing that makes __lookup_hash() work.
Hmm. The cachefiles and ecryptfs code seems to have a fair amount of
this pattern.
None of it is exactly the same, and maybe it's hard to really have a
common helper, but it does look like that sequence from
trap = lock_rename(...)
leading up to the eventual
ret = vfs_rename(&renamedata);
would be really nice to capture some way.
But maybe there just isn't any actual code commonality outside of the
general pattern.
I was curious, and that "trap = lock_rename()" pattern including those
"exit5" labels is _ancient_, btw.
It goes back to a commit by Al back in 2002, best seen in Thomas' BK
history conversion:
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git/commit/?id=1b3d7c93c6d1927540120bafb08fa60c0d96cbee
so it's not like this is a pattern that has seen a lot of changes.
Maybe it's ok to just have various copies of it, but let's see if Al
has any ideas.
Linus
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2022-03-30 2:23 ` Linus Torvalds
@ 2022-03-30 9:18 ` Christoph Hellwig
0 siblings, 0 replies; 94+ messages in thread
From: Christoph Hellwig @ 2022-03-30 9:18 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Steve French, Al Viro, CIFS, Namjae Jeon
On Tue, Mar 29, 2022 at 07:23:19PM -0700, Linus Torvalds wrote:
> Hmm. The cachefiles and ecryptfs code seems to have a fair amount of
> this pattern.
Which is expected as those (plus nfsd) really are the major consumers
of doing the full set of file system namespace operations from kernel
space.
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [GIT PULL] ksmbd server fixes
2022-03-30 1:48 ` Linus Torvalds
2022-03-30 1:57 ` Steve French
2022-03-30 2:23 ` Linus Torvalds
@ 2022-03-30 9:17 ` Christoph Hellwig
2022-04-01 1:20 ` Al Viro
3 siblings, 0 replies; 94+ messages in thread
From: Christoph Hellwig @ 2022-03-30 9:17 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Steve French, Al Viro, CIFS, Namjae Jeon
On Tue, Mar 29, 2022 at 06:48:51PM -0700, Linus Torvalds wrote:
> On Mon, Mar 28, 2022 at 6:39 PM Steve French <smfrench@gmail.com> wrote:
> >
> > - four patches relating to dentry race
>
> I took a look at this, and I absolutely hate it.
>
> You are basically exporting vfs-internal functions (__lookup_hash() in
> particular) that really shouldn't be exported.
It really shouldn't indeed, and I'm rather worried that this pull
request just exports it without any relevant ACKs.
> And the _reason_ you are exporting them seems to be that you have
> copied most of do_renameat2() as ksmbd_vfs_rename() but then made
> various small changes.
>
> This all makes me _very_ uncomfortable.
>
> I really get the feeling that we'd be much better off exporting
> something that is just a bigger part of that rename logic, not that
> really low-level __lookup_hash() thing.
Agreed.
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [GIT PULL] ksmbd server fixes
2022-03-30 1:48 ` Linus Torvalds
` (2 preceding siblings ...)
2022-03-30 9:17 ` Christoph Hellwig
@ 2022-04-01 1:20 ` Al Viro
2022-04-01 12:52 ` Namjae Jeon
3 siblings, 1 reply; 94+ messages in thread
From: Al Viro @ 2022-04-01 1:20 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Steve French, CIFS, Namjae Jeon
On Tue, Mar 29, 2022 at 06:48:51PM -0700, Linus Torvalds wrote:
> On Mon, Mar 28, 2022 at 6:39 PM Steve French <smfrench@gmail.com> wrote:
> >
> > - four patches relating to dentry race
>
> I took a look at this, and I absolutely hate it.
>
> You are basically exporting vfs-internal functions (__lookup_hash() in
> particular) that really shouldn't be exported.
>
> And the _reason_ you are exporting them seems to be that you have
> copied most of do_renameat2() as ksmbd_vfs_rename() but then made
> various small changes.
>
> This all makes me _very_ uncomfortable.
>
> I really get the feeling that we'd be much better off exporting
> something that is just a bigger part of that rename logic, not that
> really low-level __lookup_hash() thing.
>
> >From what I can tell, almost everything between that __lookup_hash()
> and the final vfs_rename() call is shared, even to the point of error
> label names (ok, you call it "out5", the vfs layer calls it "exit5".
>
> The main exception is that odd
>
> parent_fp = ksmbd_lookup_fd_inode(old_parent->d_inode);
> if (parent_fp) {
> ...
>
> sequence, but that looks like it could have been done before the
> __lookup_hash() too.
If only... Note that
if (old_dentry != old_child) {
err = -ESTALE;
dput(old_dentry);
goto out4;
}
thing in there. -ESTALE is actually wrong - what happens there is
a lost race with rename.
The source of headache is that they are trying to implement not
"rename this entry in this directory to that entry in that directory";
it's "rename an opened file, no matter which directory it's in".
Comes from shit-for-brains protocol, that tries both to treat file
name as a piece of metadata (which, in itself, would be defensible)
*and* allow cross-directory moves. Shoved into the same fchown-like
scheme.
So they end up with source already looked up. We want both parents
locked and we bloody well want them to be the parents of the objects
we'll operate upon.
What that code does is
* pin a reference to current parent of source
* look the parent of destination of up
* lock both
* ... and pray that child is still the child of what we'd locked.
* for that, take a snapshot of its name (it's not guaranteed
to be stable otherwise)
* look that name up in what used to be its parent
* ... and see if what we've got is our source.
In case of mismatch (i.e. cross-directory rename at any point between
dget_parent() and the end of lock_rename()) we fail with -ESTALE. Note
that we do *not* do anything of that sort if that cross-directory rename
happens just prior to dget_parent() - that is accepted just fine.
This is bogus. That song and dance is done after we'd locked the
thing that used to be the parent of source. At that point nothing
can move into or out of that sucker, so all we need is a check that
old_child->d_parent is equal to old_parent and, probably, that it's
still hashed.
No re-lookup is needed. What's more, I suspect that the right thing
to do would be a specialized variant of lock_rename() that would
take source and new parent and do the following:
if (READ_ONCE(source->d_parent) == new_parent) {
inode_lock_nested(new_parent->d_inode, I_MUTEX_PARENT);
if (likely(source->d_parent == new_parent))
return NULL;
}
// fuck that, looks like a cross-rename one.
mutex_lock(&source->d_sb->s_vfs_rename_mutex);
// now all ->d_parent are stable
if (unlikely(source->d_parent == new_parent)) {
inode_lock_nested(new_parent->d_inode, I_MUTEX_PARENT);
// we want the same rules as for lock_rename()
mutex_unlock(&source->d_sb->s_vfs_rename_mutex);
return NULL;
}
// cross-directory it is...
same as lock_rename() after having grabbed ->s_vfs_rename_mutex
Pass old_child and new_path.dentry to this lock_rename() analogue.
As soon as it returns, we know that old_child->d_parent is stable,
that it and new_path.dentry are properly locked for rename.
No dget_parent() needed (just dget(old_child->d_parent)), no need to
bother with re-lookups, snapshots, etc. - check that old_child is
still hashed and if it isn't, we really can return a hard error.
Unlike this -ESTALE, it's not a transient condition.
To be paired with unlock_rename() - just remember to pass it the
value of old_child->d_parent taken *before* vfs_rename(). And
it would have to live in fs/namei.c, right next to lock_rename(),
obviously.
I don't think that __lookup_hash() makes a good _name_ (or calling
conventions) to expose, but it's not really different from e.g.
lookup_one_len() as far exposing internals is concerned.
We want the parent held exclusive and that's all there is to it.
BTW, what the hell is this about?
if (d_is_symlink(new_path.dentry)) {
err = -EACCES;
goto out2;
}
new_path is the new parent; why bother with that check at all?
It's not as if any kind of lookup in it would have a chance to
succeed...
> I'd be even happier if we could actually hjave some common helper
> starting at that
>
> trap = lock_rename(...);
>
> because that whole locking and 'trap' logic is kind of a big deal, and
> the locking is the only thing that makes __lookup_hash() work.
>
> Adding Al to the cc in case he has any ideas. Maybe he's ok with this
> whole thing, and with his blessing I'll take this pull as-is, but as
> it is I'm not comfortable with it.
Unfortunately, it's not similar to rename(2) - different things given
to it ;-/ Bits and pieces might be possible to factorize, but the
difference in what we start from is fundamental.
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2022-04-01 1:20 ` Al Viro
@ 2022-04-01 12:52 ` Namjae Jeon
2022-04-01 13:34 ` Al Viro
0 siblings, 1 reply; 94+ messages in thread
From: Namjae Jeon @ 2022-04-01 12:52 UTC (permalink / raw)
To: Al Viro; +Cc: Linus Torvalds, Steve French, CIFS
2022-04-01 10:20 GMT+09:00, Al Viro <viro@zeniv.linux.org.uk>:
> On Tue, Mar 29, 2022 at 06:48:51PM -0700, Linus Torvalds wrote:
>> On Mon, Mar 28, 2022 at 6:39 PM Steve French <smfrench@gmail.com> wrote:
>> >
>> > - four patches relating to dentry race
>>
>> I took a look at this, and I absolutely hate it.
>>
>> You are basically exporting vfs-internal functions (__lookup_hash() in
>> particular) that really shouldn't be exported.
>>
>> And the _reason_ you are exporting them seems to be that you have
>> copied most of do_renameat2() as ksmbd_vfs_rename() but then made
>> various small changes.
>>
>> This all makes me _very_ uncomfortable.
>>
>> I really get the feeling that we'd be much better off exporting
>> something that is just a bigger part of that rename logic, not that
>> really low-level __lookup_hash() thing.
>>
>> >From what I can tell, almost everything between that __lookup_hash()
>> and the final vfs_rename() call is shared, even to the point of error
>> label names (ok, you call it "out5", the vfs layer calls it "exit5".
>>
>> The main exception is that odd
>>
>> parent_fp = ksmbd_lookup_fd_inode(old_parent->d_inode);
>> if (parent_fp) {
>> ...
>>
>> sequence, but that looks like it could have been done before the
>> __lookup_hash() too.
>
> If only... Note that
> if (old_dentry != old_child) {
> err = -ESTALE;
> dput(old_dentry);
> goto out4;
> }
> thing in there. -ESTALE is actually wrong - what happens there is
> a lost race with rename.
>
> The source of headache is that they are trying to implement not
> "rename this entry in this directory to that entry in that directory";
> it's "rename an opened file, no matter which directory it's in".
>
> Comes from shit-for-brains protocol, that tries both to treat file
> name as a piece of metadata (which, in itself, would be defensible)
> *and* allow cross-directory moves. Shoved into the same fchown-like
> scheme.
>
> So they end up with source already looked up. We want both parents
> locked and we bloody well want them to be the parents of the objects
> we'll operate upon.
>
> What that code does is
> * pin a reference to current parent of source
> * look the parent of destination of up
> * lock both
> * ... and pray that child is still the child of what we'd locked.
> * for that, take a snapshot of its name (it's not guaranteed
> to be stable otherwise)
> * look that name up in what used to be its parent
> * ... and see if what we've got is our source.
>
> In case of mismatch (i.e. cross-directory rename at any point between
> dget_parent() and the end of lock_rename()) we fail with -ESTALE. Note
> that we do *not* do anything of that sort if that cross-directory rename
> happens just prior to dget_parent() - that is accepted just fine.
>
> This is bogus. That song and dance is done after we'd locked the
> thing that used to be the parent of source. At that point nothing
> can move into or out of that sucker, so all we need is a check that
> old_child->d_parent is equal to old_parent and, probably, that it's
> still hashed.
>
> No re-lookup is needed. What's more, I suspect that the right thing
> to do would be a specialized variant of lock_rename() that would
> take source and new parent and do the following:
>
> if (READ_ONCE(source->d_parent) == new_parent) {
> inode_lock_nested(new_parent->d_inode, I_MUTEX_PARENT);
> if (likely(source->d_parent == new_parent))
> return NULL;
> }
> // fuck that, looks like a cross-rename one.
> mutex_lock(&source->d_sb->s_vfs_rename_mutex);
> // now all ->d_parent are stable
> if (unlikely(source->d_parent == new_parent)) {
> inode_lock_nested(new_parent->d_inode, I_MUTEX_PARENT);
> // we want the same rules as for lock_rename()
> mutex_unlock(&source->d_sb->s_vfs_rename_mutex);
> return NULL;
> }
> // cross-directory it is...
> same as lock_rename() after having grabbed ->s_vfs_rename_mutex
>
> Pass old_child and new_path.dentry to this lock_rename() analogue.
> As soon as it returns, we know that old_child->d_parent is stable,
> that it and new_path.dentry are properly locked for rename.
> No dget_parent() needed (just dget(old_child->d_parent)), no need to
> bother with re-lookups, snapshots, etc. - check that old_child is
> still hashed and if it isn't, we really can return a hard error.
> Unlike this -ESTALE, it's not a transient condition.
>
> To be paired with unlock_rename() - just remember to pass it the
> value of old_child->d_parent taken *before* vfs_rename(). And
> it would have to live in fs/namei.c, right next to lock_rename(),
> obviously.
Thanks for your detailed explanation!
I will check it.
>
> I don't think that __lookup_hash() makes a good _name_ (or calling
> conventions) to expose, but it's not really different from e.g.
> lookup_one_len() as far exposing internals is concerned.
> We want the parent held exclusive and that's all there is to it.
>
> BTW, what the hell is this about?
> if (d_is_symlink(new_path.dentry)) {
> err = -EACCES;
> goto out2;
> }
> new_path is the new parent; why bother with that check at all?
> It's not as if any kind of lookup in it would have a chance to
> succeed...
Let me check it again. I will remove this check.
Thanks!
>
>> I'd be even happier if we could actually hjave some common helper
>> starting at that
>>
>> trap = lock_rename(...);
>>
>> because that whole locking and 'trap' logic is kind of a big deal, and
>> the locking is the only thing that makes __lookup_hash() work.
>>
>> Adding Al to the cc in case he has any ideas. Maybe he's ok with this
>> whole thing, and with his blessing I'll take this pull as-is, but as
>> it is I'm not comfortable with it.
>
> Unfortunately, it's not similar to rename(2) - different things given
> to it ;-/ Bits and pieces might be possible to factorize, but the
> difference in what we start from is fundamental.
>
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2022-04-01 12:52 ` Namjae Jeon
@ 2022-04-01 13:34 ` Al Viro
2022-04-01 14:58 ` Namjae Jeon
0 siblings, 1 reply; 94+ messages in thread
From: Al Viro @ 2022-04-01 13:34 UTC (permalink / raw)
To: Namjae Jeon; +Cc: Linus Torvalds, Steve French, CIFS
On Fri, Apr 01, 2022 at 09:52:09PM +0900, Namjae Jeon wrote:
> > take source and new parent and do the following:
> >
> > if (READ_ONCE(source->d_parent) == new_parent) {
> > inode_lock_nested(new_parent->d_inode, I_MUTEX_PARENT);
> > if (likely(source->d_parent == new_parent))
> > return NULL;
and
inode_unlock(new_parent->d_inode);
to do locking in proper order...
> > }
> > // fuck that, looks like a cross-rename one.
> > mutex_lock(&source->d_sb->s_vfs_rename_mutex);
> > // now all ->d_parent are stable
> > if (unlikely(source->d_parent == new_parent)) {
> > inode_lock_nested(new_parent->d_inode, I_MUTEX_PARENT);
> > // we want the same rules as for lock_rename()
> > mutex_unlock(&source->d_sb->s_vfs_rename_mutex);
> > return NULL;
> > }
> > // cross-directory it is...
> > same as lock_rename() after having grabbed ->s_vfs_rename_mutex
// p1 != p2, p1->d_sb == p2->d_sb, p1->d_sb->s_vfs_rename_mutex held
static struct dentry *lock_two_directories(struct dentry *p1, struct dentry *p2)
{
struct dentry *p;
p = d_ancestor(p2, p1);
if (p) {
inode_lock_nested(p2->d_inode, I_MUTEX_PARENT);
inode_lock_nested(p1->d_inode, I_MUTEX_CHILD);
return p;
}
p = d_ancestor(p1, p2);
if (p) {
inode_lock_nested(p1->d_inode, I_MUTEX_PARENT);
inode_lock_nested(p2->d_inode, I_MUTEX_CHILD);
return p;
}
inode_lock_nested(p1->d_inode, I_MUTEX_PARENT);
inode_lock_nested(p2->d_inode, I_MUTEX_PARENT2);
return NULL;
}
struct dentry *lock_rename(struct dentry *p1, struct dentry *p2)
{
if (p1 == p2) {
inode_lock_nested(p1->d_inode, I_MUTEX_PARENT);
return NULL;
}
mutex_lock(&p1->d_sb->s_vfs_rename_mutex);
return lock_two_directories(p1, p2);
}
struct dentry *lock_rename_child(struct dentry *c1, struct dentry *p2)
{
if (READ_ONCE(c1->d_parent) == p2) {
inode_lock_nested(p2->d_inode, I_MUTEX_PARENT);
if (likely(c1->d_parent == p2))
return NULL;
// too bad, we'd raced with another rename
inode_unlock(p2->d_inode);
}
// looks like it's cross-directory
mutex_lock(&c1->d_sb->s_vfs_rename_mutex);
// recheck, now that ->d_parent is stable
if (likely(c1->d_parent != p2))
return lock_two_directories(c1->d_parent, p2);
// it's not cross-directory, after all - raced with another rename
inode_lock_nested(p2->d_inode, I_MUTEX_PARENT);
// drop ->s_vfs_rename_mutex, so we won't confuse unlock_rename()
// note that locked p2 alone is enough to prevent moves to or from
// p2, so c1->d_parent will remain p2 until we unlock p2
mutex_unlock(&c1->d_sb->s_vfs_rename_mutex);
return NULL;
}
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [GIT PULL] ksmbd server fixes
2022-04-01 13:34 ` Al Viro
@ 2022-04-01 14:58 ` Namjae Jeon
0 siblings, 0 replies; 94+ messages in thread
From: Namjae Jeon @ 2022-04-01 14:58 UTC (permalink / raw)
To: Al Viro; +Cc: Linus Torvalds, Steve French, CIFS
2022-04-01 22:34 GMT+09:00, Al Viro <viro@zeniv.linux.org.uk>:
> On Fri, Apr 01, 2022 at 09:52:09PM +0900, Namjae Jeon wrote:
>> > take source and new parent and do the following:
>> >
>> > if (READ_ONCE(source->d_parent) == new_parent) {
>> > inode_lock_nested(new_parent->d_inode, I_MUTEX_PARENT);
>> > if (likely(source->d_parent == new_parent))
>> > return NULL;
> and
> inode_unlock(new_parent->d_inode);
> to do locking in proper order...
Okay, Let me check it with these codes.
Thanks for sharing the codes!
>
>> > }
>> > // fuck that, looks like a cross-rename one.
>> > mutex_lock(&source->d_sb->s_vfs_rename_mutex);
>> > // now all ->d_parent are stable
>> > if (unlikely(source->d_parent == new_parent)) {
>> > inode_lock_nested(new_parent->d_inode, I_MUTEX_PARENT);
>> > // we want the same rules as for lock_rename()
>> > mutex_unlock(&source->d_sb->s_vfs_rename_mutex);
>> > return NULL;
>> > }
>> > // cross-directory it is...
>> > same as lock_rename() after having grabbed ->s_vfs_rename_mutex
>
> // p1 != p2, p1->d_sb == p2->d_sb, p1->d_sb->s_vfs_rename_mutex held
> static struct dentry *lock_two_directories(struct dentry *p1, struct dentry
> *p2)
> {
> struct dentry *p;
>
> p = d_ancestor(p2, p1);
> if (p) {
> inode_lock_nested(p2->d_inode, I_MUTEX_PARENT);
> inode_lock_nested(p1->d_inode, I_MUTEX_CHILD);
> return p;
> }
>
> p = d_ancestor(p1, p2);
> if (p) {
> inode_lock_nested(p1->d_inode, I_MUTEX_PARENT);
> inode_lock_nested(p2->d_inode, I_MUTEX_CHILD);
> return p;
> }
>
> inode_lock_nested(p1->d_inode, I_MUTEX_PARENT);
> inode_lock_nested(p2->d_inode, I_MUTEX_PARENT2);
> return NULL;
> }
>
> struct dentry *lock_rename(struct dentry *p1, struct dentry *p2)
> {
> if (p1 == p2) {
> inode_lock_nested(p1->d_inode, I_MUTEX_PARENT);
> return NULL;
> }
>
> mutex_lock(&p1->d_sb->s_vfs_rename_mutex);
> return lock_two_directories(p1, p2);
> }
>
> struct dentry *lock_rename_child(struct dentry *c1, struct dentry *p2)
> {
> if (READ_ONCE(c1->d_parent) == p2) {
> inode_lock_nested(p2->d_inode, I_MUTEX_PARENT);
> if (likely(c1->d_parent == p2))
> return NULL;
>
> // too bad, we'd raced with another rename
> inode_unlock(p2->d_inode);
> }
>
> // looks like it's cross-directory
> mutex_lock(&c1->d_sb->s_vfs_rename_mutex);
>
> // recheck, now that ->d_parent is stable
> if (likely(c1->d_parent != p2))
> return lock_two_directories(c1->d_parent, p2);
>
> // it's not cross-directory, after all - raced with another rename
> inode_lock_nested(p2->d_inode, I_MUTEX_PARENT);
> // drop ->s_vfs_rename_mutex, so we won't confuse unlock_rename()
> // note that locked p2 alone is enough to prevent moves to or from
> // p2, so c1->d_parent will remain p2 until we unlock p2
> mutex_unlock(&c1->d_sb->s_vfs_rename_mutex);
> return NULL;
> }
>
^ permalink raw reply [flat|nested] 94+ messages in thread
* [GIT PULL] ksmbd server fixes
@ 2022-02-07 21:04 Steve French
2022-02-07 23:34 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2022-02-07 21:04 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Namjae Jeon, CIFS, LKML
Please pull the following changes since commit
e783362eb54cd99b2cac8b3a9aeac942e6f6ac07:
Linux 5.17-rc1 (2022-01-23 10:12:53 +0200)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/5.17-rc3-ksmbd-server-fixes
for you to fetch changes up to f9929ef6a2a55f03aac61248c6a3a987b8546f2a:
ksmbd: add support for key exchange (2022-02-04 00:12:22 -0600)
----------------------------------------------------------------
6 ksmbd server fixes including:
- NTLMSSP authentication improvement
- RDMA (smbdirect) fix allowing broader set of NICs to be supported
- improved buffer validation
- 3 additional small fixes, including a posix extensions fix for stable
Regression test results:
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/8/builds/100
----------------------------------------------------------------
Hyunchul Lee (1):
ksmbd: smbd: validate buffer descriptor structures
Namjae Jeon (5):
ksmbd: fix SMB 3.11 posix extension mount failure
ksmbd: fix same UniqueId for dot and dotdot entries
ksmbd: don't align last entry offset in smb2 query directory
ksmbd: reduce smb direct max read/write size
ksmbd: add support for key exchange
fs/Kconfig | 4 ++--
fs/ksmbd/auth.c | 27 +++++++++++++++++++++++++++
fs/ksmbd/smb2pdu.c | 45 +++++++++++++++++++++++++++++++++++----------
fs/ksmbd/smb_common.c | 5 ++++-
fs/ksmbd/transport_rdma.c | 2 +-
fs/ksmbd/vfs.h | 1 +
6 files changed, 70 insertions(+), 14 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2021-11-27 21:43 Steve French
2021-11-27 22:52 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2021-11-27 21:43 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS, Namjae Jeon
Please pull the following changes since commit
136057256686de39cc3a07c2e39ef6bc43003ff6:
Linux 5.16-rc2 (2021-11-21 13:47:39 -0800)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/5.16-rc2-ksmbd-fixes
for you to fetch changes up to 178ca6f85aa3231094467691f5ea1ff2f398aa8d:
ksmbd: fix memleak in get_file_stream_info() (2021-11-25 00:09:26 -0600)
----------------------------------------------------------------
5 ksmbd server fixes, 4 for stable
- memleak fix
- fix for default data stream on fs that don't support xattr
- error logging fix
- session setup fix
- minor doc cleanup
Regression test results:
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/8/builds/96
----------------------------------------------------------------
Christophe JAILLET (1):
ksmbd: Fix an error handling path in 'smb2_sess_setup()'
Namjae Jeon (3):
ksmbd: downgrade addition info error msg to debug in smb2_get_info_sec()
ksmbd: contain default data stream even if xattr is empty
ksmbd: fix memleak in get_file_stream_info()
Salvatore Bonaccorso (1):
docs: filesystem: cifs: ksmbd: Fix small layout issues
Documentation/filesystems/cifs/ksmbd.rst | 10 +++++-----
fs/ksmbd/smb2pdu.c | 30 +++++++++++++++++-------------
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread* [GIT PULL] ksmbd server fixes
@ 2021-09-26 12:13 Steve French
2021-09-26 21:11 ` pr-tracker-bot
0 siblings, 1 reply; 94+ messages in thread
From: Steve French @ 2021-09-26 12:13 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS, Namjae Jeon
Please pull the following changes since commit
707a63e9a9dd55432d47bf40457d4a3413888dcc:
Merge tag '5.15-rc1-ksmbd' of git://git.samba.org/ksmbd (2021-09-20
15:35:17 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/5.15-rc2-ksmbd-fixes
for you to fetch changes up to 265fd1991c1db85fbabaad4946ca0e63e2ae688d:
ksmbd: use LOOKUP_BENEATH to prevent the out of share access
(2021-09-24 21:25:23 -0500)
----------------------------------------------------------------
Five fixes for the ksmbd kernel server, including three security fixes:
- removing follow symlinks support
- converting to use LOOKUP_BENEATH to prevent out of share access
- SMB3 compounding security fix
-fix for returning the default streams correctly, fixing a bug when
writing ppt or doc files from some clients
- logging more clearly that ksmbd is experimental (at module load time)
Functional testing passed (e.g.
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/8/builds/73).
Additional patches are being reviewed, addressing the remaining
potential overflows found in the security reviews.
----------------------------------------------------------------
Hyunchul Lee (1):
ksmbd: use LOOKUP_BENEATH to prevent the out of share access
Namjae Jeon (3):
ksmbd: add default data stream name in FILE_STREAM_INFORMATION
ksmbd: check protocol id in ksmbd_verify_smb_message()
ksmbd: remove follow symlinks support
Steve French (1):
ksmbd: log that server is experimental at module load
fs/ksmbd/misc.c | 100 ++++++++---------------------------------
fs/ksmbd/misc.h | 7 +--
fs/ksmbd/server.c | 3 ++
fs/ksmbd/smb2pdu.c | 119 ++++++++++++++++--------------------------------
fs/ksmbd/smb_common.c | 13 ++++--
fs/ksmbd/smb_common.h | 1 +
fs/ksmbd/vfs.c | 172
++++++++++++++++++++++++++++++++++------------------------------------
fs/ksmbd/vfs.h | 9 +++-
8 files changed, 164 insertions(+), 260 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 94+ messages in thread
end of thread, other threads:[~2024-04-22 23:51 UTC | newest]
Thread overview: 94+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-28 22:07 [GIT PULL] ksmbd server fixes Steve French
2022-06-29 16:44 ` pr-tracker-bot
-- strict thread matches above, loose matches on Subject: below --
2024-04-22 23:20 Steve French
2024-04-22 23:51 ` pr-tracker-bot
2024-04-05 3:15 Steve French
2024-04-05 17:09 ` pr-tracker-bot
2024-03-20 17:06 Steve French
2024-03-20 23:46 ` pr-tracker-bot
2024-02-10 1:45 Steve French
2024-02-10 16:26 ` pr-tracker-bot
2024-01-27 7:20 Steve French
2024-01-27 17:21 ` pr-tracker-bot
2024-01-18 0:39 Steve French
2024-01-19 18:03 ` pr-tracker-bot
2024-01-11 14:20 Steve French
2024-01-12 5:07 ` pr-tracker-bot
2023-11-27 21:00 Steve French
2023-11-28 1:26 ` pr-tracker-bot
2023-11-10 7:16 Steve French
2023-11-10 18:47 ` pr-tracker-bot
2023-11-02 2:46 Steve French
2023-11-02 18:38 ` pr-tracker-bot
2023-10-15 2:46 Steve French
2023-10-15 2:52 ` pr-tracker-bot
2023-10-08 4:27 Steve French
2023-10-08 18:06 ` pr-tracker-bot
2023-09-29 22:11 Steve French
2023-09-29 23:59 ` pr-tracker-bot
2023-09-17 1:55 Steve French
2023-09-17 18:24 ` pr-tracker-bot
2023-08-09 23:11 Steve French
2023-08-10 5:02 ` pr-tracker-bot
2023-07-26 6:17 Steve French
2023-07-26 18:42 ` pr-tracker-bot
2023-06-30 5:59 Steve French
2023-07-01 5:04 ` pr-tracker-bot
2023-06-20 4:45 Steve French
2023-06-20 19:01 ` pr-tracker-bot
2023-06-11 1:59 Steve French
2023-06-11 17:43 ` pr-tracker-bot
2023-05-21 5:14 Steve French
2023-05-21 18:06 ` Linus Torvalds
2023-05-21 18:32 ` Linus Torvalds
2023-05-21 19:03 ` Steve French
2023-05-21 19:21 ` Linus Torvalds
2023-05-22 4:38 ` Steve French
2023-05-22 8:04 ` ronnie sahlberg
2023-05-21 18:09 ` pr-tracker-bot
2023-05-06 0:19 Steve French
2023-05-06 2:20 ` pr-tracker-bot
2023-04-27 2:11 Steve French
2023-04-29 18:19 ` pr-tracker-bot
2023-04-07 4:16 Steve French
2023-04-07 20:56 ` pr-tracker-bot
2023-03-25 0:00 Steve French
2023-03-25 1:18 ` pr-tracker-bot
2023-02-22 4:15 Steve French
2023-02-22 22:26 ` pr-tracker-bot
2023-01-28 1:45 Steve French
2023-01-28 19:33 ` pr-tracker-bot
2023-01-10 3:13 Steve French
2023-01-10 11:36 ` pr-tracker-bot
2022-12-15 3:18 Steve French
2022-12-15 17:32 ` Linus Torvalds
2022-12-15 18:28 ` pr-tracker-bot
2022-10-06 23:53 Steve French
2022-10-07 17:00 ` pr-tracker-bot
2022-08-19 5:03 Steve French
2022-08-19 21:14 ` pr-tracker-bot
2022-08-08 20:00 Steve French
2022-08-09 3:20 ` pr-tracker-bot
2022-06-01 6:20 Steve French
2022-06-01 19:34 ` pr-tracker-bot
2022-04-24 0:10 Steve French
2022-04-24 0:32 ` pr-tracker-bot
2022-04-01 18:40 Steve French
2022-04-01 21:41 ` Linus Torvalds
2022-04-01 21:45 ` pr-tracker-bot
2022-03-29 1:39 Steve French
2022-03-30 1:48 ` Linus Torvalds
2022-03-30 1:57 ` Steve French
2022-03-30 2:23 ` Linus Torvalds
2022-03-30 9:18 ` Christoph Hellwig
2022-03-30 9:17 ` Christoph Hellwig
2022-04-01 1:20 ` Al Viro
2022-04-01 12:52 ` Namjae Jeon
2022-04-01 13:34 ` Al Viro
2022-04-01 14:58 ` Namjae Jeon
2022-02-07 21:04 Steve French
2022-02-07 23:34 ` pr-tracker-bot
2021-11-27 21:43 Steve French
2021-11-27 22:52 ` pr-tracker-bot
2021-09-26 12:13 Steve French
2021-09-26 21:11 ` pr-tracker-bot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.