diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
index 8b4f86ce50ce85e75e28c6d3c92ce346ed4a6888..e7350d9d60e9b748c189c6bc8b325548083b739b 100644
--- a/drivers/infiniband/core/nldev.c
+++ b/drivers/infiniband/core/nldev.c
@@ -1123,13 +1123,10 @@ static int res_get_common_dumpit(struct sk_buff *skb,
 	 * objects.
 	 */
 	xa_for_each(&rt->xa, id, res) {
-		if (idx < start)
-			goto next;
-
 		if (!is_visible_in_pid_ns(res))
-			goto next;
+			continue;
 
-		if (!rdma_restrack_get(res))
+		if (idx < start || !rdma_restrack_get(res))
 			goto next;
 
 		xa_unlock(&rt->xa);