<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 8 January 2016 at 10:45, Belal, Awais <span dir="ltr"><<a href="mailto:Awais_Belal@mentor.com" target="_blank">Awais_Belal@mentor.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Armin,<br>
<br>
Thanks a lot.<br>
<br>
Can you please share the diff? I am just asking because Joshua is seeing the same sort of issue with the fido branch while my local setup does not complain there either.<span class=""><br></span></blockquote><div><br></div><div>I've cherry-picked the change from Armin's branch onto my joshuagl/fido-next branch.<br><br></div><div>Thanks,<br><br></div><div>Joshua <br></div><div><br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">
BR,<br>
Awais<br>
<br>
________________________________________<br>
From: akuster808 [<a href="mailto:akuster808@gmail.com">akuster808@gmail.com</a>]<br>
</span>Sent: Friday, January 08, 2016 7:32 AM<br>
<div class="HOEnZb"><div class="h5">To: Belal, Awais<br>
Cc: <a href="mailto:openembedded-core@lists.openembedded.org">openembedded-core@lists.openembedded.org</a><br>
Subject: Re: [OE-core] [dizzy][PATCH] grub2: Fix CVE-2015-8370<br>
<br>
Awais,<br>
<br>
<br>
<br>
hand applied. merged and pushed to<br>
<br>
<a href="http://git.yoctoproject.org/poky-contrib.git" rel="noreferrer" target="_blank">git.yoctoproject.org/poky-contrib.git</a> akuster/dizzy-next<br>
<br>
thanks,<br>
Armin<br>
<br>
On 01/07/2016 01:56 AM, Belal, Awais wrote:<br>
> Hi Armin,<br>
><br>
> With dizzy-next from your fork<br>
><br>
> awais@alpha:~/yocto/build-dizzy-akuster$ bitbake -c patch grub<br>
> Parsing recipes: 100% |##############################################################| Time: 00:00:46<br>
> Parsing of 1458 .bb files complete (0 cached, 1458 parsed). 1914 targets, 66 skipped, 0 masked, 0 errors.<br>
> NOTE: Resolving any missing task queue dependencies<br>
><br>
> Build Configuration:<br>
> BB_VERSION = "1.24.0"<br>
> BUILD_SYS = "x86_64-linux"<br>
> NATIVELSBSTRING = "Ubuntu-14.04"<br>
> TARGET_SYS = "x86_64-poky-linux"<br>
> MACHINE = "amdfalconx86"<br>
> DISTRO = "poky"<br>
> DISTRO_VERSION = "1.7.3"<br>
> TUNE_FEATURES = "dbfp4"<br>
> TARGET_FPU = ""<br>
> meta<br>
> meta-yocto<br>
> meta-yocto-bsp = "akuster/dizzy-next:4807ff0ca0abf085e6b81257534a4a62fde88d16"<br>
> common<br>
> meta-amdfalconx86 = "(detachedfromorigin/dizzy):84ae10ad68c7b253ab87558c5a6df057c9a84f08"<br>
> meta-oe<br>
> meta-python = "(detachedfromorigin/dizzy):7f1df52e9409edcc4d4cd5f34694f8740f56e1bf"<br>
><br>
> NOTE: Preparing runqueue<br>
> NOTE: Executing SetScene Tasks<br>
> NOTE: Executing RunQueue Tasks<br>
> NOTE: Tasks Summary: Attempted 10 tasks of which 0 didn't need to be rerun and all succeeded.<br>
> awais@alpha:~/yocto/build-dizzy-akuster$ ls tmp/work/dbfp4-poky-linux/grub/2.00-r1/<br>
> 0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch<br>
> 0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch<br>
> check-if-liblzma-is-disabled.patch<br>
> fix-endianness-problem.patch<br>
> fix-issue-with-flex-2.5.37.patch<br>
> grub-2.00<br>
> grub-2.00-add-oe-kernel.patch<br>
> grub-2.00-fpmath-sse-387-fix.patch<br>
> grub2-remove-sparc64-setup-from-x86-builds.patch<br>
> grub-install.in.patch<br>
> remove-gets.patch<br>
> temp<br>
> awais@alpha:~/yocto/build-dizzy-akuster$<br>
><br>
> Pretty odd what's happening :)<br>
><br>
> BR,<br>
> Awais<br>
><br>
> ________________________________________<br>
> From: akuster808 [<a href="mailto:akuster808@gmail.com">akuster808@gmail.com</a>]<br>
> Sent: Wednesday, January 06, 2016 10:15 PM<br>
> To: Belal, Awais<br>
> Cc: <a href="mailto:openembedded-core@lists.openembedded.org">openembedded-core@lists.openembedded.org</a><br>
> Subject: Re: [OE-core] [dizzy][PATCH] grub2: Fix CVE-2015-8370<br>
><br>
> Awais,<br>
><br>
> this is what I am seeing.<br>
><br>
> NOTE: Executing RunQueue Tasks<br>
> ERROR: Command Error: exit status: 1 Output:<br>
> Applying patch 0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch<br>
> patching file grub-core/lib/crypto.c<br>
> Hunk #1 FAILED at 470.<br>
> 1 out of 1 hunk FAILED -- rejects in file grub-core/lib/crypto.c<br>
> patching file grub-core/normal/auth.c<br>
> Hunk #1 FAILED at 174.<br>
> 1 out of 1 hunk FAILED -- rejects in file grub-core/normal/auth.c<br>
> Patch 0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch does<br>
> not apply (enforce with -f)<br>
> ERROR: Function failed: patch_do_patch<br>
> ERROR: Logfile of failure stored in:<br>
> /home/akuster/oss/maint/mylayers/poky/build/tmp/work/i586-poky-linux/grub/2.00-r1/temp/log.do_patch.3029<br>
> ERROR: Task 1<br>
> (/home/akuster/oss/maint/mylayers/poky/meta/recipes-bsp/grub/<a href="http://grub_2.00.bb" rel="noreferrer" target="_blank">grub_2.00.bb</a>,<br>
> do_patch) failed with exit code '1'<br>
><br>
><br>
> I am using my contrib akuster/dizzy-next.<br>
><br>
> I will hand fixup the changes. please give me a few days.<br>
><br>
> - armin<br>
><br>
><br>
> On 01/06/2016 01:43 AM, Belal, Awais wrote:<br>
>> Ping!<br>
>><br>
>> BR,<br>
>> Awais<br>
>><br>
>> ________________________________________<br>
>> From: <a href="mailto:openembedded-core-bounces@lists.openembedded.org">openembedded-core-bounces@lists.openembedded.org</a> [<a href="mailto:openembedded-core-bounces@lists.openembedded.org">openembedded-core-bounces@lists.openembedded.org</a>] on behalf of Belal, Awais<br>
>> Sent: Monday, January 04, 2016 12:53 PM<br>
>> To: akuster808<br>
>> Cc: <a href="mailto:openembedded-core@lists.openembedded.org">openembedded-core@lists.openembedded.org</a><br>
>> Subject: Re: [OE-core] [dizzy][PATCH] grub2: Fix CVE-2015-8370<br>
>><br>
>> Hi Armin,<br>
>><br>
>> Odd, applies cleanly on dizzy for me. Can you please share the patch log?<br>
>><br>
>> On a scratch build dir, I get the following:<br>
>> --------------------------------------------------------------<br>
>> awais@alpha:~/yocto/build-dizzy$ bitbake -c patch grub<br>
>> Parsing recipes: 100% |#############################################################| Time: 00:00:36<br>
>> Parsing of 1458 .bb files complete (0 cached, 1458 parsed). 1914 targets, 66 skipped, 0 masked, 0 errors.<br>
>> NOTE: Resolving any missing task queue dependencies<br>
>><br>
>> Build Configuration:<br>
>> BB_VERSION = "1.24.0"<br>
>> BUILD_SYS = "x86_64-linux"<br>
>> NATIVELSBSTRING = "Ubuntu-14.04"<br>
>> TARGET_SYS = "x86_64-poky-linux"<br>
>> MACHINE = "amdfalconx86"<br>
>> DISTRO = "poky"<br>
>> DISTRO_VERSION = "1.7.3"<br>
>> TUNE_FEATURES = "dbfp4"<br>
>> TARGET_FPU = ""<br>
>> meta<br>
>> meta-yocto<br>
>> meta-yocto-bsp = "(detachedfromorigin/dizzy):6d34267e0a13e10ab91b60590b27a2b5ba3b7da6"<br>
>> common<br>
>> meta-amdfalconx86 = "(detachedfromorigin/dizzy):84ae10ad68c7b253ab87558c5a6df057c9a84f08"<br>
>> meta-oe<br>
>> meta-python = "(detachedfromorigin/dizzy):7f1df52e9409edcc4d4cd5f34694f8740f56e1bf"<br>
>><br>
>> NOTE: Preparing runqueue<br>
>> NOTE: Executing SetScene Tasks<br>
>> NOTE: Executing RunQueue Tasks<br>
>> NOTE: Tasks Summary: Attempted 10 tasks of which 0 didn't need to be rerun and all succeeded.<br>
>> awais@alpha:~/yocto/build-dizzy$<br>
>> --------------------------------------------------------------<br>
>><br>
>> BR,<br>
>> Awais<br>
>><br>
>> ________________________________________<br>
>> From: akuster808 [<a href="mailto:akuster808@gmail.com">akuster808@gmail.com</a>]<br>
>> Sent: Monday, January 04, 2016 7:13 AM<br>
>> To: Belal, Awais<br>
>> Cc: <a href="mailto:openembedded-core@lists.openembedded.org">openembedded-core@lists.openembedded.org</a><br>
>> Subject: Re: [OE-core] [dizzy][PATCH] grub2: Fix CVE-2015-8370<br>
>><br>
>> On 12/31/15 5:38 AM, Belal, Awais wrote:<br>
>> Awais,<br>
>><br>
>>> Ping!<br>
>> This patch does not apply to the current dizzy branch.<br>
>><br>
>> is there a dependency patch I missed to apply?<br>
>><br>
>> regards,<br>
>> Armin<br>
>>><br>
>>> BR,<br>
>>> Awais<br>
>>><br>
>>> ________________________________________<br>
>>> From: <a href="mailto:openembedded-core-bounces@lists.openembedded.org">openembedded-core-bounces@lists.openembedded.org</a> [<a href="mailto:openembedded-core-bounces@lists.openembedded.org">openembedded-core-bounces@lists.openembedded.org</a>] on behalf of Belal, Awais<br>
>>> Sent: Wednesday, December 23, 2015 4:20 PM<br>
>>> To: <a href="mailto:openembedded-core@lists.openembedded.org">openembedded-core@lists.openembedded.org</a><br>
>>> Subject: [OE-core] [dizzy][PATCH] grub2: Fix CVE-2015-8370<br>
>>><br>
>>> <a href="http://git.savannah.gnu.org/cgit/grub.git/commit/?id=451d80e52d851432e109771bb8febafca7a5f1f2" rel="noreferrer" target="_blank">http://git.savannah.gnu.org/cgit/grub.git/commit/?id=451d80e52d851432e109771bb8febafca7a5f1f2</a><br>
>>><br>
>>> Signed-off-by: Awais Belal <<a href="mailto:awais_belal@mentor.com">awais_belal@mentor.com</a>><br>
>>> ---<br>
>>> ...E-2015-8370-Grub2-user-pass-vulnerability.patch | 52 ++++++++++++++++++++++<br>
>>> meta/recipes-bsp/grub/<a href="http://grub-efi_2.00.bb" rel="noreferrer" target="_blank">grub-efi_2.00.bb</a> | 1 +<br>
>>> meta/recipes-bsp/grub/<a href="http://grub_2.00.bb" rel="noreferrer" target="_blank">grub_2.00.bb</a> | 1 +<br>
>>> 3 files changed, 54 insertions(+)<br>
>>> create mode 100644 meta/recipes-bsp/grub/files/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch<br>
>>><br>
>>> diff --git a/meta/recipes-bsp/grub/files/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch b/meta/recipes-bsp/grub/files/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch<br>
>>> new file mode 100644<br>
>>> index 0000000..f9252e9<br>
>>> --- /dev/null<br>
>>> +++ b/meta/recipes-bsp/grub/files/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch<br>
>>> @@ -0,0 +1,52 @@<br>
>>> +Upstream-Status: Accepted<br>
>>> +Signed-off-by: Awais Belal <<a href="mailto:awais_belal@mentor.com">awais_belal@mentor.com</a>><br>
>>> +<br>
>>> +From 451d80e52d851432e109771bb8febafca7a5f1f2 Mon Sep 17 00:00:00 2001<br>
>>> +From: Hector Marco-Gisbert <<a href="mailto:hecmargi@upv.es">hecmargi@upv.es</a>><br>
>>> +Date: Wed, 16 Dec 2015 04:57:18 +0000<br>
>>> +Subject: Fix security issue when reading username and password<br>
>>> +<br>
>>> +This patch fixes two integer underflows at:<br>
>>> + * grub-core/lib/crypto.c<br>
>>> + * grub-core/normal/auth.c<br>
>>> +<br>
>>> +CVE-2015-8370<br>
>>> +<br>
>>> +Signed-off-by: Hector Marco-Gisbert <<a href="mailto:hecmargi@upv.es">hecmargi@upv.es</a>><br>
>>> +Signed-off-by: Ismael Ripoll-Ripoll <<a href="mailto:iripoll@disca.upv.es">iripoll@disca.upv.es</a>><br>
>>> +Also-By: Andrey Borzenkov <<a href="mailto:arvidjaar@gmail.com">arvidjaar@gmail.com</a>><br>
>>> +---<br>
>>> +diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c<br>
>>> +index 010e550..683a8aa 100644<br>
>>> +--- a/grub-core/lib/crypto.c<br>
>>> ++++ b/grub-core/lib/crypto.c<br>
>>> +@@ -470,7 +470,8 @@ grub_password_get (char buf[], unsigned buf_size)<br>
>>> +<br>
>>> + if (key == '\b')<br>
>>> + {<br>
>>> +- cur_len--;<br>
>>> ++ if (cur_len)<br>
>>> ++ cur_len--;<br>
>>> + continue;<br>
>>> + }<br>
>>> +<br>
>>> +diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c<br>
>>> +index c6bd96e..8615c48 100644<br>
>>> +--- a/grub-core/normal/auth.c<br>
>>> ++++ b/grub-core/normal/auth.c<br>
>>> +@@ -174,8 +174,11 @@ grub_username_get (char buf[], unsigned buf_size)<br>
>>> +<br>
>>> + if (key == '\b')<br>
>>> + {<br>
>>> +- cur_len--;<br>
>>> +- grub_printf ("\b");<br>
>>> ++ if (cur_len)<br>
>>> ++ {<br>
>>> ++ cur_len--;<br>
>>> ++ grub_printf ("\b");<br>
>>> ++ }<br>
>>> + continue;<br>
>>> + }<br>
>>> +<br>
>>> +--<br>
>>> +cgit v0.9.0.2<br>
>>> diff --git a/meta/recipes-bsp/grub/<a href="http://grub-efi_2.00.bb" rel="noreferrer" target="_blank">grub-efi_2.00.bb</a> b/meta/recipes-bsp/grub/<a href="http://grub-efi_2.00.bb" rel="noreferrer" target="_blank">grub-efi_2.00.bb</a><br>
>>> index 7674255..6822e7a 100644<br>
>>> --- a/meta/recipes-bsp/grub/<a href="http://grub-efi_2.00.bb" rel="noreferrer" target="_blank">grub-efi_2.00.bb</a><br>
>>> +++ b/meta/recipes-bsp/grub/<a href="http://grub-efi_2.00.bb" rel="noreferrer" target="_blank">grub-efi_2.00.bb</a><br>
>>> @@ -30,6 +30,7 @@ SRC_URI = "<a href="ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz" rel="noreferrer" target="_blank">ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz</a> \<br>
>>> file://grub-2.00-add-oe-kernel.patch \<br>
>>> file://grub-efi-fix-with-glibc-2.20.patch \<br>
>>> file://0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch \<br>
>>> + file://0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch \<br>
>>> "<br>
>>> SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"<br>
>>> SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"<br>
>>> diff --git a/meta/recipes-bsp/grub/<a href="http://grub_2.00.bb" rel="noreferrer" target="_blank">grub_2.00.bb</a> b/meta/recipes-bsp/grub/<a href="http://grub_2.00.bb" rel="noreferrer" target="_blank">grub_2.00.bb</a><br>
>>> index d4df676..94b6da9 100644<br>
>>> --- a/meta/recipes-bsp/grub/<a href="http://grub_2.00.bb" rel="noreferrer" target="_blank">grub_2.00.bb</a><br>
>>> +++ b/meta/recipes-bsp/grub/<a href="http://grub_2.00.bb" rel="noreferrer" target="_blank">grub_2.00.bb</a><br>
>>> @@ -25,6 +25,7 @@ SRC_URI = "<a href="ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz" rel="noreferrer" target="_blank">ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz</a> \<br>
>>> file://fix-endianness-problem.patch \<br>
>>> file://grub2-remove-sparc64-setup-from-x86-builds.patch \<br>
>>> file://0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch \<br>
>>> + file://0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch \<br>
>>> "<br>
>>><br>
>>> SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"<br>
>>> --<br>
>>> 1.9.1<br>
>>><br>
>>> --<br>
>>> _______________________________________________<br>
>>> Openembedded-core mailing list<br>
>>> <a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
>>> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
>><br>
>> --<br>
>> _______________________________________________<br>
>> Openembedded-core mailing list<br>
>> <a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
>> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
>><br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</div></div></blockquote></div><br></div></div>