From: yangzz-97 <70520104+yangzz-97@users.noreply.github.com>
Date: Sun, 6 Sep 2020 10:30:48 +0000 (+0800)
Subject: libfdisk: reset context FD on error
X-Git-Tag: v2.37-rc1~494
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=933f095feb6c695e02c9989d091c76cc1b8d6d4c;p=thirdparty%2Futil-linux.git

libfdisk: reset context FD on error

When the query disk fails, reset cxt->dev_fd.

Addresses: https://github.com/karelzak/util-linux/pull/1137
Addresses: https://github.com/karelzak/util-linux/issues/1131
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c
index 327e03b42b..206627849c 100644
--- a/libfdisk/src/context.c
+++ b/libfdisk/src/context.c
@@ -636,6 +636,7 @@ static int fdisk_assign_fd(struct fdisk_context *cxt, int fd,
 fail:
 	{
 		int rc = -errno;
+		cxt->dev_fd = -1;
 		DBG(CXT, ul_debugobj(cxt, "failed to assign device [rc=%d]", rc));
 		return rc;
 	}