mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 22:35:28 +00:00
35f33eadc0
- Revert TPM patches, they break some x86 platforms and ppc64 Resolves: rhbz#1334075 Resolves: rhbz#1334672 - Chainloading on EFI doesn't work with some bootloaders Resolves: rhbz#1320273 Signed-off-by: Peter Jones <pjones@redhat.com>
47 lines
1.2 KiB
Diff
47 lines
1.2 KiB
Diff
From 5a0d703884a73f93a68753c6ed64bdf08797c82a Mon Sep 17 00:00:00 2001
|
|
From: Hector Marco-Gisbert <hecmargi@upv.es>
|
|
Date: Fri, 13 Nov 2015 16:21:09 +0100
|
|
Subject: [PATCH 72/80] Fix security issue when reading username and password
|
|
|
|
This patch fixes two integer underflows at:
|
|
* grub-core/lib/crypto.c
|
|
* grub-core/normal/auth.c
|
|
|
|
Resolves: CVE-2015-8370
|
|
|
|
Signed-off-by: Hector Marco-Gisbert <hecmargi@upv.es>
|
|
Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
|
|
---
|
|
grub-core/lib/crypto.c | 2 +-
|
|
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 683a8aa..c5ab9eb 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)
|
|
break;
|
|
}
|
|
|
|
- if (key == '\b')
|
|
+ if (key == '\b' && cur_len)
|
|
{
|
|
if (cur_len)
|
|
cur_len--;
|
|
diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
|
|
index 7338f82..6d6dc7d 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)
|
|
break;
|
|
}
|
|
|
|
- if (key == '\b')
|
|
+ if (key == '\b' && cur_len)
|
|
{
|
|
if (cur_len)
|
|
{
|
|
--
|
|
2.7.4
|
|
|