summaryrefslogtreecommitdiff
path: root/SOURCES/patch-5.18-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'SOURCES/patch-5.18-redhat.patch')
-rw-r--r--SOURCES/patch-5.18-redhat.patch48
1 files changed, 46 insertions, 2 deletions
diff --git a/SOURCES/patch-5.18-redhat.patch b/SOURCES/patch-5.18-redhat.patch
index baf737b..5fee738 100644
--- a/SOURCES/patch-5.18-redhat.patch
+++ b/SOURCES/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