proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-11-30 01:17:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Three smb3 client fixes including two for stable

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCgAdFiEE6fsu8pdIjtWE/DpLiiy9cAdyT1EFAma2k9YACgkQiiy9cAdy
 T1GkqAv7B8wyDp7pVU8qtTxct1gVtDEqvd2Kte6962uwvKWEhhf8SKzagypICudL
 vXxwJuPsRlFM5jWd8h36/xXC17BYM1mEsz6GVq9viUYUcqtrKrGPsOL7+OLVR3Mp
 SwPRPLYyLyMBHhc3Su2/6uGr87NMkcgDTzugZrx67ojAaw/xkYsiuz+Wm8ijbdik
 waDkJ3zosj0Nbhud47sf6rkrymiqC5kP717rhlcXF+TxNscFDQ/eFO8b0lt3g5q5
 +Y338a4pLLFWXBm1jP9EOtbx7NSDKaqWVYYtnwEBs6EV3QGpKjbT1zBQ07wWjfT4
 FhcFhYYukq7Jc4X39JouBXqYWR2wjB8VpMzCuwNsDNJ7FahNaGTgfXCMx6C0Bi0w
 XICAMoZfBXGSAs+NTyi38AHyPQ+KdYJeSgA9doL+3FhMGx9KKAVkT6XB3twhxoOS
 w/iMyzhx/1mwv4CukCKm3lDflN09AseB688QiFsTshTmnTlWFcHdEnORqWbNrd2N
 evhrKvxK
 =GIpz
 -----END PGP SIGNATURE-----

Merge tag '6.11-rc2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6

Pull smb client fixes from Steve French:

 - DFS fix

 - fix for security flags for requiring encryption

 - minor cleanup

* tag '6.11-rc2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: cifs_inval_name_dfs_link_error: correct the check for fullpath
  Fix spelling errors in Server Message Block
  smb3: fix setting SecurityFlags when encryption is required
This commit is contained in:
Linus Torvalds 2024-08-09 21:33:25 -07:00
commit 34ac1e82e5
7 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/admin-guide/cifs/usage.rst
View File

@ -742,7 +742,7 @@ SecurityFlags Flags which control security negotiation and
may use NTLMSSP 0x00080 may use NTLMSSP 0x00080
must use NTLMSSP 0x80080 must use NTLMSSP 0x80080
seal (packet encryption) 0x00040 seal (packet encryption) 0x00040
must seal (not implemented yet) 0x40040 must seal 0x40040
cifsFYI If set to non-zero value, additional debug information cifsFYI If set to non-zero value, additional debug information
will be logged to the system error log. This field will be logged to the system error log. This field

2
fs/smb/client/cifs_debug.c
View File

