2021-06-07 09:00:32

by Zheng Yongjun

Subject: [PATCH net-next] xfrm: use BUG_ON instead of if condition followed by BUG

Use BUG_ON instead of if condition followed by BUG.

This issue was detected with the help of Coccinelle.

Signed-off-by: Zheng Yongjun <[email protected]>
---
net/xfrm/xfrm_policy.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index ce500f847b99..532314578151 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -421,8 +421,7 @@ void xfrm_policy_destroy(struct xfrm_policy *policy)
{
BUG_ON(!policy->walk.dead);

- if (del_timer(&policy->timer) || del_timer(&policy->polq.hold_timer))
- BUG();
+ BUG_ON(del_timer(&policy->timer) || del_timer(&policy->polq.hold_timer));

call_rcu(&policy->rcu, xfrm_policy_destroy_rcu);
}
--
2.25.1

2021-06-07 09:06:15

by Herbert Xu

Subject: Re: [PATCH net-next] xfrm: use BUG_ON instead of if condition followed by BUG

On Mon, Jun 07, 2021 at 05:11:21PM +0800, Zheng Yongjun wrote:
> Use BUG_ON instead of if condition followed by BUG.
>
> This issue was detected with the help of Coccinelle.
>
> Signed-off-by: Zheng Yongjun <[email protected]>
> ---
> net/xfrm/xfrm_policy.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
> index ce500f847b99..532314578151 100644
> --- a/net/xfrm/xfrm_policy.c
> +++ b/net/xfrm/xfrm_policy.c
> @@ -421,8 +421,7 @@ void xfrm_policy_destroy(struct xfrm_policy *policy)
> {
> BUG_ON(!policy->walk.dead);
>
> - if (del_timer(&policy->timer) || del_timer(&policy->polq.hold_timer))
> - BUG();
> + BUG_ON(del_timer(&policy->timer) || del_timer(&policy->polq.hold_timer));

Nack. Do not put statements with side effects within BUG_ON.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt