4:23 a.m.
From: kernel test robot <lkp(a)intel.com>
net/key/af_key.c:950:2-5: WARNING: Use BUG_ON
net/key/af_key.c:967:2-5: WARNING: Use BUG_ON
net/key/af_key.c:3227:2-5: WARNING: Use BUG_ON
net/key/af_key.c:3243:2-5: WARNING: Use BUG_ON
net/key/af_key.c:3440:2-5: WARNING: Use BUG_ON
net/key/af_key.c:3463:2-5: WARNING: Use BUG_ON
net/key/af_key.c:2117: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!
af_key.c | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -946,8 +946,7 @@ static struct sk_buff *__pfkey_xfrm_stat
pfkey_sockaddr_fill(&x->props.saddr, 0,
(struct sockaddr *) (addr + 1),
x->props.family);
- if (!addr->sadb_address_prefixlen)
- BUG();
+ BUG_ON(!addr->sadb_address_prefixlen);
/* dst address */
addr = (struct sadb_address*) skb_put(skb,
@@ -963,8 +962,7 @@ static struct sk_buff *__pfkey_xfrm_stat
pfkey_sockaddr_fill(&x->id.daddr, 0,
(struct sockaddr *) (addr + 1),
x->props.family);
- if (!addr->sadb_address_prefixlen)
- BUG();
+ BUG_ON(!addr->sadb_address_prefixlen);
if (!xfrm_addr_equal(&x->sel.saddr, &x->props.saddr,
x->props.family)) {
@@ -2110,11 +2108,7 @@ static int pfkey_xfrm_policy2msg(struct
addr->sadb_address_proto = pfkey_proto_from_xfrm(xp->selector.proto);
addr->sadb_address_prefixlen = xp->selector.prefixlen_s;
addr->sadb_address_reserved = 0;
- if (!pfkey_sockaddr_fill(&xp->selector.saddr,
- xp->selector.sport,
- (struct sockaddr *) (addr + 1),
- xp->family))
- BUG();
+ BUG_ON(!pfkey_sockaddr_fill(&xp->selector.saddr, xp->selector.sport, (struct
sockaddr *)(addr + 1), xp->family));
/* dst address */
addr = (struct sadb_address*) skb_put(skb,
@@ -3223,8 +3217,7 @@ static int pfkey_send_acquire(struct xfr
pfkey_sockaddr_fill(&x->props.saddr, 0,
(struct sockaddr *) (addr + 1),
x->props.family);
- if (!addr->sadb_address_prefixlen)
- BUG();
+ BUG_ON(!addr->sadb_address_prefixlen);
/* dst address */
addr = (struct sadb_address*) skb_put(skb,
@@ -3239,8 +3232,7 @@ static int pfkey_send_acquire(struct xfr
pfkey_sockaddr_fill(&x->id.daddr, 0,
(struct sockaddr *) (addr + 1),
x->props.family);
- if (!addr->sadb_address_prefixlen)
- BUG();
+ BUG_ON(!addr->sadb_address_prefixlen);
pol = (struct sadb_x_policy *) skb_put(skb, sizeof(struct sadb_x_policy));
pol->sadb_x_policy_len = sizeof(struct sadb_x_policy)/sizeof(uint64_t);
@@ -3436,8 +3428,7 @@ static int pfkey_send_new_mapping(struct
pfkey_sockaddr_fill(&x->props.saddr, 0,
(struct sockaddr *) (addr + 1),
x->props.family);
- if (!addr->sadb_address_prefixlen)
- BUG();
+ BUG_ON(!addr->sadb_address_prefixlen);
/* NAT_T_SPORT (old port) */
n_port = (struct sadb_x_nat_t_port*) skb_put(skb, sizeof (*n_port));
@@ -3459,8 +3450,7 @@ static int pfkey_send_new_mapping(struct
pfkey_sockaddr_fill(ipaddr, 0,
(struct sockaddr *) (addr + 1),
x->props.family);
- if (!addr->sadb_address_prefixlen)
- BUG();
+ BUG_ON(!addr->sadb_address_prefixlen);
/* NAT_T_DPORT (new port) */
n_port = (struct sadb_x_nat_t_port*) skb_put(skb, sizeof (*n_port));