From: Karel Zak <kzak@redhat.com>
Date: Mon, 19 Sep 2022 12:23:25 +0000 (+0200)
Subject: lsblk: fix endless loop if device specified more than once
X-Git-Tag: v2.39-rc1~511
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eb31ca7f7971101846bd3668be5d7807200fa2f;p=thirdparty%2Futil-linux.git

lsblk: fix endless loop if device specified more than once

Fixes: https://github.com/util-linux/util-linux/issues/1814
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/lsblk-devtree.c b/misc-utils/lsblk-devtree.c
index ce9d3e84f7..6f9dc54b3c 100644
--- a/misc-utils/lsblk-devtree.c
+++ b/misc-utils/lsblk-devtree.c
@@ -282,8 +282,25 @@ void lsblk_unref_devtree(struct lsblk_devtree *tr)
 	}
 }
 
+static int has_root(struct lsblk_devtree *tr, struct lsblk_device *dev)
+{
+	struct lsblk_iter itr;
+	struct lsblk_device *x = NULL;
+
+	lsblk_reset_iter(&itr, LSBLK_ITER_FORWARD);
+
+	while (lsblk_devtree_next_root(tr, &itr, &x) == 0) {
+		if (x == dev)
+			return 1;
+	}
+	return 0;
+}
+
 int lsblk_devtree_add_root(struct lsblk_devtree *tr, struct lsblk_device *dev)
 {
+	if (has_root(tr, dev))
+		return 0;
+
 	if (!lsblk_devtree_has_device(tr, dev))
 		lsblk_devtree_add_device(tr, dev);