From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Fri, 4 Oct 2019 18:38:41 +0000 (-0400)
Subject: bcachefs: Fix deref of error pointer
X-Git-Tag: v6.7-rc1~201^2~2319
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d65a8551c822030e1214bcffbcb181d4878414b5;p=thirdparty%2Flinux.git

bcachefs: Fix deref of error pointer

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/str_hash.h b/fs/bcachefs/str_hash.h
index 31e55acbbeadc..a81fc3596fc10 100644
--- a/fs/bcachefs/str_hash.h
+++ b/fs/bcachefs/str_hash.h
@@ -251,9 +251,10 @@ int bch2_hash_set(struct btree_trans *trans,
 	if (!ret)
 		ret = -ENOSPC;
 out:
-	if (slot)
+	if (!IS_ERR_OR_NULL(slot))
 		bch2_trans_iter_put(trans, slot);
-	bch2_trans_iter_put(trans, iter);
+	if (!IS_ERR_OR_NULL(iter))
+		bch2_trans_iter_put(trans, iter);
 
 	return ret;
 found: