From: Luis Henriques <lhenriques@suse.de>
To: Peter Oberparleiter <oberpar@linux.ibm.com>
Cc: linux-kernel@vger.kernel.org, Luis Henriques <lhenriques@suse.de>
Subject: [RFC PATCH] gcov: add basic gcov_info validation to gcov initialization
Date: Wed, 2 Jun 2021 11:24:55 +0100 [thread overview]
Message-ID: <20210602102455.11724-1-lhenriques@suse.de> (raw)
In-Reply-To: <YLZYwgs5hyzFZMlw@suse.de>
Add a basic gcov_info struct validation helper to gcc to ensure we have
sane from the compiler.
Signed-off-by: Luis Henriques <lhenriques@suse.de>
---
Hi!
I know this won't really validate the gcov_info struct, but it will at
least prevent kernel crashes in simple scenarios (such as the one I'm
seeing with gcc 9.3.1).
Cheers,
--
Luis
kernel/gcov/gcc_4_7.c | 8 ++++++++
kernel/gcov/gcc_base.c | 5 +++++
kernel/gcov/gcov.h | 1 +
3 files changed, 14 insertions(+)
diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c
index 460c12b7dfea..028d9b94463d 100644
--- a/kernel/gcov/gcc_4_7.c
+++ b/kernel/gcov/gcc_4_7.c
@@ -126,6 +126,14 @@ struct gcov_info *gcov_info_next(struct gcov_info *info)
return info->next;
}
+bool gcov_info_is_valid(struct gcov_info *info)
+{
+ if (!info || !info->functions)
+ return false;
+
+ return true;
+}
+
/**
* gcov_info_link - link/add profiling data set to the list
* @info: profiling data set
diff --git a/kernel/gcov/gcc_base.c b/kernel/gcov/gcc_base.c
index 3cf736b9f880..3e02a89f69b6 100644
--- a/kernel/gcov/gcc_base.c
+++ b/kernel/gcov/gcc_base.c
@@ -13,6 +13,11 @@ void __gcov_init(struct gcov_info *info)
{
static unsigned int gcov_version;
+ if (!gcov_info_is_valid(info)) {
+ pr_err_once("Invalid gcov_info structure\n");
+ return;
+ }
+
mutex_lock(&gcov_lock);
if (gcov_version == 0) {
gcov_version = gcov_info_version(info);
diff --git a/kernel/gcov/gcov.h b/kernel/gcov/gcov.h
index 912b8ea01d33..4b3d924c2031 100644
--- a/kernel/gcov/gcov.h
+++ b/kernel/gcov/gcov.h
@@ -45,6 +45,7 @@ struct gcov_info;
const char *gcov_info_filename(struct gcov_info *info);
unsigned int gcov_info_version(struct gcov_info *info);
struct gcov_info *gcov_info_next(struct gcov_info *info);
+bool gcov_info_is_valid(struct gcov_info *info);
void gcov_info_link(struct gcov_info *info);
void gcov_info_unlink(struct gcov_info *prev, struct gcov_info *info);
bool gcov_info_within_module(struct gcov_info *info, struct module *mod);
next prev parent reply other threads:[~2021-06-02 15:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-01 15:56 gcov: NULL pointer dereference with gcc 9.3.1 Luis Henriques
2021-06-02 10:24 ` Luis Henriques [this message]
2021-06-07 9:59 ` [RFC PATCH] gcov: add basic gcov_info validation to gcov initialization Peter Oberparleiter
2021-06-07 10:48 ` Luis Henriques
2021-06-02 12:35 ` gcov: NULL pointer dereference with gcc 9.3.1 Peter Oberparleiter
2021-06-02 14:22 ` Luis Henriques
2021-06-07 14:32 ` Peter Oberparleiter
2021-06-08 12:46 ` Luis Henriques
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=20210602102455.11724-1-lhenriques@suse.de \
--to=lhenriques@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=oberpar@linux.ibm.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
all inboxes | Powered by JetHome®