From: Jeff Layton <jlayton@kernel.org>
To: David Howells <dhowells@redhat.com>,
Christian Brauner <christian@brauner.io>
Cc: Eric Van Hensbergen <ericvh@kernel.org>,
Dominique Martinet <asmadeus@codewreck.org>,
Matthew Wilcox <willy@infradead.org>,
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-mm@kvack.org, linux-kernel@vger.kernel.org,
linux_oss@crudebyte.com
Subject: Re: [PATCH 2/2] netfs: Fix missing zero-length check in unbuffered write
Date: Mon, 29 Jan 2024 07:43:35 -0500 [thread overview]
Message-ID: <1e4d080eb0d94b40f8fc5cce60a83391b9a2c2c3.camel@kernel.org> (raw)
In-Reply-To: <20240129094924.1221977-3-dhowells@redhat.com>
On Mon, 2024-01-29 at 09:49 +0000, David Howells wrote:
> Fix netfs_unbuffered_write_iter() to return immediately if
> generic_write_checks() returns 0, indicating there's nothing to write.
> Note that netfs_file_write_iter() already does this.
>
> Also, whilst we're at it, put in checks for the size being zero before we
> even take the locks. Note that generic_write_checks() can still reduce the
> size to zero, so we still need that check.
>
> Without this, a warning similar to the following is logged to dmesg:
>
> netfs: Zero-sized write [R=1b6da]
>
> and the syscall fails with EIO, e.g.:
>
> /sbin/ldconfig.real: Writing of cache extension data failed: Input/output error
>
> This can be reproduced on 9p by:
>
> xfs_io -f -c 'pwrite 0 0' /xfstest.test/foo
>
> Fixes: 153a9961b551 ("netfs: Implement unbuffered/DIO write support")
> Reported-by: Eric Van Hensbergen <ericvh@kernel.org>
> Link: https://lore.kernel.org/r/ZbQUU6QKmIftKsmo@FV7GG9FTHL/
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Dominique Martinet <asmadeus@codewreck.org>
> cc: Jeff Layton <jlayton@kernel.org>
> cc: v9fs@lists.linux.dev
> cc: linux_oss@crudebyte.com
> cc: netfs@lists.linux.dev
> cc: linux-fsdevel@vger.kernel.org
> ---
> fs/netfs/buffered_write.c | 3 +++
> fs/netfs/direct_write.c | 5 ++++-
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c
> index a3059b3168fd..9a0d32e4b422 100644
> --- a/fs/netfs/buffered_write.c
> +++ b/fs/netfs/buffered_write.c
> @@ -477,6 +477,9 @@ ssize_t netfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
>
> _enter("%llx,%zx,%llx", iocb->ki_pos, iov_iter_count(from), i_size_read(inode));
>
> + if (!iov_iter_count(from))
> + return 0;
> +
> if ((iocb->ki_flags & IOCB_DIRECT) ||
> test_bit(NETFS_ICTX_UNBUFFERED, &ictx->flags))
> return netfs_unbuffered_write_iter(iocb, from);
> diff --git a/fs/netfs/direct_write.c b/fs/netfs/direct_write.c
> index 60a40d293c87..bee047e20f5d 100644
> --- a/fs/netfs/direct_write.c
> +++ b/fs/netfs/direct_write.c
> @@ -139,6 +139,9 @@ ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from)
>
> _enter("%llx,%zx,%llx", iocb->ki_pos, iov_iter_count(from), i_size_read(inode));
>
> + if (!iov_iter_count(from))
> + return 0;
> +
> trace_netfs_write_iter(iocb, from);
> netfs_stat(&netfs_n_rh_dio_write);
>
> @@ -146,7 +149,7 @@ ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from)
> if (ret < 0)
> return ret;
> ret = generic_write_checks(iocb, from);
> - if (ret < 0)
> + if (ret <= 0)
> goto out;
> ret = file_remove_privs(file);
> if (ret < 0)
>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
next prev parent reply other threads:[~2024-01-29 12:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-29 9:49 [PATCH 0/2] netfs: Miscellaneous fixes David Howells
2024-01-29 9:49 ` [PATCH 1/2] netfs: Fix i_dio_count leak on DIO read past i_size David Howells
2024-01-29 12:41 ` Jeff Layton
2024-01-29 9:49 ` [PATCH 2/2] netfs: Fix missing zero-length check in unbuffered write David Howells
2024-01-29 12:43 ` Jeff Layton [this message]
2024-01-30 21:57 ` Dominique Martinet
2024-02-19 8:38 ` Linux regression tracking (Thorsten Leemhuis)
2024-02-20 9:51 ` Christian Brauner
2024-01-29 13:53 ` [PATCH 0/2] netfs: Miscellaneous fixes Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1e4d080eb0d94b40f8fc5cce60a83391b9a2c2c3.camel@kernel.org \
--to=jlayton@kernel.org \
--cc=asmadeus@codewreck.org \
--cc=ceph-devel@vger.kernel.org \
--cc=christian@brauner.io \
--cc=dhowells@redhat.com \
--cc=ericvh@kernel.org \
--cc=linux-afs@lists.infradead.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux_oss@crudebyte.com \
--cc=netfs@lists.linux.dev \
--cc=v9fs@lists.linux.dev \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).