67 lines
1.8 KiB
Diff
67 lines
1.8 KiB
Diff
From 559980c2e1dea1082949c17d52794c43c35f40ce Mon Sep 17 00:00:00 2001
|
|
From: liuchao173 <liuchao173@huawei.com>
|
|
Date: Thu, 7 Nov 2019 09:35:42 +0000
|
|
Subject: [PATCH 7/8] backport: fix the problem of banmod that memory is freed
|
|
before using
|
|
|
|
Currently strdupa() is used to allocate memory for irq_info's name in
|
|
collect_full_irq_list(), we know that it allocate memory from stack,
|
|
when the invoking function return, the memory will be freed. so if the
|
|
irq_info's name is invalid, it will lead to check_for_module_ban() no
|
|
correct.
|
|
|
|
check_for_irq_ban
|
|
check_for_module_ban(res->name) // res->name is not valid
|
|
|
|
Use strdup() instead of strdupa(), and free the memory of irq_info's
|
|
name before freeing the irq_info.
|
|
|
|
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
|
|
---
|
|
classify.c | 9 ++++++++-
|
|
procinterrupts.c | 2 +-
|
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/classify.c b/classify.c
|
|
index 3136fc3..ed3f3ba 100644
|
|
--- a/classify.c
|
|
+++ b/classify.c
|
|
@@ -748,6 +748,13 @@ static void add_missing_irq(struct irq_info *info, void *attr)
|
|
add_new_irq(info->irq, info, proc_interrupts);
|
|
}
|
|
|
|
+static void free_tmp_irqs(gpointer data)
|
|
+{
|
|
+ struct irq_info *info = data;
|
|
+
|
|
+ free(info->name);
|
|
+ free(info);
|
|
+}
|
|
|
|
void rebuild_irq_db(void)
|
|
{
|
|
@@ -777,7 +784,7 @@ void rebuild_irq_db(void)
|
|
|
|
for_each_irq(tmp_irqs, add_missing_irq, interrupts_db);
|
|
|
|
- g_list_free_full(tmp_irqs, free);
|
|
+ g_list_free_full(tmp_irqs, free_tmp_irqs);
|
|
|
|
}
|
|
|
|
diff --git a/procinterrupts.c b/procinterrupts.c
|
|
index 87fae2f..11fe1bc 100644
|
|
--- a/procinterrupts.c
|
|
+++ b/procinterrupts.c
|
|
@@ -228,7 +228,7 @@ GList* collect_full_irq_list()
|
|
info->class = IRQ_OTHER;
|
|
#endif
|
|
}
|
|
- info->name = strdupa(irq_mod);
|
|
+ info->name = strdup(irq_mod);
|
|
tmp_list = g_list_append(tmp_list, info);
|
|
}
|
|
free(savedline);
|
|
--
|
|
2.19.1
|