Fix zpool_history_unpack unconditionally returning ENOMEM on nvlist_u…

…npack failure Signed-off-by: WHR <[email protected]>
openzfs · Apr 12, 2022 · edd685a · edd685a
1 parent 35d81a7
commit edd685a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/libzutil/zutil_pool.c b/lib/libzutil/zutil_pool.c
@@ -109,6 +109,7 @@ zpool_history_unpack(char *buf, uint64_t bytes_read, uint64_t *leftover,
 	nvlist_t *nv;
 	int i;
 	void *tmp;
+	int err;
 
 	while (bytes_read > sizeof (reclen)) {
 
@@ -120,8 +121,9 @@ zpool_history_unpack(char *buf, uint64_t bytes_read, uint64_t *leftover,
 			break;
 
 		/* unpack record */
-		if (nvlist_unpack(buf + sizeof (reclen), reclen, &nv, 0) != 0)
-			return (ENOMEM);
+		err = nvlist_unpack(buf + sizeof (reclen), reclen, &nv, 0);
+		if (err != 0)
+			return (err);
 		bytes_read -= sizeof (reclen) + reclen;
 		buf += sizeof (reclen) + reclen;