projects
/
openwrt
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
grub2: rebase patches
[openwrt/.git]
/
package
/
boot
/
grub2
/
patches
/
300-CVE-2015-8370.patch
diff --git
a/package/boot/grub2/patches/300-CVE-2015-8370.patch
b/package/boot/grub2/patches/300-CVE-2015-8370.patch
index 11bc4340c08d559ec00c8303740d4512f3cb1a12..eb7919639a895e1da9dc42410c9a07a31d22a073 100644
(file)
--- 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(-)
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
--- 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;
}
break;
}
@@
-29,16
+27,14
@@
index ca334d5a40e..e6c78d16d39 100644
{
if (cur_len)
cur_len--;
{
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
--- 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;
}
break;
}
-- if (key ==
GRUB_TERM_BACKSPACE
)
-+ if (key ==
GRUB_TERM_BACKSPACE
&& cur_len)
+- if (key ==
'\b'
)
++ if (key ==
'\b'
&& cur_len)
{
if (cur_len)
{
{
if (cur_len)
{