4:25 a.m.
From: kernel test robot <lkp(a)intel.com>
net/core/skbuff.c:1497:2-5: WARNING: Use BUG_ON
net/core/skbuff.c:1084:2-5: WARNING: Use BUG_ON
net/core/skbuff.c:986:2-5: WARNING: Use BUG_ON
net/core/skbuff.c:1220:2-5: 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!
skbuff.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -982,8 +982,7 @@ struct sk_buff *skb_copy(const struct sk
/* Set the tail pointer and length */
skb_put(n, skb->len);
- if (skb_copy_bits(skb, -headerlen, n->head, headerlen + skb->len))
- BUG();
+ BUG_ON(skb_copy_bits(skb, -headerlen, n->head, headerlen + skb->len));
copy_skb_header(n, skb);
return n;
@@ -1080,8 +1079,7 @@ int pskb_expand_head(struct sk_buff *skb
BUG_ON(nhead < 0);
- if (skb_shared(skb))
- BUG();
+ BUG_ON(skb_shared(skb));
size = SKB_DATA_ALIGN(size);
@@ -1215,9 +1213,7 @@ struct sk_buff *skb_copy_expand(const st
head_copy_off = newheadroom - head_copy_len;
/* Copy the linear header and data. */
- if (skb_copy_bits(skb, -head_copy_len, n->head + head_copy_off,
- skb->len + head_copy_len))
- BUG();
+ BUG_ON(skb_copy_bits(skb, -head_copy_len, n->head + head_copy_off, skb->len +
head_copy_len));
copy_skb_header(n, skb);
@@ -1493,8 +1489,7 @@ unsigned char *__pskb_pull_tail(struct s
return NULL;
}
- if (skb_copy_bits(skb, skb_headlen(skb), skb_tail_pointer(skb), delta))
- BUG();
+ BUG_ON(skb_copy_bits(skb, skb_headlen(skb), skb_tail_pointer(skb), delta));
/* Optimization: no fragments, no reasons to preestimate
* size of pulled pages. Superb.