From 9a0803365302eeeefcf9d5f2503645826f7882f1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 27 Apr 2020 20:51:41 +0200 Subject: [PATCH] drop queue-4.19/cifs-fix-uninitialised-lease_key-in-open_shroot.patch --- ...initialised-lease_key-in-open_shroot.patch | 41 ------------------- queue-4.19/series | 1 - 2 files changed, 42 deletions(-) delete mode 100644 queue-4.19/cifs-fix-uninitialised-lease_key-in-open_shroot.patch diff --git a/queue-4.19/cifs-fix-uninitialised-lease_key-in-open_shroot.patch b/queue-4.19/cifs-fix-uninitialised-lease_key-in-open_shroot.patch deleted file mode 100644 index 9d0f353a04e..00000000000 --- a/queue-4.19/cifs-fix-uninitialised-lease_key-in-open_shroot.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0fe0781f29dd8ab618999e6bda33c782ebbdb109 Mon Sep 17 00:00:00 2001 -From: Paulo Alcantara -Date: Mon, 20 Apr 2020 23:44:24 -0300 -Subject: cifs: fix uninitialised lease_key in open_shroot() - -From: Paulo Alcantara - -commit 0fe0781f29dd8ab618999e6bda33c782ebbdb109 upstream. - -SMB2_open_init() expects a pre-initialised lease_key when opening a -file with a lease, so set pfid->lease_key prior to calling it in -open_shroot(). - -This issue was observed when performing some DFS failover tests and -the lease key was never randomly generated. - -Signed-off-by: Paulo Alcantara (SUSE) -Signed-off-by: Steve French -Reviewed-by: Ronnie Sahlberg -Reviewed-by: Aurelien Aptel -CC: Stable -Signed-off-by: Greg Kroah-Hartman - ---- - fs/cifs/smb2ops.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/fs/cifs/smb2ops.c -+++ b/fs/cifs/smb2ops.c -@@ -1681,6 +1681,11 @@ smb2_queryfs(const unsigned int xid, str - if (smb3_encryption_required(tcon)) - flags |= CIFS_TRANSFORM_REQ; - -+ if (!server->ops->new_lease_key) -+ return -EIO; -+ -+ server->ops->new_lease_key(pfid); -+ - memset(rqst, 0, sizeof(rqst)); - memset(resp_buftype, 0, sizeof(resp_buftype)); - memset(rsp_iov, 0, sizeof(rsp_iov)); diff --git a/queue-4.19/series b/queue-4.19/series index 41d8457c244..fdeb03793df 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -108,7 +108,6 @@ audit-check-the-length-of-userspace-generated-audit-records.patch asoc-dapm-fixup-dapm-kcontrol-widget.patch iwlwifi-pcie-actually-release-queue-memory-in-tvqm.patch iwlwifi-mvm-beacon-statistics-shouldn-t-go-backwards.patch -cifs-fix-uninitialised-lease_key-in-open_shroot.patch arm-imx-provide-v7_cpu_resume-only-on-arm_cpu_suspend-y.patch powerpc-setup_64-set-cache-line-size-based-on-cache-block-size.patch staging-comedi-dt2815-fix-writing-hi-byte-of-analog-output.patch -- 2.47.3