Skip to content

Commit 087c1fa

Browse files
edumazetkuba-moo
authored andcommitted
ipv6: mcast: extend RCU protection in igmp6_send()
igmp6_send() can be called without RTNL or RCU being held. Extend RCU protection so that we can safely fetch the net pointer and avoid a potential UAF. Note that we no longer can use sock_alloc_send_skb() because ipv6.igmp_sk uses GFP_KERNEL allocations which can sleep. Instead use alloc_skb() and charge the net->ipv6.igmp_sk socket under RCU protection. Fixes: b8ad0cb ("[NETNS][IPV6] mcast - handle several network namespace") Signed-off-by: Eric Dumazet <[email protected]> Reviewed-by: David Ahern <[email protected]> Reviewed-by: Kuniyuki Iwashima <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent ed6ae1f commit 087c1fa

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

net/ipv6/mcast.c

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2165,21 +2165,21 @@ static void mld_send_cr(struct inet6_dev *idev)
21652165

21662166
static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
21672167
{
2168-
struct net *net = dev_net(dev);
2169-
struct sock *sk = net->ipv6.igmp_sk;
2168+
const struct in6_addr *snd_addr, *saddr;
2169+
int err, len, payload_len, full_len;
2170+
struct in6_addr addr_buf;
21702171
struct inet6_dev *idev;
21712172
struct sk_buff *skb;
21722173
struct mld_msg *hdr;
2173-
const struct in6_addr *snd_addr, *saddr;
2174-
struct in6_addr addr_buf;
21752174
int hlen = LL_RESERVED_SPACE(dev);
21762175
int tlen = dev->needed_tailroom;
2177-
int err, len, payload_len, full_len;
21782176
u8 ra[8] = { IPPROTO_ICMPV6, 0,
21792177
IPV6_TLV_ROUTERALERT, 2, 0, 0,
21802178
IPV6_TLV_PADN, 0 };
2181-
struct flowi6 fl6;
21822179
struct dst_entry *dst;
2180+
struct flowi6 fl6;
2181+
struct net *net;
2182+
struct sock *sk;
21832183

21842184
if (type == ICMPV6_MGM_REDUCTION)
21852185
snd_addr = &in6addr_linklocal_allrouters;
@@ -2190,19 +2190,21 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
21902190
payload_len = len + sizeof(ra);
21912191
full_len = sizeof(struct ipv6hdr) + payload_len;
21922192

2193-
rcu_read_lock();
2194-
IP6_INC_STATS(net, __in6_dev_get(dev), IPSTATS_MIB_OUTREQUESTS);
2195-
rcu_read_unlock();
2193+
skb = alloc_skb(hlen + tlen + full_len, GFP_KERNEL);
21962194

2197-
skb = sock_alloc_send_skb(sk, hlen + tlen + full_len, 1, &err);
2195+
rcu_read_lock();
21982196

2197+
net = dev_net_rcu(dev);
2198+
idev = __in6_dev_get(dev);
2199+
IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS);
21992200
if (!skb) {
2200-
rcu_read_lock();
2201-
IP6_INC_STATS(net, __in6_dev_get(dev),
2202-
IPSTATS_MIB_OUTDISCARDS);
2201+
IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);
22032202
rcu_read_unlock();
22042203
return;
22052204
}
2205+
sk = net->ipv6.igmp_sk;
2206+
skb_set_owner_w(skb, sk);
2207+
22062208
skb->priority = TC_PRIO_CONTROL;
22072209
skb_reserve(skb, hlen);
22082210

@@ -2227,9 +2229,6 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
22272229
IPPROTO_ICMPV6,
22282230
csum_partial(hdr, len, 0));
22292231

2230-
rcu_read_lock();
2231-
idev = __in6_dev_get(skb->dev);
2232-
22332232
icmpv6_flow_init(sk, &fl6, type,
22342233
&ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr,
22352234
skb->dev->ifindex);

0 commit comments

Comments
 (0)