Merge tag 'trace-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[firefly-linux-kernel-4.4.55.git] / net / sctp / input.c

diff --git a/net/sctp/input.c b/net/sctp/input.c
index c1b991294516fd1ef29de13cf24f06c1d63c8be2..b6493b3f11a97f359d0ec70cde2812082f65910f 100644 (file)
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -133,9 +133,13 @@ int sctp_rcv(struct sk_buff *skb)
        __skb_pull(skb, skb_transport_offset(skb));
        if (skb->len < sizeof(struct sctphdr))
                goto discard_it;
-       if (!sctp_checksum_disable && !skb_csum_unnecessary(skb) &&
-                 sctp_rcv_checksum(net, skb) < 0)
+
+       skb->csum_valid = 0; /* Previous value not applicable */
+       if (skb_csum_unnecessary(skb))
+               __skb_decr_checksum_unnecessary(skb);
+       else if (!sctp_checksum_disable && sctp_rcv_checksum(net, skb) < 0)
                goto discard_it;
+       skb->csum_valid = 1;
 
        skb_pull(skb, sizeof(struct sctphdr));