From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>,
Abaci Robot <abaci@linux.alibaba.com>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 5.11 08/22] ftrace: Check if pages were allocated before calling free_pages()
Date: Mon, 5 Apr 2021 12:03:51 -0400 [thread overview]
Message-ID: <20210405160406.268132-8-sashal@kernel.org> (raw)
In-Reply-To: <20210405160406.268132-1-sashal@kernel.org>
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
[ Upstream commit 59300b36f85f254260c81d9dd09195fa49eb0f98 ]
It is possible that on error pg->size can be zero when getting its order,
which would return a -1 value. It is dangerous to pass in an order of -1
to free_pages(). Check if order is greater than or equal to zero before
calling free_pages().
Link: https://lore.kernel.org/lkml/20210330093916.432697c7@gandalf.local.home/
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
kernel/trace/ftrace.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index b7e29db127fa..3ba52d4e1314 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -3231,7 +3231,8 @@ ftrace_allocate_pages(unsigned long num_to_init)
pg = start_pg;
while (pg) {
order = get_count_order(pg->size / ENTRIES_PER_PAGE);
- free_pages((unsigned long)pg->records, order);
+ if (order >= 0)
+ free_pages((unsigned long)pg->records, order);
start_pg = pg->next;
kfree(pg);
pg = start_pg;
@@ -6451,7 +6452,8 @@ void ftrace_release_mod(struct module *mod)
clear_mod_from_hashes(pg);
order = get_count_order(pg->size / ENTRIES_PER_PAGE);
- free_pages((unsigned long)pg->records, order);
+ if (order >= 0)
+ free_pages((unsigned long)pg->records, order);
tmp_page = pg->next;
kfree(pg);
ftrace_number_of_pages -= 1 << order;
@@ -6811,7 +6813,8 @@ void ftrace_free_mem(struct module *mod, void *start_ptr, void *end_ptr)
if (!pg->index) {
*last_pg = pg->next;
order = get_count_order(pg->size / ENTRIES_PER_PAGE);
- free_pages((unsigned long)pg->records, order);
+ if (order >= 0)
+ free_pages((unsigned long)pg->records, order);
ftrace_number_of_pages -= 1 << order;
ftrace_number_of_groups--;
kfree(pg);
--
2.30.2
next prev parent reply other threads:[~2021-04-05 16:04 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-05 16:03 [PATCH AUTOSEL 5.11 01/22] interconnect: core: fix error return code of icc_link_destroy() Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 02/22] gfs2: Flag a withdraw if init_threads() fails Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 03/22] KVM: arm64: Hide system instruction access to Trace registers Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 04/22] KVM: arm64: Disable guest access to trace filter controls Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 05/22] drm/imx: imx-ldb: fix out of bounds array access warning Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 06/22] gfs2: report "already frozen/thawed" errors Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 07/22] scsi: iscsi: Fix race condition between login and sync thread Sasha Levin
2021-04-05 16:03 ` Sasha Levin [this message]
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 09/22] tools/kvm_stat: Add restart delay Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 10/22] drm/tegra: dc: Don't set PLL clock to 0Hz Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 11/22] gpu: host1x: Use different lock classes for each client Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 12/22] XArray: Fix splitting to non-zero orders Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 13/22] radix tree test suite: Fix compilation Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 14/22] block: only update parent bi_status when bio fail Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 15/22] radix tree test suite: Register the main thread with the RCU library Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 16/22] idr test suite: Take RCU read lock in idr_find_test_1 Sasha Levin
2021-04-05 16:04 ` [PATCH AUTOSEL 5.11 17/22] idr test suite: Create anchor before launching throbber Sasha Levin
2021-04-05 16:04 ` [PATCH AUTOSEL 5.11 18/22] null_blk: fix command timeout completion handling Sasha Levin
2021-04-05 16:04 ` [PATCH AUTOSEL 5.11 19/22] io_uring: don't mark S_ISBLK async work as unbounded Sasha Levin
2021-04-05 16:04 ` [PATCH AUTOSEL 5.11 20/22] riscv: evaluate put_user() arg before enabling user access Sasha Levin
2021-04-05 16:04 ` [PATCH AUTOSEL 5.11 21/22] riscv,entry: fix misaligned base for excp_vect_table Sasha Levin
2021-04-05 16:04 ` [PATCH AUTOSEL 5.11 22/22] block: don't ignore REQ_NOWAIT for direct IO Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210405160406.268132-8-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=abaci@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox