From 9dcc2a5838aadd87045ab3eee863f853a0b3200e Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 8 Apr 2024 02:33:27 +0100 Subject: [PATCH] nsresource: fix FD leak Also fix return code, namespace_open_by_type uses RET_NERRNO CID#1542923 Follow-up for 54452c7b2aa --- src/shared/nsresource.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/shared/nsresource.c b/src/shared/nsresource.c index 4419f2fdde..bc0a352581 100644 --- a/src/shared/nsresource.c +++ b/src/shared/nsresource.c @@ -146,15 +146,16 @@ int nsresource_register_userns(const char *name, int userns_fd) { int nsresource_add_mount(int userns_fd, int mount_fd) { _cleanup_(varlink_unrefp) Varlink *vl = NULL; + _cleanup_close_ int _userns_fd = -EBADF; int r, userns_fd_idx, mount_fd_idx; const char *error_id; assert(mount_fd >= 0); if (userns_fd < 0) { - int _userns_fd = namespace_open_by_type(NAMESPACE_USER); + _userns_fd = namespace_open_by_type(NAMESPACE_USER); if (_userns_fd < 0) - return -errno; + return _userns_fd; userns_fd = _userns_fd; } -- 2.25.1