vfio/pds: fix return value in pds_vfio_get_lm_file()

[PATCH -next] vfio/pds: fix return value in pds_vfio_get_lm_file()

Posted by Yang Yingliang 2 years, 4 months ago

anon_inode_getfile() never returns NULL pointer, it will return
ERR_PTR() when it fails, so replace the check with IS_ERR().

Fixes: bb500dbe2ac6 ("vfio/pds: Add VFIO live migration support")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/vfio/pci/pds/lm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/vfio/pci/pds/lm.c b/drivers/vfio/pci/pds/lm.c
index aec75574cab3..79fe2e66bb49 100644
--- a/drivers/vfio/pci/pds/lm.c
+++ b/drivers/vfio/pci/pds/lm.c
@@ -31,7 +31,7 @@ pds_vfio_get_lm_file(const struct file_operations *fops, int flags, u64 size)
 	/* Create file */
 	lm_file->filep =
 		anon_inode_getfile("pds_vfio_lm", fops, lm_file, flags);
-	if (!lm_file->filep)
+	if (IS_ERR(lm_file->filep))
 		goto out_free_file;
 
 	stream_open(lm_file->filep->f_inode, lm_file->filep);
-- 
2.25.1

Re: [PATCH -next] vfio/pds: fix return value in pds_vfio_get_lm_file()

Posted by Alex Williamson 2 years, 3 months ago

On Sat, 19 Aug 2023 10:37:16 +0800
Yang Yingliang <yangyingliang@huawei.com> wrote:

> anon_inode_getfile() never returns NULL pointer, it will return
> ERR_PTR() when it fails, so replace the check with IS_ERR().
> 
> Fixes: bb500dbe2ac6 ("vfio/pds: Add VFIO live migration support")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
>  drivers/vfio/pci/pds/lm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/vfio/pci/pds/lm.c b/drivers/vfio/pci/pds/lm.c
> index aec75574cab3..79fe2e66bb49 100644
> --- a/drivers/vfio/pci/pds/lm.c
> +++ b/drivers/vfio/pci/pds/lm.c
> @@ -31,7 +31,7 @@ pds_vfio_get_lm_file(const struct file_operations *fops, int flags, u64 size)
>  	/* Create file */
>  	lm_file->filep =
>  		anon_inode_getfile("pds_vfio_lm", fops, lm_file, flags);
> -	if (!lm_file->filep)
> +	if (IS_ERR(lm_file->filep))
>  		goto out_free_file;
>  
>  	stream_open(lm_file->filep->f_inode, lm_file->filep);

Applied to vfio next branch for v6.6.  Thanks,

Alex

Re: [PATCH -next] vfio/pds: fix return value in pds_vfio_get_lm_file()

Posted by Brett Creeley 2 years, 3 months ago

On 8/18/2023 7:37 PM, Yang Yingliang wrote:
> Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.
> 
> 
> anon_inode_getfile() never returns NULL pointer, it will return
> ERR_PTR() when it fails, so replace the check with IS_ERR().
> 
> Fixes: bb500dbe2ac6 ("vfio/pds: Add VFIO live migration support")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
>   drivers/vfio/pci/pds/lm.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/vfio/pci/pds/lm.c b/drivers/vfio/pci/pds/lm.c
> index aec75574cab3..79fe2e66bb49 100644
> --- a/drivers/vfio/pci/pds/lm.c
> +++ b/drivers/vfio/pci/pds/lm.c
> @@ -31,7 +31,7 @@ pds_vfio_get_lm_file(const struct file_operations *fops, int flags, u64 size)
>          /* Create file */
>          lm_file->filep =
>                  anon_inode_getfile("pds_vfio_lm", fops, lm_file, flags);
> -       if (!lm_file->filep)
> +       if (IS_ERR(lm_file->filep))
>                  goto out_free_file;

LGTM! Thanks for fixing this.

Reviewed-by: Brett Creeley <brett.creeley@amd.com>

> 
>          stream_open(lm_file->filep->f_inode, lm_file->filep);
> --
> 2.25.1
>