xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnvdimm/security: Fix nvdimm_security_state() state request selection

Browse Source 
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: 89fa9d8ea7 ("...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>
This commit is contained in:
Dave Jiang
2019-01-15 11:26:21 -07:00
committed by Dan Williams
parent b4fe30e45a
commit faa8bd6e12
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/nvdimm/nd-core.h
View File

@@ -54,12 +54,12 @@ struct nvdimm {
}; };
static inline enum nvdimm_security_state nvdimm_security_state( 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) if (!nvdimm->sec.ops)
return -ENXIO; return -ENXIO;
return nvdimm->sec.ops->state(nvdimm, master); return nvdimm->sec.ops->state(nvdimm, ptype);
} }
int nvdimm_security_freeze(struct nvdimm *nvdimm); int nvdimm_security_freeze(struct nvdimm *nvdimm);
#if IS_ENABLED(CONFIG_NVDIMM_KEYS) #if IS_ENABLED(CONFIG_NVDIMM_KEYS)