| From | Greg Kroah-Hartman <> | Subject | [PATCH 4.4 189/312] ipv4: fix checksum annotation in udp4_csum_init | Date | Fri, 8 May 2020 14:33:00 +0200 |
| |
From: Hannes Frederic Sowa <hannes@stressinduktion.org>
commit b46d9f625b07f843c706c2c7d0210a90ccdf143b upstream.
Reported-by: Cong Wang <xiyou.wangcong@gmail.com> Cc: Cong Wang <xiyou.wangcong@gmail.com> Cc: Tom Herbert <tom@herbertland.com> Fixes: 4068579e1e098fa ("net: Implmement RFC 6936 (zero RX csums for UDP/IPv6") Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- net/ipv4/udp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
--- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1754,8 +1754,11 @@ static inline int udp4_csum_init(struct } } - return skb_checksum_init_zero_check(skb, proto, uh->check, - inet_compute_pseudo); + /* Note, we are only interested in != 0 or == 0, thus the + * force to int. + */ + return (__force int)skb_checksum_init_zero_check(skb, proto, uh->check, + inet_compute_pseudo); } /*
|