From: Alison Schofield <alison.schofield@intel.com>
To: Vishal Verma <vishal.l.verma@intel.com>,
Dan Williams <dan.j.williams@intel.com>
Cc: Alison Schofield <alison.schofield@intel.com>, nvdimm@lists.linux.dev
Subject: [ndctl PATCH] ndctl: return -errno when keyctl_read_alloc() fails
Date: Fri, 18 Jun 2021 18:40:56 -0700 [thread overview]
Message-ID: <20210619014056.31907-3-alison.schofield@intel.com> (raw)
In-Reply-To: <20210619014056.31907-1-alison.schofield@intel.com>
When keyctl_read_alloc() fails during key creation a stale rc
value is returned as a key serial number, rather than the errno
from keyctl_read_alloc(). The nvdimm driver eventually discovers
it's a bad key serial number, and the entire operation fails as
it should.
Fail immediately by using the available errno correctly.
Fixes: 86b078b44275 ("ndctl: add passphrase management commands")
Signed-off-by: Alison Schofield <alison.schofield@intel.com>
---
ndctl/util/keys.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/ndctl/util/keys.c b/ndctl/util/keys.c
index 30cb4c8..d1cc890 100644
--- a/ndctl/util/keys.c
+++ b/ndctl/util/keys.c
@@ -254,6 +254,7 @@ static key_serial_t dimm_create_key(struct ndctl_dimm *dimm,
size = keyctl_read_alloc(key, &buffer);
if (size < 0) {
+ rc = -errno;
fprintf(stderr, "keyctl_read_alloc failed: %s\n", strerror(errno));
keyctl_unlink(key, KEY_SPEC_USER_KEYRING);
return rc;
base-commit: 4e646fa490ba4b782afa188dd8818b94c419924e
--
2.25.1
prev parent reply other threads:[~2021-06-19 1:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-19 1:40 [ndctl PATCH] ndctl: do not try to load a key already on the kernel keyring Alison Schofield
2021-06-19 1:40 ` [ndctl PATCH] ndctl: remove key from kernel keyring if blob storage fails Alison Schofield
2021-06-19 1:40 ` Alison Schofield [this message]
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=20210619014056.31907-3-alison.schofield@intel.com \
--to=alison.schofield@intel.com \
--cc=dan.j.williams@intel.com \
--cc=nvdimm@lists.linux.dev \
--cc=vishal.l.verma@intel.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).