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"
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 675410c3b3b1cf4523f02ab6e3128c39bd5d5101 Mon Sep 17 00:00:00 2001
|
|
From: Seung-Woo Kim <sw0312.kim@samsung.com>
|
|
Date: Tue, 13 Apr 2021 20:23:15 +0900
|
|
Subject: [PATCH] libkmod: fix possible double free with wrong
|
|
modules.builtin.modinfo
|
|
|
|
Conflict:NA
|
|
Reference:https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=675410c3b3b1cf4523f02ab6e3128c39bd5d5101
|
|
|
|
Fix double free for *modinfo with non '\0' terminated wrong
|
|
modules.builtin.modinfo, which is because EOF is minus value.
|
|
|
|
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
|
|
---
|
|
libkmod/libkmod-builtin.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/libkmod/libkmod-builtin.c b/libkmod/libkmod-builtin.c
|
|
index a75a542..a002cb5 100644
|
|
--- a/libkmod/libkmod-builtin.c
|
|
+++ b/libkmod/libkmod-builtin.c
|
|
@@ -313,7 +313,7 @@ ssize_t kmod_builtin_get_modinfo(struct kmod_ctx *ctx, const char *modname,
|
|
while (offset < iter->next) {
|
|
offset = get_string(iter, pos, &line, &linesz);
|
|
if (offset <= 0) {
|
|
- count = (offset) ? -errno : -EOF;
|
|
+ count = (offset) ? -errno : -EINVAL;
|
|
free(*modinfo);
|
|
goto fail;
|
|
}
|
|
--
|
|
2.23.0
|
|
|