On Tue, Nov 22, 2022 at 2:10 PM Hanjun Guo <guohanjun@xxxxxxxxxx> wrote:
>
> On 2022/11/11 9:23, Yang Yingliang wrote:
> > After commit 1fa5ae857bb1 ("driver core: get rid of struct device's
> > bus_id string array"), the name of device is allocated dynamically,
> > move dev_set_name() after pnp_add_id() to avoid memory leak.
> >
> > Fixes: 1fa5ae857bb1 ("driver core: get rid of struct device's bus_id string array")
> > Signed-off-by: Yang Yingliang <yangyingliang@xxxxxxxxxx>
> > ---
> > v1 -> v2:
> > Move dev_set_name() after pnp_add_id().
> > ---
> > drivers/pnp/core.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
> > index 4df5aa6a309c..6a60c5d83383 100644
> > --- a/drivers/pnp/core.c
> > +++ b/drivers/pnp/core.c
> > @@ -148,14 +148,14 @@ struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id,
> > dev->dev.coherent_dma_mask = dev->dma_mask;
> > dev->dev.release = &pnp_release_device;
> >
> > - dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number);
> > -
> > dev_id = pnp_add_id(dev, pnpid);
> > if (!dev_id) {
> > kfree(dev);
> > return NULL;
> > }
> >
> > + dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number);
>
> Lots of places in the kernel didn't check the return value of
> dev_set_name(), so it looks good to me,
>
> Reviewed-by: Hanjun Guo <guohanjun@xxxxxxxxxx>
Applied as 6.2 material, thanks!
