From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1F3CC282C4 for ; Thu, 7 Feb 2019 11:43:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6800B2080A for ; Thu, 7 Feb 2019 11:43:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549539836; bh=SZcAUdsRzD+RqM2rrERHs5pwbqW0DPb3JG/fXt+DuSI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=k3gdyn04YZ+bHRWQb7U+IdMq1DlvP/bleD19vp8oiAynF2v/HTkMVqdP5+CNtVdTc YJNtPvHkPf8ty9c9LRaa0zx/YeaxonNSepyKuA4dA2WXotxuaKAZZ1T7vZMmQjELAw IJpKzqp60JMBmQzDJesKE7a+GzM96dxle54fvHsY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727623AbfBGLnx (ORCPT ); Thu, 7 Feb 2019 06:43:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:34368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726799AbfBGLnw (ORCPT ); Thu, 7 Feb 2019 06:43:52 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C03DD2080F; Thu, 7 Feb 2019 11:43:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549539832; bh=SZcAUdsRzD+RqM2rrERHs5pwbqW0DPb3JG/fXt+DuSI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r3DUJ5ezNnhscSi8Ppg+pbcpuhWGPpsRsUvzmzT89YzRV2KCaEhZCnmM4Y5Il2WjD LA7HqSQAsKTF6KsCZKpRXg5Lj97U01HYuFmitKIK3BmdUmpD2IJ/lxxfqr9VqcHB8K D1h/+MF+l/DN5HjUkHC9xhb7tmTGDMR2HYkr0gwY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , "David S. Miller" , Mao Wenan , Ben Hutchings Subject: [PATCH 4.4 30/34] ipv4: frags: precedence bug in ip_expire() Date: Thu, 7 Feb 2019 12:42:12 +0100 Message-Id: <20190207113026.725752897@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207113025.552605181@linuxfoundation.org> References: <20190207113025.552605181@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Carpenter commit 70837ffe3085c9a91488b52ca13ac84424da1042 upstream. 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 Signed-off-by: David S. Miller Signed-off-by: Mao Wenan Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ip_fragment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -205,7 +205,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