[PATCH v2 18/18] [fixup] module_load_modinfo

Gerd Hoffmann posted 18 patches 4 years, 8 months ago
Maintainers: Kevin Wolf <kwolf@redhat.com>, Peter Lieven <pl@kamp.de>, Christian Borntraeger <borntraeger@de.ibm.com>, Ronnie Sahlberg <ronniesahlberg@gmail.com>, David Hildenbrand <david@redhat.com>, Max Reitz <mreitz@redhat.com>, Eric Blake <eblake@redhat.com>, Cornelia Huck <cohuck@redhat.com>, Michael Roth <michael.roth@amd.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Markus Armbruster <armbru@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Samuel Thibault <samuel.thibault@ens-lyon.org>
[PATCH v2 18/18] [fixup] module_load_modinfo
Posted by Gerd Hoffmann 4 years, 8 months ago
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 util/module.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/module.c b/util/module.c
index 564b8e3da760..4f98cc74ae37 100644
--- a/util/module.c
+++ b/util/module.c
@@ -158,7 +158,7 @@ static void module_load_modinfo(void)
 {
     char *file, *json;
     FILE *fp;
-    int i, size;
+    int i, size, ret;
     Visitor *v;
     Error *errp = NULL;
 
@@ -185,8 +185,8 @@ static void module_load_modinfo(void)
     size = ftell(fp);
     fseek(fp, 0, SEEK_SET);
     json = g_malloc0(size + 1);
-    fread(json, size, 1, fp);
-    json[size] = 0;
+    ret = fread(json, 1, size, fp);
+    json[ret] = 0;
     fclose(fp);
 
     v = qobject_input_visitor_new_str(json, NULL, &errp);
-- 
2.31.1


Re: [PATCH v2 18/18] [fixup] module_load_modinfo
Posted by Gerd Hoffmann 4 years, 8 months ago
On Thu, Jun 10, 2021 at 07:57:55AM +0200, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Oops.  That should have been squashed into patch #13.

take care,
  Gerd