| Message ID | 20230131063928.388035-4-ajd@linux.ibm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | pSeries dynamic secure boot secvar interface + platform keyring loading | expand |
On 1/31/23 01:39, Andrew Donnellan wrote: > From: Russell Currey <ruscur@russell.cc> > > secvar_ops->get_next() returns -ENOENT when there are no more variables > to return, which is expected behaviour. > > Fix this by returning 0 if get_next() returns -ENOENT. > > This fixes an issue introduced in commit bd5d9c743d38 ("powerpc: expose > secure variables to userspace via sysfs"), but the return code of > secvar_sysfs_load() was never checked so this issue never mattered. > > Signed-off-by: Russell Currey <ruscur@russell.cc> > Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com> > > --- > > v5: New patch > --- > arch/powerpc/kernel/secvar-sysfs.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/kernel/secvar-sysfs.c b/arch/powerpc/kernel/secvar-sysfs.c > index 1ee4640a2641..7fa5f8ed9542 100644 > --- a/arch/powerpc/kernel/secvar-sysfs.c > +++ b/arch/powerpc/kernel/secvar-sysfs.c > @@ -179,8 +179,10 @@ static int secvar_sysfs_load(void) > rc = secvar_ops->get_next(name, &namesize, NAME_MAX_SIZE); > if (rc) { > if (rc != -ENOENT) > - pr_err("error getting secvar from firmware %d\n", > - rc); > + pr_err("error getting secvar from firmware %d\n", rc); > + else > + rc = 0; > + > break; > } > Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
diff --git a/arch/powerpc/kernel/secvar-sysfs.c b/arch/powerpc/kernel/secvar-sysfs.c index 1ee4640a2641..7fa5f8ed9542 100644 --- a/arch/powerpc/kernel/secvar-sysfs.c +++ b/arch/powerpc/kernel/secvar-sysfs.c @@ -179,8 +179,10 @@ static int secvar_sysfs_load(void) rc = secvar_ops->get_next(name, &namesize, NAME_MAX_SIZE); if (rc) { if (rc != -ENOENT) - pr_err("error getting secvar from firmware %d\n", - rc); + pr_err("error getting secvar from firmware %d\n", rc); + else + rc = 0; + break; }