Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc63f70b authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

[IPV4/IPV6] multicast: Check add_grhead() return value 



add_grhead() allocates memory with GFP_ATOMIC and in at least two places skb
from it passed to skb_put() without checking.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f2f2102d

net/ipv4/igmp.c

+2 −0
Original line number Diff line number Diff line
@@ -455,6 +455,8 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ip_mc_list *pmc, 
			skb = add_grhead(skb, pmc, type, &pgr);

			first = 0;

		}

		if (!skb)

			return NULL;

		psrc = (__be32 *)skb_put(skb, sizeof(__be32));

		*psrc = psf->sf_inaddr;

		scount++; stotal++;

net/ipv6/mcast.c

+2 −0
Original line number Diff line number Diff line
@@ -1582,6 +1582,8 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc, 
			skb = add_grhead(skb, pmc, type, &pgr);

			first = 0;

		}

		if (!skb)

			return NULL;

		psrc = (struct in6_addr *)skb_put(skb, sizeof(*psrc));

		*psrc = psf->sf_addr;

		scount++; stotal++;