From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ww0-f44.google.com ([74.125.82.44]:49507 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754052Ab0HCIRZ (ORCPT ); Tue, 3 Aug 2010 04:17:25 -0400 Date: Tue, 3 Aug 2010 10:17:01 +0200 From: Dan Carpenter To: Christoph Fritz Cc: "John W. Linville" , kernel-janitors , Zhu Yi , "David S. Miller" , Reinette Chatre , linux-wireless Subject: Re: [PATCH] wireless: ipw2100: check result of kzalloc() Message-ID: <20100803081701.GP26313@bicker> References: <1280797822.11158.55.camel@lovely.krouter> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1280797822.11158.55.camel@lovely.krouter> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Tue, Aug 03, 2010 at 03:10:22AM +0200, Christoph Fritz wrote: > If kzalloc() fails return with -ENOMEM from ipw2100_net_init() which is > called by register_netdev. > > Signed-off-by: Christoph Fritz > --- > drivers/net/wireless/ipw2x00/ipw2100.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c > index 0bd4dfa..908c176 100644 > --- a/drivers/net/wireless/ipw2x00/ipw2100.c > +++ b/drivers/net/wireless/ipw2x00/ipw2100.c > @@ -1924,6 +1924,8 @@ static int ipw2100_net_init(struct net_device *dev) > bg_band->channels = > kzalloc(geo->bg_channels * > sizeof(struct ieee80211_channel), GFP_KERNEL); > + if (!bg_band->channels) There should be an "ipw2100_down(priv);" on the error path here. > + return -ENOMEM; > /* translate geo->bg to bg_band.channels */ regards, dan carpenter