From patchwork Fri Jun 10 09:06:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michio Honda X-Patchwork-Id: 99859 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C0EC5B7008 for ; Fri, 10 Jun 2011 19:06:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753314Ab1FJJGS (ORCPT ); Fri, 10 Jun 2011 05:06:18 -0400 Received: from shonan.sfc.wide.ad.jp ([203.178.142.130]:60724 "EHLO mail.sfc.wide.ad.jp" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751149Ab1FJJGR convert rfc822-to-8bit (ORCPT ); Fri, 10 Jun 2011 05:06:17 -0400 Received: from [IPv6:2001:200:1c0:2800:5a55:caff:fefa:8287] (unknown [IPv6:2001:200:1c0:2800:5a55:caff:fefa:8287]) by mail.sfc.wide.ad.jp (Postfix) with ESMTPSA id D95F027809B; Fri, 10 Jun 2011 18:06:15 +0900 (JST) From: Michio Honda Subject: [PATCH v1] sctp: kzalloc() error handling on deleting last address Date: Fri, 10 Jun 2011 18:06:15 +0900 Message-Id: <42280E6C-8514-4C01-9B81-35DDE65BBE42@sfc.wide.ad.jp> Cc: Wei Yongjun , netdev@vger.kernel.org To: David Miller Mime-Version: 1.0 (Apple Message framework v1084) X-Mailer: Apple Mail (2.1084) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From be2da529aa45061e77ad96313175e141aaadc16a Mon Sep 17 00:00:00 2001 From: Michio Honda 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 Acked-by: Wei Yongjun --- net/sctp/socket.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) 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 =