Commit 1cb95e07 authored by Dan Williams's avatar Dan Williams

libnvdimm/dimm: Fix security capability detection for non-Intel NVDIMMs

Kees reports a crash with the following signature...

 RIP: 0010:nvdimm_visible+0x79/0x80
 [..]
 Call Trace:
  internal_create_group+0xf4/0x380
  sysfs_create_groups+0x46/0xb0
  device_add+0x331/0x680
  nd_async_device_register+0x15/0x60
  async_run_entry_fn+0x38/0x100

...when starting a QEMU environment with "label-less" DIMM. Without
labels QEMU does not publish any DSM methods. Without defined methods
the NVDIMM_FAMILY type is not established and the nfit driver will skip
registering security operations.

In that case the security state should be initialized to a negative
value in __nvdimm_create() and nvdimm_visible() should skip
interrogating the specific ops. However, since 'enum
nvdimm_security_state' was only defined to contain positive values the
"if (nvdimm->sec.state < 0)" check always fails.

Define a negative error state to allow negative state values to be
handled as expected.

Fixes: f2989396 ("acpi/nfit, libnvdimm: Introduce nvdimm_security_ops")
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Reported-by: default avatarKees Cook <keescook@chromium.org>
Tested-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent ccb7f15a
...@@ -160,6 +160,7 @@ static inline struct nd_blk_region_desc *to_blk_region_desc( ...@@ -160,6 +160,7 @@ static inline struct nd_blk_region_desc *to_blk_region_desc(
} }
enum nvdimm_security_state { enum nvdimm_security_state {
NVDIMM_SECURITY_ERROR = -1,
NVDIMM_SECURITY_DISABLED, NVDIMM_SECURITY_DISABLED,
NVDIMM_SECURITY_UNLOCKED, NVDIMM_SECURITY_UNLOCKED,
NVDIMM_SECURITY_LOCKED, NVDIMM_SECURITY_LOCKED,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment