---

yaml --- r: 255507 b: refs/heads/master c: 6d65e5e h: refs/heads/master i: 255505: bafa1f7 255503: bede24b v: v3
git-mirror · Jun 11, 2011 · 65f8e36 · 65f8e36
1 parent 028a67c
commit 65f8e36
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69785b79ca9b1acb62098ff059f897bfe59d443f
+refs/heads/master: 6d65e5eee6fc8fa9abef9e78e7e789c2cb06f95c
diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c
@@ -786,6 +786,10 @@ static int sctp_send_asconf_del_ip(struct sock		*sk,
 				continue;
 			asoc->asconf_addr_del_pending =
 			    kzalloc(sizeof(union sctp_addr), GFP_ATOMIC);
+			if (asoc->asconf_addr_del_pending == NULL) {
+				retval = -ENOMEM;
+				goto out;
+			}
 			asoc->asconf_addr_del_pending->sa.sa_family =
 				    addrs->sa_family;
 			asoc->asconf_addr_del_pending->v4.sin_port =