linux-kernel - Re: [Patch v4] firmware: dmi-sysfs: add SMBIOS entry point area attribute

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <54DC10FC.6030008@linaro.org>
Date:	Thu, 12 Feb 2015 04:33:32 +0200
From:	Ivan Khoronzhuk <ivan.khoronzhuk@...aro.org>
To:	Matt Fleming <matt@...eblueprint.co.uk>
CC:	Grant Likely <grant.likely@...aro.org>,
	Ard Biesheuvel <ard.biesheuvel@...aro.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	linux-api@...r.kernel.org, linux-doc@...r.kernel.org,
	Leif Lindholm <leif.lindholm@...aro.org>,
	Mark Salter <msalter@...hat.com>
Subject: Re: [Patch v4] firmware: dmi-sysfs: add SMBIOS entry point area attribute


On 02/11/2015 04:43 PM, Matt Fleming wrote:
> On Wed, 11 Feb, at 02:17:03PM, Matt Fleming wrote:
>> On Tue, 10 Feb, at 11:51:44AM, Ivan Khoronzhuk wrote:
>>> If you are Ok with this patch, could you please pickup it?
>> Applied, thanks Ivan!
> Btw this patch doesn't apply cleanly, the reject looks like this,
>
> --- drivers/firmware/dmi_scan.c
> +++ drivers/firmware/dmi_scan.c
> @@ -537,6 +543,8 @@
>   		dmi_ver &= 0xFFFFFF;

The problem is in above string.
I used linux next, but I had one patch before.
Sorry... just forgot about it.
I've attached the same patch but on top of linux_next,
it can be applied cleanly.
Sorry once again and thanks!

>   		dmi_len = get_unaligned_le32(buf + 12);
>   		dmi_base = get_unaligned_le64(buf + 16);
> +		smbios_header_size = buf[6];
> +		memcpy(smbios_header, buf, smbios_header_size);
>   
>   		/*
>   		 * The 64-bit SMBIOS 3.0 entry point no longer has a field
>
> What version of the kernel did you base this patch on? The conflict is
> trivial to fixup and I've done so and pushed it out on the EFI 'next'
> branch, but I wanted to call out this conflict explicitly.
>


View attachment "0001-firmware-dmi-sysfs-add-SMBIOS-entry-point-area-attri.patch" of type "text/x-patch" (6642 bytes)