diff options
-rw-r--r-- | meta-oe/recipes-extended/libblockdev/files/CVE-2025-6019.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/libblockdev/files/CVE-2025-6019.patch b/meta-oe/recipes-extended/libblockdev/files/CVE-2025-6019.patch new file mode 100644 index 0000000000..4bca3f7564 --- /dev/null +++ b/meta-oe/recipes-extended/libblockdev/files/CVE-2025-6019.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From d92467589216059aff46f545a7c3eba594103ee3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Blume <Thomas.Blume@suse.com> | ||
3 | Date: Fri, 16 May 2025 14:27:10 +0200 | ||
4 | Subject: [PATCH] Don't allow suid and dev set on fs resize | ||
5 | |||
6 | Fixes: CVE-2025-6019 | ||
7 | |||
8 | CVE: CVE-2025-6019 | ||
9 | Upstream-Status: Backport [ https://github.com/storaged-project/libblockdev/commit/46b54414f66e965e3c37f8f51e621f96258ae22e ] | ||
10 | |||
11 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
12 | --- | ||
13 | src/plugins/fs/generic.c | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/plugins/fs/generic.c b/src/plugins/fs/generic.c | ||
17 | index eb6b5567..86051391 100644 | ||
18 | --- a/src/plugins/fs/generic.c | ||
19 | +++ b/src/plugins/fs/generic.c | ||
20 | @@ -409,7 +409,7 @@ static gboolean xfs_resize_device (const gchar *device, guint64 new_size, const | ||
21 | "before resizing it.", device); | ||
22 | return FALSE; | ||
23 | } | ||
24 | - ret = bd_fs_mount (device, mountpoint, "xfs", NULL, NULL, error); | ||
25 | + ret = bd_fs_mount (device, mountpoint, "xfs", "nosuid,nodev", NULL, error); | ||
26 | if (!ret) { | ||
27 | g_prefix_error (error, "Failed to mount '%s' before resizing it: ", device); | ||
28 | return FALSE; | ||
29 | -- | ||
30 | 2.34.1 | ||
31 | |||
diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb index 3e6df5689a..cb3fde288d 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb | |||
@@ -12,6 +12,7 @@ inherit autotools gobject-introspection pkgconfig | |||
12 | 12 | ||
13 | SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch;protocol=https \ | 13 | SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch;protocol=https \ |
14 | file://0001-lvm-Do-not-include-duplicate-entries-in-bd_lvm_lvs-o.patch \ | 14 | file://0001-lvm-Do-not-include-duplicate-entries-in-bd_lvm_lvs-o.patch \ |
15 | file://CVE-2025-6019.patch \ | ||
15 | " | 16 | " |
16 | SRCREV = "47ff12242c89e36a33259d18b7068b26c3bb1c64" | 17 | SRCREV = "47ff12242c89e36a33259d18b7068b26c3bb1c64" |
17 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |