net: fix two sparse warnings introduced by IGMP/MLD parsing exports

> net/core/skbuff.c:4108:13: sparse: incorrect type in assignment (different base types)
> net/ipv6/mcast_snoop.c:63 ipv6_mc_check_exthdrs() warn: unsigned 'offset' is never less than zero.

Introduced by 9afd85c9e4552b276e2f4cfefd622bdeeffbbf26
("net: Export IGMP/MLD message validation code")

Reported-by: kbuild test robot <[email protected]>
Signed-off-by: Linus Lüssing <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 1e4278a4dd7ea239c84c598e0ca08c51f10ce2b4..b9eb90b39ac7e0a28f9f99d58f37a1b629a75206 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4093,7 +4093,7 @@ struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb,
 {
        struct sk_buff *skb_chk;
        unsigned int offset = skb_transport_offset(skb);
-       int ret;
+       __sum16 ret;
 
        skb_chk = skb_checksum_maybe_trim(skb, transport_len);
        if (!skb_chk)

diff --git a/net/ipv6/mcast_snoop.c b/net/ipv6/mcast_snoop.c
index 1a2cbc13a7d3b37d3a464e0ebb8c6fa68c7a2223..df8afe5ab31e4b8e75bf2fbf844f8b3e798edbba 100644 (file)
--- a/net/ipv6/mcast_snoop.c
+++ b/net/ipv6/mcast_snoop.c
@@ -47,7 +47,7 @@ static int ipv6_mc_check_ip6hdr(struct sk_buff *skb)
 static int ipv6_mc_check_exthdrs(struct sk_buff *skb)
 {
        const struct ipv6hdr *ip6h;
-       unsigned int offset;
+       int offset;
        u8 nexthdr;
        __be16 frag_off;