On Mon, 2013-03-11 at 12:38 -0700, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > This is a note to let you know that I've just added the patch titled > > dmi_scan: fix missing check for _DMI_ signature in smbios_present() > > to the 3.8-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > The filename of the patch is: > dmi_scan-fix-missing-check-for-_dmi_-signature-in-smbios_present.patch > and it can be found in the queue-3.8 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable@xxxxxxxxxxxxxxx> know about it. This is needed in all active 3.x branches, since they include the previous change that caused a regression: 3.0: a6aa749 drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists 3.2: 9a1f08a drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists 3.4: b88532f drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists Ben. > From a40e7cf8f06b4e322ba902e4e9f6a6b0c2daa907 Mon Sep 17 00:00:00 2001 > From: Ben Hutchings <ben@xxxxxxxxxxxxxxx> > Date: Fri, 8 Mar 2013 12:43:32 -0800 > Subject: dmi_scan: fix missing check for _DMI_ signature in smbios_present() > > From: Ben Hutchings <ben@xxxxxxxxxxxxxxx> > > commit a40e7cf8f06b4e322ba902e4e9f6a6b0c2daa907 upstream. > > Commit 9f9c9cbb6057 ("drivers/firmware/dmi_scan.c: fetch dmi version > from SMBIOS if it exists") hoisted the check for "_DMI_" into > dmi_scan_machine(), which means that we don't bother to check for > "_DMI_" at offset 16 in an SMBIOS entry. smbios_present() may also call > dmi_present() for an address where we found "_SM_", if it failed further > validation. > > Check for "_DMI_" in smbios_present() before calling dmi_present(). > > [akpm@xxxxxxxxxxxxxxxxxxxx: fix build] > Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx> > Reported-by: Tim McGrath <tmhikaru@xxxxxxxxx> > Tested-by: Tim Mcgrath <tmhikaru@xxxxxxxxx> > Cc: Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > --- > drivers/firmware/dmi_scan.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > --- a/drivers/firmware/dmi_scan.c > +++ b/drivers/firmware/dmi_scan.c > @@ -442,7 +442,6 @@ static int __init dmi_present(const char > static int __init smbios_present(const char __iomem *p) > { > u8 buf[32]; > - int offset = 0; > > memcpy_fromio(buf, p, 32); > if ((buf[5] < 32) && dmi_checksum(buf, buf[5])) { > @@ -461,9 +460,9 @@ static int __init smbios_present(const c > dmi_ver = 0x0206; > break; > } > - offset = 16; > + return memcmp(p + 16, "_DMI_", 5) || dmi_present(p + 16); > } > - return dmi_present(buf + offset); > + return 1; > } > > void __init dmi_scan_machine(void) > > > Patches currently in stable-queue which might be from ben@xxxxxxxxxxxxxxx are > > queue-3.8/dmi_scan-fix-missing-check-for-_dmi_-signature-in-smbios_present.patch > queue-3.8/md-protect-against-crash-upon-fsync-on-ro-array.patch > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- Ben Hutchings The obvious mathematical breakthrough [to break modern encryption] would be development of an easy way to factor large prime numbers. - Bill Gates
Attachment:
signature.asc
Description: This is a digitally signed message part