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
| ||
|
Message-Id: <1423563470-21303-6-git-send-email-jslaby@suse.cz> Date: Tue, 10 Feb 2015 11:17:24 +0100 From: Jiri Slaby <jslaby@...e.cz> To: stable@...r.kernel.org Cc: karl beldan <karl.beldan@...il.com>, Karl Beldan <karl.beldan@...ierawaves.com>, Al Viro <viro@...IV.linux.org.uk>, Eric Dumazet <eric.dumazet@...il.com>, Arnd Bergmann <arnd@...db.de>, Mike Frysinger <vapier@...too.org>, netdev@...r.kernel.org, linux-kernel@...r.kernel.org, Eric Dumazet <edumazet@...gle.com>, "David S. Miller" <davem@...emloft.net>, Jiri Slaby <jslaby@...e.cz> Subject: [patch added to the 3.12 stable tree] lib/checksum.c: fix carry in csum_tcpudp_nofold From: karl beldan <karl.beldan@...il.com> This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== commit 150ae0e94634714b23919f0c333fee28a5b199d5 upstream. The carry from the 64->32bits folding was dropped, e.g with: saddr=0xFFFFFFFF daddr=0xFF0000FF len=0xFFFF proto=0 sum=1, csum_tcpudp_nofold returned 0 instead of 1. Signed-off-by: Karl Beldan <karl.beldan@...ierawaves.com> Cc: Al Viro <viro@...IV.linux.org.uk> Cc: Eric Dumazet <eric.dumazet@...il.com> Cc: Arnd Bergmann <arnd@...db.de> Cc: Mike Frysinger <vapier@...too.org> Cc: netdev@...r.kernel.org Cc: linux-kernel@...r.kernel.org Signed-off-by: Eric Dumazet <edumazet@...gle.com> Signed-off-by: David S. Miller <davem@...emloft.net> Signed-off-by: Jiri Slaby <jslaby@...e.cz> --- lib/checksum.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/checksum.c b/lib/checksum.c index 129775eb6de6..fcf38943132c 100644 --- a/lib/checksum.c +++ b/lib/checksum.c @@ -47,6 +47,15 @@ static inline unsigned short from32to16(unsigned int x) return x; } +static inline u32 from64to32(u64 x) +{ + /* add up 32-bit and 32-bit for 32+c bit */ + x = (x & 0xffffffff) + (x >> 32); + /* add up carry.. */ + x = (x & 0xffffffff) + (x >> 32); + return (u32)x; +} + static unsigned int do_csum(const unsigned char *buff, int len) { int odd; @@ -195,8 +204,7 @@ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, #else s += (proto + len) << 8; #endif - s += (s >> 32); - return (__force __wsum)s; + return (__force __wsum)from64to32(s); } EXPORT_SYMBOL(csum_tcpudp_nofold); #endif -- 2.2.2 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists