2022-10-26 02:09:07

by Rafael Mendonca

Subject: [PATCH] KVM: s390: pci: Fix allocation size of aift kzdev elements

The 'kzdev' field of struct 'zpci_aift' is an array of pointers to
'kvm_zdev' structs. Allocate the proper size accordingly.

Reported by Coccinelle:
WARNING: Use correct pointer type argument for sizeof

Fixes: 98b1d33dac5f ("KVM: s390: pci: do initial setup for AEN interpretation")
Signed-off-by: Rafael Mendonca <[email protected]>
---
arch/s390/kvm/pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c
index c50c1645c0ae..ded1af2ddae9 100644
--- a/arch/s390/kvm/pci.c
+++ b/arch/s390/kvm/pci.c
@@ -126,7 +126,7 @@ int kvm_s390_pci_aen_init(u8 nisc)
return -EPERM;

mutex_lock(&aift->aift_lock);
- aift->kzdev = kcalloc(ZPCI_NR_DEVICES, sizeof(struct kvm_zdev),
+ aift->kzdev = kcalloc(ZPCI_NR_DEVICES, sizeof(struct kvm_zdev *),
GFP_KERNEL);
if (!aift->kzdev) {
rc = -ENOMEM;
--
2.34.1

2022-10-26 14:15:37

by Christian Borntraeger

Subject: Re: [PATCH] KVM: s390: pci: Fix allocation size of aift kzdev elements

Am 26.10.22 um 03:32 schrieb Rafael Mendonca:
> The 'kzdev' field of struct 'zpci_aift' is an array of pointers to
> 'kvm_zdev' structs. Allocate the proper size accordingly.
>
> Reported by Coccinelle:
> WARNING: Use correct pointer type argument for sizeof
>
> Fixes: 98b1d33dac5f ("KVM: s390: pci: do initial setup for AEN interpretation")
> Signed-off-by: Rafael Mendonca <[email protected]>

Reviewed-by: Christian Borntraeger <[email protected]>

> ---
> arch/s390/kvm/pci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c
> index c50c1645c0ae..ded1af2ddae9 100644
> --- a/arch/s390/kvm/pci.c
> +++ b/arch/s390/kvm/pci.c
> @@ -126,7 +126,7 @@ int kvm_s390_pci_aen_init(u8 nisc)
> return -EPERM;
>
> mutex_lock(&aift->aift_lock);
> - aift->kzdev = kcalloc(ZPCI_NR_DEVICES, sizeof(struct kvm_zdev),
> + aift->kzdev = kcalloc(ZPCI_NR_DEVICES, sizeof(struct kvm_zdev *),
> GFP_KERNEL);
> if (!aift->kzdev) {
> rc = -ENOMEM;

2022-10-26 14:16:55

by Matthew Rosato

Subject: Re: [PATCH] KVM: s390: pci: Fix allocation size of aift kzdev elements

On 10/25/22 9:32 PM, Rafael Mendonca wrote:
> The 'kzdev' field of struct 'zpci_aift' is an array of pointers to
> 'kvm_zdev' structs. Allocate the proper size accordingly.
>
> Reported by Coccinelle:
> WARNING: Use correct pointer type argument for sizeof
>
> Fixes: 98b1d33dac5f ("KVM: s390: pci: do initial setup for AEN interpretation")
> Signed-off-by: Rafael Mendonca <[email protected]>

Thanks for reporting & fixing.

Reviewed-by: Matthew Rosato <[email protected]>

> ---
> arch/s390/kvm/pci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c
> index c50c1645c0ae..ded1af2ddae9 100644
> --- a/arch/s390/kvm/pci.c
> +++ b/arch/s390/kvm/pci.c
> @@ -126,7 +126,7 @@ int kvm_s390_pci_aen_init(u8 nisc)
> return -EPERM;
>
> mutex_lock(&aift->aift_lock);
> - aift->kzdev = kcalloc(ZPCI_NR_DEVICES, sizeof(struct kvm_zdev),
> + aift->kzdev = kcalloc(ZPCI_NR_DEVICES, sizeof(struct kvm_zdev *),
> GFP_KERNEL);
> if (!aift->kzdev) {
> rc = -ENOMEM;

2022-10-26 15:15:53

by Janosch Frank

Subject: Re: [PATCH] KVM: s390: pci: Fix allocation size of aift kzdev elements

On 10/26/22 15:36, Matthew Rosato wrote:
> On 10/25/22 9:32 PM, Rafael Mendonca wrote:
>> The 'kzdev' field of struct 'zpci_aift' is an array of pointers to
>> 'kvm_zdev' structs. Allocate the proper size accordingly.
>>
>> Reported by Coccinelle:
>> WARNING: Use correct pointer type argument for sizeof
>>
>> Fixes: 98b1d33dac5f ("KVM: s390: pci: do initial setup for AEN interpretation")
>> Signed-off-by: Rafael Mendonca <[email protected]>
>
> Thanks for reporting & fixing.
>
> Reviewed-by: Matthew Rosato <[email protected]>

After consulting Matt I've put this into the CI and I'll pick it once it
received a bit of coverage.