2022-09-18 14:37:43

by CGEL

Subject: [PATCH linux-next] KVM: s390: pci: fix comparing pointer to 0

From: Xu Panda <[email protected]>

Comparing pointer whith NULL instead of comparing pointer to 0.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Xu Panda <[email protected]>
---
arch/s390/kvm/pci.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/s390/kvm/pci.h b/arch/s390/kvm/pci.h
index 3a3606c3a0fe..aadafa2e03d1 100644
--- a/arch/s390/kvm/pci.h
+++ b/arch/s390/kvm/pci.h
@@ -46,8 +46,8 @@ extern struct zpci_aift *aift;
static inline struct kvm *kvm_s390_pci_si_to_kvm(struct zpci_aift *aift,
unsigned long si)
{
- if (!IS_ENABLED(CONFIG_VFIO_PCI_ZDEV_KVM) || aift->kzdev == 0 ||
- aift->kzdev[si] == 0)
+ if (!IS_ENABLED(CONFIG_VFIO_PCI_ZDEV_KVM) || aift->kzdev == NULL ||
+ aift->kzdev[si] == NULL)
return 0;
return aift->kzdev[si]->kvm;
};
--
2.15.2

2022-09-19 06:42:46

by Christian Borntraeger

Subject: Re: [PATCH linux-next] KVM: s390: pci: fix comparing pointer to 0

Am 18.09.22 um 16:36 schrieb [email protected]:
> From: Xu Panda <[email protected]>
>
> Comparing pointer whith NULL instead of comparing pointer to 0.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Xu Panda <[email protected]>

Thanks but there is already a fix queued (https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git/commit/?h=next&id=3ed2607b18cce86efed3a3c76fce89dc11184f62)
and your fix would still trigger checkpatch --strict warning.
> ---
> arch/s390/kvm/pci.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/s390/kvm/pci.h b/arch/s390/kvm/pci.h
> index 3a3606c3a0fe..aadafa2e03d1 100644
> --- a/arch/s390/kvm/pci.h
> +++ b/arch/s390/kvm/pci.h
> @@ -46,8 +46,8 @@ extern struct zpci_aift *aift;
> static inline struct kvm *kvm_s390_pci_si_to_kvm(struct zpci_aift *aift,
> unsigned long si)
> {
> - if (!IS_ENABLED(CONFIG_VFIO_PCI_ZDEV_KVM) || aift->kzdev == 0 ||
> - aift->kzdev[si] == 0)
> + if (!IS_ENABLED(CONFIG_VFIO_PCI_ZDEV_KVM) || aift->kzdev == NULL ||
> + aift->kzdev[si] == NULL)
> return 0;
> return aift->kzdev[si]->kvm;
> };