From: Daniel Danzberger <daniel@dd-wrt.com>
Date: Tue, 4 May 2021 13:23:11 +0000 (+0200)
Subject: fstools: block: fix segfault on mount with no target
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b5397a142d3ac35daeb526b1df82ccbf64bff741;p=project%2Ffstools.git

fstools: block: fix segfault on mount with no target

When a UCI fstab mount config doesn't contain a target option,
a 'block mount' call segfaults when comparing a mount's target (NULL)
to a found mount point returned by find_mount_point()

Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
Acked-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/block.c b/block.c
index f094216..c6d93d1 100644
--- a/block.c
+++ b/block.c
@@ -1021,7 +1021,7 @@ static int mount_device(struct probe_info *pr, int type)
 
 	mp = find_mount_point(pr->dev);
 	if (mp) {
-		if (m && m->type == TYPE_MOUNT && strcmp(m->target, mp)) {
+		if (m && m->type == TYPE_MOUNT && m->target && strcmp(m->target, mp)) {
 			ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp);
 			err = -1;
 		} else