mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v7] platform/x86: hp-bioscfg: fix heap OOB in hp_enforce_single_line_input()
@ 2026-10-24 17:26 Muhammad Bilal
  2026-10-25 19:52 ` Andy Shevchenko
  0 siblings, 1 reply; 4+ messages in thread
From: Muhammad Bilal @ 2026-10-24 17:26 UTC (permalink / raw)
  To: jorge.lopez2, hansg, ilpo.jarvinen
  Cc: andriy.shevchenko, linux, platform-driver-x86, linux-kernel,
	stable, meatuni001

The input is copied with kstrdup(), which stops at the first NUL, but
the full write size is passed to hp_enforce_single_line_input(). With
an embedded NUL the helper reads, and can write one byte, past the
copy. Use strnchrnul() so the scan stops at the first NUL, and return
-EINVAL for a NUL or newline before the last byte.

Tested on HP EliteBook 840 G2 (Fedora 44, Linux 7.2.8): writing "A\0"
followed by 4093 bytes of "B" to current_password 100 times returns
-EINVAL every time, without reading into the heap.

Fixes: a34fc329b189 ("platform/x86: hp-bioscfg: bioscfg")
Cc: stable@vger.kernel.org
Suggested-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Muhammad Bilal <meatuni001@gmail.com>
---
Changes in v7:
 - Use strnchrnul() instead of a separate NUL check (Andy)
 - Drop the trailing comments

Changes in v6:
 - Return -EINVAL on embedded NUL instead of limiting the scan (Ilpo)

Changes in v5:
 - Limit the scan to the string instead of copying the input past its
   first NUL (Ilpo)

v6: https://lore.kernel.org/all/20261016025352.230535-1-meatuni001@gmail.com/
v5: https://lore.kernel.org/all/20261007134711.473857-1-meatuni001@gmail.com/

 drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
index 876fc35d035b..8873d91bc235 100644
--- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
+++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
@@ -162,12 +162,12 @@ int hp_enforce_single_line_input(char *buf, size_t count)
 {
 	char *p;
 
-	p = memchr(buf, '\n', count);
+	p = strnchrnul(buf, count, '\n');
 
 	if (p == buf + count - 1)
-		*p = '\0'; /* strip trailing newline */
-	else if (p)
-		return -EINVAL;  /* enforce single line input */
+		*p = '\0';
+	else if (p < buf + count - 1)
+		return -EINVAL;
 
 	return 0;
 }

base-commit: 8667bd30fd033295b3038ce374c551d1059538ba
-- 
2.56.0


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v7] platform/x86: hp-bioscfg: fix heap OOB in hp_enforce_single_line_input()
  2026-10-24 17:26 [PATCH v7] platform/x86: hp-bioscfg: fix heap OOB in hp_enforce_single_line_input() Muhammad Bilal
@ 2026-10-25 19:52 ` Andy Shevchenko
  2026-10-26  5:16   ` Muhammad Bilal
  0 siblings, 1 reply; 4+ messages in thread
From: Andy Shevchenko @ 2026-10-25 19:52 UTC (permalink / raw)
  To: Muhammad Bilal
  Cc: jorge.lopez2, hansg, ilpo.jarvinen, linux, platform-driver-x86,
	linux-kernel, stable

On Sat, Oct 24, 2026 at 10:26:41PM +0500, Muhammad Bilal wrote:
> The input is copied with kstrdup(), which stops at the first NUL, but
> the full write size is passed to hp_enforce_single_line_input(). With
> an embedded NUL the helper reads, and can write one byte, past the
> copy. Use strnchrnul() so the scan stops at the first NUL, and return
> -EINVAL for a NUL or newline before the last byte.
> 
> Tested on HP EliteBook 840 G2 (Fedora 44, Linux 7.2.8): writing "A\0"
> followed by 4093 bytes of "B" to current_password 100 times returns
> -EINVAL every time, without reading into the heap.

...

>  - Drop the trailing comments

Why? At least The first one has the same meaning as before, what's wrong with
the second one?

-- 
With Best Regards,
Andy Shevchenko



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v7] platform/x86: hp-bioscfg: fix heap OOB in hp_enforce_single_line_input()
  2026-10-25 19:52 ` Andy Shevchenko
