nvme: check chardev for resets and rescan

Also change nvme_verify_chr() to return -EINVAL from -ENOTBLK.

Signed-off-by: Tokunori Ikegami <[email protected]>

Author: ikegami-t

libnvme/src/nvme/ioctl.c

@@ -38,7 +38,7 @@ static int nvme_verify_chr(struct nvme_transport_handle *hdl)
 		return -errno;
 
 	if (!S_ISCHR(nvme_stat.st_mode))
-		return -ENOTBLK;
+		return -EINVAL;
 	return 0;
 }
 

nvme.c

@@ -5349,6 +5349,11 @@ static int subsystem_reset(int argc, char **argv, struct command *acmd, struct p
 	if (err)
 		return err;
 
+	if (!nvme_transport_handle_is_chardev(hdl)) {
+		nvme_show_error("Only character device is allowed");
+		return -EINVAL;
+	}
+
 	err = nvme_subsystem_reset(hdl);
 	if (err < 0) {
 		if (errno == ENOTTY)
@@ -5375,6 +5380,11 @@ static int reset(int argc, char **argv, struct command *acmd, struct plugin *plu
 	if (err)
 		return err;
 
+	if (!nvme_transport_handle_is_chardev(hdl)) {
+		nvme_show_error("Only character device is allowed");
+		return -EINVAL;
+	}
+
 	err = nvme_ctrl_reset(hdl);
 	if (err < 0)
 		nvme_show_error("Reset: %s", nvme_strerror(err));
@@ -5399,6 +5409,11 @@ static int ns_rescan(int argc, char **argv, struct command *acmd, struct plugin
 	if (err)
 		return err;
 
+	if (!nvme_transport_handle_is_chardev(hdl)) {
+		nvme_show_error("Only character device is allowed");
+		return -EINVAL;
+	}
+
 	err = validate_output_format(nvme_cfg.output_format, &flags);
 	if (err < 0) {
 		nvme_show_error("Invalid output format");