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

Merge tag 'v7.1-rc-part2-ksmbd-fixes' of git://git.samba.org/ksmbd

Pull more smb server updates from Steve French:

 - move fs/smb/common/smbdirect to fs/smb/smbdirect

 - change signature calc to use AES-CMAC library, simpler and faster

 - invalid signature fix

 - multichannel fix

 - open create options fix

 - fix durable handle leak

 - cap maximum lock count to avoid potential denial of service

 - four connection fixes: connection free and session destroy IDA fixes,
   refcount fix, connection leak fix, max_connections off by one fix

 - IPC validation fix

 - fix out of bounds write in getting xattrs

 - fix use after free in durable handle reconnect

 - three ACL fixes: fix potential ACL overflow, harden num_aces check,
   and fix minimum ACE size check

* tag 'v7.1-rc-part2-ksmbd-fixes' of git://git.samba.org/ksmbd:
  smb: smbdirect: move fs/smb/common/smbdirect/ to fs/smb/smbdirect/
  smb: server: stop sending fake security descriptors
  ksmbd: scope conn->binding slowpath to bound sessions only
  ksmbd: fix CreateOptions sanitization clobbering the whole field
  ksmbd: fix durable fd leak on ClientGUID mismatch in durable v2 open
  ksmbd: fix O(N^2) DoS in smb2_lock via unbounded LockCount
  ksmbd: destroy async_ida in ksmbd_conn_free()
  ksmbd: destroy tree_conn_ida in ksmbd_session_destroy()
  ksmbd: Use AES-CMAC library for SMB3 signature calculation
  ksmbd: reset rcount per connection in ksmbd_conn_wait_idle_sess_id()
  ksmbd: fix out-of-bounds write in smb2_get_ea() EA alignment
  ksmbd: use check_add_overflow() to prevent u16 DACL size overflow
  ksmbd: fix use-after-free in smb2_open during durable reconnect
  ksmbd: validate num_aces and harden ACE walk in smb_inherit_dacl()
  smb: server: fix max_connections off-by-one in tcp accept path
  ksmbd: require minimum ACE size in smb_check_perm_dacl()
  ksmbd: validate response sizes in ipc_validate_msg()
  smb: server: fix active_num_conn leak on transport allocation failure
parents d0ed69f3 1249c01a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -24662,7 +24662,7 @@ L: linux-cifs@vger.kernel.org
L:	samba-technical@lists.samba.org (moderated for non-subscribers)
S:	Maintained
F:	fs/smb/client/smbdirect.*
F:	fs/smb/common/smbdirect/
F:	fs/smb/smbdirect/
F:	fs/smb/server/transport_rdma.*
SMC91x ETHERNET DRIVER
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@

source "fs/smb/client/Kconfig"
source "fs/smb/server/Kconfig"
source "fs/smb/common/smbdirect/Kconfig"
source "fs/smb/smbdirect/Kconfig"

config SMBFS
	tristate
+1 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_SMBFS)		+= common/
obj-$(CONFIG_SMBDIRECT)		+= smbdirect/
obj-$(CONFIG_CIFS)		+= client/
obj-$(CONFIG_SMB_SERVER)	+= server/
+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ config CIFS_SMB_DIRECT
	bool "SMB Direct support"
	depends on CIFS && INFINIBAND && INFINIBAND_ADDR_TRANS
	depends on CIFS=m || INFINIBAND=y
	select SMB_COMMON_SMBDIRECT
	select SMBDIRECT
	help
	  Enables SMB Direct support for SMB 3.0, 3.02 and 3.1.1.
	  SMB Direct allows transferring SMB packets over RDMA. If unsure,
+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
#include "cifs_debug.h"
#include "cifsproto.h"
#include "smb2proto.h"
#include "../common/smbdirect/smbdirect_public.h"
#include "../smbdirect/public.h"

/* Port numbers for SMBD transport */
#define SMB_PORT	445
Loading