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 =