From: Andrew Donnellan <ajd@linux.ibm.com> To: linuxppc-dev@lists.ozlabs.org, linux-integrity@vger.kernel.org Cc: ruscur@russell.cc, bgray@linux.ibm.com, nayna@linux.ibm.com, gcwilson@linux.ibm.com, gjoyce@linux.ibm.com, brking@linux.ibm.com, stefanb@linux.ibm.com, sudhakar@linux.ibm.com, erichte@linux.ibm.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, zohar@linux.ibm.com, joel@jms.id.au, npiggin@gmail.com Subject: [PATCH v6 01/26] powerpc/pseries: Fix handling of PLPKS object flushing timeout Date: Fri, 10 Feb 2023 19:03:36 +1100 [thread overview] Message-ID: <20230210080401.345462-2-ajd@linux.ibm.com> (raw) In-Reply-To: <20230210080401.345462-1-ajd@linux.ibm.com> plpks_confirm_object_flushed() uses the H_PKS_CONFIRM_OBJECT_FLUSHED hcall to check whether changes to an object in the Platform KeyStore have been flushed to non-volatile storage. The hcall returns two output values, the return code and the flush status. plpks_confirm_object_flushed() polls the hcall until either the flush status has updated, the return code is an error, or a timeout has been exceeded. While we're still polling, the hcall is returning H_SUCCESS (0) as the return code. In the timeout case, this means that upon exiting the polling loop, rc is 0, and therefore 0 is returned to the user. Handle the timeout case separately and return ETIMEDOUT if triggered. Fixes: 2454a7af0f2a ("powerpc/pseries: define driver for Platform KeyStore") Reported-by: Benjamin Gray <bgray@linux.ibm.com> Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com> Tested-by: Russell Currey <ruscur@russell.cc> Reviewed-by: Russell Currey <ruscur@russell.cc> Signed-off-by: Russell Currey <ruscur@russell.cc> --- v3: Merge plpks fixes and signed update series with secvar series Neaten how we return at the end of the function (ruscur) v4: Move up in series (npiggin) --- arch/powerpc/platforms/pseries/plpks.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/pseries/plpks.c b/arch/powerpc/platforms/pseries/plpks.c index 4edd1585e245..9e85b6d85b0b 100644 --- a/arch/powerpc/platforms/pseries/plpks.c +++ b/arch/powerpc/platforms/pseries/plpks.c @@ -248,6 +248,7 @@ static int plpks_confirm_object_flushed(struct label *label, struct plpks_auth *auth) { unsigned long retbuf[PLPAR_HCALL_BUFSIZE] = { 0 }; + bool timed_out = true; u64 timeout = 0; u8 status; int rc; @@ -259,22 +260,26 @@ static int plpks_confirm_object_flushed(struct label *label, status = retbuf[0]; if (rc) { + timed_out = false; if (rc == H_NOT_FOUND && status == 1) rc = 0; break; } - if (!rc && status == 1) + if (!rc && status == 1) { + timed_out = false; break; + } usleep_range(PKS_FLUSH_SLEEP, PKS_FLUSH_SLEEP + PKS_FLUSH_SLEEP_RANGE); timeout = timeout + PKS_FLUSH_SLEEP; } while (timeout < PKS_FLUSH_MAX_TIMEOUT); - rc = pseries_status_to_err(rc); + if (timed_out) + return -ETIMEDOUT; - return rc; + return pseries_status_to_err(rc); } int plpks_write_var(struct plpks_var var) -- 2.39.1
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Donnellan <ajd@linux.ibm.com> To: linuxppc-dev@lists.ozlabs.org, linux-integrity@vger.kernel.org Cc: sudhakar@linux.ibm.com, erichte@linux.ibm.com, gregkh@linuxfoundation.org, nayna@linux.ibm.com, npiggin@gmail.com, linux-kernel@vger.kernel.org, zohar@linux.ibm.com, gjoyce@linux.ibm.com, ruscur@russell.cc, joel@jms.id.au, bgray@linux.ibm.com, brking@linux.ibm.com, gcwilson@linux.ibm.com, stefanb@linux.ibm.com Subject: [PATCH v6 01/26] powerpc/pseries: Fix handling of PLPKS object flushing timeout Date: Fri, 10 Feb 2023 19:03:36 +1100 [thread overview] Message-ID: <20230210080401.345462-2-ajd@linux.ibm.com> (raw) In-Reply-To: <20230210080401.345462-1-ajd@linux.ibm.com> plpks_confirm_object_flushed() uses the H_PKS_CONFIRM_OBJECT_FLUSHED hcall to check whether changes to an object in the Platform KeyStore have been flushed to non-volatile storage. The hcall returns two output values, the return code and the flush status. plpks_confirm_object_flushed() polls the hcall until either the flush status has updated, the return code is an error, or a timeout has been exceeded. While we're still polling, the hcall is returning H_SUCCESS (0) as the return code. In the timeout case, this means that upon exiting the polling loop, rc is 0, and therefore 0 is returned to the user. Handle the timeout case separately and return ETIMEDOUT if triggered. Fixes: 2454a7af0f2a ("powerpc/pseries: define driver for Platform KeyStore") Reported-by: Benjamin Gray <bgray@linux.ibm.com> Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com> Tested-by: Russell Currey <ruscur@russell.cc> Reviewed-by: Russell Currey <ruscur@russell.cc> Signed-off-by: Russell Currey <ruscur@russell.cc> --- v3: Merge plpks fixes and signed update series with secvar series Neaten how we return at the end of the function (ruscur) v4: Move up in series (npiggin) --- arch/powerpc/platforms/pseries/plpks.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/pseries/plpks.c b/arch/powerpc/platforms/pseries/plpks.c index 4edd1585e245..9e85b6d85b0b 100644 --- a/arch/powerpc/platforms/pseries/plpks.c +++ b/arch/powerpc/platforms/pseries/plpks.c @@ -248,6 +248,7 @@ static int plpks_confirm_object_flushed(struct label *label, struct plpks_auth *auth) { unsigned long retbuf[PLPAR_HCALL_BUFSIZE] = { 0 }; + bool timed_out = true; u64 timeout = 0; u8 status; int rc; @@ -259,22 +260,26 @@ static int plpks_confirm_object_flushed(struct label *label, status = retbuf[0]; if (rc) { + timed_out = false; if (rc == H_NOT_FOUND && status == 1) rc = 0; break; } - if (!rc && status == 1) + if (!rc && status == 1) { + timed_out = false; break; + } usleep_range(PKS_FLUSH_SLEEP, PKS_FLUSH_SLEEP + PKS_FLUSH_SLEEP_RANGE); timeout = timeout + PKS_FLUSH_SLEEP; } while (timeout < PKS_FLUSH_MAX_TIMEOUT); - rc = pseries_status_to_err(rc); + if (timed_out) + return -ETIMEDOUT; - return rc; + return pseries_status_to_err(rc); } int plpks_write_var(struct plpks_var var) -- 2.39.1
next prev parent reply other threads:[~2023-02-10 8:11 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-02-10 8:03 [PATCH v6 00/26] pSeries dynamic secure boot secvar interface + platform keyring loading Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan [this message] 2023-02-10 8:03 ` [PATCH v6 01/26] powerpc/pseries: Fix handling of PLPKS object flushing timeout Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 02/26] powerpc/pseries: Fix alignment of PLPKS structures and buffers Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 03/26] powerpc/secvar: Fix incorrect return in secvar_sysfs_load() Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 04/26] powerpc/secvar: Use u64 in secvar_operations Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 05/26] powerpc/secvar: Warn and error if multiple secvar ops are set Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 20:51 ` Stefan Berger 2023-02-10 20:51 ` Stefan Berger 2023-02-10 8:03 ` [PATCH v6 06/26] powerpc/secvar: Use sysfs_emit() instead of sprintf() Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 07/26] powerpc/secvar: Handle format string in the consumer Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 08/26] powerpc/secvar: Handle max object size " Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 09/26] powerpc/secvar: Clean up init error messages Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 10/26] powerpc/secvar: Extend sysfs to include config vars Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 11/26] powerpc/secvar: Allow backend to populate static list of variable names Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 12/26] powerpc/secvar: Warn when PAGE_SIZE is smaller than max object size Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 13/26] powerpc/secvar: Don't print error on ENOENT when reading variables Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 14/26] powerpc/pseries: Move plpks.h to include directory Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 15/26] powerpc/pseries: Move PLPKS constants to header file Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 16/26] powerpc/pseries: Expose PLPKS config values, support additional fields Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 17/26] powerpc/pseries: Implement signed update for PLPKS objects Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 18/26] powerpc/pseries: Log hcall return codes for PLPKS debug Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 19/26] powerpc/pseries: Make caller pass buffer to plpks_read_var() Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 20/26] powerpc/pseries: Turn PSERIES_PLPKS into a hidden option Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 21/26] powerpc/pseries: Clarify warning when PLPKS password already set Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 20:47 ` Stefan Berger 2023-02-10 20:47 ` Stefan Berger 2023-02-12 13:26 ` Andrew Donnellan 2023-02-12 13:26 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 22/26] powerpc/pseries: Add helper to get PLPKS password length Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 8:03 ` [PATCH v6 23/26] powerpc/pseries: Pass PLPKS password on kexec Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 20:59 ` Stefan Berger 2023-02-10 20:59 ` Stefan Berger 2023-02-10 8:03 ` [PATCH v6 24/26] powerpc/pseries: Implement secvars for dynamic secure boot Andrew Donnellan 2023-02-10 8:03 ` Andrew Donnellan 2023-02-10 21:23 ` Stefan Berger 2023-02-10 21:23 ` Stefan Berger 2023-02-10 21:28 ` Stefan Berger 2023-02-10 21:28 ` Stefan Berger 2023-02-12 13:33 ` Andrew Donnellan 2023-02-12 13:33 ` Andrew Donnellan 2023-02-13 5:26 ` Michael Ellerman 2023-02-13 5:26 ` Michael Ellerman 2023-02-13 7:07 ` Andrew Donnellan 2023-02-13 7:07 ` Andrew Donnellan 2023-02-13 7:06 ` Andrew Donnellan 2023-02-13 7:06 ` Andrew Donnellan 2023-02-13 11:32 ` Michael Ellerman 2023-02-13 11:32 ` Michael Ellerman 2023-02-13 13:52 ` Stefan Berger 2023-02-13 13:52 ` Stefan Berger 2023-02-14 6:07 ` Andrew Donnellan 2023-02-14 6:07 ` Andrew Donnellan 2023-02-15 11:46 ` Michael Ellerman 2023-02-15 11:46 ` Michael Ellerman 2023-02-10 8:04 ` [PATCH v6 25/26] integrity/powerpc: Improve error handling & reporting when loading certs Andrew Donnellan 2023-02-10 8:04 ` Andrew Donnellan 2023-02-10 8:04 ` [PATCH v6 26/26] integrity/powerpc: Support loading keys from PLPKS Andrew Donnellan 2023-02-10 8:04 ` Andrew Donnellan 2023-02-15 12:41 ` [PATCH v6 00/26] pSeries dynamic secure boot secvar interface + platform keyring loading Michael Ellerman 2023-02-15 12:41 ` Michael Ellerman
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=20230210080401.345462-2-ajd@linux.ibm.com \ --to=ajd@linux.ibm.com \ --cc=bgray@linux.ibm.com \ --cc=brking@linux.ibm.com \ --cc=erichte@linux.ibm.com \ --cc=gcwilson@linux.ibm.com \ --cc=gjoyce@linux.ibm.com \ --cc=gregkh@linuxfoundation.org \ --cc=joel@jms.id.au \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=nayna@linux.ibm.com \ --cc=npiggin@gmail.com \ --cc=ruscur@russell.cc \ --cc=stefanb@linux.ibm.com \ --cc=sudhakar@linux.ibm.com \ --cc=zohar@linux.ibm.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: 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.