From patchwork Tue Mar 17 10:55:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229353 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.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 45412C18E5B for ; Tue, 17 Mar 2020 10:58:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B72E20735 for ; Tue, 17 Mar 2020 10:58:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584442702; bh=CJWOWQa3hIlsT45lEVBrSR3FnQYkMwvvDTbOn39maNI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fPdqqfCwtG6afqAk1Rmf1gMjXd+t+w8kjIHaJZvLBwgMKurhVOW/KblwsnYoWd0Ek BmgVXewZbwYPWYYYT2TWHwX+LMmCcTMWrlnNU5VHXkTzzISAQtcR3dyEqUDGzBPfJG HQGgOw9SEqMIfHWxfpan4XdaYLFKvpPSFYvKcAkc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726797AbgCQK6U (ORCPT ); Tue, 17 Mar 2020 06:58:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:36430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727201AbgCQK6U (ORCPT ); Tue, 17 Mar 2020 06:58:20 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 2808420719; Tue, 17 Mar 2020 10:58:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584442699; bh=CJWOWQa3hIlsT45lEVBrSR3FnQYkMwvvDTbOn39maNI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fvlyABBPlMQPGhKIirIg45cGJGiDJMdtjjH8ORZOvf0OurzyTHqwciiZh02sfON2D X5mLhqOqQyErsn7DPaLWwqzXgyvYOTWC5aF21ACNPaS8BTnTHpFycFWqnKrsS5PILW U0dP3sdSxaiRd7CpvYaNHaVuotH6dRHdB6qDY1YQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vasily Averin , Pablo Neira Ayuso Subject: [PATCH 4.19 51/89] netfilter: nf_conntrack: ct_cpu_seq_next should increase position index Date: Tue, 17 Mar 2020 11:55:00 +0100 Message-Id: <20200317103305.791797399@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317103259.744774526@linuxfoundation.org> References: <20200317103259.744774526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vasily Averin commit dc15af8e9dbd039ebb06336597d2c491ef46ab74 upstream. If .next function does not change position index, following .show function will repeat output related to current position index. Cc: stable@vger.kernel.org Fixes: 1f4aace60b0e ("fs/seq_file.c: simplify seq_file iteration code ...") Link: https://bugzilla.kernel.org/show_bug.cgi?id=206283 Signed-off-by: Vasily Averin Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nf_conntrack_standalone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -390,7 +390,7 @@ static void *ct_cpu_seq_next(struct seq_ *pos = cpu + 1; return per_cpu_ptr(net->ct.stat, cpu); } - + (*pos)++; return NULL; }