Commit 86bb4f69 authored Feb 13, 2014 by Greg Kroah-Hartman Committed by Bjorn Helgaas Feb 13, 2014

PCI/MSI: Check kmalloc() return value, fix leak of 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.

Found by Coverity (CID 1163315 and 1163316e).

Fixes: 1c51b50c ("PCI/MSI: Export MSI mode using attributes, not kobjects")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

parent 322a8e91

drivers/pci/msi.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message