nvme-cli/list: fix when nvme device can not be open

This patch checks the validity of fd returned by open operation on
the nvme divices. For example, when a user who doesn't have the
permission to open the device trys to use nvme list command to list
nvme devices, the fd is returned as -1 and errno indicates permission
denied.
In addition,this patch closes the current open device before
processing the next device.

Signed-off-by: Guan Junxiong <guanjunxiong@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>

diff --git a/nvme.c b/nvme.c
index 235a1bbf22b9722e6e9f2d3d20326e5ef1caadf2..b4a039ada597882cf7f9ac1b3362c1bbfa6175eb 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -911,7 +911,13 @@ static int list(int argc, char **argv, struct command *cmd, struct plugin *plugi
        for (i = 0; i < n; i++) {
                snprintf(path, sizeof(path), "%s%s", dev, devices[i]->d_name);
                fd = open(path, O_RDONLY);
+               if (fd < 0) {
+                       fprintf(stderr, "can not open %s: %s\n", path,
+                                       strerror(errno));
+                       return errno;
+               }
                ret = get_nvme_info(fd, &list_items[i], path);
+               close(fd);
                if (ret)
                        return ret;
        }