linux-kernel - Re: [GIT PULL -tip v3] fix 39 'make headers

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: <20090118185034.GA26908@elte.hu>
Date:	Sun, 18 Jan 2009 19:50:34 +0100
From:	Ingo Molnar <mingo@...e.hu>
To:	Jaswinder Singh Rajput <jaswinder@...nel.org>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	Sam Ravnborg <sam@...nborg.org>,
	x86 maintainers <x86@...nel.org>,
	LKML <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL -tip v3] fix 39 'make headers_check' warnings


hm, i just noticed this detail:

commit 3521c5eef990515719614e212b26ea49e610d072
Author: Jaswinder Singh Rajput <jaswinderrajput@...il.com>
Date:   Sat Jan 17 19:25:46 2009 +0530

    headers_check fix: x86, swab.h
    
    fix the following 'make headers_check' warnings:
    
      usr/include/asm/swab.h:4: include of <linux/types.h> is preferred over <asm/types.h>
      usr/include/asm/swab.h:7: found __[us]{8,16,32,64} type without #include <linux/types.h>
      usr/include/asm/swab.h:10: leaks CONFIG_X86 to userspace where it is not valid
      usr/include/asm/swab.h:40: leaks CONFIG_X86 to userspace where it is not valid
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@...il.com>
    Signed-off-by: Ingo Molnar <mingo@...e.hu>

diff --git a/arch/x86/include/asm/swab.h b/arch/x86/include/asm/swab.h
index 306d417..613be68 100644
--- a/arch/x86/include/asm/swab.h
+++ b/arch/x86/include/asm/swab.h
@@ -1,12 +1,15 @@
 #ifndef _ASM_X86_SWAB_H
 #define _ASM_X86_SWAB_H
 
-#include <asm/types.h>
+#include <linux/types.h>
+#ifdef __KERNEL__
 #include <linux/compiler.h>
+#endif /* __KERNEL__ */
 
 static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
 {
 #ifdef __i386__
+#ifdef __KERNEL__
 # ifdef CONFIG_X86_BSWAP
 	asm("bswap %0" : "=r" (val) : "0" (val));
 # else
@@ -16,7 +19,13 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
 	    : "=q" (val)
 	    : "0" (val));
 # endif
-
+#else /* __KERNEL__ */
+	asm("xchgb %b0,%h0\n\t"	/* swap lower bytes	*/
+	    "rorl $16,%0\n\t"	/* swap words		*/
+	    "xchgb %b0,%h0"	/* swap higher bytes	*/
+	    : "=q" (val)
+	    : "0" (val));
+#endif /* __KERNEL__ */
 #else /* __i386__ */
 	asm("bswapl %0"
 	    : "=r" (val)
@@ -37,6 +46,7 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 val)
 		__u64 u;
 	} v;
 	v.u = val;
+#ifdef __KERNEL__
 # ifdef CONFIG_X86_BSWAP
 	asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1"
 	    : "=r" (v.s.a), "=r" (v.s.b)
@@ -48,6 +58,13 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 val)
 	    : "=r" (v.s.a), "=r" (v.s.b)
 	    : "0" (v.s.a), "1" (v.s.b));
 # endif
+#else /* __KERNEL__ */
+	v.s.a = __arch_swab32(v.s.a);
+	v.s.b = __arch_swab32(v.s.b);
+	asm("xchgl %0,%1"
+	    : "=r" (v.s.a), "=r" (v.s.b)
+	    : "0" (v.s.a), "1" (v.s.b));
+#endif /* __KERNEL__ */
 	return v.u;
 #else /* __i386__ */
 	asm("bswapq %0"


why does such a change introduce new code? It is duplicating existing code 
instead of cleaning it all up.

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/