logging: fix error handling for ioctl passthru wrappers

libnvme fixed the error handling for the passthru commands. Update the nvme-cli version accordingly. Signed-off-by: Daniel Wagner <[email protected]>
linux-nvme · Apr 9, 2024 · a2b1aec · a2b1aec
1 parent a82d948
commit a2b1aec
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/util/logging.c b/util/logging.c
@@ -2,6 +2,7 @@
 
 #include <inttypes.h>
 
+#include <errno.h>
 #include <stdint.h>
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
@@ -104,8 +105,14 @@ int nvme_submit_passthru(int fd, unsigned long ioctl_cmd,
 		nvme_show_latency(start, end);
 	}
 
-	if (err >= 0 && result)
-		*result = cmd->result;
+	if (err >= 0) {
+		if (result)
+			*result = cmd->result;
+		if (cmd->result) {
+			errno = EPROTO;
+			err = -1;
+		}
+	}
 
 	return err;
 }
@@ -131,8 +138,14 @@ int nvme_submit_passthru64(int fd, unsigned long ioctl_cmd,
 		nvme_show_latency(start, end);
 	}
 
-	if (err >= 0 && result)
-		*result = cmd->result;
+	if (err >= 0) {
+		if (result)
+			*result = cmd->result;
+		if (cmd->result) {
+			errno = EPROTO;
+			err = -1;
+		}
+	}
 
 	return err;
 }