linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "tip-bot2 for Josh Poimboeuf" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com>,
	Josh Poimboeuf <jpoimboe@redhat.com>,
	Borislav Petkov <bp@suse.de>, x86 <x86@kernel.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/urgent] objtool: Make BP scratch register warning more robust
Date: Tue, 14 Apr 2020 10:34:01 -0000	[thread overview]
Message-ID: <158686044154.28353.9906241096479989820.tip-bot2@tip-bot2> (raw)
In-Reply-To: <afc628693a37acd287e843bcc5c0430263d93c74.1585761021.git.jpoimboe@redhat.com>

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     b296695298d8632d8b703ac25fe70be34a07c0d9
Gitweb:        https://git.kernel.org/tip/b296695298d8632d8b703ac25fe70be34a07c0d9
Author:        Josh Poimboeuf <jpoimboe@redhat.com>
AuthorDate:    Wed, 01 Apr 2020 13:23:29 -05:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Tue, 14 Apr 2020 12:24:22 +02:00

objtool: Make BP scratch register warning more robust

If func is NULL, a seg fault can result.

This is a theoretical issue which was found by Coverity, ID: 1492002
("Dereference after null check").

Fixes: c705cecc8431 ("objtool: Track original function across branches")
Reported-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/afc628693a37acd287e843bcc5c0430263d93c74.1585761021.git.jpoimboe@redhat.com
---
 tools/objtool/check.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index cb2d299..4b170fd 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2005,8 +2005,8 @@ static int validate_return(struct symbol *func, struct instruction *insn, struct
 	}
 
 	if (state->bp_scratch) {
-		WARN("%s uses BP as a scratch register",
-		     func->name);
+		WARN_FUNC("BP used as a scratch register",
+			  insn->sec, insn->offset);
 		return 1;
 	}
 

  reply	other threads:[~2020-04-14 10:56 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-01 18:23 [PATCH 0/5] objtool fixes Josh Poimboeuf
2020-04-01 18:23 ` [PATCH 1/5] objtool: Fix CONFIG_UBSAN_TRAP unreachable warnings Josh Poimboeuf
2020-04-02  7:30   ` Kees Cook
2020-04-14 10:34   ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2020-04-01 18:23 ` [PATCH 2/5] objtool: Support Clang non-section symbols in ORC dump Josh Poimboeuf
2020-04-14 10:34   ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2020-04-01 18:23 ` [PATCH 3/5] objtool: Support Clang non-section symbols in ORC generation Josh Poimboeuf
2020-04-01 18:49   ` Peter Zijlstra
2020-04-01 19:05     ` Josh Poimboeuf
2020-04-01 19:08       ` Josh Poimboeuf
2020-04-03  8:58   ` Miroslav Benes
2020-04-03 14:58     ` Josh Poimboeuf
2020-04-14 10:34   ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2020-04-01 18:23 ` [PATCH 4/5] objtool: Fix switch table detection in .text.unlikely Josh Poimboeuf
2020-04-14 10:34   ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2020-04-01 18:23 ` [PATCH 5/5] objtool: Make BP scratch register warning more robust Josh Poimboeuf
2020-04-14 10:34   ` tip-bot2 for Josh Poimboeuf [this message]
2020-04-02 14:28 ` [PATCH 0/5] objtool fixes Peter Zijlstra
2020-04-03  9:00 ` Miroslav Benes
2020-04-09 13:53 ` Josh Poimboeuf

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=158686044154.28353.9906241096479989820.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bp@suse.de \
    --cc=gustavo@embeddedor.com \
    --cc=jpoimboe@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=x86@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;
as well as URLs for NNTP newsgroup(s).