From: Dave Jiang <dave.jiang@intel.com> To: dan.j.williams@intel.com Cc: alison.schofield@intel.com, keescook@chromium.org, linux-nvdimm@lists.01.org, ebiggers3@gmail.com, dhowells@redhat.com, keyrings@vger.kernel.org Subject: [PATCH v12 06/12] nfit/libnvdimm: add disable passphrase support to Intel nvdimm. Date: Mon, 08 Oct 2018 16:56:02 -0700 [thread overview] Message-ID: <153904296278.60070.16419066666105951804.stgit@djiang5-desk3.ch.intel.com> (raw) In-Reply-To: <153904272246.60070.6230977215877367778.stgit@djiang5-desk3.ch.intel.com> Add support to disable passphrase (security) for the Intel nvdimm. The passphrase used for disabling is pulled from userspace via the kernel key management. The action is triggered by writing "disable <old_keyid>" to the sysfs attribute "security". libnvdimm will support the generic disable API call. The kernel will verify the passphrase of the user key against the cached kernel key. If no kernel key exists, then the user key will be tried for the op. Signed-off-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/acpi/nfit/intel.c | 53 +++++++++++++++++++++++++++++++++ drivers/nvdimm/dimm_devs.c | 5 +++ drivers/nvdimm/dimm_devs_security.c | 56 +++++++++++++++++++++++++++++++++++ drivers/nvdimm/nd.h | 7 ++++ include/linux/libnvdimm.h | 3 ++ 5 files changed, 124 insertions(+) diff --git a/drivers/acpi/nfit/intel.c b/drivers/acpi/nfit/intel.c index 314eae7e02d7..21d30222371f 100644 --- a/drivers/acpi/nfit/intel.c +++ b/drivers/acpi/nfit/intel.c @@ -18,6 +18,58 @@ #include "intel.h" #include "nfit.h" +static int intel_dimm_security_disable(struct nvdimm_bus *nvdimm_bus, + struct nvdimm *nvdimm, const struct nvdimm_key_data *nkey) +{ + struct nvdimm_bus_descriptor *nd_desc = to_nd_desc(nvdimm_bus); + int cmd_rc, rc = 0; + struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm); + struct { + struct nd_cmd_pkg pkg; + struct nd_intel_disable_passphrase cmd; + } nd_cmd = { + .pkg = { + .nd_command = NVDIMM_INTEL_DISABLE_PASSPHRASE, + .nd_family = NVDIMM_FAMILY_INTEL, + .nd_size_in = ND_INTEL_PASSPHRASE_SIZE, + .nd_size_out = ND_INTEL_STATUS_SIZE, + .nd_fw_size = ND_INTEL_STATUS_SIZE, + }, + .cmd = { + .status = 0, + }, + }; + + if (!test_bit(NVDIMM_INTEL_DISABLE_PASSPHRASE, &nfit_mem->dsm_mask)) + return -ENOTTY; + + memcpy(nd_cmd.cmd.passphrase, nkey->data, + sizeof(nd_cmd.cmd.passphrase)); + rc = nd_desc->ndctl(nd_desc, nvdimm, ND_CMD_CALL, &nd_cmd, + sizeof(nd_cmd), &cmd_rc); + if (rc < 0) + goto out; + if (cmd_rc < 0) { + rc = cmd_rc; + goto out; + } + + switch (nd_cmd.cmd.status) { + case 0: + break; + case ND_INTEL_STATUS_INVALID_PASS: + rc = -EINVAL; + goto out; + case ND_INTEL_STATUS_INVALID_STATE: + default: + rc = -ENXIO; + goto out; + } + + out: + return rc; +} + /* * The update passphrase takes the old passphrase and the new passphrase * and send those to the nvdimm. The nvdimm will verify the old @@ -217,4 +269,5 @@ const struct nvdimm_security_ops intel_security_ops = { .state = intel_dimm_security_state, .unlock = intel_dimm_security_unlock, .change_key = intel_dimm_security_update_passphrase, + .disable = intel_dimm_security_disable, }; diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c index fe1a90636749..ae0c3e02e4f5 100644 --- a/drivers/nvdimm/dimm_devs.c +++ b/drivers/nvdimm/dimm_devs.c @@ -437,6 +437,11 @@ static ssize_t security_store(struct device *dev, return -EINVAL; dev_dbg(dev, "update %#x %#x\n", old_key, new_key); rc = nvdimm_security_change_key(dev, old_key, new_key); + } else if (sysfs_streq(cmd, "disable")) { + if (rc != 2) + return -EINVAL; + dev_dbg(dev, "disable %#x\n", old_key); + rc = nvdimm_security_disable(dev, old_key); } else return -EINVAL; diff --git a/drivers/nvdimm/dimm_devs_security.c b/drivers/nvdimm/dimm_devs_security.c index d9d0355e1844..6f8b9021292c 100644 --- a/drivers/nvdimm/dimm_devs_security.c +++ b/drivers/nvdimm/dimm_devs_security.c @@ -164,6 +164,62 @@ int nvdimm_security_get_state(struct device *dev) &nvdimm->state); } +int nvdimm_security_disable(struct device *dev, unsigned int keyid) +{ + struct nvdimm *nvdimm = to_nvdimm(dev); + struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev); + struct key *key; + int rc; + struct user_key_payload *payload; + bool is_userkey = false; + + if (!nvdimm->security_ops) + return -EOPNOTSUPP; + + if (nvdimm->state == NVDIMM_SECURITY_UNSUPPORTED) + return -EOPNOTSUPP; + + mutex_lock(&nvdimm->key_mutex); + /* look for a key from cached key */ + key = nvdimm_get_and_verify_key(dev, keyid); + if (IS_ERR(key)) { + mutex_unlock(&nvdimm->key_mutex); + return PTR_ERR(key); + } + if (!key) { + /* get old user key */ + key = nvdimm_lookup_user_key(dev, keyid); + if (!key) { + mutex_unlock(&nvdimm->key_mutex); + return -ENOKEY; + } + is_userkey = true; + } + + down_read(&key->sem); + payload = key->payload.data[0]; + + rc = nvdimm->security_ops->disable(nvdimm_bus, nvdimm, + (void *)payload->data); + up_read(&key->sem); + if (rc < 0) { + dev_warn(dev, "unlock failed\n"); + goto out; + } + + /* If we succeed then remove the key */ + if (!is_userkey) { + key_invalidate(key); + nvdimm->key = NULL; + } + key_put(key); + + out: + mutex_unlock(&nvdimm->key_mutex); + nvdimm_security_get_state(dev); + return rc; +} + int nvdimm_security_unlock_dimm(struct device *dev) { struct nvdimm *nvdimm = to_nvdimm(dev); diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h index 61bdc0c45c11..b80cab3a12df 100644 --- a/drivers/nvdimm/nd.h +++ b/drivers/nvdimm/nd.h @@ -430,6 +430,7 @@ int nvdimm_security_unlock_dimm(struct device *dev); int nvdimm_security_get_state(struct device *dev); int nvdimm_security_change_key(struct device *dev, unsigned int old_keyid, unsigned int new_keyid); +int nvdimm_security_disable(struct device *dev, unsigned int keyid); #else static inline struct key *nvdimm_get_key(struct device *dev) { @@ -451,5 +452,11 @@ static inline int nvdimm_security_change_key(struct device *dev, { return -EOPNOTSUPP; } + +static inline int nvdimm_security_disable(struct device *dev, + unsigned int keyid) +{ + return -EOPNOTSUPP; +} #endif #endif /* __ND_H__ */ diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h index bd6a413164ee..c60ab4b238f3 100644 --- a/include/linux/libnvdimm.h +++ b/include/linux/libnvdimm.h @@ -182,6 +182,9 @@ struct nvdimm_security_ops { struct nvdimm *nvdimm, const struct nvdimm_key_data *old_data, const struct nvdimm_key_data *new_data); + int (*disable)(struct nvdimm_bus *nvdimm_bus, + struct nvdimm *nvdimm, + const struct nvdimm_key_data *nkey); }; void badrange_init(struct badrange *badrange); _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
WARNING: multiple messages have this Message-ID (diff)
From: Dave Jiang <dave.jiang@intel.com> To: dan.j.williams@intel.com Cc: alison.schofield@intel.com, keescook@chromium.org, linux-nvdimm@lists.01.org, ebiggers3@gmail.com, dhowells@redhat.com, keyrings@vger.kernel.org Subject: [PATCH v12 06/12] nfit/libnvdimm: add disable passphrase support to Intel nvdimm. Date: Mon, 08 Oct 2018 23:56:02 +0000 [thread overview] Message-ID: <153904296278.60070.16419066666105951804.stgit@djiang5-desk3.ch.intel.com> (raw) In-Reply-To: <153904272246.60070.6230977215877367778.stgit@djiang5-desk3.ch.intel.com> Add support to disable passphrase (security) for the Intel nvdimm. The passphrase used for disabling is pulled from userspace via the kernel key management. The action is triggered by writing "disable <old_keyid>" to the sysfs attribute "security". libnvdimm will support the generic disable API call. The kernel will verify the passphrase of the user key against the cached kernel key. If no kernel key exists, then the user key will be tried for the op. Signed-off-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/acpi/nfit/intel.c | 53 +++++++++++++++++++++++++++++++++ drivers/nvdimm/dimm_devs.c | 5 +++ drivers/nvdimm/dimm_devs_security.c | 56 +++++++++++++++++++++++++++++++++++ drivers/nvdimm/nd.h | 7 ++++ include/linux/libnvdimm.h | 3 ++ 5 files changed, 124 insertions(+) diff --git a/drivers/acpi/nfit/intel.c b/drivers/acpi/nfit/intel.c index 314eae7e02d7..21d30222371f 100644 --- a/drivers/acpi/nfit/intel.c +++ b/drivers/acpi/nfit/intel.c @@ -18,6 +18,58 @@ #include "intel.h" #include "nfit.h" +static int intel_dimm_security_disable(struct nvdimm_bus *nvdimm_bus, + struct nvdimm *nvdimm, const struct nvdimm_key_data *nkey) +{ + struct nvdimm_bus_descriptor *nd_desc = to_nd_desc(nvdimm_bus); + int cmd_rc, rc = 0; + struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm); + struct { + struct nd_cmd_pkg pkg; + struct nd_intel_disable_passphrase cmd; + } nd_cmd = { + .pkg = { + .nd_command = NVDIMM_INTEL_DISABLE_PASSPHRASE, + .nd_family = NVDIMM_FAMILY_INTEL, + .nd_size_in = ND_INTEL_PASSPHRASE_SIZE, + .nd_size_out = ND_INTEL_STATUS_SIZE, + .nd_fw_size = ND_INTEL_STATUS_SIZE, + }, + .cmd = { + .status = 0, + }, + }; + + if (!test_bit(NVDIMM_INTEL_DISABLE_PASSPHRASE, &nfit_mem->dsm_mask)) + return -ENOTTY; + + memcpy(nd_cmd.cmd.passphrase, nkey->data, + sizeof(nd_cmd.cmd.passphrase)); + rc = nd_desc->ndctl(nd_desc, nvdimm, ND_CMD_CALL, &nd_cmd, + sizeof(nd_cmd), &cmd_rc); + if (rc < 0) + goto out; + if (cmd_rc < 0) { + rc = cmd_rc; + goto out; + } + + switch (nd_cmd.cmd.status) { + case 0: + break; + case ND_INTEL_STATUS_INVALID_PASS: + rc = -EINVAL; + goto out; + case ND_INTEL_STATUS_INVALID_STATE: + default: + rc = -ENXIO; + goto out; + } + + out: + return rc; +} + /* * The update passphrase takes the old passphrase and the new passphrase * and send those to the nvdimm. The nvdimm will verify the old @@ -217,4 +269,5 @@ const struct nvdimm_security_ops intel_security_ops = { .state = intel_dimm_security_state, .unlock = intel_dimm_security_unlock, .change_key = intel_dimm_security_update_passphrase, + .disable = intel_dimm_security_disable, }; diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c index fe1a90636749..ae0c3e02e4f5 100644 --- a/drivers/nvdimm/dimm_devs.c +++ b/drivers/nvdimm/dimm_devs.c @@ -437,6 +437,11 @@ static ssize_t security_store(struct device *dev, return -EINVAL; dev_dbg(dev, "update %#x %#x\n", old_key, new_key); rc = nvdimm_security_change_key(dev, old_key, new_key); + } else if (sysfs_streq(cmd, "disable")) { + if (rc != 2) + return -EINVAL; + dev_dbg(dev, "disable %#x\n", old_key); + rc = nvdimm_security_disable(dev, old_key); } else return -EINVAL; diff --git a/drivers/nvdimm/dimm_devs_security.c b/drivers/nvdimm/dimm_devs_security.c index d9d0355e1844..6f8b9021292c 100644 --- a/drivers/nvdimm/dimm_devs_security.c +++ b/drivers/nvdimm/dimm_devs_security.c @@ -164,6 +164,62 @@ int nvdimm_security_get_state(struct device *dev) &nvdimm->state); } +int nvdimm_security_disable(struct device *dev, unsigned int keyid) +{ + struct nvdimm *nvdimm = to_nvdimm(dev); + struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev); + struct key *key; + int rc; + struct user_key_payload *payload; + bool is_userkey = false; + + if (!nvdimm->security_ops) + return -EOPNOTSUPP; + + if (nvdimm->state = NVDIMM_SECURITY_UNSUPPORTED) + return -EOPNOTSUPP; + + mutex_lock(&nvdimm->key_mutex); + /* look for a key from cached key */ + key = nvdimm_get_and_verify_key(dev, keyid); + if (IS_ERR(key)) { + mutex_unlock(&nvdimm->key_mutex); + return PTR_ERR(key); + } + if (!key) { + /* get old user key */ + key = nvdimm_lookup_user_key(dev, keyid); + if (!key) { + mutex_unlock(&nvdimm->key_mutex); + return -ENOKEY; + } + is_userkey = true; + } + + down_read(&key->sem); + payload = key->payload.data[0]; + + rc = nvdimm->security_ops->disable(nvdimm_bus, nvdimm, + (void *)payload->data); + up_read(&key->sem); + if (rc < 0) { + dev_warn(dev, "unlock failed\n"); + goto out; + } + + /* If we succeed then remove the key */ + if (!is_userkey) { + key_invalidate(key); + nvdimm->key = NULL; + } + key_put(key); + + out: + mutex_unlock(&nvdimm->key_mutex); + nvdimm_security_get_state(dev); + return rc; +} + int nvdimm_security_unlock_dimm(struct device *dev) { struct nvdimm *nvdimm = to_nvdimm(dev); diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h index 61bdc0c45c11..b80cab3a12df 100644 --- a/drivers/nvdimm/nd.h +++ b/drivers/nvdimm/nd.h @@ -430,6 +430,7 @@ int nvdimm_security_unlock_dimm(struct device *dev); int nvdimm_security_get_state(struct device *dev); int nvdimm_security_change_key(struct device *dev, unsigned int old_keyid, unsigned int new_keyid); +int nvdimm_security_disable(struct device *dev, unsigned int keyid); #else static inline struct key *nvdimm_get_key(struct device *dev) { @@ -451,5 +452,11 @@ static inline int nvdimm_security_change_key(struct device *dev, { return -EOPNOTSUPP; } + +static inline int nvdimm_security_disable(struct device *dev, + unsigned int keyid) +{ + return -EOPNOTSUPP; +} #endif #endif /* __ND_H__ */ diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h index bd6a413164ee..c60ab4b238f3 100644 --- a/include/linux/libnvdimm.h +++ b/include/linux/libnvdimm.h @@ -182,6 +182,9 @@ struct nvdimm_security_ops { struct nvdimm *nvdimm, const struct nvdimm_key_data *old_data, const struct nvdimm_key_data *new_data); + int (*disable)(struct nvdimm_bus *nvdimm_bus, + struct nvdimm *nvdimm, + const struct nvdimm_key_data *nkey); }; void badrange_init(struct badrange *badrange);
next prev parent reply other threads:[~2018-10-08 23:56 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-08 23:55 [PATCH v12 00/12] Adding security support for nvdimm Dave Jiang 2018-10-08 23:55 ` Dave Jiang 2018-10-08 23:55 ` [PATCH v12 01/12] nfit: add support for Intel DSM 1.7 commands Dave Jiang 2018-10-08 23:55 ` Dave Jiang 2018-10-08 23:55 ` [PATCH v12 02/12] nfit/libnvdimm: store dimm id as a member to struct nvdimm Dave Jiang 2018-10-08 23:55 ` Dave Jiang 2018-10-08 23:55 ` [PATCH v12 03/12] keys: export lookup_user_key to external users Dave Jiang 2018-10-08 23:55 ` Dave Jiang 2018-10-08 23:55 ` [PATCH v12 04/12] nfit/libnvdimm: add unlock of nvdimm support for Intel DIMMs Dave Jiang 2018-10-08 23:55 ` Dave Jiang 2018-10-09 19:07 ` Dan Williams 2018-10-09 19:07 ` Dan Williams 2018-10-09 19:45 ` Dave Jiang 2018-10-09 19:45 ` Dave Jiang 2018-10-08 23:55 ` [PATCH v12 05/12] nfit/libnvdimm: add set passphrase support for Intel nvdimms Dave Jiang 2018-10-08 23:55 ` Dave Jiang 2018-10-08 23:56 ` Dave Jiang [this message] 2018-10-08 23:56 ` [PATCH v12 06/12] nfit/libnvdimm: add disable passphrase support to Intel nvdimm Dave Jiang 2018-10-08 23:56 ` [PATCH v12 07/12] nfit/libnvdimm: add freeze security " Dave Jiang 2018-10-08 23:56 ` Dave Jiang 2018-10-08 23:56 ` [PATCH v12 08/12] nfit/libnvdimm: add support for issue secure erase DSM " Dave Jiang 2018-10-08 23:56 ` Dave Jiang 2018-10-08 23:56 ` [PATCH v12 09/12] nfit_test: add test support for Intel nvdimm security DSMs Dave Jiang 2018-10-08 23:56 ` Dave Jiang 2018-10-08 23:56 ` [PATCH v12 10/12] libnvdimm: add documentation for nvdimm security support Dave Jiang 2018-10-08 23:56 ` Dave Jiang 2018-10-08 23:56 ` [PATCH v12 11/12] libnvdimm: Drop nvdimm_bus from security_ops interface Dave Jiang 2018-10-08 23:56 ` Dave Jiang 2018-10-08 23:56 ` [PATCH v12 12/12] acpi, nfit: Move acpi_nfit_get_security_ops() to generic location Dave Jiang 2018-10-08 23:56 ` Dave Jiang 2018-10-10 1:35 ` [PATCH v12 00/12] Adding security support for nvdimm Williams, Dan J 2018-10-10 1:35 ` Williams, Dan J 2018-10-10 16:13 ` Dave Jiang 2018-10-10 16:13 ` Dave Jiang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=153904296278.60070.16419066666105951804.stgit@djiang5-desk3.ch.intel.com \ --to=dave.jiang@intel.com \ --cc=alison.schofield@intel.com \ --cc=dan.j.williams@intel.com \ --cc=dhowells@redhat.com \ --cc=ebiggers3@gmail.com \ --cc=keescook@chromium.org \ --cc=keyrings@vger.kernel.org \ --cc=linux-nvdimm@lists.01.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.