d5cdeeba4c
libkmod-module:check "new_from_name" return value in get_builtin libkmod:fix possible double free with wrong modules.buildin.modinfo libkmod:fix an overflow with wrong modules.builtin.modinfo libkmod-config:fix a memory leak when kmod_list_append() fails Fix "modinfo -F always shows name for built-ins"
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 64541d6aad210879e104e4796beeef49d4311f6d Mon Sep 17 00:00:00 2001
|
|
From: Yauheni Kaliuta <ykaliuta@redhat.com>
|
|
Date: Tue, 8 Jun 2021 09:29:22 +0300
|
|
Subject: [PATCH] libkmod-module: check "new_from_name" return value in
|
|
get_builtin
|
|
|
|
Conflict:NA
|
|
Reference:https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=64541d6aad210879e104e4796beeef49d4311f6d
|
|
|
|
kmod_module_new_from_name() may fail and return error value. It is
|
|
handled properly across the code, but in this particular place the
|
|
check is missing.
|
|
|
|
Signed-off-by: Yauheni Kaliuta <ykaliuta@redhat.com>
|
|
---
|
|
libkmod/libkmod-module.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
|
|
index b6320cc..6e0ff1a 100644
|
|
--- a/libkmod/libkmod-module.c
|
|
+++ b/libkmod/libkmod-module.c
|
|
@@ -2912,7 +2912,10 @@ int kmod_module_get_builtin(struct kmod_ctx *ctx, struct kmod_list **list)
|
|
goto fail;
|
|
}
|
|
|
|
- kmod_module_new_from_name(ctx, modname, &mod);
|
|
+ err = kmod_module_new_from_name(ctx, modname, &mod);
|
|
+ if (err < 0)
|
|
+ goto fail;
|
|
+
|
|
kmod_module_set_builtin(mod, true);
|
|
|
|
*list = kmod_list_append(*list, mod);
|
|
--
|
|
2.23.0
|
|
|