From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68DF43346BE; Wed, 23 Sep 2026 14:10:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790172626; cv=none; b=LjgJ0rUhjgOF/dZmsmb6liPt5VG7bvuFADt67KnJfenu7ahd2V3IpzlawSoH+IWb0XQHXQGX5dTfWr4n3vSf0UPNW8Z4Sx4voGOds5GWaHCnAdfUIUljr5QQIzNsFvERHzlIsxM9vWesJYD8kWRmzwxlZwDWPMv0Q+t1k341h5s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790172626; c=relaxed/simple; bh=RWcC1Qsj5MPK334eMhYpFlkiiGMMOQV6cVfeMwwjUiw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pDr0Zpt3/jgXhC3HiCIh4cPly5nTMON71yZSSzoNtSb4L4IyDq199e2N133C1gy9vkd6uUssNC8QRoQkph/xrs7eHb9oOgcE44XKA7OAKUmeZYr1pCmuz0fsdMYHtfYDRc3WO4Mwo1r4a4rk5ptnkE93hX4xi76t7kEZcyzDCdM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RV0re209; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="RV0re209" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E2DB1F000FF; Wed, 23 Sep 2026 14:10:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790172625; bh=2ihoweJvppVGPnU494ZVFkrKDh2FJJDo9YMN3jwWBiY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RV0re209NJ+UoP/HlFQCtE/JKXgnxLzSUtfehphgxIRlCCGbE1yoNqTv8RV8ywfYU Lm5p6JhuzWNHj92XDYF/mTkDFUPm6LLjEfc6mNw18F2kI+6R7NVO8IkSDeqV2FwUfL 10JV1/TYjdgThRRkqdvEg+j33daI97J1zN733pNQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?G=C3=BCnther=20Noack?= , =?UTF-8?q?G=C3=BCnther=20Noack?= , =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Sasha Levin Subject: [PATCH 6.18 005/398] selftests/landlock: Fix socket file descriptor leaks in audit helpers Date: Wed, 23 Sep 2026 16:01:19 +0200 Message-ID: <20260923140643.586037831@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923140643.441954610@linuxfoundation.org> References: <20260923140643.441954610@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mickaël Salaün [ Upstream commit 9143d790337a0d066c2d632c802f69b981e6c23a ] audit_init() opens a netlink socket and configures it, but leaks the file descriptor if audit_set_status() or setsockopt() fails. Fix this by jumping to an error path that closes the socket before returning. Apply the same fix to audit_init_with_exe_filter(), which leaks the file descriptor from audit_init() if audit_init_filter_exe() or audit_filter_exe() fails, and to audit_cleanup(), which leaks it if audit_init_filter_exe() fails in FIXTURE_TEARDOWN_PARENT(). Cc: Günther Noack Cc: stable@vger.kernel.org Fixes: 6a500b22971c ("selftests/landlock: Add tests for audit flags and domain IDs") Reviewed-by: Günther Noack Link: https://lore.kernel.org/r/20260402192608.1458252-3-mic@digikod.net Signed-off-by: Mickaël Salaün Signed-off-by: Sasha Levin --- tools/testing/selftests/landlock/audit.h | 26 +++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/landlock/audit.h b/tools/testing/selftests/landlock/audit.h index d6d6f5116dc96..f6d7b9ad60168 100644 --- a/tools/testing/selftests/landlock/audit.h +++ b/tools/testing/selftests/landlock/audit.h @@ -443,17 +443,19 @@ static int audit_init(void) err = audit_set_status(fd, AUDIT_STATUS_ENABLED, 1); if (err) - return err; + goto err_close; err = audit_set_status(fd, AUDIT_STATUS_PID, getpid()); if (err) - return err; + goto err_close; /* Sets a timeout for negative tests. */ err = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &audit_tv_default, sizeof(audit_tv_default)); - if (err) - return -errno; + if (err) { + err = -errno; + goto err_close; + } /* * Drains stale audit records that accumulated in the kernel backlog @@ -466,6 +468,10 @@ static int audit_init(void) ; return fd; + +err_close: + close(fd); + return err; } static int audit_init_filter_exe(struct audit_filter *filter, const char *path) @@ -515,8 +521,10 @@ static int audit_cleanup(int audit_fd, struct audit_filter *filter) filter = &new_filter; err = audit_init_filter_exe(filter, NULL); - if (err) + if (err) { + close(audit_fd); return err; + } } /* Filters might not be in place. */ @@ -542,11 +550,15 @@ static int audit_init_with_exe_filter(struct audit_filter *filter) err = audit_init_filter_exe(filter, NULL); if (err) - return err; + goto err_close; err = audit_filter_exe(fd, filter, AUDIT_ADD_RULE); if (err) - return err; + goto err_close; return fd; + +err_close: + close(fd); + return err; } -- 2.53.0