linux-kernel - [tip:x86/alternatives] jump_label: Add the jump_label_can_update

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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-41bef31d0abe29b5888b33b526cacc8a30795318@git.kernel.org>
Date:   Fri, 19 Apr 2019 11:37:24 -0700
From:   tip-bot for Daniel Bristot de Oliveira <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     jkosina@...e.cz, linux-kernel@...r.kernel.org, jbaron@...mai.com,
        mhiramat@...nel.org, dvlasenk@...hat.com, bristot@...hat.com,
        mingo@...nel.org, hpa@...or.com, brgerst@...il.com,
        swood@...hat.com, peterz@...radead.org, acme@...hat.com,
        luto@...nel.org, alexander.shishkin@...ux.intel.com,
        jpoimboe@...hat.com, crecklin@...hat.com, tglx@...utronix.de,
        jolsa@...hat.com, rostedt@...dmis.org,
        torvalds@...ux-foundation.org, williams@...hat.com,
        gregkh@...uxfoundation.org, mtosatti@...hat.com, bp@...en8.de
Subject: [tip:x86/alternatives] jump_label: Add the
 jump_label_can_update_check() helper

Commit-ID:  41bef31d0abe29b5888b33b526cacc8a30795318
Gitweb:     https://git.kernel.org/tip/41bef31d0abe29b5888b33b526cacc8a30795318
Author:     Daniel Bristot de Oliveira <bristot@...hat.com>
AuthorDate: Fri, 21 Dec 2018 11:27:27 +0100
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Fri, 19 Apr 2019 19:37:34 +0200

jump_label: Add the jump_label_can_update_check() helper

Move the check of if a jump_entry is valid to a specific function. No
functional change.

Signed-off-by: Daniel Bristot de Oliveira <bristot@...hat.com>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Andy Lutomirski <luto@...nel.org>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Chris von Recklinghausen <crecklin@...hat.com>
Cc: Clark Williams <williams@...hat.com>
Cc: Denys Vlasenko <dvlasenk@...hat.com>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Jason Baron <jbaron@...mai.com>
Cc: Jiri Kosina <jkosina@...e.cz>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Josh Poimboeuf <jpoimboe@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Marcelo Tosatti <mtosatti@...hat.com>
Cc: Masami Hiramatsu <mhiramat@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Scott Wood <swood@...hat.com>
Cc: Steven Rostedt (VMware) <rostedt@...dmis.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/1e758cd3b2206be96091a57a17b26585e94792b6.1545228276.git.bristot@redhat.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 kernel/jump_label.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index 288d630da22d..456c0d7cbb5b 100644
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@ -374,22 +374,32 @@ static enum jump_label_type jump_label_type(struct jump_entry *entry)
 	return enabled ^ branch;
 }
 
+bool jump_label_can_update_check(struct jump_entry *entry, bool init)
+{
+	/*
+	 * An entry->code of 0 indicates an entry which has been
+	 * disabled because it was in an init text area.
+	 */
+	if (init || !jump_entry_is_init(entry)) {
+		if (!kernel_text_address(jump_entry_code(entry))) {
+			WARN_ONCE(1, "can't patch jump_label at %pS",
+				  (void *)jump_entry_code(entry));
+			return 0;
+		}
+		return 1;
+	}
+	return 0;
+}
+
 static void __jump_label_update(struct static_key *key,
 				struct jump_entry *entry,
 				struct jump_entry *stop,
 				bool init)
 {
 	for_each_label_entry(key, entry, stop) {
-		/*
-		 * An entry->code of 0 indicates an entry which has been
-		 * disabled because it was in an init text area.
-		 */
-		if (init || !jump_entry_is_init(entry)) {
-			if (kernel_text_address(jump_entry_code(entry)))
-				arch_jump_label_transform(entry, jump_label_type(entry));
-			else
-				WARN_ONCE(1, "can't patch jump_label at %pS",
-					  (void *)jump_entry_code(entry));
+		if (jump_label_can_update_check(entry, init)) {
+			arch_jump_label_transform(entry,
+						  jump_label_type(entry));
 		}
 	}
 }