]> www.infradead.org Git - users/sagi/libnvme.git/commitdiff
util: fix a file handle leak in nvme_uuid_random()
authorMaurizio Lombardi <mlombard@redhat.com>
Tue, 8 Nov 2022 10:35:27 +0000 (11:35 +0100)
committerDaniel Wagner <dwagner@suse.de>
Wed, 9 Nov 2022 09:31:59 +0000 (10:31 +0100)
Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
src/nvme/util.c

index c61dbe9214ba82ef960fba5534e160e337c14708..e8caa5087e1e8a499ba38ba00599a782d24df2c9 100644 (file)
@@ -871,13 +871,11 @@ int nvme_uuid_random(unsigned char uuid[NVME_UUID_LEN])
        if (f < 0)
                return -errno;
        n = read(f, uuid, NVME_UUID_LEN);
-       if (n < 0) {
-               close(f);
+       close(f);
+       if (n < 0)
                return -errno;
-       } else if (n != NVME_UUID_LEN) {
-               close(f);
+       else if (n != NVME_UUID_LEN)
                return -EIO;
-       }
 
        /*
         * See https://www.rfc-editor.org/rfc/rfc4122#section-4.4