4:23 a.m.
From: kernel test robot <lkp(a)intel.com>
net/rxrpc/ar-recvmsg.c:125:4-7: WARNING: Use BUG_ON
net/rxrpc/ar-recvmsg.c:217:5-8: WARNING: Use BUG_ON
net/rxrpc/ar-recvmsg.c:242:3-6: WARNING: Use BUG_ON
net/rxrpc/ar-recvmsg.c:269:4-7: WARNING: Use BUG_ON
net/rxrpc/ar-recvmsg.c:321:3-6: WARNING: Use BUG_ON
Use BUG_ON instead of a if condition followed by BUG.
Semantic patch information:
This makes an effort to find cases where BUG() follows an if
condition on an expression and replaces the if condition and BUG()
with a BUG_ON having the conditional expression of the if statement
as argument.
Generated by: scripts/coccinelle/misc/bugon.cocci
Fixes: 8214bf079208 ("scripts/dtc: Export YYLOC global declaration")
Reported-by: kernel test robot <lkp(a)intel.com>
Signed-off-by: kernel test robot <lkp(a)intel.com>
---
tree: https://android.googlesource.com/kernel/goldfish android-3.18
head: dd54b61f1458c03f68fc019b4874d98f2f0ae3a5
commit: 8214bf079208b146e63cd0a3ce0ed335a87ce7b3 [396/1051] scripts/dtc: Export YYLOC
global declaration
:::::: branch date: 5 weeks ago
:::::: commit date: 3 months ago
Please take the patch only if it's a positive warning. Thanks!
ar-recvmsg.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
--- a/net/rxrpc/ar-recvmsg.c
+++ b/net/rxrpc/ar-recvmsg.c
@@ -121,8 +121,7 @@ int rxrpc_recvmsg(struct kiocb *iocb, st
if (test_bit(RXRPC_CALL_RELEASED, &call->flags)) {
_debug("packet from released call");
- if (skb_dequeue(&rx->sk.sk_receive_queue) != skb)
- BUG();
+ BUG_ON(skb_dequeue(&rx->sk.sk_receive_queue) != skb);
rxrpc_free_skb(skb);
continue;
}
@@ -212,9 +211,7 @@ int rxrpc_recvmsg(struct kiocb *iocb, st
/* last bit of request received */
if (!(flags & MSG_PEEK)) {
_debug("eat packet");
- if (skb_dequeue(&rx->sk.sk_receive_queue) !=
- skb)
- BUG();
+ BUG_ON(skb_dequeue(&rx->sk.sk_receive_queue) != skb);
rxrpc_free_skb(skb);
}
msg->msg_flags &= ~MSG_MORE;
@@ -238,8 +235,7 @@ int rxrpc_recvmsg(struct kiocb *iocb, st
}
_debug("eat packet");
- if (skb_dequeue(&rx->sk.sk_receive_queue) != skb)
- BUG();
+ BUG_ON(skb_dequeue(&rx->sk.sk_receive_queue) != skb);
rxrpc_free_skb(skb);
}
@@ -265,8 +261,7 @@ receive_non_data_message:
if (ret < 0)
goto copy_error;
if (!(flags & MSG_PEEK)) {
- if (skb_dequeue(&rx->sk.sk_receive_queue) != skb)
- BUG();
+ BUG_ON(skb_dequeue(&rx->sk.sk_receive_queue) != skb);
rxrpc_free_skb(skb);
}
goto out;
@@ -317,8 +312,7 @@ terminal_message:
if (!(flags & MSG_PEEK)) {
_net("free terminal skb %p", skb);
- if (skb_dequeue(&rx->sk.sk_receive_queue) != skb)
- BUG();
+ BUG_ON(skb_dequeue(&rx->sk.sk_receive_queue) != skb);
rxrpc_free_skb(skb);
rxrpc_remove_user_ID(rx, call);
}