Commit c1ce1560 authored Jan 11, 2017 by Eric Dumazet Committed by David S. Miller Jan 12, 2017

secure_seq: fix sparse errors



Fixes following warnings :

net/core/secure_seq.c:125:28: warning: incorrect type in argument 1
(different base types)
net/core/secure_seq.c:125:28:    expected unsigned int const [unsigned]
[usertype] a
net/core/secure_seq.c:125:28:    got restricted __be32 [usertype] saddr
net/core/secure_seq.c:125:35: warning: incorrect type in argument 2
(different base types)
net/core/secure_seq.c:125:35:    expected unsigned int const [unsigned]
[usertype] b
net/core/secure_seq.c:125:35:    got restricted __be32 [usertype] daddr
net/core/secure_seq.c:125:43: warning: cast from restricted __be16
net/core/secure_seq.c:125:61: warning: restricted __be16 degrades to
integer

Fixes: 7cd23e53 ("secure_seq: use SipHash in place of MD5")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a8ac1a55

net/core/secure_seq.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -122,7 +122,9 @@ u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
		{
		u64 seq;
		net_secret_init();
		seq = siphash_3u32(saddr, daddr, (u32)sport << 16 \| dport, &net_secret);
		seq = siphash_3u32((__force u32)saddr, (__force u32)daddr,
		(__force u32)sport << 16 \| (__force u32)dport,
		&net_secret);
		seq += ktime_get_real_ns();
		seq &= (1ull << 48) - 1;
		return seq;

Admin message