Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2019-01-21 13:48:27 +0100
committerJohannes Thumshirn <jthumshirn@suse.de>2019-01-21 13:48:27 +0100
commita8d7528d54eb294dc3eebf88a463632e6e1a7cb0 (patch)
treeb69b1ea00e6650ccc248f8d4ade19965308ad3dd
parent2581a339dc9bdf95815bf1aee0c6f07a4b054c39 (diff)
libnvdimm/security: Fix nvdimm_security_state() state requestSLE15-SP1
selection (bsc#1122654).
-rw-r--r--patches.fixes/libnvdimm-security-fix-nvdimm_security_state-state-request-selection.patch40
-rw-r--r--series.conf1
2 files changed, 41 insertions, 0 deletions
diff --git a/patches.fixes/libnvdimm-security-fix-nvdimm_security_state-state-request-selection.patch b/patches.fixes/libnvdimm-security-fix-nvdimm_security_state-state-request-selection.patch
new file mode 100644
index 0000000000..85363db377
--- /dev/null
+++ b/patches.fixes/libnvdimm-security-fix-nvdimm_security_state-state-request-selection.patch
@@ -0,0 +1,40 @@
+From: Dave Jiang <dave.jiang@intel.com>
+Date: Tue, 15 Jan 2019 11:26:21 -0700
+Subject: libnvdimm/security: Fix nvdimm_security_state() state request
+ selection
+Git-commit: faa8bd6e12e6aeea289d8e6ba74777b72a69434c
+Patch-mainline: v5.0-rc3
+References: bsc#1122654
+
+The input parameter should be enum nvdimm_passphrase_type instead of bool
+for selection of master/user for selection of extended master passphrase
+state or the regular user passphrase state.
+
+Fixes: 89fa9d8ea7bdf ("...add Intel DSM 1.8 master passphrase support")
+Signed-off-by: Dave Jiang <dave.jiang@intel.com>
+Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
+---
+ drivers/nvdimm/nd-core.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/nvdimm/nd-core.h b/drivers/nvdimm/nd-core.h
+index 2b2cf4e554d3..e5ffd5733540 100644
+--- a/drivers/nvdimm/nd-core.h
++++ b/drivers/nvdimm/nd-core.h
+@@ -54,12 +54,12 @@ struct nvdimm {
+ };
+
+ static inline enum nvdimm_security_state nvdimm_security_state(
+- struct nvdimm *nvdimm, bool master)
++ struct nvdimm *nvdimm, enum nvdimm_passphrase_type ptype)
+ {
+ if (!nvdimm->sec.ops)
+ return -ENXIO;
+
+- return nvdimm->sec.ops->state(nvdimm, master);
++ return nvdimm->sec.ops->state(nvdimm, ptype);
+ }
+ int nvdimm_security_freeze(struct nvdimm *nvdimm);
+ #if IS_ENABLED(CONFIG_NVDIMM_KEYS)
+
diff --git a/series.conf b/series.conf
index 82ad4bb04c..66c87c6425 100644
--- a/series.conf
+++ b/series.conf
@@ -42543,6 +42543,7 @@
patches.drivers/tty-Don-t-hold-ldisc-lock-in-tty_reopen-if-ldisc-pre.patch
patches.fixes/smc-move-unhash-as-early-as-possible-in-smc_release
patches.fixes/libnvdimm-dimm-fix-security-capability-detection-for-non-intel-nvdimms.patch
+ patches.fixes/libnvdimm-security-fix-nvdimm_security_state-state-request-selection.patch
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch