2019-06-08 09:02:20

by Hariprasad Kelam

Subject: [PATCH] af_key: make use of BUG_ON macro

fix below warnings reported by coccicheck

net/key/af_key.c:932:2-5: WARNING: Use BUG_ON instead of if condition
followed by BUG.
net/key/af_key.c:948:2-5: WARNING: Use BUG_ON instead of if condition
followed by BUG.

Signed-off-by: Hariprasad Kelam <[email protected]>
---
net/key/af_key.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/key/af_key.c b/net/key/af_key.c
index fe5fc4b..b67ed3a 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -928,8 +928,7 @@ static struct sk_buff *__pfkey_xfrm_state2msg(const struct xfrm_state *x,
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 = skb_put(skb, sizeof(struct sadb_address) + sockaddr_size);
@@ -944,8 +943,7 @@ static struct sk_buff *__pfkey_xfrm_state2msg(const struct xfrm_state *x,
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)) {
--
2.7.4

2019-06-10 02:59:21

by David Miller

Subject: Re: [PATCH] af_key: make use of BUG_ON macro

From: Hariprasad Kelam <[email protected]>
Date: Sat, 8 Jun 2019 14:30:50 +0530

> fix below warnings reported by coccicheck
>
> net/key/af_key.c:932:2-5: WARNING: Use BUG_ON instead of if condition
> followed by BUG.
> net/key/af_key.c:948:2-5: WARNING: Use BUG_ON instead of if condition
> followed by BUG.
>
> Signed-off-by: Hariprasad Kelam <[email protected]>

Applied to net-next.