|
 |
8631a2 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
8631a2 |
From: Hector Marco-Gisbert <hecmargi@upv.es>
|
|
|
8631a2 |
Date: Fri, 13 Nov 2015 16:21:09 +0100
|
|
|
8631a2 |
Subject: [PATCH] Fix security issue when reading username and password
|
|
|
8631a2 |
|
|
|
8631a2 |
This patch fixes two integer underflows at:
|
|
|
8631a2 |
* grub-core/lib/crypto.c
|
|
|
8631a2 |
* grub-core/normal/auth.c
|
|
|
8631a2 |
|
|
|
8631a2 |
Resolves: CVE-2015-8370
|
|
|
8631a2 |
|
|
|
8631a2 |
Signed-off-by: Hector Marco-Gisbert <hecmargi@upv.es>
|
|
|
8631a2 |
Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
|
|
|
8631a2 |
---
|
|
|
8631a2 |
grub-core/lib/crypto.c | 2 +-
|
|
|
8631a2 |
grub-core/normal/auth.c | 2 +-
|
|
|
8631a2 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
8631a2 |
|
|
|
8631a2 |
diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
|
|
|
8631a2 |
index ca334d5a40e..e6c78d16d39 100644
|
|
|
8631a2 |
--- a/grub-core/lib/crypto.c
|
|
|
8631a2 |
+++ b/grub-core/lib/crypto.c
|
|
|
8631a2 |
@@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned buf_size)
|
|
|
8631a2 |
break;
|
|
|
8631a2 |
}
|
|
|
8631a2 |
|
|
|
8631a2 |
- if (key == '\b')
|
|
|
8631a2 |
+ if (key == '\b' && cur_len)
|
|
|
8631a2 |
{
|
|
|
8631a2 |
if (cur_len)
|
|
|
8631a2 |
cur_len--;
|
|
|
8631a2 |
diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
|
|
|
8631a2 |
index 6be678c0de1..c35ce972473 100644
|
|
|
8631a2 |
--- a/grub-core/normal/auth.c
|
|
|
8631a2 |
+++ b/grub-core/normal/auth.c
|
|
|
8631a2 |
@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size)
|
|
|
8631a2 |
break;
|
|
|
8631a2 |
}
|
|
|
8631a2 |
|
|
|
8631a2 |
- if (key == GRUB_TERM_BACKSPACE)
|
|
|
8631a2 |
+ if (key == GRUB_TERM_BACKSPACE && cur_len)
|
|
|
8631a2 |
{
|
|
|
8631a2 |
if (cur_len)
|
|
|
8631a2 |
{
|