@ -1072,7 +1072,7 @@ static int cifs_security_flags_proc_open(struct inode *inode, struct file *file)
static void static void
cifs_security_flags_handle_must_flags(unsigned int *flags) cifs_security_flags_handle_must_flags(unsigned int *flags)
{ {
unsigned int signflags = *flags & CIFSSEC_MUST_SIGN; unsigned int signflags = *flags & (CIFSSEC_MUST_SIGN | CIFSSEC_MUST_SEAL);
if ((*flags & CIFSSEC_MUST_KRB5) == CIFSSEC_MUST_KRB5) if ((*flags & CIFSSEC_MUST_KRB5) == CIFSSEC_MUST_KRB5)
*flags = CIFSSEC_MUST_KRB5; *flags = CIFSSEC_MUST_KRB5;

12
fs/smb/client/cifsglob.h
View File

@ -345,7 +345,7 @@ struct smb_version_operations {
/* connect to a server share */ /* connect to a server share */
int (*tree_connect)(const unsigned int, struct cifs_ses *, const char *, int (*tree_connect)(const unsigned int, struct cifs_ses *, const char *,
struct cifs_tcon *, const struct nls_table *); struct cifs_tcon *, const struct nls_table *);
/* close tree connecion */ /* close tree connection */
int (*tree_disconnect)(const unsigned int, struct cifs_tcon *); int (*tree_disconnect)(const unsigned int, struct cifs_tcon *);
/* get DFS referrals */ /* get DFS referrals */
int (*get_dfs_refer)(const unsigned int, struct cifs_ses *, int (*get_dfs_refer)(const unsigned int, struct cifs_ses *,
@ -816,7 +816,7 @@ struct TCP_Server_Info {
* Protected by @refpath_lock and @srv_lock. The @refpath_lock is * Protected by @refpath_lock and @srv_lock. The @refpath_lock is
* mostly used for not requiring a copy of @leaf_fullpath when getting * mostly used for not requiring a copy of @leaf_fullpath when getting
* cached or new DFS referrals (which might also sleep during I/O). * cached or new DFS referrals (which might also sleep during I/O).
* While @srv_lock is held for making string and NULL comparions against * While @srv_lock is held for making string and NULL comparisons against
* both fields as in mount(2) and cache refresh. * both fields as in mount(2) and cache refresh.
* *
* format: \\HOST\SHARE[\OPTIONAL PATH] * format: \\HOST\SHARE[\OPTIONAL PATH]
@ -1881,7 +1881,7 @@ static inline bool is_replayable_error(int error)
#define CIFSSEC_MAY_SIGN 0x00001 #define CIFSSEC_MAY_SIGN 0x00001
#define CIFSSEC_MAY_NTLMV2 0x00004 #define CIFSSEC_MAY_NTLMV2 0x00004
#define CIFSSEC_MAY_KRB5 0x00008 #define CIFSSEC_MAY_KRB5 0x00008
#define CIFSSEC_MAY_SEAL 0x00040 /* not supported yet */ #define CIFSSEC_MAY_SEAL 0x00040
#define CIFSSEC_MAY_NTLMSSP 0x00080 /* raw ntlmssp with ntlmv2 */ #define CIFSSEC_MAY_NTLMSSP 0x00080 /* raw ntlmssp with ntlmv2 */
#define CIFSSEC_MUST_SIGN 0x01001 #define CIFSSEC_MUST_SIGN 0x01001
@ -1891,11 +1891,11 @@ require use of the stronger protocol */
#define CIFSSEC_MUST_NTLMV2 0x04004 #define CIFSSEC_MUST_NTLMV2 0x04004
#define CIFSSEC_MUST_KRB5 0x08008 #define CIFSSEC_MUST_KRB5 0x08008
#ifdef CONFIG_CIFS_UPCALL #ifdef CONFIG_CIFS_UPCALL
#define CIFSSEC_MASK 0x8F08F /* flags supported if no weak allowed */ #define CIFSSEC_MASK 0xCF0CF /* flags supported if no weak allowed */
#else #else
#define CIFSSEC_MASK 0x87087 /* flags supported if no weak allowed */ #define CIFSSEC_MASK 0xC70C7 /* flags supported if no weak allowed */
#endif /* UPCALL */ #endif /* UPCALL */
#define CIFSSEC_MUST_SEAL 0x40040 /* not supported yet */ #define CIFSSEC_MUST_SEAL 0x40040
#define CIFSSEC_MUST_NTLMSSP 0x80080 /* raw ntlmssp with ntlmv2 */ #define CIFSSEC_MUST_NTLMSSP 0x80080 /* raw ntlmssp with ntlmv2 */
#define CIFSSEC_DEF (CIFSSEC_MAY_SIGN | CIFSSEC_MAY_NTLMV2 | CIFSSEC_MAY_NTLMSSP | CIFSSEC_MAY_SEAL) #define CIFSSEC_DEF (CIFSSEC_MAY_SIGN | CIFSSEC_MAY_NTLMV2 | CIFSSEC_MAY_NTLMSSP | CIFSSEC_MAY_SEAL)

11
fs/smb/client/misc.c
View File

@ -352,7 +352,7 @@ checkSMB(char *buf, unsigned int total_read, struct TCP_Server_Info *server)
* on simple responses (wct, bcc both zero) * on simple responses (wct, bcc both zero)
* in particular have seen this on * in particular have seen this on
* ulogoffX and FindClose. This leaves * ulogoffX and FindClose. This leaves
* one byte of bcc potentially unitialized * one byte of bcc potentially uninitialized
*/ */
/* zero rest of bcc */ /* zero rest of bcc */
tmp[sizeof(struct smb_hdr)+1] = 0; tmp[sizeof(struct smb_hdr)+1] = 0;
@ -1234,6 +1234,7 @@ int cifs_inval_name_dfs_link_error(const unsigned int xid,
const char *full_path, const char *full_path,
bool *islink) bool *islink)
{ {
struct TCP_Server_Info *server = tcon->ses->server;
struct cifs_ses *ses = tcon->ses; struct cifs_ses *ses = tcon->ses;
size_t len; size_t len;
char *path; char *path;
@ -1250,12 +1251,12 @@ int cifs_inval_name_dfs_link_error(const unsigned int xid,
!is_tcon_dfs(tcon)) !is_tcon_dfs(tcon))
return 0; return 0;
spin_lock(&tcon->tc_lock); spin_lock(&server->srv_lock);
if (!tcon->origin_fullpath) { if (!server->leaf_fullpath) {
spin_unlock(&tcon->tc_lock); spin_unlock(&server->srv_lock);
return 0; return 0;
} }
spin_unlock(&tcon->tc_lock); spin_unlock(&server->srv_lock);
/* /*
* Slow path - tcon is DFS and @full_path has prefix path, so attempt * Slow path - tcon is DFS and @full_path has prefix path, so attempt

3
fs/smb/client/smb2pdu.c
View File

@ -82,6 +82,9 @@ int smb3_encryption_required(const struct cifs_tcon *tcon)
if (tcon->seal && if (tcon->seal &&
(tcon->ses->server->capabilities & SMB2_GLOBAL_CAP_ENCRYPTION)) (tcon->ses->server->capabilities & SMB2_GLOBAL_CAP_ENCRYPTION))
return 1; return 1;
if (((global_secflags & CIFSSEC_MUST_SEAL) == CIFSSEC_MUST_SEAL) &&
(tcon->ses->server->capabilities & SMB2_GLOBAL_CAP_ENCRYPTION))
return 1;
return 0; return 0;
} }

8
fs/smb/client/smbdirect.c
View File

@ -406,7 +406,7 @@ static void smbd_post_send_credits(struct work_struct *work)
else else
response = get_empty_queue_buffer(info); response = get_empty_queue_buffer(info);
if (!response) { if (!response) {
/* now switch to emtpy packet queue */ /* now switch to empty packet queue */
if (use_receive_queue) { if (use_receive_queue) {
use_receive_queue = 0; use_receive_queue = 0;
continue; continue;
@ -618,7 +618,7 @@ out:
/* /*
* Test if FRWR (Fast Registration Work Requests) is supported on the device * Test if FRWR (Fast Registration Work Requests) is supported on the device
* This implementation requries FRWR on RDMA read/write * This implementation requires FRWR on RDMA read/write
* return value: true if it is supported * return value: true if it is supported
*/ */
static bool frwr_is_supported(struct ib_device_attr *attrs) static bool frwr_is_supported(struct ib_device_attr *attrs)
@ -2177,7 +2177,7 @@ cleanup_entries:
* MR available in the list. It may access the list while the * MR available in the list. It may access the list while the
* smbd_mr_recovery_work is recovering the MR list. This doesn't need a lock * smbd_mr_recovery_work is recovering the MR list. This doesn't need a lock
* as they never modify the same places. However, there may be several CPUs * as they never modify the same places. However, there may be several CPUs
* issueing I/O trying to get MR at the same time, mr_list_lock is used to * issuing I/O trying to get MR at the same time, mr_list_lock is used to
* protect this situation. * protect this situation.
*/ */
static struct smbd_mr *get_mr(struct smbd_connection *info) static struct smbd_mr *get_mr(struct smbd_connection *info)
@ -2311,7 +2311,7 @@ struct smbd_mr *smbd_register_mr(struct smbd_connection *info,
/* /*
* There is no need for waiting for complemtion on ib_post_send * There is no need for waiting for complemtion on ib_post_send
* on IB_WR_REG_MR. Hardware enforces a barrier and order of execution * on IB_WR_REG_MR. Hardware enforces a barrier and order of execution
* on the next ib_post_send when we actaully send I/O to remote peer * on the next ib_post_send when we actually send I/O to remote peer
*/ */
rc = ib_post_send(info->id->qp, &reg_wr->wr, NULL); rc = ib_post_send(info->id->qp, &reg_wr->wr, NULL);
if (!rc) if (!rc)

2
fs/smb/client/transport.c
View File

@ -1289,7 +1289,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,
out: out:
/* /*
* This will dequeue all mids. After this it is important that the * This will dequeue all mids. After this it is important that the
* demultiplex_thread will not process any of these mids any futher. * demultiplex_thread will not process any of these mids any further.
* This is prevented above by using a noop callback that will not * This is prevented above by using a noop callback that will not
* wake this thread except for the very last PDU. * wake this thread except for the very last PDU.
*/ */