From 6fa58852abe24bd32c5ae0814ed0bc0aad0be40b Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@openvz.org>
Date: Tue, 6 Feb 2007 14:35:25 -0800
Subject: [PATCH] --- yaml --- r: 46953 b: refs/heads/master c:
 cc63f70b8b410eb653449151821f6b8b9af6ca42 h: refs/heads/master i:   46951:
 ee541b6b7ee49148dfc2a4e5efb5bfd121414aca v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv4/igmp.c  | 2 ++
 trunk/net/ipv6/mcast.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2c0cde715bb4..e6e33e85b0fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2f2102d1a1dbc83b5b37b6596cd8374120cbe16
+refs/heads/master: cc63f70b8b410eb653449151821f6b8b9af6ca42
diff --git a/trunk/net/ipv4/igmp.c b/trunk/net/ipv4/igmp.c
index 0017ccb01d6d..024ae56cab25 100644
--- a/trunk/net/ipv4/igmp.c
+++ b/trunk/net/ipv4/igmp.c
@@ -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++;
diff --git a/trunk/net/ipv6/mcast.c b/trunk/net/ipv6/mcast.c
index 882cde4b4047..e3ec21695832 100644
--- a/trunk/net/ipv6/mcast.c
+++ b/trunk/net/ipv6/mcast.c
@@ -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++;