From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout-b7-smtp.messagingengine.com (fout-b7-smtp.messagingengine.com [202.12.124.150]) (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 D445337C909 for ; Mon, 4 May 2026 09:58:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.150 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777888709; cv=none; b=iUJRu+PM753qu+NYDrQPJIMVPwozPHa8R22MwwuhXDceB2ir33AhjoyeNJNnwF6CM9wZ6ru/YEJGlicIBzZPRWATXsTtOph37WYqZKBot3x6f0DgGnHN+yk55QCLw7IAf2ukxqelZbZQvaguk2ZBO2F60c1dX9Gi0zflPXRVXeY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777888709; c=relaxed/simple; bh=NWP+12qWK8xYm8x1ye9eTVdykzYyibAxT+S9M5D9o1E=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=B2QriArroe85b6C3BsLLskdfNRCUBVfSILtHgPag1dWyu7foYOmvswNBBtdhFdCV+/tGYW8qTpwqSa8dI4TR/5PdNSOGcg6p4MEb/vzdz4O8VCmavDPnBfuEVycx/pc2nJ/frngPlXOSBG3psWETQL3hnlAMbCzXaWtSXnGdIPg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kroah.com; spf=pass smtp.mailfrom=kroah.com; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b=nhTUC+QI; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=rT3hhMZ+; arc=none smtp.client-ip=202.12.124.150 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kroah.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kroah.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="nhTUC+QI"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="rT3hhMZ+" Received: from phl-compute-05.internal (phl-compute-05.internal [10.202.2.45]) by mailfout.stl.internal (Postfix) with ESMTP id E75FC1D000AA; Mon, 4 May 2026 05:58:26 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Mon, 04 May 2026 05:58:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1777888706; x=1777975106; bh=yYlB/RjvfILny8j9UjxW9N/Z5MBpqLhpYgnXop7vZMI=; b= nhTUC+QIbb9G8j7WMih1Q2l9GsD4yOZRHpHjJzM84buNDrU3n36GLMt+okM9X5Uy v8To+GQw2KuNcaV7ZC5dsILOCOzn0Lkr6a3SYxDfnvN9tQ7VLnDgCeOPzL2UJe00 ixmN0fWUiujx1BssHT/VkCxQ5fVScpguXDVYepK2t+yau8XfHLa6D4e0RJJSmkB4 8n4RIka7lUq18UXhst5C6OkIC2XlX4HA70HDBBq5i81yezsZcemodxCMD9MnDSXn 6VCqH/btBQrGbqtLqh0xN/x3086vscig8g5jB5aOzv+uRYTU+R6MibmPbMS660pD PGXpWI5kuXVemTAIIhGW0Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1777888706; x= 1777975106; bh=yYlB/RjvfILny8j9UjxW9N/Z5MBpqLhpYgnXop7vZMI=; b=r T3hhMZ+Z9bjUT2ksc0GwolYLHx1ENdXDwpdSp9ebCH41Y3EUMIL/nm3JBBbnpWIG FruGE3BV7IWCt3nfsAN6dS0El6HPmF2vB7xPfyl1fNoxniMYmwTTod7WD7rfnVhl 9biuuXLnpP26QW52jmBeyzZq/4gsELJs6IOrcdjacWMjsKjyGQBwjQeJ8mwHdZSM 8XZx1rAxfoJzpGW5ApHJhsYrFlqRP5bA9SMt/7GYfUBlsDjd8OGXHPkqgEU2Gwmx 5e07bgMSWJtAMkMgYl7jXog2/2zCsx9BC2qS2W9aMyLP6OvYnM6OAOboUiHb8mVP 6NqUFviT8OA+ktiDXtYVg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefhedrtddtgdelkeehgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpeffhffvvefukfhfgggtugfgjgesthekredttddtudenucfhrhhomhepifhrvghgucfm jfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepgeevveetgf evjeffffevleeuhfejfeegueevfeetudejudefudetjedttdehueffnecuffhomhgrihhn pehkvghrnhgvlhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehgrhgvgheskhhrohgrhhdrtghomhdpnhgspghrtghpthhtohepuddt pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehsrghshhgrlheskhgvrhhnvghlrd horhhgpdhrtghpthhtohepshhtrggslhgvsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhr tghpthhtohepmhhitgesughighhikhhougdrnhgvthdprhgtphhtthhopehgnhhorggtkh esghhoohhglhgvrdgtohhmpdhrtghpthhtohepghhnohgrtghkfedttddtsehgmhgrihhl rdgtohhm X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 4 May 2026 05:58:26 -0400 (EDT) Date: Mon, 4 May 2026 11:58:25 +0200 From: Greg KH To: Sasha Levin Cc: stable@vger.kernel.org, =?iso-8859-1?Q?Micka=EBl_Sala=FCn?= , =?iso-8859-1?Q?G=FCnther?= Noack , =?iso-8859-1?Q?G=FCnther?= Noack Subject: Re: [PATCH 6.18.y] selftests/landlock: Fix socket file descriptor leaks in audit helpers Message-ID: <2026050420-overfed-obstacle-83f2@gregkh> References: <2026050112-second-frenzied-c947@gregkh> <20260502130541.590744-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20260502130541.590744-1-sashal@kernel.org> On Sat, May 02, 2026 at 09:05:41AM -0400, Sasha Levin wrote: > 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 02fd1393947a7..36a6816b47f13 100644 > --- a/tools/testing/selftests/landlock/audit.h > +++ b/tools/testing/selftests/landlock/audit.h > @@ -379,19 +379,25 @@ 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; > + } > > return fd; > + > +err_close: > + close(fd); > + return err; > } > > static int audit_init_filter_exe(struct audit_filter *filter, const char *path) > @@ -441,8 +447,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. */ > @@ -468,11 +476,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 > > Also does not apply :(