diff options
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux/8a3a74160b96498d672e3652827aa7e6d7f3a120.patch')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/8a3a74160b96498d672e3652827aa7e6d7f3a120.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/8a3a74160b96498d672e3652827aa7e6d7f3a120.patch b/meta/recipes-core/util-linux/util-linux/8a3a74160b96498d672e3652827aa7e6d7f3a120.patch new file mode 100644 index 0000000000..a5bb00ab65 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/8a3a74160b96498d672e3652827aa7e6d7f3a120.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 8a3a74160b96498d672e3652827aa7e6d7f3a120 Mon Sep 17 00:00:00 2001 | ||
2 | From: Karel Zak <kzak@redhat.com> | ||
3 | Date: Tue, 15 Jun 2021 12:04:43 +0200 | ||
4 | Subject: [PATCH] mkswap: fix holes detection (infinite loop and/or | ||
5 | stack-buffer-underflow) | ||
6 | |||
7 | Reported-by: Brian Lane <bcl@redhat.com> | ||
8 | Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1971877 | ||
9 | Fix: https://github.com/karelzak/util-linux/issues/1348 | ||
10 | Signed-off-by: Karel Zak <kzak@redhat.com> | ||
11 | Upstream-Status: Backport | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | --- | ||
14 | disk-utils/mkswap.c | 2 ++ | ||
15 | 1 file changed, 2 insertions(+) | ||
16 | |||
17 | diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c | ||
18 | index 27374fd72..c45a3a317 100644 | ||
19 | --- a/disk-utils/mkswap.c | ||
20 | +++ b/disk-utils/mkswap.c | ||
21 | @@ -267,6 +267,8 @@ static void check_extents(struct mkswap_control *ctl) | ||
22 | return; | ||
23 | |||
24 | n = fiemap->fm_mapped_extents; | ||
25 | + if (n == 0) | ||
26 | + break; | ||
27 | |||
28 | for (i = 0; i < n; i++) { | ||
29 | struct fiemap_extent *e = &fiemap->fm_extents[i]; | ||