Fixes for 5.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.4/series b/queue-5.4/series
new file mode 100644 (file)
index 0000000..9cd77fc
--- /dev/null
+++ b/queue-5.4/series
@@ -0,0 +1 @@
+x86-efi-remove-unused-variables.patch

diff --git a/queue-5.4/x86-efi-remove-unused-variables.patch b/queue-5.4/x86-efi-remove-unused-variables.patch
new file mode 100644 (file)
index 0000000..9f49972
--- /dev/null
+++ b/queue-5.4/x86-efi-remove-unused-variables.patch
@@ -0,0 +1,40 @@
+From 26e97d28e633a2d599bbdbe67e1b016d0207d551 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Fri, 15 Nov 2019 21:08:30 +0800
+Subject: x86/efi: remove unused variables
+
+From: YueHaibing <yuehaibing@huawei.com>
+
+[ Upstream commit 6f090192f8225f52ba95d08785989688cb768cca ]
+
+commit ad723674d675 ("x86/efi: move common keyring handler functions
+to new file") leave this unused.
+
+Fixes: ad723674d675 ("x86/efi: move common keyring handler functions to new file")
+Reported-by: Hulk Robot <hulkci@huawei.com>
+Signed-off-by: YueHaibing <yuehaibing@huawei.com>
+Link: https://lore.kernel.org/r/20191115130830.13320-1-yuehaibing@huawei.com
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ security/integrity/platform_certs/load_uefi.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c
+index aa874d84e413..f0c908241966 100644
+--- a/security/integrity/platform_certs/load_uefi.c
++++ b/security/integrity/platform_certs/load_uefi.c
+@@ -11,11 +11,6 @@
+ #include "../integrity.h"
+ #include "keyring_handler.h"
+ 
+-static efi_guid_t efi_cert_x509_guid __initdata = EFI_CERT_X509_GUID;
+-static efi_guid_t efi_cert_x509_sha256_guid __initdata =
+-      EFI_CERT_X509_SHA256_GUID;
+-static efi_guid_t efi_cert_sha256_guid __initdata = EFI_CERT_SHA256_GUID;
+-
+ /*
+  * Look to see if a UEFI variable called MokIgnoreDB exists and return true if
+  * it does.
+-- 
+2.30.2
+