diff mbox series

[1/2] netfs: Fix i_dio_count leak on DIO read past i_size

Message ID 20240129094924.1221977-2-dhowells@redhat.com
State New
Headers show
Series netfs: Miscellaneous fixes | expand

Commit Message

David Howells Jan. 29, 2024, 9:49 a.m. UTC 
From: Marc Dionne <marc.dionne@auristor.com>

If netfs_begin_read gets a NETFS_DIO_READ request that begins
past i_size, it won't perform any i/o and just return 0.  This
will leak an increment to i_dio_count that is done at the top
of the function.

This can cause subsequent buffered read requests to block
indefinitely, waiting for a non existing dio operation to complete.

Add a inode_dio_end() for the NETFS_DIO_READ case, before returning.

Signed-off-by: Marc Dionne <marc.dionne@auristor.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: linux-afs@lists.infradead.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
---
 fs/netfs/io.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Jeff Layton Jan. 29, 2024, 12:41 p.m. UTC | #1 
On Mon, 2024-01-29 at 09:49 +0000, David Howells wrote:
> From: Marc Dionne <marc.dionne@auristor.com>
> 
> If netfs_begin_read gets a NETFS_DIO_READ request that begins
> past i_size, it won't perform any i/o and just return 0.  This
> will leak an increment to i_dio_count that is done at the top
> of the function.
> 
> This can cause subsequent buffered read requests to block
> indefinitely, waiting for a non existing dio operation to complete.
> 
> Add a inode_dio_end() for the NETFS_DIO_READ case, before returning.
> 
> Signed-off-by: Marc Dionne <marc.dionne@auristor.com>
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Jeff Layton <jlayton@kernel.org>
> cc: linux-afs@lists.infradead.org
> cc: netfs@lists.linux.dev
> cc: linux-fsdevel@vger.kernel.org
> ---
>  fs/netfs/io.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/fs/netfs/io.c b/fs/netfs/io.c
> index e8ff1e61ce79..4261ad6c55b6 100644
> --- a/fs/netfs/io.c
> +++ b/fs/netfs/io.c
> @@ -748,6 +748,8 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync)
>  
>  	if (!rreq->submitted) {
>  		netfs_put_request(rreq, false, netfs_rreq_trace_put_no_submit);
> +		if (rreq->origin == NETFS_DIO_READ)
> +			inode_dio_end(rreq->inode);
>  		ret = 0;
>  		goto out;
>  	}
> 
> 

Reviewed-by: Jeff Layton <jlayton@kernel.org>
diff mbox series

Patch

diff --git a/fs/netfs/io.c b/fs/netfs/io.c
index e8ff1e61ce79..4261ad6c55b6 100644
--- a/fs/netfs/io.c
+++ b/fs/netfs/io.c
@@ -748,6 +748,8 @@  int netfs_begin_read(struct netfs_io_request *rreq, bool sync)
 
 	if (!rreq->submitted) {
 		netfs_put_request(rreq, false, netfs_rreq_trace_put_no_submit);
+		if (rreq->origin == NETFS_DIO_READ)
+			inode_dio_end(rreq->inode);
 		ret = 0;
 		goto out;
 	}