From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752208AbdEHXqn (ORCPT ); Mon, 8 May 2017 19:46:43 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:51729 "EHLO mail3-relais-sop.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751087AbdEHXqm (ORCPT ); Mon, 8 May 2017 19:46:42 -0400 X-IronPort-AV: E=Sophos;i="5.38,311,1491256800"; d="scan'208";a="222898576" Date: Tue, 9 May 2017 07:46:34 +0800 (SGT) From: Julia Lawall X-X-Sender: jll@hadrien To: Joe Perches cc: David Laight , "'Christophe JAILLET'" , "andrew@lunn.ch" , "vivien.didelot@savoirfairelinux.com" , "f.fainelli@gmail.com" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "kernel-janitors@vger.kernel.org" Subject: Re: [PATCH] net: dsa: loop: Check for memory allocation failure In-Reply-To: <1494265443.31950.62.camel@perches.com> Message-ID: References: <20170506052945.2639-1-christophe.jaillet@wanadoo.fr> <063D6719AE5E284EB5DD2968C1650D6DCFFE715E@AcuExch.aculab.com> <1494265443.31950.62.camel@perches.com> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 8 May 2017, Joe Perches wrote: > On Mon, 2017-05-08 at 20:32 +0800, Julia Lawall wrote: > > > > On Mon, 8 May 2017, David Laight wrote: > > > > > From: Christophe JAILLET > > > > Sent: 06 May 2017 06:30 > > > > If 'devm_kzalloc' fails, a NULL pointer will be dereferenced. > > > > Return -ENOMEM instead, as done for some other memory allocation just a > > > > few lines above. > > > > > > ... > > > > --- a/drivers/net/dsa/dsa_loop.c > > > > +++ b/drivers/net/dsa/dsa_loop.c > > > > @@ -256,6 +256,9 @@ static int dsa_loop_drv_probe(struct mdio_device *mdiodev) > > > > return -ENOMEM; > > > > > > > > ps = devm_kzalloc(&mdiodev->dev, sizeof(*ps), GFP_KERNEL); > > > > + if (!ps) > > > > + return -ENOMEM; > > > > + > > > > ps->netdev = dev_get_by_name(&init_net, pdata->netdev); > > > > if (!ps->netdev) > > > > return -EPROBE_DEFER; > > > > > > On the face if it this code leaks like a sieve. > > > > I don't think so. The allocations (dsa_switch_alloc and devm_kzalloc) use > > devm functions. > > It's at least wasteful. > > Each time -EPROBE_DEFER occurs, another set of calls to > dsa_switch_alloc and dev_kzalloc also occurs. > > Perhaps it'd be better to do: > > if (ps->netdev) { > devm_kfree(&devmdev->dev, ps); > devm_kfree(&mdiodev->dev, ds); > return -EPROBE_DEFER; > } Is EPROBE_DEFER handled differently than other kinds of errors? julia > > -- > To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >