From: Jarmo Tiitto <jarmo.tiitto@gmail.com>
To: Sami Tolvanen <samitolvanen@google.com>,
Bill Wendling <wcw@google.com>, Kees Cook <keescook@chromium.org>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
clang-built-linux@googlegroups.com, linux-kernel@vger.kernel.org
Cc: Jarmo Tiitto <jarmo.tiitto@gmail.com>, morbo@google.com
Subject: [PATCH 1/1] pgo: Fix allocate_node() handling of non-vmlinux nodes.
Date: Wed, 2 Jun 2021 03:57:04 +0300 [thread overview]
Message-ID: <20210602005702.9650-2-jarmo.tiitto@gmail.com> (raw)
In-Reply-To: <20210602005702.9650-1-jarmo.tiitto@gmail.com>
Currently allocate_node() will reserve nodes even if *p
doesn't point into __llvm_prf_data_start - __llvm_prf_data_end
range.
Fix it by checking if p points into vmlinux range
and otherwise return NULL.
Signed-off-by: Jarmo Tiitto <jarmo.tiitto@gmail.com>
---
kernel/pgo/instrument.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/pgo/instrument.c b/kernel/pgo/instrument.c
index 0e07ee1b17d9..9bca535dfa91 100644
--- a/kernel/pgo/instrument.c
+++ b/kernel/pgo/instrument.c
@@ -55,6 +55,10 @@ void prf_unlock(unsigned long flags)
static struct llvm_prf_value_node *allocate_node(struct llvm_prf_data *p,
u32 index, u64 value)
{
+ /* check if p points into vmlinux. If not, don't allocate. */
+ if (p < __llvm_prf_data_start || p >= __llvm_prf_data_end)
+ return NULL;
+
if (&__llvm_prf_vnds_start[current_node + 1] >= __llvm_prf_vnds_end)
return NULL; /* Out of nodes */
--
2.31.1
next prev parent reply other threads:[~2021-06-02 1:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-02 0:57 [PATCH 0/1] pgo: Fix allocate_node() handling of non-vmlinux nodes Jarmo Tiitto
2021-06-02 0:57 ` Jarmo Tiitto [this message]
2021-06-02 17:41 ` [PATCH 1/1] " Kees Cook
2021-06-02 18:52 ` jarmo.tiitto
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=20210602005702.9650-2-jarmo.tiitto@gmail.com \
--to=jarmo.tiitto@gmail.com \
--cc=clang-built-linux@googlegroups.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=morbo@google.com \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=samitolvanen@google.com \
--cc=wcw@google.com \
/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