diff options
| author | Rosen Penev <rosenp@gmail.com> | 2018-08-22 19:07:57 -0700 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-08-30 13:16:20 +0200 |
| commit | a0569f5e812bbe27d460085d7e4430a87c55bf95 (patch) | |
| tree | 69e57f4eb1f499170eae3244e7c38962beea43cb /package/boot | |
| parent | 30758ee10e82a06ac4ed65f15d4cd93989f23fe6 (diff) | |
| download | upstream-a0569f5e812bbe27d460085d7e4430a87c55bf95.tar.gz upstream-a0569f5e812bbe27d460085d7e4430a87c55bf95.tar.bz2 upstream-a0569f5e812bbe27d460085d7e4430a87c55bf95.zip | |
grub2: Fix CVE-2015-8370
This CVE is a culmination of multiple integer overflow issues that cause
multiple issues like Denial of Service and authentication bypass.
More info: https://nvd.nist.gov/vuln/detail/CVE-2015-8370
Taken from Fedora.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 7e73e9128f6a63b9198c88eea97c267810447be4)
Diffstat (limited to 'package/boot')
| -rw-r--r-- | package/boot/grub2/Makefile | 2 | ||||
| -rw-r--r-- | package/boot/grub2/patches/300-CVE-2015-8370.patch | 44 |
2 files changed, 45 insertions, 1 deletions
diff --git a/package/boot/grub2/Makefile b/package/boot/grub2/Makefile index b2ae171569..ba6032ba9d 100644 --- a/package/boot/grub2/Makefile +++ b/package/boot/grub2/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=grub PKG_CPE_ID:=cpe:/a:gnu:grub2 PKG_VERSION:=2.02 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/grub diff --git a/package/boot/grub2/patches/300-CVE-2015-8370.patch b/package/boot/grub2/patches/300-CVE-2015-8370.patch new file mode 100644 index 0000000000..11bc4340c0 --- /dev/null +++ b/package/boot/grub2/patches/300-CVE-2015-8370.patch @@ -0,0 +1,44 @@ +From 0000000000000000000000000000000000000000 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] 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 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) + 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 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) + break; + } + +- if (key == GRUB_TERM_BACKSPACE) ++ if (key == GRUB_TERM_BACKSPACE && cur_len) + { + if (cur_len) + { |