Re: [libvirt PATCH 4/4] tests: pcivpdtest: check return value of virCreateAnonymousFile

[Kristina Hanicova <khanicov@xxxxxxxxxx>]

On Tue, Nov 23, 2021 at 3:20 PM Ján Tomko <jtomko@xxxxxxxxxx> wrote:

Fixes: 59c1bc3a0e25e6d725db41990f11e0b53137115d
Fixes: 43820e4b8037680ec451761216750c6b139db67a
Fixes: 600f580d623ae4077ddeb6c7cb24f8a315a7c73b
Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
 tests/virpcivpdtest.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/virpcivpdtest.c b/tests/virpcivpdtest.c
index 284350fe29..62c51cdeb9 100644
--- a/tests/virpcivpdtest.c
+++ b/tests/virpcivpdtest.c
@@ -446,6 +446,8 @@ testVirPCIVPDReadVPDBytes(const void *opaque G_GNUC_UNUSED)
     buf = g_malloc0(dataLen);

     fd = virCreateAnonymousFile(fullVPDExample, dataLen);
+    if (fd < 0)
+        return -1;

I would prefer if you rewrote this before merging as:

   if ((fd = virCreateAnonymousFile(fullVPDExample, dataLen)) < 0)

       return -1;

(The whole patch.) I think it looks cleaner, but that's just my preference.

     readBytes = virPCIVPDReadVPDBytes(fd, buf, dataLen, 0, &csum);

@@ -482,6 +484,9 @@ testVirPCIVPDParseVPDStringResource(const void *opaque G_GNUC_UNUSED)

     dataLen = G_N_ELEMENTS(stringResExample);
     fd = virCreateAnonymousFile(stringResExample, dataLen);
+    if (fd < 0)
+        return -1;
+
     result = virPCIVPDParseVPDLargeResourceString(fd, 0, dataLen, &csum, res);
     VIR_FORCE_CLOSE(fd);

@@ -552,6 +557,9 @@ testVirPCIVPDParseFullVPD(const void *opaque G_GNUC_UNUSED)

     dataLen = G_N_ELEMENTS(fullVPDExample);
     fd = virCreateAnonymousFile(fullVPDExample, dataLen);
+    if (fd < 0)
+        return -1;
+
     res = virPCIVPDParse(fd);
     VIR_FORCE_CLOSE(fd);

@@ -620,6 +628,9 @@ testVirPCIVPDParseZeroLengthRW(const void *opaque G_GNUC_UNUSED)

     dataLen = G_N_ELEMENTS(fullVPDExample);
     fd = virCreateAnonymousFile(fullVPDExample, dataLen);
+    if (fd < 0)
+        return -1;
+
     res = virPCIVPDParse(fd);
     VIR_FORCE_CLOSE(fd);

@@ -670,6 +681,9 @@ testVirPCIVPDParseNoRW(const void *opaque G_GNUC_UNUSED)

     dataLen = G_N_ELEMENTS(fullVPDExample);
     fd = virCreateAnonymousFile(fullVPDExample, dataLen);
+    if (fd < 0)
+        return -1;
+
     res = virPCIVPDParse(fd);
     VIR_FORCE_CLOSE(fd);

@@ -723,6 +737,9 @@ testVirPCIVPDParseFullVPDSkipInvalidKeywords(const void *opaque G_GNUC_UNUSED)

     dataLen = G_N_ELEMENTS(fullVPDExample);
     fd = virCreateAnonymousFile(fullVPDExample, dataLen);
+    if (fd < 0)
+        return -1;
+
     res = virPCIVPDParse(fd);
     VIR_FORCE_CLOSE(fd);

@@ -776,6 +793,9 @@ testVirPCIVPDParseFullVPDSkipInvalidValues(const void *opaque G_GNUC_UNUSED)

     dataLen = G_N_ELEMENTS(fullVPDExample);
     fd = virCreateAnonymousFile(fullVPDExample, dataLen);
+    if (fd < 0)
+        return -1;
+
     res = virPCIVPDParse(fd);
     VIR_FORCE_CLOSE(fd);

--
2.31.1

Kristína