* [PATCH] util/guest-random: Fix size arg to tail memcpy
@ 2021-07-09 12:06 Mark Nelson
2021-07-09 14:54 ` Richard Henderson
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Mark Nelson @ 2021-07-09 12:06 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Mark Nelson, richard.henderson
We know that in the body of this if statement i is less than len, so
we really should be copying len - i bytes not i - len bytes.
Fix this typo.
Signed-off-by: Mark Nelson <mdnelson8@gmail.com>
---
util/guest-random.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/guest-random.c b/util/guest-random.c
index 086115bd67..23643f86cc 100644
--- a/util/guest-random.c
+++ b/util/guest-random.c
@@ -38,7 +38,7 @@ static int glib_random_bytes(void *buf, size_t len)
}
if (i < len) {
x = g_rand_int(rand);
- __builtin_memcpy(buf + i, &x, i - len);
+ __builtin_memcpy(buf + i, &x, len - i);
}
return 0;
}
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] util/guest-random: Fix size arg to tail memcpy
2021-07-09 12:06 [PATCH] util/guest-random: Fix size arg to tail memcpy Mark Nelson
@ 2021-07-09 14:54 ` Richard Henderson
2021-07-09 16:07 ` Philippe Mathieu-Daudé
2021-07-09 16:28 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2021-07-09 14:54 UTC (permalink / raw)
To: Mark Nelson, qemu-devel; +Cc: qemu-trivial
On 7/9/21 5:06 AM, Mark Nelson wrote:
> We know that in the body of this if statement i is less than len, so
> we really should be copying len - i bytes not i - len bytes.
>
> Fix this typo.
>
> Signed-off-by: Mark Nelson<mdnelson8@gmail.com>
> ---
> util/guest-random.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] util/guest-random: Fix size arg to tail memcpy
2021-07-09 12:06 [PATCH] util/guest-random: Fix size arg to tail memcpy Mark Nelson
2021-07-09 14:54 ` Richard Henderson
@ 2021-07-09 16:07 ` Philippe Mathieu-Daudé
2021-07-09 16:28 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-07-09 16:07 UTC (permalink / raw)
To: Mark Nelson, qemu-devel; +Cc: qemu-trivial, richard.henderson
On 7/9/21 2:06 PM, Mark Nelson wrote:
> We know that in the body of this if statement i is less than len, so
> we really should be copying len - i bytes not i - len bytes.
>
> Fix this typo.
>
Oops.
Fixes: 8d8404f1564 ("util: Add qemu_guest_getrandom and associated
routines")
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Mark Nelson <mdnelson8@gmail.com>
> ---
> util/guest-random.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/util/guest-random.c b/util/guest-random.c
> index 086115bd67..23643f86cc 100644
> --- a/util/guest-random.c
> +++ b/util/guest-random.c
> @@ -38,7 +38,7 @@ static int glib_random_bytes(void *buf, size_t len)
> }
> if (i < len) {
> x = g_rand_int(rand);
> - __builtin_memcpy(buf + i, &x, i - len);
> + __builtin_memcpy(buf + i, &x, len - i);
> }
> return 0;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] util/guest-random: Fix size arg to tail memcpy
2021-07-09 12:06 [PATCH] util/guest-random: Fix size arg to tail memcpy Mark Nelson
2021-07-09 14:54 ` Richard Henderson
2021-07-09 16:07 ` Philippe Mathieu-Daudé
@ 2021-07-09 16:28 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Laurent Vivier @ 2021-07-09 16:28 UTC (permalink / raw)
To: Mark Nelson, qemu-devel; +Cc: qemu-trivial, richard.henderson
Le 09/07/2021 à 14:06, Mark Nelson a écrit :
> We know that in the body of this if statement i is less than len, so
> we really should be copying len - i bytes not i - len bytes.
>
> Fix this typo.
>
> Signed-off-by: Mark Nelson <mdnelson8@gmail.com>
> ---
> util/guest-random.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/util/guest-random.c b/util/guest-random.c
> index 086115bd67..23643f86cc 100644
> --- a/util/guest-random.c
> +++ b/util/guest-random.c
> @@ -38,7 +38,7 @@ static int glib_random_bytes(void *buf, size_t len)
> }
> if (i < len) {
> x = g_rand_int(rand);
> - __builtin_memcpy(buf + i, &x, i - len);
> + __builtin_memcpy(buf + i, &x, len - i);
> }
> return 0;
> }
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-09 16:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-09 12:06 [PATCH] util/guest-random: Fix size arg to tail memcpy Mark Nelson
2021-07-09 14:54 ` Richard Henderson
2021-07-09 16:07 ` Philippe Mathieu-Daudé
2021-07-09 16:28 ` Laurent Vivier
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).