summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2023-03-06 21:57:43 +0000
committerMarek Szuba <marecki@gentoo.org>2023-03-06 22:06:05 +0000
commit3d5d8540cfb53f55d192ff0867ba4d96b14062a5 (patch)
tree36f25f4355b3436347b57aa65b4cb119c16b247d /sys-apps/fwupd/files
parentapp-admin/ansible-lint: add 6.14.0 (diff)
downloadgentoo-3d5d8540cfb53f55d192ff0867ba4d96b14062a5.tar.gz
gentoo-3d5d8540cfb53f55d192ff0867ba4d96b14062a5.tar.bz2
gentoo-3d5d8540cfb53f55d192ff0867ba4d96b14062a5.zip
sys-apps/fwupd: backport the 2nd part of fwupdtool get-devices segfault fix
Closes: https://bugs.gentoo.org/895716 Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'sys-apps/fwupd/files')
-rw-r--r--sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch b/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch
new file mode 100644
index 000000000000..42d5915397b8
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch
@@ -0,0 +1,19 @@
+From 7e502cf7d3da00a978201455f3a3799ae4aded75 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 6 Mar 2023 16:56:05 +0000
+Subject: [PATCH] Fix a critical warning when parsing an empty kernel cmdline
+
+Fix the bounds check so we never pass a bufsz of zero to fu_strsplit().
+
+Resolves: https://github.com/fwupd/fwupd/issues/5575
+--- a/libfwupdplugin/fu-kernel.c
++++ b/libfwupdplugin/fu-kernel.c
+@@ -253,7 +253,7 @@ fu_kernel_get_cmdline(GError **error)
+ if (!g_file_get_contents("/proc/cmdline", &buf, &bufsz, error))
+ return NULL;
+ hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+- if (bufsz > 0) {
++ if (bufsz > 1) {
+ g_auto(GStrv) tokens = fu_strsplit(buf, bufsz - 1, " ", -1);
+ for (guint i = 0; tokens[i] != NULL; i++) {
+ g_auto(GStrv) kv = NULL;