linux-kernel - [tip: objtool/core] objtool: Use arch specific values in restore

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <158759428931.28353.13335784773110278925.tip-bot2@tip-bot2>
Date:   Wed, 22 Apr 2020 22:24:49 -0000
From:   "tip-bot2 for Julien Thierry" <tip-bot2@...utronix.de>
To:     linux-tip-commits@...r.kernel.org
Cc:     Raphael Gault <raphael.gault@....com>,
        Julien Thierry <jthierry@...hat.com>,
        "Peter Zijlstra (Intel)" <peterz@...radead.org>,
        Miroslav Benes <mbenes@...e.cz>,
        Josh Poimboeuf <jpoimboe@...hat.com>, x86 <x86@...nel.org>,
        LKML <linux-kernel@...r.kernel.org>
Subject: [tip: objtool/core] objtool: Use arch specific values in restore_reg()

The following commit has been merged into the objtool/core branch of tip:

Commit-ID:     da99afd93ae2dfbe99b1989b86b38b3f6976ee27
Gitweb:        https://git.kernel.org/tip/da99afd93ae2dfbe99b1989b86b38b3f6976ee27
Author:        Julien Thierry <jthierry@...hat.com>
AuthorDate:    Fri, 27 Mar 2020 15:28:43 
Committer:     Josh Poimboeuf <jpoimboe@...hat.com>
CommitterDate: Tue, 14 Apr 2020 10:39:25 -05:00

objtool: Use arch specific values in restore_reg()

The initial register state is set up by arch specific code. Use the
value the arch code has set when restoring registers from the stack.

Suggested-by: Raphael Gault <raphael.gault@....com>
Signed-off-by: Julien Thierry <jthierry@...hat.com>
Acked-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Reviewed-by: Miroslav Benes <mbenes@...e.cz>
Signed-off-by: Josh Poimboeuf <jpoimboe@...hat.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 34b3d7b..5044f4c 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1504,8 +1504,8 @@ static void save_reg(struct insn_state *state, unsigned char reg, int base,
 
 static void restore_reg(struct insn_state *state, unsigned char reg)
 {
-	state->regs[reg].base = CFI_UNDEFINED;
-	state->regs[reg].offset = 0;
+	state->regs[reg].base = initial_func_cfi.regs[reg].base;
+	state->regs[reg].offset = initial_func_cfi.regs[reg].offset;
 }
 
 /*