From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751871AbdJXQSP (ORCPT ); Tue, 24 Oct 2017 12:18:15 -0400 Received: from gateway24.websitewelcome.com ([192.185.51.253]:15333 "EHLO gateway24.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751465AbdJXQSM (ORCPT ); Tue, 24 Oct 2017 12:18:12 -0400 Date: Tue, 24 Oct 2017 11:18:09 -0500 From: "Gustavo A. R. Silva" To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH] net: rxrpc: rxkad: use BUG_ON instead of if condition followed by BUG Message-ID: <20171024161809.GA29118@embeddedor.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 189.145.38.148 X-Exim-ID: 1e71u6-003pQI-Ui X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedor) [189.145.38.148]:53064 X-Source-Auth: garsilva@embeddedor.com X-Email-Count: 3 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use BUG_ON instead of if condition followed by BUG. This issue was detected with the help of Coccinelle. Signed-off-by: Gustavo A. R. Silva --- net/rxrpc/rxkad.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c index c38b3a1..80bad60 100644 --- a/net/rxrpc/rxkad.c +++ b/net/rxrpc/rxkad.c @@ -70,9 +70,8 @@ static int rxkad_init_connection_security(struct rxrpc_connection *conn) goto error; } - if (crypto_skcipher_setkey(ci, token->kad->session_key, - sizeof(token->kad->session_key)) < 0) - BUG(); + BUG_ON(crypto_skcipher_setkey(ci, token->kad->session_key, + sizeof(token->kad->session_key)) < 0); switch (conn->params.security_level) { case RXRPC_SECURITY_PLAIN: @@ -570,8 +569,7 @@ static void rxkad_locate_data_1(struct rxrpc_call *call, struct sk_buff *skb, { struct rxkad_level1_hdr sechdr; - if (skb_copy_bits(skb, *_offset, &sechdr, sizeof(sechdr)) < 0) - BUG(); + BUG_ON(skb_copy_bits(skb, *_offset, &sechdr, sizeof(sechdr)) < 0); *_offset += sizeof(sechdr); *_len = ntohl(sechdr.data_size) & 0xffff; } @@ -584,8 +582,7 @@ static void rxkad_locate_data_2(struct rxrpc_call *call, struct sk_buff *skb, { struct rxkad_level2_hdr sechdr; - if (skb_copy_bits(skb, *_offset, &sechdr, sizeof(sechdr)) < 0) - BUG(); + BUG_ON(skb_copy_bits(skb, *_offset, &sechdr, sizeof(sechdr)) < 0); *_offset += sizeof(sechdr); *_len = ntohl(sechdr.data_size) & 0xffff; } @@ -1022,9 +1019,8 @@ static void rxkad_decrypt_response(struct rxrpc_connection *conn, ASSERT(rxkad_ci != NULL); mutex_lock(&rxkad_ci_mutex); - if (crypto_skcipher_setkey(rxkad_ci, session_key->x, - sizeof(*session_key)) < 0) - BUG(); + BUG_ON(crypto_skcipher_setkey(rxkad_ci, session_key->x, + sizeof(*session_key)) < 0); memcpy(&iv, session_key, sizeof(iv)); @@ -1066,8 +1062,8 @@ static int rxkad_verify_response(struct rxrpc_connection *conn, if (skb_copy_bits(skb, sizeof(struct rxrpc_wire_header), &response, sizeof(response)) < 0) goto protocol_error; - if (!pskb_pull(skb, sizeof(response))) - BUG(); + + BUG_ON(!pskb_pull(skb, sizeof(response))); version = ntohl(response.version); ticket_len = ntohl(response.ticket_len); -- 2.7.4