* [PATCH v2] cifs: Fix cifs_limit_bvec_subset() to correctly check the maxmimum size
@ 2023-05-23 12:48 David Howells
2023-05-23 16:30 ` Shyam Prasad N
0 siblings, 1 reply; 2+ messages in thread
From: David Howells @ 2023-05-23 12:48 UTC (permalink / raw)
To: Shyam Prasad N
Cc: dhowells, Steve French, Rohith Surabattula, Paulo Alcantara,
Tom Talpey, Jeff Layton, linux-cifs, linux-fsdevel, linux-kernel
Fix cifs_limit_bvec_subset() so that it limits the span to the maximum
specified and won't return with a size greater than max_size.
Fixes: d08089f649a0 ("cifs: Change the I/O paths to use an iterator rather than a page list")
Reported-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Steve French <smfrench@gmail.com>
cc: Rohith Surabattula <rohiths.msft@gmail.com>
cc: Paulo Alcantara <pc@manguebit.com>
cc: Tom Talpey <tom@talpey.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: linux-cifs@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
---
fs/cifs/file.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index ba7f2e09d6c8..df88b8c04d03 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -3353,9 +3353,10 @@ static size_t cifs_limit_bvec_subset(const struct iov_iter *iter, size_t max_siz
while (n && ix < nbv) {
len = min3(n, bvecs[ix].bv_len - skip, max_size);
span += len;
+ max_size -= len;
nsegs++;
ix++;
- if (span >= max_size || nsegs >= max_segs)
+ if (max_size == 0 || nsegs >= max_segs)
break;
skip = 0;
n -= len;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] cifs: Fix cifs_limit_bvec_subset() to correctly check the maxmimum size
2023-05-23 12:48 [PATCH v2] cifs: Fix cifs_limit_bvec_subset() to correctly check the maxmimum size David Howells
@ 2023-05-23 16:30 ` Shyam Prasad N
0 siblings, 0 replies; 2+ messages in thread
From: Shyam Prasad N @ 2023-05-23 16:30 UTC (permalink / raw)
To: David Howells
Cc: Shyam Prasad N, Steve French, Rohith Surabattula,
Paulo Alcantara, Tom Talpey, Jeff Layton, linux-cifs,
linux-fsdevel, linux-kernel
On Tue, May 23, 2023 at 6:24 PM David Howells <dhowells@redhat.com> wrote:
>
> Fix cifs_limit_bvec_subset() so that it limits the span to the maximum
> specified and won't return with a size greater than max_size.
>
> Fixes: d08089f649a0 ("cifs: Change the I/O paths to use an iterator rather than a page list")
> Reported-by: Shyam Prasad N <sprasad@microsoft.com>
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Steve French <smfrench@gmail.com>
> cc: Rohith Surabattula <rohiths.msft@gmail.com>
> cc: Paulo Alcantara <pc@manguebit.com>
> cc: Tom Talpey <tom@talpey.com>
> cc: Jeff Layton <jlayton@kernel.org>
> cc: linux-cifs@vger.kernel.org
> cc: linux-fsdevel@vger.kernel.org
> ---
> fs/cifs/file.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/cifs/file.c b/fs/cifs/file.c
> index ba7f2e09d6c8..df88b8c04d03 100644
> --- a/fs/cifs/file.c
> +++ b/fs/cifs/file.c
> @@ -3353,9 +3353,10 @@ static size_t cifs_limit_bvec_subset(const struct iov_iter *iter, size_t max_siz
> while (n && ix < nbv) {
> len = min3(n, bvecs[ix].bv_len - skip, max_size);
> span += len;
> + max_size -= len;
> nsegs++;
> ix++;
> - if (span >= max_size || nsegs >= max_segs)
> + if (max_size == 0 || nsegs >= max_segs)
> break;
> skip = 0;
> n -= len;
>
Looks good to me.
--
Regards,
Shyam
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-23 16:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-23 12:48 [PATCH v2] cifs: Fix cifs_limit_bvec_subset() to correctly check the maxmimum size David Howells
2023-05-23 16:30 ` Shyam Prasad N
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 NNTP newsgroup(s).