Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2607552lqp; Mon, 25 Mar 2024 04:22:46 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCW5lIr51iaxidgp3ed/yswCaIOyKzhxmosywjFRElte7WTevA9wrxP6PlDoqv3Ds2cwoHXfzpXsls2kx7W26FEet4rLsrLLR+aRFrNHbA== X-Google-Smtp-Source: AGHT+IGlT4NuHGQ2xg2BFV4KKL90MPs46cpHuxreyMaWsJP8yvGT7uh/XsbIuXKMkvYM3DcneONU X-Received: by 2002:a17:906:5810:b0:a46:af7d:28d3 with SMTP id m16-20020a170906581000b00a46af7d28d3mr4294795ejq.11.1711365766126; Mon, 25 Mar 2024 04:22:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711365766; cv=pass; d=google.com; s=arc-20160816; b=osYswuM9rjd9VOY51AojHeQWkjDXxyNQWnkvqq4JMLdb5VmaWm9Rp3hNXkLwss0A+u JtzEH7YQSj8EjFAb6oXxIr7C4EvxLWqPtIqPU0t0Kt2LYzoMKnKPbwrNmvQtMmqO/Cg3 ze4ddl42Tj+Q/DzN2bUNTa1eJ3fb/uekg/AEY8EAj8OxOBU544nb+T806qh87dCPaJ65 hjZ3XABrwq/8eo9jFWZur7lFCxYo7sEabScd99XHLth+bkisztJuiwhLz22wfhlut+Yn dQQrhg0Tx981BFKyWWvHXXc8h+v2HoOvuZR8XqKNf30PNBJdvgKITVrNDlE5fjxsaZbH GhMg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=EK/i4T+8+MsPIRlVSQI6Zlw6LwcCtrMN96MhuYgZF0M=; fh=yjxqQO4Uz8aug8AqGCwL2f7bZBnG98N3ofjFNeXcHE0=; b=sNiRW7zNjGs2ek7RjkuP+BE3/gt1PJS+LI2M8PZ5TcxyBUjumlJCqif5DBySP6+5jY ljHQEU5pXOSA6QJZyHDyaooBYJt4FFka9FXmUnOYuoPftKb2Ajzvi6lJx8o6vRvQRV4c Qh/l9IL3dtBYOfFIADVO7EeJ478cHj083zWP3WrIAD1NptddGyVaCI8oUnO7mlwGti/7 y1AlhNfq7fAHJqOv9aUeghMKNi6KP28uwGJRXgmnBUrSC59JsmeFgMWb8mPK41nByWXE Z9mRUWnXMKcDAOkAK0+MwrxXvhjwDBs0TAoanaNKvkPdZfZBwZ4etgCG9bvYGNMdBIAH CI2w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hNyPaLEF; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115575-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115575-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id l6-20020a170906794600b00a4751f5c465si1339771ejo.1047.2024.03.25.04.22.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 04:22:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115575-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hNyPaLEF; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115575-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115575-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id CFAD71F31F9C for ; Mon, 25 Mar 2024 11:22:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 969E824F6E0; Mon, 25 Mar 2024 02:44:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hNyPaLEF" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACBE31F30B0; Sun, 24 Mar 2024 22:58:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321124; cv=none; b=KWjXpuWMW1NrvRLLXjgi1zczzAHs8hut1T2vd8VPD64L22EpizMW7prKwJEZK1cny54jTFwLGYhsvf0w7Ikdt8yglPHh8tWG4ARcynrNUISqUi8eAlpYZ2efDxODM6yYa5GdiXeOQdHLYcjNXf199BWWVIkK8B2FRetdr3zFOQk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321124; c=relaxed/simple; bh=klOIANNcSD6uUUBwawVG7HMyBUU/vv9lKS8+Lyajj6c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fb/k1lxzIFZZ7yJiwi7YyVbcBtUuJxe01CA7tKuMuBkJb380UwIVOcPQFBA6CM9YPwq/NuuDvQbE9+FUq1toBZm131Lq3agK07xyON/0vuJDIA5RG/3sjFDsoZqyb0yleImGwcdpfWnHl5/LkfoM1Vxvsa9Zxage1KHjysJbIkE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hNyPaLEF; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 807B1C43390; Sun, 24 Mar 2024 22:58:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321124; bh=klOIANNcSD6uUUBwawVG7HMyBUU/vv9lKS8+Lyajj6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hNyPaLEFkeqMafYXZZVEcQva2G1DGGDihJ0qQI6fCDH1xufIeuELWSO+fL92zUOuF F2WIpqBlPgqdCXcEoHiRvir6C19clboRGifI4M6J5+zAzPdPvb/M0alCSihHtGi2eK sAOGIiD2muH9axy2/NT6qSM5i3JK4Vlth34de15LJpz06gaG9901z6myZMmcKqfi/c 0ikmXVLJmJPWJLHbJF/YkMasPMAtcZubJHUbcOQOsMOFrDnhPFoHRsWuPMIbDvy9j2 ILc6xBLfqgCDHlVcrNg32TYhCSNQ9kpVO3ir75ru4dTrwkcbpk+2njPP6mGbhs0/OJ dQCG0rHMn5CGg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiubo Li , Frank Hsiao , Ilya Dryomov , Sasha Levin Subject: [PATCH 6.7 685/713] ceph: stop copying to iter at EOF on sync reads Date: Sun, 24 Mar 2024 18:46:51 -0400 Message-ID: <20240324224720.1345309-686-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Xiubo Li [ Upstream commit 1065da21e5df9d843d2c5165d5d576be000142a6 ] If EOF is encountered, ceph_sync_read() return value is adjusted down according to i_size, but the "to" iter is advanced by the actual number of bytes read. Then, when retrying, the remainder of the range may be skipped incorrectly. Ensure that the "to" iter is advanced only until EOF. [ idryomov: changelog ] Fixes: c3d8e0b5de48 ("ceph: return the real size read when it hits EOF") Reported-by: Frank Hsiao Signed-off-by: Xiubo Li Reviewed-by: Ilya Dryomov Tested-by: Frank Hsiao Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- fs/ceph/file.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 3b5aae29e9447..523debc6f23e0 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -1135,7 +1135,12 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos, } idx = 0; - left = ret > 0 ? ret : 0; + if (ret <= 0) + left = 0; + else if (off + ret > i_size) + left = i_size - off; + else + left = ret; while (left > 0) { size_t plen, copied; @@ -1164,15 +1169,13 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos, } if (ret > 0) { - if (off > *ki_pos) { - if (off >= i_size) { - *retry_op = CHECK_EOF; - ret = i_size - *ki_pos; - *ki_pos = i_size; - } else { - ret = off - *ki_pos; - *ki_pos = off; - } + if (off >= i_size) { + *retry_op = CHECK_EOF; + ret = i_size - *ki_pos; + *ki_pos = i_size; + } else { + ret = off - *ki_pos; + *ki_pos = off; } if (last_objver) -- 2.43.0