From: mwleeds@mailtundra.com <mwleeds@mailtundra.com>
Date: Sun, 7 Apr 2024 01:47:25 +0000 (-0700)
Subject: zfs: Fix malloc() success check
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=0c17f85710a70a24ec19852a2f6f0749e807656f;p=u-boot.git

zfs: Fix malloc() success check

This code was hitting the error code path whenever malloc() succeeded
rather than when it failed, so presumably this part of the code hasn't
been tested. I had to apply this fix (and others) to get U-Boot to boot
from ZFS on an Nvidia Jetson TX2 NX SoM (an aarch64 computer).

Signed-off-by: Phaedrus Leeds <mwleeds@mailtundra.com>
---

diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 1fec96cd5c..14779dee32 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -655,7 +655,7 @@ dmu_read(dnode_end_t *dn, uint64_t blkid, void **buf,
 											dn->endian)
 				<< SPA_MINBLOCKSHIFT;
 			*buf = malloc(size);
-			if (*buf) {
+			if (!*buf) {
 				err = ZFS_ERR_OUT_OF_MEMORY;
 				break;
 			}