From patchwork Mon Aug 6 19:17:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 954180 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="15MC/vPx"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41knVg4Z3Bz9s4c for ; Tue, 7 Aug 2018 05:18:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732787AbeHFV2r (ORCPT ); Mon, 6 Aug 2018 17:28:47 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:59194 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730653AbeHFV2r (ORCPT ); Mon, 6 Aug 2018 17:28:47 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w76JE6Y6055042; Mon, 6 Aug 2018 19:17:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : mime-version : content-type; s=corp-2018-07-02; bh=rmfL7z4iY44F1TlHo8O3qK11SJQVkve4R9EQ/Jf6Vws=; b=15MC/vPxAiigAzAW9Uh7QTUWnzqleuU8SgrE7IKxTrgQ6WmV5VU1u/lXOlm5tt1Pfu/5 WzzVk5ttTlxWd1bL6OOdlxj+fTC7qEgViGe3YMTSk6MX0J4Qvk7zWMTS5qP550xDz6DZ M9QvZgOP2ZcypATsmQmlkyobINDTD6izwGUTZmgqhxohCLG3ZTQiklc2RkEwoqZftYjw 3YH8d82MBjT4tEVvEUoYeuoC1xv7YfJbY70pty60dnBolaKtef5j0qnCdOx63RCp2vej Ah2TqKbJlVN43oKhGCIviEvRdDnbDxeDJrUTzy0AYe1GcAWz48jvMytUTvybS0r5d/zY VQ== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2kn4spp99s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 06 Aug 2018 19:17:47 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w76JHlMt029080 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 6 Aug 2018 19:17:47 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w76JHhtt002591; Mon, 6 Aug 2018 19:17:46 GMT Received: from kili.mountain (/197.232.248.111) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 06 Aug 2018 12:17:42 -0700 Date: Mon, 6 Aug 2018 22:17:35 +0300 From: Dan Carpenter To: "David S. Miller" , Peter Oskolkov Cc: Alexey Kuznetsov , Hideaki YOSHIFUJI , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH net-next] ipv4: frags: precedence bug in ip_expire() Message-ID: <20180806191735.c5miffnrhl2w2ljh@kili.mountain> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding User-Agent: NeoMutt/20170113 (1.7.2) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8977 signatures=668707 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=966 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1808060201 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 0e8f8de77e71..7cb7ed761d8c 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -154,7 +154,7 @@ static void ip_expire(struct timer_list *t) __IP_INC_STATS(net, IPSTATS_MIB_REASMFAILS); __IP_INC_STATS(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