| Message ID | 20140123193037.GA2605@kroah.com |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Jan 23, 2014 at 11:30:37AM -0800, Greg Kroah-Hartman wrote: > Coverity reported that I forgot to check the return value of kmalloc > when creating the MSI attribute name, so fix that up and properly free > it if there is an error when allocating the msi_dev_attr variable. > > Fixes: 1c51b50c2995 ("PCI/MSI: Export MSI mode using attributes, not kobjects") > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Applied to my pci/msi branch, thanks! > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c > index 7a0fec6ce571..39dff3fe57af 100644 > --- a/drivers/pci/msi.c > +++ b/drivers/pci/msi.c > @@ -545,9 +545,15 @@ static int populate_msi_sysfs(struct pci_dev *pdev) > return -ENOMEM; > list_for_each_entry(entry, &pdev->msi_list, list) { > char *name = kmalloc(20, GFP_KERNEL); > + if (!name) > + goto error_attrs; > + > msi_dev_attr = kzalloc(sizeof(*msi_dev_attr), GFP_KERNEL); > - if (!msi_dev_attr) > + if (!msi_dev_attr) { > + kfree(name); > goto error_attrs; > + } > + > sprintf(name, "%d", entry->irq); > sysfs_attr_init(&msi_dev_attr->attr); > msi_dev_attr->attr.name = name; -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 7a0fec6ce571..39dff3fe57af 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -545,9 +545,15 @@ static int populate_msi_sysfs(struct pci_dev *pdev) return -ENOMEM; list_for_each_entry(entry, &pdev->msi_list, list) { char *name = kmalloc(20, GFP_KERNEL); + if (!name) + goto error_attrs; + msi_dev_attr = kzalloc(sizeof(*msi_dev_attr), GFP_KERNEL); - if (!msi_dev_attr) + if (!msi_dev_attr) { + kfree(name); goto error_attrs; + } + sprintf(name, "%d", entry->irq); sysfs_attr_init(&msi_dev_attr->attr); msi_dev_attr->attr.name = name;
Coverity reported that I forgot to check the return value of kmalloc when creating the MSI attribute name, so fix that up and properly free it if there is an error when allocating the msi_dev_attr variable. Fixes: 1c51b50c2995 ("PCI/MSI: Export MSI mode using attributes, not kobjects") Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html