2020-05-19 15:17:21

by Prabhakar Mahadev Lad

Subject: [PATCH] PCI: endpoint: Fix epc windows allocation in pci_epc_multi_mem_init()

Fix allocation of epc windows with the correct size, this also fix smatch
warning:

drivers/pci/endpoint/pci-epc-mem.c:65 pci_epc_multi_mem_init()
warn: double check that we're allocating correct size: 4 vs 112

Fixes: ecbae87 ("PCI: endpoint: Add support to handle multiple base for mapping outbound memory")
Signed-off-by: Lad Prabhakar <[email protected]>
Reported-by: kbuild test robot <[email protected]>
Reported-by: Dan Carpenter <[email protected]>
---
drivers/pci/endpoint/pci-epc-mem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/endpoint/pci-epc-mem.c b/drivers/pci/endpoint/pci-epc-mem.c
index 2325f74..80c46f3 100644
--- a/drivers/pci/endpoint/pci-epc-mem.c
+++ b/drivers/pci/endpoint/pci-epc-mem.c
@@ -62,7 +62,7 @@ int pci_epc_multi_mem_init(struct pci_epc *epc,
if (!windows || !num_windows)
return -EINVAL;

- epc->windows = kcalloc(num_windows, sizeof(*mem), GFP_KERNEL);
+ epc->windows = kcalloc(num_windows, sizeof(*epc->windows), GFP_KERNEL);
if (!epc->windows)
return -ENOMEM;

--
2.7.4

2020-05-22 11:42:00

by Lorenzo Pieralisi

Subject: Re: [PATCH] PCI: endpoint: Fix epc windows allocation in pci_epc_multi_mem_init()

On Tue, May 19, 2020 at 04:11:20PM +0100, Lad Prabhakar wrote:
> Fix allocation of epc windows with the correct size, this also fix smatch
> warning:
>
> drivers/pci/endpoint/pci-epc-mem.c:65 pci_epc_multi_mem_init()
> warn: double check that we're allocating correct size: 4 vs 112
>
> Fixes: ecbae87 ("PCI: endpoint: Add support to handle multiple base for mapping outbound memory")
> Signed-off-by: Lad Prabhakar <[email protected]>
> Reported-by: kbuild test robot <[email protected]>
> Reported-by: Dan Carpenter <[email protected]>
> ---
> drivers/pci/endpoint/pci-epc-mem.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Squashed in the original commit in pci/rcar, pushed out.

Thanks,
Lorenzo

> diff --git a/drivers/pci/endpoint/pci-epc-mem.c b/drivers/pci/endpoint/pci-epc-mem.c
> index 2325f74..80c46f3 100644
> --- a/drivers/pci/endpoint/pci-epc-mem.c
> +++ b/drivers/pci/endpoint/pci-epc-mem.c
> @@ -62,7 +62,7 @@ int pci_epc_multi_mem_init(struct pci_epc *epc,
> if (!windows || !num_windows)
> return -EINVAL;
>
> - epc->windows = kcalloc(num_windows, sizeof(*mem), GFP_KERNEL);
> + epc->windows = kcalloc(num_windows, sizeof(*epc->windows), GFP_KERNEL);
> if (!epc->windows)
> return -ENOMEM;
>
> --
> 2.7.4
>