net:xfrm:use IS_ERR() with __xfrm_policy_eval_candidates()

[PATCH v1] net:xfrm:use IS_ERR() with __xfrm_policy_eval_candidates()

Posted by Yang Ruibin 1 year, 5 months ago

__xfrm_policy_eval_candidates() function maybe returns
error pointers,So use IS_ERR() to check it.

Signed-off-by: Yang Ruibin <11162571@vivo.com>
---
 net/xfrm/xfrm_policy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index c56c61b0c12e..2e412a48b981 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2156,7 +2156,7 @@ xfrm_policy_eval_candidates(struct xfrm_pol_inexact_candidates *cand,
 		tmp = __xfrm_policy_eval_candidates(cand->res[i],
 						    prefer,
 						    fl, type, family, if_id);
-		if (!tmp)
+		if (IS_ERR(tmp))
 			continue;
 
 		if (IS_ERR(tmp))
-- 
2.34.1

Re: [PATCH v1] net:xfrm:use IS_ERR() with __xfrm_policy_eval_candidates()

Posted by Steffen Klassert 1 year, 5 months ago

On Wed, Aug 21, 2024 at 07:38:06AM -0400, Yang Ruibin wrote:
> __xfrm_policy_eval_candidates() function maybe returns
> error pointers,So use IS_ERR() to check it.
> 
> Signed-off-by: Yang Ruibin <11162571@vivo.com>
> ---
>  net/xfrm/xfrm_policy.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
> index c56c61b0c12e..2e412a48b981 100644
> --- a/net/xfrm/xfrm_policy.c
> +++ b/net/xfrm/xfrm_policy.c
> @@ -2156,7 +2156,7 @@ xfrm_policy_eval_candidates(struct xfrm_pol_inexact_candidates *cand,
>  		tmp = __xfrm_policy_eval_candidates(cand->res[i],
>  						    prefer,
>  						    fl, type, family, if_id);
> -		if (!tmp)
> +		if (IS_ERR(tmp))
>  			continue;

This looks wrong. The error case is already handled below.

>  		if (IS_ERR(tmp))
> -- 
> 2.34.1