Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1757807ybz; Sat, 18 Apr 2020 07:53:18 -0700 (PDT) X-Google-Smtp-Source: APiQypKKiPoFqSiyDJD4pXfMeUlmw9tNtUBJUBIyBeYOH7S+I3Bh2BQgn4FBAE4NE5noP9uI+atl X-Received: by 2002:a17:906:60d4:: with SMTP id f20mr7933142ejk.209.1587221598543; Sat, 18 Apr 2020 07:53:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587221598; cv=none; d=google.com; s=arc-20160816; b=dFvRKjtrjlY314I88AOfr0tb1wDmQlwif+Yonpedd10kFuRc8YUzEWvpSS/cLreegy e5C0nYiijXwIYYRBZJ6wqJAqsjmPCvgAni4gyX5K2ZINTP+PWbJ3sLBRF2aToUHfYrgK j8eB/WF+/PWvw8Rf5kWcvOYfmgWZX9JJmF/a7p2gnSTSDv/Xz7KBS+QSruD8RVI8Rdea cZ4OB7lCIfF9c5doPUYcLIgL70qcjlboT10D4cS6yT44NM38oo5r4ASRQlh/PRMZYLvv bmeWAOBXxPCZNOq/eE43sDeOiPkdEMeYMcHyI1krd6A7QeLKxDvvny7QLKIkqGggEdvb G7sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=p3relojn4TMUWeT5Id4WOpRGdRaVexKoWtBr2DETcec=; b=QrZ7k6ZsrKQpOzcAHS0GdLgQadNr5UM5G8gdJ8bqgjcEwaReR28irV323gjNMIsjKW G+Pz8GH43Z6JMjD6naV6RPidOi5+MK78xwgOM/jwn8+wpG1qX/+Qggjka2fkfC9vnKSq cPiY2J2kesDgT7ysfGYI+giO5JiADDiRl6P2Jhai/iTHliacZJzpBUqTQt1Ot7kop+As 3YpJK1/IrPpyFvvcpsJMO4nzgJlq/5ADhHwSqad/uQQvWXSMg8A3+TF1tFDSHKfS1xqi 9nTX0On6trD/sfQo5KxYYQDMn28fq1ewkIqHsxil3H0TRLoTFSILOsz4nIX58POcNfbo 5VnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xRIUueMu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i6si18339883edg.339.2020.04.18.07.52.56; Sat, 18 Apr 2020 07:53:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xRIUueMu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728454AbgDROmx (ORCPT + 99 others); Sat, 18 Apr 2020 10:42:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:53184 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728433AbgDROmt (ORCPT ); Sat, 18 Apr 2020 10:42:49 -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 5C80722272; Sat, 18 Apr 2020 14:42:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587220968; bh=eVdIKm2kuMC/roZW1kDDMJeJ4ns4NVmx3rwtzKl9sLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xRIUueMuZpkU592LSS+dW4dWgbbAvrNu4t4wSsw+dI+eafNj3ZVwIs3n24Tx48k3e oTch8nE+wmV646sB/jy48g/3g5YfF+AdoSamNLNiPRG1RSn55GBwz6LTcXNmmDnWh8 TXnRHCNqfaSTCZHrD7EV7G7dGSB51Cwu00fGJvtM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vasily Averin , Andrew Morton , Waiman Long , Davidlohr Bueso , Manfred Spraul , Al Viro , Ingo Molnar , NeilBrown , Peter Oberparleiter , Steven Rostedt , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 4.19 16/47] ipc/util.c: sysvipc_find_ipc() should increase position index Date: Sat, 18 Apr 2020 10:41:56 -0400 Message-Id: <20200418144227.9802-16-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144227.9802-1-sashal@kernel.org> References: <20200418144227.9802-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vasily Averin [ Upstream commit 89163f93c6f969da5811af5377cc10173583123b ] 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: Waiman Long Cc: Davidlohr Bueso Cc: Manfred Spraul Cc: Al Viro Cc: Ingo Molnar Cc: NeilBrown Cc: Peter Oberparleiter Cc: Steven Rostedt Link: http://lkml.kernel.org/r/b7a20945-e315-8bb0-21e6-3875c14a8494@virtuozzo.com Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- ipc/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipc/util.c b/ipc/util.c index 0af05752969f1..b111e792b3125 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -735,13 +735,13 @@ static struct kern_ipc_perm *sysvipc_find_ipc(struct ipc_ids *ids, loff_t pos, total++; } + *new_pos = pos + 1; if (total >= ids->in_use) return NULL; for (; pos < IPCMNI; pos++) { ipc = idr_find(&ids->ipcs_idr, pos); if (ipc != NULL) { - *new_pos = pos + 1; rcu_read_lock(); ipc_lock_object(ipc); return ipc; -- 2.20.1