| Message ID | 42280E6C-8514-4C01-9B81-35DDE65BBE42@sfc.wide.ad.jp |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
> From be2da529aa45061e77ad96313175e141aaadc16a Mon Sep 17 00:00:00 2001 > From: Michio Honda <micchie@sfc.wide.ad.jp> > Date: Fri, 10 Jun 2011 16:42:14 +0900 > Subject: [PATCH v1] sctp: kzalloc() error handling on deleting last address > > Signed-off-by: Michio Honda <micchie@sfc.wide.ad.jp> > --- > net/sctp/socket.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > It is OK to me. Acked-by: Wei Yongjun <yjwei@cn.fujitsu.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Michio Honda <micchie@sfc.wide.ad.jp> Date: Fri, 10 Jun 2011 18:06:15 +0900 >>From be2da529aa45061e77ad96313175e141aaadc16a Mon Sep 17 00:00:00 2001 > From: Michio Honda <micchie@sfc.wide.ad.jp> > Date: Fri, 10 Jun 2011 16:42:14 +0900 > Subject: [PATCH v1] sctp: kzalloc() error handling on deleting last address > > Signed-off-by: Michio Honda <micchie@sfc.wide.ad.jp> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index e7e1b14..60038fe 100644 --- a/net/sctp/socket.c +++ b/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 =