This is a note to let you know that I've just added the patch titled
ipv4: fix checksum annotation in udp4_csum_init
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ipv4-fix-checksum-annotation-in-udp4_csum_init.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b46d9f625b07f843c706c2c7d0210a90ccdf143b Mon Sep 17 00:00:00 2001
From: Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx>
Date: Sun, 12 Jun 2016 12:02:46 +0200
Subject: ipv4: fix checksum annotation in udp4_csum_init
From: Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx>
commit b46d9f625b07f843c706c2c7d0210a90ccdf143b upstream.
Reported-by: Cong Wang <xiyou.wangcong@xxxxxxxxx>
Cc: Cong Wang <xiyou.wangcong@xxxxxxxxx>
Cc: Tom Herbert <tom@xxxxxxxxxxxxxxx>
Fixes: 4068579e1e098fa ("net: Implmement RFC 6936 (zero RX csums for UDP/IPv6")
Signed-off-by: Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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);
}
/*
Patches currently in stable-queue which might be from hannes@xxxxxxxxxxxxxxxxxxx are
queue-4.4/ipv4-fix-checksum-annotation-in-udp4_csum_init.patch
queue-4.4/ipv6-fix-checksum-annotation-in-udp6_csum_init.patch
