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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,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 96F46C43612 for ; Wed, 2 Jan 2019 20:43:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70BB020874 for ; Wed, 2 Jan 2019 20:43:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727795AbfABUnI (ORCPT ); Wed, 2 Jan 2019 15:43:08 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:43845 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727787AbfABUnI (ORCPT ); Wed, 2 Jan 2019 15:43:08 -0500 Received: from mail-qk1-f199.google.com ([209.85.222.199]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1genM2-0002dz-Qh for stable@vger.kernel.org; Wed, 02 Jan 2019 20:43:06 +0000 Received: by mail-qk1-f199.google.com with SMTP id z126so38115450qka.10 for ; Wed, 02 Jan 2019 12:43:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HEubLEt2IjRABaSPr7Ib16wjjFBZlNNp3QPirrJHQmA=; b=gvKmZswpiuu2I8/aJBfp2ezpSjjA7nMWyWcKCYFJd0y5vsl6EBY5sQIvNOUbuRzKGo lvqMRKhGUsX5NPRcM4aJcF3Eis7K8eMKrHDPukLttcGUoncTrcBEVitJC97XrWYABC6I xJ1Yb+jiwQvqBaYWcAuRoa9u5uVCfOtmHqBFWapKww6VAlGepEyFqOwTCZgSJhDgsvaX kMfmqwHnm7Tgi+vI/2KvKs72C0cYl7rtHrVIk0f06Ku5UQ0IAejxKMOJtUG7e1rSBnlu X6rAV47xzdrg8TigBEYA3GmGbI1kdekYfTk1sR74OebVi4r0H+lQVO8P2hhgBwDfHaBE oDBw== X-Gm-Message-State: AJcUukfz1ga6F02McjuUDJdCsgfABbFDDFREexf/bLOtHh4AqgLpFb0B EYU0fpQY0vHEBGjGY5lZIgEBlBzOjh5OFn73Gwy4ZmPfn9inqLy4ZgpupTuIW3Bd1H3qUUHOGCn Y5KP0sT3j6cN7HdfabTqFd1Wh005SbRE59Q== X-Received: by 2002:a0c:a326:: with SMTP id u35mr44666955qvu.190.1546461785856; Wed, 02 Jan 2019 12:43:05 -0800 (PST) X-Google-Smtp-Source: ALg8bN5VH4IZbTQcTWiZZYaRP0CTJsrSkEkR79axHOonRjOvGERyfcbqwimMnBH8V71lonZV8NHmeA== X-Received: by 2002:a0c:a326:: with SMTP id u35mr44666941qvu.190.1546461785737; Wed, 02 Jan 2019 12:43:05 -0800 (PST) Received: from localhost.localdomain ([179.159.56.118]) by smtp.gmail.com with ESMTPSA id e17sm26679381qte.12.2019.01.02.12.43.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jan 2019 12:43:05 -0800 (PST) From: Mauricio Faria de Oliveira To: stable@vger.kernel.org, netdev@vger.kernel.org, Florian Westphal Cc: Alakesh Haloi , nivedita.singhvi@canonical.com, Pablo Neira Ayuso , Jozsef Kadlecsik , "David S. Miller" , Yi-Hung Wei Subject: [PATCH v2 4.14 5/5] netfilter: nf_conncount: don't skip eviction when age is negative Date: Wed, 2 Jan 2019 18:42:04 -0200 Message-Id: <20190102204204.12389-6-mfo@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190102204204.12389-1-mfo@canonical.com> References: <20190102204204.12389-1-mfo@canonical.com> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Florian Westphal commit 4cd273bb91b3001f623f516ec726c49754571b1a upstream. (not in Linus's tree now, but in nf.git + linux-next.git already.) age is signed integer, so result can be negative when the timestamps have a large delta. In this case we want to discard the entry. Instead of using age >= 2 || age < 0, just make it unsigned. Fixes: b36e4523d4d56 ("netfilter: nf_conncount: fix garbage collection confirm race") Reviewed-by: Shawn Bohrer Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso [mfo: backport: use older file name, nf_conncount.c -> xt_connlimit.c] Signed-off-by: Mauricio Faria de Oliveira --- net/netfilter/xt_connlimit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c index 913b86ef..b1646c2 100644 --- a/net/netfilter/xt_connlimit.c +++ b/net/netfilter/xt_connlimit.c @@ -141,7 +141,7 @@ find_or_evict(struct net *net, struct xt_connlimit_conn *conn) const struct nf_conntrack_tuple_hash *found; unsigned long a, b; int cpu = raw_smp_processor_id(); - __s32 age; + u32 age; found = nf_conntrack_find_get(net, &conn->zone, &conn->tuple); if (found) -- 2.7.4