Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f6bce3c authored by Julia Lawall's avatar Julia Lawall Committed by Jesse Barnes
Browse files

PCI hotplug: Use kmemdup 

Use kmemdup when some other buffer is immediately copied into the
allocated region.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/

)

// <smpl>
@@
expression from,to,size,flag;
statement S;
@@

-  to = \(kmalloc\|kzalloc\)(size,flag);
+  to = kmemdup(from,size,flag);
   if (to==NULL || ...) S
-  memcpy(to, from, size);
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent b7999570

drivers/pci/hotplug/cpqphp_core.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1075,13 +1075,12 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 




	/* make our own copy of the pci bus structure,

	/* make our own copy of the pci bus structure,

	 * as we like tweaking it a lot */

	 * as we like tweaking it a lot */

	ctrl->pci_bus = kmalloc(sizeof(*ctrl->pci_bus), GFP_KERNEL);

	ctrl->pci_bus = kmemdup(pdev->bus, sizeof(*ctrl->pci_bus), GFP_KERNEL);

	if (!ctrl->pci_bus) {

	if (!ctrl->pci_bus) {

		err("out of memory\n");

		err("out of memory\n");

		rc = -ENOMEM;

		rc = -ENOMEM;

		goto err_free_ctrl;

		goto err_free_ctrl;

	}

	}

	memcpy(ctrl->pci_bus, pdev->bus, sizeof(*ctrl->pci_bus));





	ctrl->bus = pdev->bus->number;

	ctrl->bus = pdev->bus->number;

	ctrl->rev = pdev->revision;

	ctrl->rev = pdev->revision;