diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-07-02 10:31:07 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-07-02 10:31:07 -0500 |
| commit | 382fdb887fbc9fdbd2a031671b9cbb7d094d1a1a (patch) | |
| tree | 2368e58f1127cf2c51c50242b4335d1b11db435f /patch-5.18-redhat.patch | |
| parent | 4db08efadd9664ad0c10303f3a35ca535e675727 (diff) | |
| download | kernel-382fdb887fbc9fdbd2a031671b9cbb7d094d1a1a.tar.gz kernel-382fdb887fbc9fdbd2a031671b9cbb7d094d1a1a.tar.xz kernel-382fdb887fbc9fdbd2a031671b9cbb7d094d1a1a.zip | |
kernel-5.18.9-200
* Sat Jul 02 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.9-0]
- Revert "smb3: fix empty netname context on secondary channels" (Justin M. Forbes)
- Revert "smb3: use netname when available on secondary channels" (Justin M. Forbes)
- fedora: arm: enable a couple of QCom drivers (Peter Robinson)
Resolves:
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.18-redhat.patch')
| -rw-r--r-- | patch-5.18-redhat.patch | 48 |
1 files changed, 46 insertions, 2 deletions
diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch index baf737bec..5fee738c2 100644 --- a/patch-5.18-redhat.patch +++ b/patch-5.18-redhat.patch @@ -30,6 +30,7 @@ drivers/nvme/host/nvme.h | 4 + drivers/pci/quirks.c | 24 ++++ drivers/usb/core/hub.c | 7 ++ + fs/cifs/smb2pdu.c | 21 +--- include/linux/efi.h | 24 ++-- include/linux/lsm_hook_defs.h | 2 + include/linux/lsm_hooks.h | 6 + @@ -42,10 +43,10 @@ security/lockdown/Kconfig | 13 +++ security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 44 files changed, 721 insertions(+), 191 deletions(-) + 45 files changed, 727 insertions(+), 206 deletions(-) diff --git a/Makefile b/Makefile -index 6ac3335f65af..5df170f9243f 100644 +index 751cfd786c8c..1dbeaa096d9b 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1516,6 +1517,49 @@ index 1460857026e0..7e1964891089 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); +diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c +index 6a8a00f28b19..179c1630bf56 100644 +--- a/fs/cifs/smb2pdu.c ++++ b/fs/cifs/smb2pdu.c +@@ -543,7 +543,6 @@ assemble_neg_contexts(struct smb2_negotiate_req *req, + struct TCP_Server_Info *server, unsigned int *total_len) + { + char *pneg_ctxt; +- char *hostname = NULL; + unsigned int ctxt_len, neg_context_count; + + if (*total_len > 200) { +@@ -571,24 +570,16 @@ assemble_neg_contexts(struct smb2_negotiate_req *req, + *total_len += ctxt_len; + pneg_ctxt += ctxt_len; + ++ ctxt_len = build_netname_ctxt((struct smb2_netname_neg_context *)pneg_ctxt, ++ server->hostname); ++ *total_len += ctxt_len; ++ pneg_ctxt += ctxt_len; ++ + build_posix_ctxt((struct smb2_posix_neg_context *)pneg_ctxt); + *total_len += sizeof(struct smb2_posix_neg_context); + pneg_ctxt += sizeof(struct smb2_posix_neg_context); + +- /* +- * secondary channels don't have the hostname field populated +- * use the hostname field in the primary channel instead +- */ +- hostname = CIFS_SERVER_IS_CHAN(server) ? +- server->primary_server->hostname : server->hostname; +- if (hostname && (hostname[0] != 0)) { +- ctxt_len = build_netname_ctxt((struct smb2_netname_neg_context *)pneg_ctxt, +- hostname); +- *total_len += ctxt_len; +- pneg_ctxt += ctxt_len; +- neg_context_count = 4; +- } else /* second channels do not have a hostname */ +- neg_context_count = 3; ++ neg_context_count = 4; + + if (server->compress_algorithm) { + build_compression_ctxt((struct smb2_compression_capabilities_context *) diff --git a/include/linux/efi.h b/include/linux/efi.h index cc6d2be2ffd5..418d814d2eb7 100644 --- a/include/linux/efi.h |