Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 4 insertions, 2 deletions

diff --git a/net/sctp/input.c b/net/sctp/input.c
index 1662f9cc869e..42b66e74bbb5 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -141,7 +141,8 @@ int sctp_rcv(struct sk_buff *skb)
         __skb_pull(skb, skb->h.raw - skb->data);
         if (skb->len < sizeof(struct sctphdr))
                 goto discard_it;
-        if (sctp_rcv_checksum(skb) < 0)
+        if ((skb->ip_summed != CHECKSUM_UNNECESSARY) &&
+            (sctp_rcv_checksum(skb) < 0))
                 goto discard_it;
 
         skb_pull(skb, sizeof(struct sctphdr));
@@ -170,7 +171,8 @@ int sctp_rcv(struct sk_buff *skb)
          * IP broadcast addresses cannot be used in an SCTP transport
          * address."
          */
-        if (!af->addr_valid(&src, NULL) || !af->addr_valid(&dest, NULL))
+        if (!af->addr_valid(&src, NULL, skb) ||
+            !af->addr_valid(&dest, NULL, skb))
                 goto discard_it;
 
         asoc = __sctp_rcv_lookup(skb, &src, &dest, &transport);