1 |
commit: 57ae9d389abac8b9ed262673172e5212dbe11dbc |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 26 09:52:16 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 26 09:52:30 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ae9d38 |
7 |
|
8 |
sys-apps/util-linux: Fixed heap-use-after-free in lsblk |
9 |
|
10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
...ux-2.34_rc1-lsblk_fix_heap_use_after_free.patch | 23 ++++++++++++++++++++++ |
14 |
sys-apps/util-linux/util-linux-2.34_rc1.ebuild | 1 + |
15 |
2 files changed, 24 insertions(+) |
16 |
|
17 |
diff --git a/sys-apps/util-linux/files/util-linux-2.34_rc1-lsblk_fix_heap_use_after_free.patch b/sys-apps/util-linux/files/util-linux-2.34_rc1-lsblk_fix_heap_use_after_free.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..41291205c5a |
20 |
--- /dev/null |
21 |
+++ b/sys-apps/util-linux/files/util-linux-2.34_rc1-lsblk_fix_heap_use_after_free.patch |
22 |
@@ -0,0 +1,23 @@ |
23 |
+From f6f8a671a9a45125b6261c08b849833bce0f39a8 Mon Sep 17 00:00:00 2001 |
24 |
+From: Karel Zak <kzak@××××××.com> |
25 |
+Date: Mon, 6 May 2019 12:39:07 +0200 |
26 |
+Subject: [PATCH] lsblk: fix heap-use-after-free |
27 |
+ |
28 |
+Addresses: https://github.com/karelzak/util-linux/issues/787 |
29 |
+Signed-off-by: Karel Zak <kzak@××××××.com> |
30 |
+--- |
31 |
+ misc-utils/lsblk.c | 1 + |
32 |
+ 1 file changed, 1 insertion(+) |
33 |
+ |
34 |
+diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c |
35 |
+index 34a6cd9ca..30d5d9b4e 100644 |
36 |
+--- a/misc-utils/lsblk.c |
37 |
++++ b/misc-utils/lsblk.c |
38 |
+@@ -1560,6 +1560,7 @@ static int process_all_devices(struct lsblk_devtree *tr) |
39 |
+ if (is_maj_excluded(dev->maj) || !is_maj_included(dev->maj)) { |
40 |
+ DBG(DEV, ul_debug(" %s: ignore (by filter)", d->d_name)); |
41 |
+ lsblk_devtree_remove_device(tr, dev); |
42 |
++ dev = NULL; |
43 |
+ goto next; |
44 |
+ } |
45 |
+ |
46 |
|
47 |
diff --git a/sys-apps/util-linux/util-linux-2.34_rc1.ebuild b/sys-apps/util-linux/util-linux-2.34_rc1.ebuild |
48 |
index b222e422b0f..e45b41732ad 100644 |
49 |
--- a/sys-apps/util-linux/util-linux-2.34_rc1.ebuild |
50 |
+++ b/sys-apps/util-linux/util-linux-2.34_rc1.ebuild |
51 |
@@ -64,6 +64,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
52 |
S="${WORKDIR}/${MY_P}" |
53 |
|
54 |
PATCHES=( |
55 |
+ "${FILESDIR}"/${P}-lsblk_fix_heap_use_after_free.patch |
56 |
"${FILESDIR}"/${P}-lscpu_floating_point_exception_fix.patch |
57 |
) |