From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 7ECFA4B8DF1 for ; Mon, 8 Jun 2026 14:57:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780930671; cv=none; b=RH9Fu2UlqsrKyhDmxngUgfqFbHKiVE4M060qTGLaRBCaK2BWl1QI/agPfnlJb1Wxd6NoAjCs1jaKxq5wy9RwJNjlYmxdoREdDPiwrkVKaeCxKOo2pG3TTtVmTH42Wf2GxDSIbGN3n6jsRPaGxPXDwyUUw3/72zn/9CuECTtofD8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780930671; c=relaxed/simple; bh=cjJNffIha+PwqPaKI1opJkQpu7n2ZDMd7gGUtzCzekA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VIddpwg5huKPvVcPfOwXsJtQCOHTfM5Xwox2Sm3+dB/j3QEazwQFOlNsAIgqY8L017akUfL33m8a9Njo+oCPKtbYwIRK2qlMub5RlbJt3wdo6cqYZnbVeSKHRYfB2JKDuEwBu1ET+w4vy+VEQlXSwALWxcrdUUQFGJllAezkj4I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Xr79/sW/; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Xr79/sW/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780930659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nmIXKYZPaEoy+v0EUgnQEN1+1FR/WvjVVNeVAn9uPnk=; b=Xr79/sW/943iANeVwNW2+pEBuf0XK3pG4Mx8r85iabnRr+sALOjTg9JGRXGvWiZ3z1PtRO wNy2ajGSvyTAp5aNAnaJteF5DqFjfXNJhw24H3V7QaxJFJeVuWH4viws1Ouc/3wN/9Rilz xrmo+F7Viz4xP/OpoFJBwx6jEeosWIs= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-581-i6wbm1NLM9-IMd-rrbx9Dg-1; Mon, 08 Jun 2026 10:57:35 -0400 X-MC-Unique: i6wbm1NLM9-IMd-rrbx9Dg-1 X-Mimecast-MFC-AGG-ID: i6wbm1NLM9-IMd-rrbx9Dg_1780930653 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 34ED219560B9; Mon, 8 Jun 2026 14:57:33 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.44.32.43]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 48FC61800347; Mon, 8 Jun 2026 14:57:27 +0000 (UTC) From: David Howells To: Christian Brauner , Matthew Wilcox , Christoph Hellwig Cc: David Howells , Paulo Alcantara , Jens Axboe , Leon Romanovsky , Steve French , ChenXiaoSong , Marc Dionne , Eric Van Hensbergen , Dominique Martinet , Ilya Dryomov , Trond Myklebust , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 20/22] netfs: Check for too much data being read Date: Mon, 8 Jun 2026 15:54:28 +0100 Message-ID: <20260608145432.681865-21-dhowells@redhat.com> In-Reply-To: <20260608145432.681865-1-dhowells@redhat.com> References: <20260608145432.681865-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Put in a check in read subreq termination to detect more data being read for a subrequest than was requested. Signed-off-by: David Howells cc: Paulo Alcantara cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/netfs/read_collect.c | 8 ++++++++ include/trace/events/netfs.h | 1 + 2 files changed, 9 insertions(+) diff --git a/fs/netfs/read_collect.c b/fs/netfs/read_collect.c index 977b69ac8725..fc62eaef6107 100644 --- a/fs/netfs/read_collect.c +++ b/fs/netfs/read_collect.c @@ -542,6 +542,14 @@ void netfs_read_subreq_terminated(struct netfs_io_subrequest *subreq) break; } + if (subreq->transferred > subreq->len) { + subreq->transferred = 0; + __set_bit(NETFS_SREQ_FAILED, &subreq->flags); + __clear_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags); + trace_netfs_sreq(subreq, netfs_sreq_trace_too_much); + subreq->error = -EIO; + } + /* Deal with retry requests, short reads and errors. If we retry * but don't make progress, we abandon the attempt. */ diff --git a/include/trace/events/netfs.h b/include/trace/events/netfs.h index 59f330003d02..cc29582f6245 100644 --- a/include/trace/events/netfs.h +++ b/include/trace/events/netfs.h @@ -134,6 +134,7 @@ EM(netfs_sreq_trace_submit, "SUBMT") \ EM(netfs_sreq_trace_superfluous, "SPRFL") \ EM(netfs_sreq_trace_terminated, "TERM ") \ + EM(netfs_sreq_trace_too_much, "!TOOM") \ EM(netfs_sreq_trace_wait_for, "_WAIT") \ EM(netfs_sreq_trace_write, "WRITE") \ EM(netfs_sreq_trace_write_skip, "SKIP ") \