aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/grub2
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-08-23 19:08:58 +0200
committerJo-Philipp Wich <jo@mein.io>2018-08-30 14:11:36 +0200
commita662d6f6bcdcfd42713d4f4dc2d30698e451d280 (patch)
treec1383ad6265ae72e7a70b7f360716bb0a1822e4d /package/boot/grub2
parenta0569f5e812bbe27d460085d7e4430a87c55bf95 (diff)
downloadupstream-a662d6f6bcdcfd42713d4f4dc2d30698e451d280.tar.gz
upstream-a662d6f6bcdcfd42713d4f4dc2d30698e451d280.tar.bz2
upstream-a662d6f6bcdcfd42713d4f4dc2d30698e451d280.zip
grub2: rebase patches
Patch 300-CVE-2015-8370.patch was added without proper rebasing on the version used by OpenWrt, make it apply and refresh the patch to fix compilation. Fixes: 7e73e9128f ("grub2: Fix CVE-2015-8370") Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit 9ffbe84ea49fc643f41bfdf687de99aee17c9154)
Diffstat (limited to 'package/boot/grub2')
-rw-r--r--package/boot/grub2/patches/300-CVE-2015-8370.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/package/boot/grub2/patches/300-CVE-2015-8370.patch b/package/boot/grub2/patches/300-CVE-2015-8370.patch
index 11bc4340c0..eb7919639a 100644
--- a/package/boot/grub2/patches/300-CVE-2015-8370.patch
+++ b/package/boot/grub2/patches/300-CVE-2015-8370.patch
@@ -16,11 +16,9 @@ Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
grub-core/normal/auth.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
-index ca334d5a40e..e6c78d16d39 100644
--- a/grub-core/lib/crypto.c
+++ b/grub-core/lib/crypto.c
-@@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned buf_size)
+@@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned
break;
}
@@ -29,16 +27,14 @@ index ca334d5a40e..e6c78d16d39 100644
{
if (cur_len)
cur_len--;
-diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
-index 6be678c0de1..c35ce972473 100644
--- a/grub-core/normal/auth.c
+++ b/grub-core/normal/auth.c
-@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size)
+@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned
break;
}
-- if (key == GRUB_TERM_BACKSPACE)
-+ if (key == GRUB_TERM_BACKSPACE && cur_len)
+- if (key == '\b')
++ if (key == '\b' && cur_len)
{
if (cur_len)
{