| Message ID | 1538031141-138417-1-git-send-email-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | [-next] PCI: hotplug: Use kmemdup rather than duplicating its implementation in pnv_php_add_devtree() | expand |
YueHaibing <yuehaibing@huawei.com> writes: > Use kmemdup rather than duplicating its implementation > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > drivers/pci/hotplug/pnv_php.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c > index 5070620..ee54f5b 100644 > --- a/drivers/pci/hotplug/pnv_php.c > +++ b/drivers/pci/hotplug/pnv_php.c > @@ -275,14 +275,13 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) > goto free_fdt1; > } > > - fdt = kzalloc(fdt_totalsize(fdt1), GFP_KERNEL); > + fdt = kmemdup(fdt1, fdt_totalsize(fdt1), GFP_KERNEL); > if (!fdt) { > ret = -ENOMEM; > goto free_fdt1; > } > > /* Unflatten device tree blob */ > - memcpy(fdt, fdt1, fdt_totalsize(fdt1)); > dt = of_fdt_unflatten_tree(fdt, php_slot->dn, NULL); > if (!dt) { > ret = -EINVAL; Looks correct to me. Acked-by: Michael Ellerman <mpe@ellerman.id.au> cheers
On Thu, Sep 27, 2018 at 06:52:21AM +0000, YueHaibing wrote: > Use kmemdup rather than duplicating its implementation > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Applied with Michael's ack to pci/hotplug for v4.20, thanks! > --- > drivers/pci/hotplug/pnv_php.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c > index 5070620..ee54f5b 100644 > --- a/drivers/pci/hotplug/pnv_php.c > +++ b/drivers/pci/hotplug/pnv_php.c > @@ -275,14 +275,13 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) > goto free_fdt1; > } > > - fdt = kzalloc(fdt_totalsize(fdt1), GFP_KERNEL); > + fdt = kmemdup(fdt1, fdt_totalsize(fdt1), GFP_KERNEL); > if (!fdt) { > ret = -ENOMEM; > goto free_fdt1; > } > > /* Unflatten device tree blob */ > - memcpy(fdt, fdt1, fdt_totalsize(fdt1)); > dt = of_fdt_unflatten_tree(fdt, php_slot->dn, NULL); > if (!dt) { > ret = -EINVAL; > > >
diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c index 5070620..ee54f5b 100644 --- a/drivers/pci/hotplug/pnv_php.c +++ b/drivers/pci/hotplug/pnv_php.c @@ -275,14 +275,13 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) goto free_fdt1; } - fdt = kzalloc(fdt_totalsize(fdt1), GFP_KERNEL); + fdt = kmemdup(fdt1, fdt_totalsize(fdt1), GFP_KERNEL); if (!fdt) { ret = -ENOMEM; goto free_fdt1; } /* Unflatten device tree blob */ - memcpy(fdt, fdt1, fdt_totalsize(fdt1)); dt = of_fdt_unflatten_tree(fdt, php_slot->dn, NULL); if (!dt) { ret = -EINVAL;
Use kmemdup rather than duplicating its implementation Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/pci/hotplug/pnv_php.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)