From: Mao Wenan <maowenan@huawei.com>
To: <gregkh@linux-foundation.org>, <stable@vger.kernel.org>,
<edumazet@google.com>, <netdev@vger.kernel.org>,
<davem@davemloft.net>, <maowenan@huawei.com>,
<eric.dumazet@gmail.com>
Subject: [PATCH stable 4.4 v2 11/11] ipv4: frags: precedence bug in ip_expire()
Date: Fri, 25 Jan 2019 10:48:44 +0800 [thread overview]
Message-ID: <1548384524-174152-12-git-send-email-maowenan@huawei.com> (raw)
In-Reply-To: <1548384524-174152-1-git-send-email-maowenan@huawei.com>
From: Dan Carpenter <dan.carpenter@oracle.com>
[ Upstream commit 70837ffe3085c9a91488b52ca13ac84424da1042 ]
We accidentally removed the parentheses here, but they are required
because '!' has higher precedence than '&'.
Fixes: fa0f527358bd ("ip: use rb trees for IP frag queue.")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Mao Wenan <maowenan@huawei.com>
---
net/ipv4/ip_fragment.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 0e75881..eb8955c 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -257,7 +257,7 @@ static void ip_expire(unsigned long arg)
IP_INC_STATS_BH(net, IPSTATS_MIB_REASMFAILS);
IP_INC_STATS_BH(net, IPSTATS_MIB_REASMTIMEOUT);
- if (!qp->q.flags & INET_FRAG_FIRST_IN)
+ if (!(qp->q.flags & INET_FRAG_FIRST_IN))
goto out;
/* sk_buff::dev and sk_buff::rbnode are unionized. So we
--
1.8.3.1
next prev parent reply other threads:[~2019-01-25 2:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-25 2:48 [PATCH stable 4.4 v2 00/11] fix FragmentSmack in stable branch (CVE-2018-5391) Mao Wenan
2019-01-25 2:48 ` [PATCH stable 4.4 v2 01/11] net: speed up skb_rbtree_purge() Mao Wenan
2019-01-25 2:48 ` [PATCH stable 4.4 v2 02/11] ip: discard IPv4 datagrams with overlapping segments Mao Wenan
2019-01-25 2:48 ` [PATCH stable 4.4 v2 03/11] net: modify skb_rbtree_purge to return the truesize of all purged skbs Mao Wenan
2019-01-25 2:48 ` [PATCH stable 4.4 v2 04/11] inet: frags: get rif of inet_frag_evicting() Mao Wenan
2019-01-25 2:48 ` [PATCH stable 4.4 v2 05/11] ip: use rb trees for IP frag queue Mao Wenan
2019-01-25 2:48 ` [PATCH stable 4.4 v2 06/11] ipv6: defrag: drop non-last frags smaller than min mtu Mao Wenan
2019-01-25 2:48 ` [PATCH stable 4.4 v2 07/11] ip: add helpers to process in-order fragments faster Mao Wenan
2019-01-25 2:48 ` [PATCH stable 4.4 v2 08/11] ip: process in-order fragments efficiently Mao Wenan
2019-01-25 2:48 ` [PATCH stable 4.4 v2 09/11] net: ipv4: do not handle duplicate fragments as overlapping Mao Wenan
2019-01-25 2:48 ` [PATCH stable 4.4 v2 10/11] ip: frags: fix crash in ip_do_fragment() Mao Wenan
2019-01-25 2:48 ` Mao Wenan [this message]
2019-02-04 10:03 ` [PATCH stable 4.4 v2 00/11] fix FragmentSmack in stable branch (CVE-2018-5391) Greg KH
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=1548384524-174152-12-git-send-email-maowenan@huawei.com \
--to=maowenan@huawei.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eric.dumazet@gmail.com \
--cc=gregkh@linux-foundation.org \
--cc=netdev@vger.kernel.org \
--cc=stable@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