Skip to content

Commit c38b7d3

Browse files
congwangdavem330
authored andcommitted
igmp: acquire pmc lock for ip_mc_clear_src()
Andrey reported a use-after-free in add_grec(): for (psf = *psf_list; psf; psf = psf_next) { ... psf_next = psf->sf_next; where the struct ip_sf_list's were already freed by: kfree+0xe8/0x2b0 mm/slub.c:3882 ip_mc_clear_src+0x69/0x1c0 net/ipv4/igmp.c:2078 ip_mc_dec_group+0x19a/0x470 net/ipv4/igmp.c:1618 ip_mc_drop_socket+0x145/0x230 net/ipv4/igmp.c:2609 inet_release+0x4e/0x1c0 net/ipv4/af_inet.c:411 sock_release+0x8d/0x1e0 net/socket.c:597 sock_close+0x16/0x20 net/socket.c:1072 This happens because we don't hold pmc->lock in ip_mc_clear_src() and a parallel mr_ifc_timer timer could jump in and access them. The RCU lock is there but it is merely for pmc itself, this spinlock could actually ensure we don't access them in parallel. Thanks to Eric and Long for discussion on this bug. Reported-by: Andrey Konovalov <[email protected]> Cc: Eric Dumazet <[email protected]> Cc: Xin Long <[email protected]> Signed-off-by: Cong Wang <[email protected]> Reviewed-by: Xin Long <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent eb3c28c commit c38b7d3

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

net/ipv4/igmp.c

+13-8
Original file line numberDiff line numberDiff line change
@@ -2071,21 +2071,26 @@ static int ip_mc_add_src(struct in_device *in_dev, __be32 *pmca, int sfmode,
20712071

20722072
static void ip_mc_clear_src(struct ip_mc_list *pmc)
20732073
{
2074-
struct ip_sf_list *psf, *nextpsf;
2074+
struct ip_sf_list *psf, *nextpsf, *tomb, *sources;
20752075

2076-
for (psf = pmc->tomb; psf; psf = nextpsf) {
2076+
spin_lock_bh(&pmc->lock);
2077+
tomb = pmc->tomb;
2078+
pmc->tomb = NULL;
2079+
sources = pmc->sources;
2080+
pmc->sources = NULL;
2081+
pmc->sfmode = MCAST_EXCLUDE;
2082+
pmc->sfcount[MCAST_INCLUDE] = 0;
2083+
pmc->sfcount[MCAST_EXCLUDE] = 1;
2084+
spin_unlock_bh(&pmc->lock);
2085+
2086+
for (psf = tomb; psf; psf = nextpsf) {
20772087
nextpsf = psf->sf_next;
20782088
kfree(psf);
20792089
}
2080-
pmc->tomb = NULL;
2081-
for (psf = pmc->sources; psf; psf = nextpsf) {
2090+
for (psf = sources; psf; psf = nextpsf) {
20822091
nextpsf = psf->sf_next;
20832092
kfree(psf);
20842093
}
2085-
pmc->sources = NULL;
2086-
pmc->sfmode = MCAST_EXCLUDE;
2087-
pmc->sfcount[MCAST_INCLUDE] = 0;
2088-
pmc->sfcount[MCAST_EXCLUDE] = 1;
20892094
}
20902095

20912096
/* Join a multicast group

0 commit comments

Comments
 (0)