From patchwork Tue Sep 29 10:59:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 263413 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=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, 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 57188C4741F for ; Tue, 29 Sep 2020 11:03:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 007A522207 for ; Tue, 29 Sep 2020 11:03:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601377407; bh=b4L+peW8joC0wtnlknOzY9zNYkJr1tC/jPAnGMInqXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YX+lsh66yf6+n1iEJs2h+le3P1vna0m429WGhiVQAeC7ckAqIHMCNvt1dKkZGE9o/ IWlT/Z0K3PWcUq0tcnwGGL38a4ClyC73LngJAs0LAknLZkdMLxR3sepBNTFlHIsxtg kBBazRl24fKeq46zdMNXl6M/krFt5I/AON3CMTlc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728425AbgI2LD0 (ORCPT ); Tue, 29 Sep 2020 07:03:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:39088 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728377AbgI2LDZ (ORCPT ); Tue, 29 Sep 2020 07:03:25 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 D96AD21941; Tue, 29 Sep 2020 11:03:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601377404; bh=b4L+peW8joC0wtnlknOzY9zNYkJr1tC/jPAnGMInqXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mUhPx93rTNXZZIc8w5JUT3DC1efTKMDGYLNCNdOTycfNXtVWkSbgxWtYCN/hDQbTA liIk7bk3Nwx7EV1mCbbxoV3/84acH8boiE/j5Ihyk3mn/z74KBjGdEJ4gsC2nsTUJ/ C5ZFLGC9/YMOzBKxFIDypQFhTSwvNboVrr5vN3s4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vasily Averin , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 23/85] neigh_stat_seq_next() should increase position index Date: Tue, 29 Sep 2020 12:59:50 +0200 Message-Id: <20200929105929.386293849@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105928.198942536@linuxfoundation.org> References: <20200929105928.198942536@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vasily Averin [ Upstream commit 1e3f9f073c47bee7c23e77316b07bc12338c5bba ] if seq_file .next fuction does not change position index, read after some lseek can generate unexpected output. https://bugzilla.kernel.org/show_bug.cgi?id=206283 Signed-off-by: Vasily Averin Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/core/neighbour.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 9849f1f4cf4f7..40d33431bc585 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -2798,6 +2798,7 @@ static void *neigh_stat_seq_next(struct seq_file *seq, void *v, loff_t *pos) *pos = cpu+1; return per_cpu_ptr(tbl->stats, cpu); } + (*pos)++; return NULL; }