From 65f8e361840233a9e2b6cc22460a28bd56bd7f67 Mon Sep 17 00:00:00 2001 From: Michio Honda Date: Fri, 10 Jun 2011 16:42:14 +0900 Subject: [PATCH] --- yaml --- r: 255507 b: refs/heads/master c: 6d65e5eee6fc8fa9abef9e78e7e789c2cb06f95c h: refs/heads/master i: 255505: bafa1f79a8eea90dbdd02a040ed7c2d8ec460fc4 255503: bede24bc07f3dee1cf833c96144e85f7c5e54094 v: v3 --- [refs] | 2 +- trunk/net/sctp/socket.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b89cf8d5de50..ec9b4af8838b 100644 --- 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 index e7e1b142875c..60038fef3ba1 100644 --- 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 =