| Message ID | 20210129081917.1808218-1-quanyang.wang@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | gpiolib: free device name on error path to fix kmemleak | expand |
On Fri, Jan 29, 2021 at 2:01 PM <quanyang.wang@windriver.com> wrote: > > From: Quanyang Wang <quanyang.wang@windriver.com> > > In gpiochip_add_data_with_key, we should check the return value of > dev_set_name to ensure that device name is allocated successfully > and then add a label on the error path to free device name to fix > kmemleak as below: Thanks for the report. Unfortunately... > + ret = dev_set_name(&gdev->dev, GPIOCHIP_NAME "%d", gdev->id); > + if (ret) > + goto err_free_ida; ... > +err_free_dev_name: > + kfree(dev_name(&gdev->dev)); ...this approach seems to create a possible double free if I'm not mistaken. The idea is that device name should be cleaned in kobject ->release() callback when device is put. Can you elaborate?
Hi Andy, On 1/30/21 1:26 AM, Andy Shevchenko wrote: > On Fri, Jan 29, 2021 at 2:01 PM <quanyang.wang@windriver.com> wrote: >> From: Quanyang Wang <quanyang.wang@windriver.com> >> >> In gpiochip_add_data_with_key, we should check the return value of >> dev_set_name to ensure that device name is allocated successfully >> and then add a label on the error path to free device name to fix >> kmemleak as below: > Thanks for the report. > Unfortunately... > >> + ret = dev_set_name(&gdev->dev, GPIOCHIP_NAME "%d", gdev->id); >> + if (ret) >> + goto err_free_ida; > ... > >> +err_free_dev_name: >> + kfree(dev_name(&gdev->dev)); > ...this approach seems to create a possible double free if I'm not mistaken. Thanks for your comment. I didn't catch the double free. Would you please point it out? > > The idea is that device name should be cleaned in kobject ->release() > callback when device is put. Yes, the device name should be freed by calling put_device(&gdev->dev). But int gpiochip_add_data_with_key, when running dev_set_name, "gdev->dev.release" hasn't been installed until in the tail of gpiochip_add_data_with_key. So we couldn't call put_device here. Any suggestion is much appreciated. Thanks, Quanyang > Can you elaborate? >
On Sat, Jan 30, 2021 at 4:45 AM quanyang.wang <quanyang.wang@windriver.com> wrote: > > Hi Andy, > > On 1/30/21 1:26 AM, Andy Shevchenko wrote: > > On Fri, Jan 29, 2021 at 2:01 PM <quanyang.wang@windriver.com> wrote: > >> From: Quanyang Wang <quanyang.wang@windriver.com> > >> > >> In gpiochip_add_data_with_key, we should check the return value of > >> dev_set_name to ensure that device name is allocated successfully > >> and then add a label on the error path to free device name to fix > >> kmemleak as below: > > Thanks for the report. > > Unfortunately... > > > >> + ret = dev_set_name(&gdev->dev, GPIOCHIP_NAME "%d", gdev->id); > >> + if (ret) > >> + goto err_free_ida; > > ... > > > >> +err_free_dev_name: > >> + kfree(dev_name(&gdev->dev)); > > ...this approach seems to create a possible double free if I'm not mistaken. > Thanks for your comment. I didn't catch the double free. Would you > please point it out? > > > > The idea is that device name should be cleaned in kobject ->release() > > callback when device is put. > > Yes, the device name should be freed by calling put_device(&gdev->dev). > But int gpiochip_add_data_with_key, > > when running dev_set_name, "gdev->dev.release" hasn't been installed > until in the tail of gpiochip_add_data_with_key. > > So we couldn't call put_device here. > > Any suggestion is much appreciated. > > Thanks, > > Quanyang > > > Can you elaborate? > > Andy, gdev->dev.release is assigned as the very last step in gpiochip_add_data_with_key() so the patch looks correct to me. Do you still have objections? Maybe I'm not seeing something. Bart
On Mon, Feb 1, 2021 at 5:50 PM Bartosz Golaszewski <bgolaszewski@baylibre.com> wrote: > > On Sat, Jan 30, 2021 at 4:45 AM quanyang.wang > <quanyang.wang@windriver.com> wrote: > > > > Hi Andy, > > > > On 1/30/21 1:26 AM, Andy Shevchenko wrote: > > > On Fri, Jan 29, 2021 at 2:01 PM <quanyang.wang@windriver.com> wrote: > > >> From: Quanyang Wang <quanyang.wang@windriver.com> > > >> > > >> In gpiochip_add_data_with_key, we should check the return value of > > >> dev_set_name to ensure that device name is allocated successfully > > >> and then add a label on the error path to free device name to fix > > >> kmemleak as below: > > > Thanks for the report. > > > Unfortunately... > > > > > >> + ret = dev_set_name(&gdev->dev, GPIOCHIP_NAME "%d", gdev->id); > > >> + if (ret) > > >> + goto err_free_ida; > > > ... > > > > > >> +err_free_dev_name: > > >> + kfree(dev_name(&gdev->dev)); > > > ...this approach seems to create a possible double free if I'm not mistaken. > > Thanks for your comment. I didn't catch the double free. Would you > > please point it out? > > > > > > The idea is that device name should be cleaned in kobject ->release() > > > callback when device is put. > > > > Yes, the device name should be freed by calling put_device(&gdev->dev). > > But int gpiochip_add_data_with_key, > > > > when running dev_set_name, "gdev->dev.release" hasn't been installed > > until in the tail of gpiochip_add_data_with_key. > > > > So we couldn't call put_device here. > > > > Any suggestion is much appreciated. > > > > Thanks, > > > > Quanyang > > > > > Can you elaborate? > > > > > Andy, > > gdev->dev.release is assigned as the very last step in > gpiochip_add_data_with_key() so the patch looks correct to me. Do you > still have objections? Maybe I'm not seeing something. OK! (Sorry, don't have time to look deeper, just remember that netdev code used to (or still?) have some twisted cases with device registration and similar syzcaller issue, but in that case it wasn't so easy to fix.
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 7e1ad4d40e0a..091e00f2e0a9 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -603,7 +603,11 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, ret = gdev->id; goto err_free_gdev; } - dev_set_name(&gdev->dev, GPIOCHIP_NAME "%d", gdev->id); + + ret = dev_set_name(&gdev->dev, GPIOCHIP_NAME "%d", gdev->id); + if (ret) + goto err_free_ida; + device_initialize(&gdev->dev); dev_set_drvdata(&gdev->dev, gdev); if (gc->parent && gc->parent->driver) @@ -617,7 +621,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, gdev->descs = kcalloc(gc->ngpio, sizeof(gdev->descs[0]), GFP_KERNEL); if (!gdev->descs) { ret = -ENOMEM; - goto err_free_ida; + goto err_free_dev_name; } if (gc->ngpio == 0) { @@ -768,6 +772,8 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, kfree_const(gdev->label); err_free_descs: kfree(gdev->descs); +err_free_dev_name: + kfree(dev_name(&gdev->dev)); err_free_ida: ida_free(&gpio_ida, gdev->id); err_free_gdev: