diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-08-23 19:08:58 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-08-30 14:10:54 +0200 |
| commit | 2252731af43d0be32deff42ab77aed7458cee34d (patch) | |
| tree | 3898273d64a2d9e367ad5593582820d8d67b7931 | |
| parent | d3e325dfeffd0b407972e6716d5fd5c8acb6c962 (diff) | |
| download | openwrt-2252731af43d0be32deff42ab77aed7458cee34d.tar.gz openwrt-2252731af43d0be32deff42ab77aed7458cee34d.tar.bz2 openwrt-2252731af43d0be32deff42ab77aed7458cee34d.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)
| -rw-r--r-- | package/boot/grub2/patches/300-CVE-2015-8370.patch | 12 |
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) { |