linux-kernel - [PATCH v4 2/4] util: Move type casts into is_kernel

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]

Date:   Fri, 16 Dec 2016 14:06:22 -0800
From:   Kees Cook <keescook@...omium.org>
To:     kernel-hardening@...ts.openwall.com
Cc:     Kees Cook <keescook@...omium.org>,
        Emese Revfy <re.emese@...il.com>, linux-kernel@...r.kernel.org,
        Arnd Bergmann <arnd@...db.de>,
        Josh Triplett <josh@...htriplett.org>, pageexec@...email.hu,
        spender@...ecurity.net, mmarek@...e.com,
        yamada.masahiro@...ionext.com, linux-kbuild@...r.kernel.org,
        minipli@...linux.so, linux@...linux.org.uk,
        catalin.marinas@....com, linux@...musvillemoes.dk,
        david.brown@...aro.org, benh@...nel.crashing.org,
        tglx@...utronix.de, akpm@...ux-foundation.org,
        jlayton@...chiereds.net, sam@...nborg.org
Subject: [PATCH v4 2/4] util: Move type casts into is_kernel_rodata

From: Emese Revfy <re.emese@...il.com>

This moves type casts into the is_kernel_rodata() function itself so that
parameters can be marked as "nocapture" in the coming initify gcc plugin.

Signed-off-by: Emese Revfy <re.emese@...il.com>
[kees: expanded commit message]
Signed-off-by: Kees Cook <keescook@...omium.org>
---
 mm/util.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mm/util.c b/mm/util.c
index 1a41553db866..5606c6b74eee 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -17,10 +17,10 @@
 
 #include "internal.h"
 
-static inline int is_kernel_rodata(unsigned long addr)
+static inline int is_kernel_rodata(const void *addr)
 {
-	return addr >= (unsigned long)__start_rodata &&
-		addr < (unsigned long)__end_rodata;
+	return (unsigned long)addr >= (unsigned long)__start_rodata &&
+		(unsigned long)addr < (unsigned long)__end_rodata;
 }
 
 /**
@@ -31,7 +31,7 @@ static inline int is_kernel_rodata(unsigned long addr)
  */
 void kfree_const(const void *x)
 {
-	if (!is_kernel_rodata((unsigned long)x))
+	if (!is_kernel_rodata(x))
 		kfree(x);
 }
 EXPORT_SYMBOL(kfree_const);
@@ -68,7 +68,7 @@ EXPORT_SYMBOL(kstrdup);
  */
 const char *kstrdup_const(const char *s, gfp_t gfp)
 {
-	if (is_kernel_rodata((unsigned long)s))
+	if (is_kernel_rodata(s))
 		return s;
 
 	return kstrdup(s, gfp);
-- 
2.7.4