From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 22 Feb 2019 21:04:14 +0000 (+0100)
Subject: conf: cleanup macros lxc_fill_autodev
X-Git-Tag: lxc-3.2.0~131^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae2a3d81b6dce0ba2489b706f1feff3bf61521c7;p=thirdparty%2Flxc.git

conf: cleanup macros lxc_fill_autodev

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index a637a0589..73489d718 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1251,7 +1251,7 @@ static int lxc_fill_autodev(const struct lxc_rootfs *rootfs)
 				 */
 				ret = open(path, O_RDONLY | O_CLOEXEC);
 				if (ret >= 0) {
-					close(ret);
+					close_prot_errno_disarm(ret);
 					/* Device nodes are fully useable. */
 					use_mknod = LXC_DEVNODE_OPEN;
 					continue;