2021-03-17 03:40:39

by Jiapeng Chong

Subject: [PATCH] rxrpc: rxkad: replace if (cond) BUG() with BUG_ON()

Fix the following coccicheck warnings:

./net/rxrpc/rxkad.c:1140:2-5: WARNING: Use BUG_ON instead of if
condition followed by BUG.

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Jiapeng Chong <[email protected]>
---
net/rxrpc/rxkad.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index e2e9e9b..bfa3d9a 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -1135,9 +1135,8 @@ static void rxkad_decrypt_response(struct rxrpc_connection *conn,
ntohl(session_key->n[0]), ntohl(session_key->n[1]));

mutex_lock(&rxkad_ci_mutex);
- if (crypto_sync_skcipher_setkey(rxkad_ci, session_key->x,
- sizeof(*session_key)) < 0)
- BUG();
+ BUG_ON(crypto_sync_skcipher_setkey(rxkad_ci, session_key->x,
+ sizeof(*session_key)) < 0);

memcpy(&iv, session_key, sizeof(iv));

--
1.8.3.1

2021-03-18 08:16:28

by Leon Romanovsky

Subject: Re: [PATCH] rxrpc: rxkad: replace if (cond) BUG() with BUG_ON()

On Wed, Mar 17, 2021 at 11:38:38AM +0800, Jiapeng Chong wrote:
> Fix the following coccicheck warnings:
>
> ./net/rxrpc/rxkad.c:1140:2-5: WARNING: Use BUG_ON instead of if
> condition followed by BUG.
>
> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Jiapeng Chong <[email protected]>
> ---
> net/rxrpc/rxkad.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
> index e2e9e9b..bfa3d9a 100644
> --- a/net/rxrpc/rxkad.c
> +++ b/net/rxrpc/rxkad.c
> @@ -1135,9 +1135,8 @@ static void rxkad_decrypt_response(struct rxrpc_connection *conn,
> ntohl(session_key->n[0]), ntohl(session_key->n[1]));
>
> mutex_lock(&rxkad_ci_mutex);
> - if (crypto_sync_skcipher_setkey(rxkad_ci, session_key->x,
> - sizeof(*session_key)) < 0)
> - BUG();
> + BUG_ON(crypto_sync_skcipher_setkey(rxkad_ci, session_key->x,
> + sizeof(*session_key)) < 0);

It will be better to delete this BUG_ON() or find a way to ensure
that it doesn't happen and delete after that.

Thanks

>
> memcpy(&iv, session_key, sizeof(iv));
>
> --
> 1.8.3.1
>