From: Al Viro <viro@zeniv.linux.org.uk>
To: Jens Axboe <axboe@kernel.dk>
Cc: tytso@mit.edu, Jason@zx2c4.com, hch@lst.de, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] random: convert to using fops->read_iter()
Date: Fri, 20 May 2022 03:11:06 +0000 [thread overview]
Message-ID: <YocGyl8mmG84tQD4@zeniv-ca.linux.org.uk> (raw)
In-Reply-To: <20220519233137.20415-2-axboe@kernel.dk>
On Thu, May 19, 2022 at 05:31:36PM -0600, Jens Axboe wrote:
> @@ -418,25 +419,23 @@ static ssize_t get_random_bytes_user(void __user *ubuf, size_t len)
> * the user directly.
> */
> if (len <= CHACHA_KEY_SIZE) {
> - ret = len - copy_to_user(ubuf, &chacha_state[4], len);
> + ret = copy_to_iter(&chacha_state[4], len, to);
> goto out_zero_chacha;
> }
>
> for (;;) {
> + size_t copied;
> +
> chacha20_block(chacha_state, output);
> if (unlikely(chacha_state[12] == 0))
> ++chacha_state[13];
>
> block_len = min_t(size_t, len, CHACHA_BLOCK_SIZE);
> - left = copy_to_user(ubuf, output, block_len);
> - if (left) {
> - ret += block_len - left;
> + copied = copy_to_iter(output, block_len, to);
> + ret += copied;
> + if (copied != block_len)
> break;
> - }
copied = copy_to_iter(output, CHACHA_BLOCK_SIZE, to);
ret += copied;
if (copied != CHACHA_BLOCK_SIZE) {
if (!ret)
ret = -EFAULT;
break;
}
}
> SYSCALL_DEFINE3(getrandom, char __user *, ubuf, size_t, len, unsigned int, flags)
> {
> + struct iovec iov = { .iov_base = ubuf };
> + struct iov_iter iter;
import_single_range(READ, ubuf, len, &iov, &iter)
(note, BTW, that this'll cap len)
next prev parent reply other threads:[~2022-05-20 3:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-19 23:31 [PATCHSET v2 0/2] Fix splice from random/urandom Jens Axboe
2022-05-19 23:31 ` [PATCH 1/2] random: convert to using fops->read_iter() Jens Axboe
2022-05-20 3:11 ` Al Viro [this message]
2022-05-20 3:26 ` Jens Axboe
2022-05-20 9:14 ` Jason A. Donenfeld
2022-05-19 23:31 ` [PATCH 2/2] random: wire up fops->splice_read_iter() Jens Axboe
2022-05-19 23:56 ` [PATCHSET v2 0/2] Fix splice from random/urandom Jason A. Donenfeld
2022-05-20 0:00 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2022-05-19 19:31 [PATCHSET " Jens Axboe
2022-05-19 19:31 ` [PATCH 1/2] random: convert to using fops->read_iter() Jens Axboe
2022-05-19 23:12 ` Jason A. Donenfeld
2022-05-19 23:20 ` Jason A. Donenfeld
2022-05-19 23:21 ` Jens Axboe
2022-05-19 23:21 ` Jason A. Donenfeld
2022-05-19 23:21 ` Jens Axboe
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=YocGyl8mmG84tQD4@zeniv-ca.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=Jason@zx2c4.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
/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