Re: [B.A.T.M.A.N.] [PATCH] batman-adv: add compat code for kstrtou32

[Antonio Quartulli <antonio@meshcoding.com>]

[-- Attachment #1.1: Type: text/plain, Size: 432 bytes --]

On Thu, Nov 21, 2013 at 04:45:14AM +0100, Matthias Schiffer wrote:
> You are casting a u32 * to unsigned long *? Won't this break horribly
> when sizeof(u32) != sizeof(unsigned long)?
> 

It will break when sizeof(unsigned long) > sizeof(uint32). For example on
x86_64. Hopefully nobody would use such ancient kernel on his machine. But you
are right.

What do you think of the attached patch?


-- 
Antonio Quartulli

[-- Attachment #1.2: patch --]
[-- Type: text/plain, Size: 608 bytes --]

diff --git a/compat.h b/compat.h
index a050bb8..fe64820 100644
--- a/compat.h
+++ b/compat.h
@@ -153,7 +153,14 @@ static inline int batadv_param_set_copystring(const char *val,
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
 
 /* cast last argument of strict_strtoul() because we have a uint32_t */
-#define kstrtou32(cp, base, v) strict_strtoul(cp, base, (unsigned long *)v)
+#define kstrtou32(cp, base, v) \
+({\
+	unsigned long _v;\
+	int _r;\
+	_r = strict_strtoul(cp, base, _v);\
+	v = (uint32_t)_v;\
+	_r;\
+})
 #define kstrtoul strict_strtoul
 #define kstrtol  strict_strtol
 

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]