From: David Howells <dhowells@redhat.com> To: Christian Brauner <christian@brauner.io> Cc: David Howells <dhowells@redhat.com>, Jeff Layton <jlayton@kernel.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, Dan Carpenter <dan.carpenter@linaro.org> Subject: [PATCH v2 05/10] netfs: Fix a NULL vs IS_ERR() check in netfs_perform_write() Date: Mon, 22 Jan 2024 22:32:18 +0000 [thread overview] Message-ID: <20240122223230.4000595-6-dhowells@redhat.com> (raw) In-Reply-To: <20240122223230.4000595-1-dhowells@redhat.com> From: Dan Carpenter <dan.carpenter@linaro.org> The netfs_grab_folio_for_write() function doesn't return NULL, it returns error pointers. Update the check accordingly. Fixes: c38f4e96e605 ("netfs: Provide func to copy data to pagecache for buffered write") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Signed-off-by: David Howells <dhowells@redhat.com> Link: https://lore.kernel.org/r/29fb1310-8e2d-47ba-b68d-40354eb7b896@moroto.mountain/ --- fs/netfs/buffered_write.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c index e7f9ba6fb16b..a3059b3168fd 100644 --- a/fs/netfs/buffered_write.c +++ b/fs/netfs/buffered_write.c @@ -221,10 +221,11 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter, if (unlikely(fault_in_iov_iter_readable(iter, part) == part)) break; - ret = -ENOMEM; folio = netfs_grab_folio_for_write(mapping, pos, part); - if (!folio) + if (IS_ERR(folio)) { + ret = PTR_ERR(folio); break; + } flen = folio_size(folio); offset = pos & (flen - 1);
WARNING: multiple messages have this Message-ID (diff)
From: David Howells <dhowells@redhat.com> To: Christian Brauner <christian@brauner.io> Cc: linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, v9fs@lists.linux.dev, Jeff Layton <jlayton@kernel.org>, linux-kernel@vger.kernel.org, Matthew Wilcox <willy@infradead.org>, David Howells <dhowells@redhat.com>, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, netfs@lists.linux.dev, ceph-devel@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-afs@lists.infradead.org, Dan Carpenter <dan.carpenter@linaro.org> Subject: [PATCH v2 05/10] netfs: Fix a NULL vs IS_ERR() check in netfs_perform_write() Date: Mon, 22 Jan 2024 22:32:18 +0000 [thread overview] Message-ID: <20240122223230.4000595-6-dhowells@redhat.com> (raw) In-Reply-To: <20240122223230.4000595-1-dhowells@redhat.com> From: Dan Carpenter <dan.carpenter@linaro.org> The netfs_grab_folio_for_write() function doesn't return NULL, it returns error pointers. Update the check accordingly. Fixes: c38f4e96e605 ("netfs: Provide func to copy data to pagecache for buffered write") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Signed-off-by: David Howells <dhowells@redhat.com> Link: https://lore.kernel.org/r/29fb1310-8e2d-47ba-b68d-40354eb7b896@moroto.mountain/ --- fs/netfs/buffered_write.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c index e7f9ba6fb16b..a3059b3168fd 100644 --- a/fs/netfs/buffered_write.c +++ b/fs/netfs/buffered_write.c @@ -221,10 +221,11 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter, if (unlikely(fault_in_iov_iter_readable(iter, part) == part)) break; - ret = -ENOMEM; folio = netfs_grab_folio_for_write(mapping, pos, part); - if (!folio) + if (IS_ERR(folio)) { + ret = PTR_ERR(folio); break; + } flen = folio_size(folio); offset = pos & (flen - 1);
next prev parent reply other threads:[~2024-01-22 22:32 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-01-22 22:32 [PATCH v2 00/10] netfs, afs, cifs, cachefiles, erofs: Miscellaneous fixes David Howells 2024-01-22 22:32 ` David Howells 2024-01-22 22:32 ` [PATCH v2 01/10] netfs: Don't use certain unnecessary folio_*() functions David Howells 2024-01-22 22:32 ` David Howells 2024-01-22 22:32 ` [PATCH v2 02/10] afs: " David Howells 2024-01-22 22:32 ` David Howells 2024-01-22 22:32 ` [PATCH v2 03/10] cifs: " David Howells 2024-01-22 22:32 ` David Howells 2024-01-22 22:32 ` [PATCH v2 04/10] netfs, fscache: Prevent Oops in fscache_put_cache() David Howells 2024-01-22 22:32 ` David Howells 2024-01-22 22:32 ` David Howells [this message] 2024-01-22 22:32 ` [PATCH v2 05/10] netfs: Fix a NULL vs IS_ERR() check in netfs_perform_write() David Howells 2024-01-22 22:32 ` [PATCH v2 06/10] cachefiles, erofs: Fix NULL deref in when cachefiles is not doing ondemand-mode David Howells 2024-01-22 22:32 ` David Howells 2024-01-23 1:32 ` Jingbo Xu 2024-01-23 1:32 ` Jingbo Xu 2024-01-22 22:32 ` [PATCH v2 07/10] afs: Hide silly-rename files from userspace David Howells 2024-01-22 22:32 ` David Howells 2024-01-22 22:32 ` [PATCH v2 08/10] afs: Fix error handling with lookup via FS.InlineBulkStatus David Howells 2024-01-22 22:32 ` David Howells 2024-01-22 22:32 ` [PATCH v2 09/10] afs: Remove afs_dynroot_d_revalidate() as it is redundant David Howells 2024-01-22 22:32 ` David Howells 2024-01-22 22:32 ` [PATCH v2 10/10] afs: Fix missing/incorrect unlocking of RCU read lock David Howells 2024-01-22 22:32 ` David Howells
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=20240122223230.4000595-6-dhowells@redhat.com \ --to=dhowells@redhat.com \ --cc=ceph-devel@vger.kernel.org \ --cc=christian@brauner.io \ --cc=dan.carpenter@linaro.org \ --cc=jlayton@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=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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.