From: Mark Nelson <mdnelson8@gmail.com>
Date: Fri, 9 Jul 2021 12:06:00 +0000 (-0500)
Subject: util/guest-random: Fix size arg to tail memcpy
X-Git-Tag: v6.1.0-rc0~29^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e28ffe90fde5702aa8716ac2fa1b4116cdcc9e61;p=thirdparty%2Fqemu.git

util/guest-random: Fix size arg to tail memcpy

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.

Fixes: 8d8404f1564 ("util: Add qemu_guest_getrandom and associated routines")
Signed-off-by: Mark Nelson <mdnelson8@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210709120600.11080-1-mdnelson8@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---

diff --git a/util/guest-random.c b/util/guest-random.c
index 086115bd670..23643f86cc6 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;
 }