@ 2026-10-26  5:16   ` Muhammad Bilal
  2026-10-26  5:21     ` Muhammad Bilal
  0 siblings, 1 reply; 4+ messages in thread
From: Muhammad Bilal @ 2026-10-26  5:16 UTC (permalink / raw)
  To: Andy Shevchenko
  Cc: jorge.lopez2, hansg, ilpo.jarvinen, linux, platform-driver-x86,
	linux-kernel, stable

Hi Andy,

No particular reason. I removed them while trimming the diff, but
you're right that both comments are still useful. I'll restore them in
the next revision.

Thanks,
Muhammad

On Mon, Oct 26, 2026 at 12:52 AM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> On Sat, Oct 24, 2026 at 10:26:41PM +0500, Muhammad Bilal wrote:
> > The input is copied with kstrdup(), which stops at the first NUL, but
> > the full write size is passed to hp_enforce_single_line_input(). With
> > an embedded NUL the helper reads, and can write one byte, past the
> > copy. Use strnchrnul() so the scan stops at the first NUL, and return
> > -EINVAL for a NUL or newline before the last byte.
> >
> > Tested on HP EliteBook 840 G2 (Fedora 44, Linux 7.2.8): writing "A\0"
> > followed by 4093 bytes of "B" to current_password 100 times returns
> > -EINVAL every time, without reading into the heap.
>
> ...
>
> >  - Drop the trailing comments
>
> Why? At least The first one has the same meaning as before, what's wrong with
> the second one?
>
> --
> With Best Regards,
> Andy Shevchenko
>
>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v7] platform/x86: hp-bioscfg: fix heap OOB in hp_enforce_single_line_input()
  2026-10-26  5:16   ` Muhammad Bilal
@ 2026-10-26  5:21     ` Muhammad Bilal
  0 siblings, 0 replies; 4+ messages in thread
From: Muhammad Bilal @ 2026-10-26  5:21 UTC (permalink / raw)
  To: Andy Shevchenko
  Cc: jorge.lopez2, hansg, ilpo.jarvinen, linux, platform-driver-x86,
	linux-kernel, stable

Hi,

Thanks for the review.

Link v8: https://lore.kernel.org/all/20261026051740.88791-1-meatuni001@gmail.com/

Thanks
Muhammad

On Mon, Oct 26, 2026 at 10:16 AM Muhammad Bilal <meatuni001@gmail.com> wrote:
>
> Hi Andy,
>
> No particular reason. I removed them while trimming the diff, but
> you're right that both comments are still useful. I'll restore them in
> the next revision.
>
> Thanks,
> Muhammad
>
> On Mon, Oct 26, 2026 at 12:52 AM Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
> >
> > On Sat, Oct 24, 2026 at 10:26:41PM +0500, Muhammad Bilal wrote:
> > > The input is copied with kstrdup(), which stops at the first NUL, but
> > > the full write size is passed to hp_enforce_single_line_input(). With
> > > an embedded NUL the helper reads, and can write one byte, past the
> > > copy. Use strnchrnul() so the scan stops at the first NUL, and return
> > > -EINVAL for a NUL or newline before the last byte.
> > >
> > > Tested on HP EliteBook 840 G2 (Fedora 44, Linux 7.2.8): writing "A\0"
> > > followed by 4093 bytes of "B" to current_password 100 times returns
> > > -EINVAL every time, without reading into the heap.
> >
> > ...
> >
> > >  - Drop the trailing comments
> >
> > Why? At least The first one has the same meaning as before, what's wrong with
> > the second one?
> >
> > --
> > With Best Regards,
> > Andy Shevchenko
> >
> >

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2026-10-26  5:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-24 17:26 [PATCH v7] platform/x86: hp-bioscfg: fix heap OOB in hp_enforce_single_line_input() Muhammad Bilal
2026-10-25 19:52 ` Andy Shevchenko
2026-10-26  5:16   ` Muhammad Bilal
2026-10-26  5:21     ` Muhammad Bilal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®