summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStefano Brivio <sbrivio@redhat.com>2019-08-13 01:46:01 +0300
committerDavid S. Miller <davem@davemloft.net>2019-08-20 03:19:46 +0300
commit3a7ef457e85173a5b9ec7a03016db5a57b717b33 (patch)
treeb47aabce599c6b7f8bd808ab3aa02d97e47c6b67 /include
parente15dbcdeb9f66c9e6068f94aed60cee9844b621a (diff)
downloadlinux-3a7ef457e85173a5b9ec7a03016db5a57b717b33.tar.xz
ipv6: Fix return value of ipv6_mc_may_pull() for malformed packets
Commit ba5ea614622d ("bridge: simplify ip_mc_check_igmp() and ipv6_mc_check_mld() calls") replaces direct calls to pskb_may_pull() in br_ipv6_multicast_mld2_report() with calls to ipv6_mc_may_pull(), that returns -EINVAL on buffers too short to be valid IPv6 packets, while maintaining the previous handling of the return code. This leads to the direct opposite of the intended effect: if the packet is malformed, -EINVAL evaluates as true, and we'll happily proceed with the processing. Return 0 if the packet is too short, in the same way as this was fixed for IPv4 by commit 083b78a9ed64 ("ip: fix ip_mc_may_pull() return value"). I don't have a reproducer for this, unlike the one referred to by the IPv4 commit, but this is clearly broken. Fixes: ba5ea614622d ("bridge: simplify ip_mc_check_igmp() and ipv6_mc_check_mld() calls") Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Acked-by: Guillaume Nault <gnault@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/addrconf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index becdad576859..3f62b347b04a 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -206,7 +206,7 @@ static inline int ipv6_mc_may_pull(struct sk_buff *skb,
unsigned int len)
{
if (skb_transport_offset(skb) + ipv6_transport_len(skb) < len)
- return -EINVAL;
+ return 0;
return pskb_may_pull(skb, len);
}