Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 25 Jun 2019 15:33:35 -0700
From:   Eric Biggers <ebiggers@google.com>
To:     Pavel Machek <pavel@denx.de>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        syzbot+7fddca22578bc67c3fe4@syzkaller.appspotmail.com,
        Johannes Berg <johannes.berg@intel.com>
Subject: Re: [PATCH 4.19 84/90] cfg80211: fix memory leak of wiphy device name
Message-ID: <20190625223335.GB218319@google.com>
References: <20190624092313.788773607@linuxfoundation.org>
 <20190624092319.410368076@linuxfoundation.org>
 <20190625215135.GA32248@amd>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190625215135.GA32248@amd>
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, Jun 25, 2019 at 11:51:36PM +0200, Pavel Machek wrote:
> Hi!
> 
> > From: Eric Biggers <ebiggers@google.com>
> > 
> > commit 4f488fbca2a86cc7714a128952eead92cac279ab upstream.
> > 
> > In wiphy_new_nm(), if an error occurs after dev_set_name() and
> > device_initialize() have already been called, it's necessary to call
> > put_device() (via wiphy_free()) to avoid a memory leak.
> ....
> > --- a/net/wireless/core.c
> > +++ b/net/wireless/core.c
> > @@ -498,7 +498,7 @@ use_default_name:
> >  				   &rdev->rfkill_ops, rdev);
> >  
> >  	if (!rdev->rfkill) {
> > -		kfree(rdev);
> > +		wiphy_free(&rdev->wiphy);
> >  		return NULL;
> >  	}
> 
> Is kfree(rdev) still neccessary?
> drivers/net/wireless/marvell/libertas/cfg.c seems to suggest so.
> 

No, because it's freed by:

    wiphy_free()
        => put_device()
            => wiphy_dev_release()
                => cfg80211_dev_free()
		    => kfree(rdev)

drivers/net/wireless/marvell/libertas/cfg.c is different because there the
struct wiphy is separately allocated from the struct wireless_dev that's being
freed afterwards.

- Eric