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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 B1F4AC3A5A0 for ; Sat, 18 Apr 2020 14:13:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 913A821D6C for ; Sat, 18 Apr 2020 14:13:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587219206; bh=no3knKj15K/kqw5BYs/rcA1+Ow+Jsr8lPJT0094hSSg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2bJLV0jeJ7R9DBJzwojfLDTOa1+JpU0Q7O7sE3xUcb+ngpkJgtaW8wPn+pyatETHq HUGbbFvu1OkiyS8F+SCyCf6Ntg73rgnWTLnfyZFhd90rcdZmdSkRcAjn4yaKlTx4xr 3uVTcHCq8jN20OuyLn1ctfzvARxVS2OCFMk94rwA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726623AbgDROJm (ORCPT ); Sat, 18 Apr 2020 10:09:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:37264 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726606AbgDROJm (ORCPT ); Sat, 18 Apr 2020 10:09:42 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0561821D82; Sat, 18 Apr 2020 14:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587218981; bh=no3knKj15K/kqw5BYs/rcA1+Ow+Jsr8lPJT0094hSSg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CrwTugD8JOtgd72UNzju6gCK+sfNCjOF0suyH17+BrjQxXstVJcP7QAyoJBkZ11BQ F6rYtqGHQ37u3C6T2pU2B2CKcTy063hCfB/fvNkZOMo18ESzY+NzSlXqDZyM0uP05f 6jntwZxBftNKFOsS3uqV1s69Sp5ll1U9a2cDXQOE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vasily Averin , Andrew Morton , Peter Oberparleiter , Al Viro , Davidlohr Bueso , Ingo Molnar , Manfred Spraul , NeilBrown , Steven Rostedt , Waiman Long , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 5.5 25/75] kernel/gcov/fs.c: gcov_seq_next() should increase position index Date: Sat, 18 Apr 2020 10:08:20 -0400 Message-Id: <20200418140910.8280-25-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418140910.8280-1-sashal@kernel.org> References: <20200418140910.8280-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vasily Averin [ Upstream commit f4d74ef6220c1eda0875da30457bef5c7111ab06 ] If seq_file .next function 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: Andrew Morton Acked-by: Peter Oberparleiter Cc: Al Viro Cc: Davidlohr Bueso Cc: Ingo Molnar Cc: Manfred Spraul Cc: NeilBrown Cc: Steven Rostedt Cc: Waiman Long Link: http://lkml.kernel.org/r/f65c6ee7-bd00-f910-2f8a-37cc67e4ff88@virtuozzo.com Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- kernel/gcov/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/gcov/fs.c b/kernel/gcov/fs.c index e5eb5ea7ea598..cc4ee482d3fba 100644 --- a/kernel/gcov/fs.c +++ b/kernel/gcov/fs.c @@ -108,9 +108,9 @@ static void *gcov_seq_next(struct seq_file *seq, void *data, loff_t *pos) { struct gcov_iterator *iter = data; + (*pos)++; if (gcov_iter_next(iter)) return NULL; - (*pos)++; return iter; } -- 2.20.1