linux-kernel - [PATCH] livepatch: change the error message in asm/livepatch.h header files

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

Message-Id: <1452767753-26622-1-git-send-email-mbenes@suse.cz>
Date:	Thu, 14 Jan 2016 11:35:53 +0100
From:	Miroslav Benes <mbenes@...e.cz>
To:	jpoimboe@...hat.com, sjenning@...hat.com, jikos@...nel.org,
	vojtech@...e.com
Cc:	pmladek@...e.cz, linux-kernel@...r.kernel.org,
	live-patching@...r.kernel.org, akpm@...ux-foundation.org,
	Miroslav Benes <mbenes@...e.cz>
Subject: [PATCH] livepatch: change the error message in asm/livepatch.h header files

If anyone includes asm/livepatch.h when CONFIG_LIVEPATCH=n the build
fails with the existing error message. Change to it to something saner.

Suggested-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Miroslav Benes <mbenes@...e.cz>
---
 arch/s390/include/asm/livepatch.h | 2 +-
 arch/x86/include/asm/livepatch.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/s390/include/asm/livepatch.h b/arch/s390/include/asm/livepatch.h
index 7aa799134a11..a52b6cca873d 100644
--- a/arch/s390/include/asm/livepatch.h
+++ b/arch/s390/include/asm/livepatch.h
@@ -37,7 +37,7 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)
 	regs->psw.addr = ip;
 }
 #else
-#error Live patching support is disabled; check CONFIG_LIVEPATCH
+#error Include linux/livepatch.h, not asm/livepatch.h
 #endif
 
 #endif
diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h
index 19c099afa861..e795f5274217 100644
--- a/arch/x86/include/asm/livepatch.h
+++ b/arch/x86/include/asm/livepatch.h
@@ -41,7 +41,7 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)
 	regs->ip = ip;
 }
 #else
-#error Live patching support is disabled; check CONFIG_LIVEPATCH
+#error Include linux/livepatch.h, not asm/livepatch.h
 #endif
 
 #endif /* _ASM_X86_LIVEPATCH_H */
-- 
2.1.4