Re: [PATCH 4.4 07/83] NFC: fix broken device allocation

From: Johan Hovold
Date: Tue Aug 01 2017 - 15:18:11 EST


On Tue, Aug 01, 2017 at 07:15:55PM +0100, Ben Hutchings wrote:
> On Tue, 2017-07-25 at 12:18 -0700, Greg Kroah-Hartman wrote:
> > 4.4-stable review patch. If anyone has any objections, please let me know.
> >
> > ------------------
> >
> > From: Johan Hovold <johan@xxxxxxxxxx>
> >
> > commit 20777bc57c346b6994f465e0d8261a7fbf213a09 upstream.
> [...]
> > --- a/net/nfc/core.c
> > +++ b/net/nfc/core.c
> [...]
> > @@ -1077,6 +1089,11 @@ struct nfc_dev *nfc_allocate_device(stru
> > }
> >
> > return dev;
> > +
> > +err_free_dev:
> > + kfree(dev);
> > +
> > + return ERR_PTR(rc);
> > }
> > EXPORT_SYMBOL(nfc_allocate_device);
> [...]
>
> But the callers expect a null pointer on error, not an error pointer.
> This looks broken in mainline too.

Indeed. Dan's checkers found this one quickly and I posted a fix on the
9th of July:

https://lkml.kernel.org/r/20170709110858.20331-1-johan@xxxxxxxxxx

but it has unfortunately not been applied yet despite a reminder sent to
Samuel and Dave when Greg picked it up for stable ten days ago.

Perhaps it can go in through Andrew's tree if there's going to be
further delays (e.g. due to vacations)?

Thanks,
Johan