From: zhong jiang <zhongjiang@huawei.com>
To: <davem@davemloft.net>, <edumazet@google.com>
Cc: <kuznet@ms2.inr.ac.ru>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCHv2] net: ipv4: Use BUG_ON directly instead of a if condition followed by BUG
Date: Tue, 11 Sep 2018 21:13:13 +0800 [thread overview]
Message-ID: <1536671593-14746-1-git-send-email-zhongjiang@huawei.com> (raw)
The if condition can be removed if we use BUG_ON directly.
The issule is detected with the help of Coccinelle.
Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
net/ipv4/tcp_input.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 62508a2..526c05e 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4934,8 +4934,8 @@ void tcp_rbtree_insert(struct rb_root *root, struct sk_buff *skb)
BUG_ON(offset < 0);
if (size > 0) {
size = min(copy, size);
- if (skb_copy_bits(skb, offset, skb_put(nskb, size), size))
- BUG();
+ BUG_ON(skb_copy_bits(skb, offset,
+ skb_put(nskb, size), size));
TCP_SKB_CB(nskb)->end_seq += size;
copy -= size;
start += size;
@@ -5327,8 +5327,8 @@ static void tcp_urg(struct sock *sk, struct sk_buff *skb, const struct tcphdr *t
/* Is the urgent pointer pointing into this packet? */
if (ptr < skb->len) {
u8 tmp;
- if (skb_copy_bits(skb, ptr, &tmp, 1))
- BUG();
+
+ BUG_ON(skb_copy_bits(skb, ptr, &tmp, 1));
tp->urg_data = TCP_URG_VALID | tmp;
if (!sock_flag(sk, SOCK_DEAD))
sk->sk_data_ready(sk);
--
1.7.12.4
next reply other threads:[~2018-09-11 13:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-11 13:13 zhong jiang [this message]
2018-09-13 10:28 ` [PATCHv2] net: ipv4: Use BUG_ON directly instead of a if condition followed by BUG Simon Horman
2018-09-13 17:42 ` David Miller
2018-09-14 5:13 ` zhong jiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1536671593-14746-1-git-send-email-zhongjiang@huawei.com \
--to=zhongjiang@huawei.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).