Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PNP: fix name memory leak in pnp_alloc_dev()

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@huawei.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Yang Yingliang and committed by
Rafael J. Wysocki
110d7b03 eb708140

+2 -2
+2 -2
drivers/pnp/core.c
··· 148 148 dev->dev.coherent_dma_mask = dev->dma_mask; 149 149 dev->dev.release = &pnp_release_device; 150 150 151 - dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number); 152 - 153 151 dev_id = pnp_add_id(dev, pnpid); 154 152 if (!dev_id) { 155 153 kfree(dev); 156 154 return NULL; 157 155 } 156 + 157 + dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number); 158 158 159 159 return dev; 160 160 }