powerpc/64: Fix checksum folding in csum_tcpudp_nofold and ip_fast_csum_nofold
authorPaul Mackerras <paulus@ozlabs.org>
Thu, 3 Nov 2016 05:10:55 +0000 (16:10 +1100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 16 Dec 2017 15:25:47 +0000 (16:25 +0100)
commiteae3f3ab7fb34732fbdd86fad79410aec48faf1d
tree6c92cba760d9d03a6eea7ce087809eda4a5a8051
parent9414a6309c7205c38ee3559a871ef165dd44c657
powerpc/64: Fix checksum folding in csum_tcpudp_nofold and ip_fast_csum_nofold

commit b492f7e4e07a28e706db26cf4943bb0911435426 upstream.

These functions compute an IP checksum by computing a 64-bit sum and
folding it to 32 bits (the "nofold" in their names refers to folding
down to 16 bits).  However, doing (u32) (s + (s >> 32)) is not
sufficient to fold a 64-bit sum to 32 bits correctly.  The addition
can produce a carry out from bit 31, which needs to be added in to
the sum to produce the correct result.

To fix this, we copy the from64to32() function from lib/checksum.c
and use that.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/include/asm/checksum.h