2020-10-31 06:00:40

by Yue Haibing

Subject: [PATCH] mm/zswap: Fix passing zero to 'PTR_ERR' warning

Fix smatch warning:

mm/zswap.c:425 zswap_cpu_comp_prepare() warn: passing zero to 'PTR_ERR'

crypto_alloc_comp() never return NULL, use IS_ERR
instead of IS_ERR_OR_NULL to fix this.

Fixes: f1c54846ee45 ("zswap: dynamic pool creation")
Signed-off-by: YueHaibing <[email protected]>
---
mm/zswap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/zswap.c b/mm/zswap.c
index 1eced701b3bd..55a2f72557a8 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -421,7 +421,7 @@ static int zswap_cpu_comp_prepare(unsigned int cpu, struct hlist_node *node)
return 0;

tfm = crypto_alloc_comp(pool->tfm_name, 0, 0);
- if (IS_ERR_OR_NULL(tfm)) {
+ if (IS_ERR(tfm)) {
pr_err("could not alloc crypto comp %s : %ld\n",
pool->tfm_name, PTR_ERR(tfm));
return -ENOMEM;
--
2.17.1

2020-11-02 10:25:35

by David Hildenbrand

Subject: Re: [PATCH] mm/zswap: Fix passing zero to 'PTR_ERR' warning

On 31.10.20 06:56, YueHaibing wrote:
> Fix smatch warning:
>
> mm/zswap.c:425 zswap_cpu_comp_prepare() warn: passing zero to 'PTR_ERR'
>
> crypto_alloc_comp() never return NULL, use IS_ERR
> instead of IS_ERR_OR_NULL to fix this.
>
> Fixes: f1c54846ee45 ("zswap: dynamic pool creation")
> Signed-off-by: YueHaibing <[email protected]>
> ---
> mm/zswap.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mm/zswap.c b/mm/zswap.c
> index 1eced701b3bd..55a2f72557a8 100644
> --- a/mm/zswap.c
> +++ b/mm/zswap.c
> @@ -421,7 +421,7 @@ static int zswap_cpu_comp_prepare(unsigned int cpu, struct hlist_node *node)
> return 0;
>
> tfm = crypto_alloc_comp(pool->tfm_name, 0, 0);
> - if (IS_ERR_OR_NULL(tfm)) {
> + if (IS_ERR(tfm)) {
> pr_err("could not alloc crypto comp %s : %ld\n",
> pool->tfm_name, PTR_ERR(tfm));
> return -ENOMEM;
>

Reviewed-by: David Hildenbrand <[email protected]>

--
Thanks,

David / dhildenb