NAK
Please don't backport this.
On Mon, 17 Jun 2024 at 15:21, Sasha Levin <sashal@xxxxxxxxxx> wrote:
>
> From: "Guilherme G. Piccoli" <gpiccoli@xxxxxxxxxx>
>
> [ Upstream commit 7c23b186ab892088f76a3ad9dbff1685ffe2e832 ]
>
> Right now efi-pstore either returns 0 (success) or -EIO; but we
> do have a function to convert UEFI errors in different standard
> error codes, helping to narrow down potential issues more accurately.
>
> So, let's use this helper here.
>
> Signed-off-by: Guilherme G. Piccoli <gpiccoli@xxxxxxxxxx>
> Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx>
> Signed-off-by: Ard Biesheuvel <ardb@xxxxxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
> drivers/firmware/efi/efi-pstore.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c
> index 833cbb995dd3f..194fdbd600ad1 100644
> --- a/drivers/firmware/efi/efi-pstore.c
> +++ b/drivers/firmware/efi/efi-pstore.c
> @@ -136,7 +136,7 @@ static int efi_pstore_read_func(struct pstore_record *record,
> &size, record->buf);
> if (status != EFI_SUCCESS) {
> kfree(record->buf);
> - return -EIO;
> + return efi_status_to_err(status);
> }
>
> /*
> @@ -181,7 +181,7 @@ static ssize_t efi_pstore_read(struct pstore_record *record)
> return 0;
>
> if (status != EFI_SUCCESS)
> - return -EIO;
> + return efi_status_to_err(status);
>
> /* skip variables that don't concern us */
> if (efi_guidcmp(guid, LINUX_EFI_CRASH_GUID))
> @@ -219,7 +219,7 @@ static int efi_pstore_write(struct pstore_record *record)
> record->size, record->psi->buf,
> true);
> efivar_unlock();
> - return status == EFI_SUCCESS ? 0 : -EIO;
> + return efi_status_to_err(status);
> };
>
> static int efi_pstore_erase(struct pstore_record *record)
> @@ -230,7 +230,7 @@ static int efi_pstore_erase(struct pstore_record *record)
> PSTORE_EFI_ATTRIBUTES, 0, NULL);
>
> if (status != EFI_SUCCESS && status != EFI_NOT_FOUND)
> - return -EIO;
> + return efi_status_to_err(status);
> return 0;
> }
>
> --
> 2.43.0
>
