domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

grub2: rebase patches

Browse Source 
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 9ffbe84ea4)
This commit is contained in:
Jo-Philipp Wich
2018-08-23 19:08:58 +02:00
parent a0569f5e81
commit a662d6f6bc
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package/boot/grub2/patches/300-CVE-2015-8370.patch
View File

@@ -16,11 +16,9 @@ Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
grub-core/normal/auth.c | 2 +- grub-core/normal/auth.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-) 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 --- a/grub-core/lib/crypto.c
+++ b/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; break;
} }
@@ -29,16 +27,14 @@ index ca334d5a40e..e6c78d16d39 100644
{ {
if (cur_len) if (cur_len)
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 --- a/grub-core/normal/auth.c
+++ b/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; break;
} }
- if (key == GRUB_TERM_BACKSPACE) - if (key == '\b')
+ if (key == GRUB_TERM_BACKSPACE && cur_len) + if (key == '\b' && cur_len)
{ {
if (cur_len) if (cur_len)
{ {