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 92A794A8A2C; Tue, 15 Sep 2026 11:36:22 +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=1789472184; cv=none; b=Qgf3Nck/YoOgZ87c4qQs4IsuMYfhx9MDLSRMSKVFghg1DTppfY4/Bfq02cyU5AWU5BE9I4T/OJVOvGlnsQw8UzsBm2OndYR+fE7taNCQVH/qDGosbNWb3J4ev4eFS+WriIg362oazcCMsPn6X53efVgc60ynDTrbPppSTSQ97gM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789472184; c=relaxed/simple; bh=SoVog+6B8HBuyIDP19b0KqkTeSBHFQ/u5Q+O82974JE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CX5yux5I0npGOEl0kNJUq5jIFpeTnh6qsZqtFSfUZd+K1R0zCjCMBm54c3e2l4swrMP5qW989SaIYkiArs2KNuoksUJcwJHBylLPtIoJMvMimEoZLdUdFjM4QtHW0pjFQyXtRpE0W1mTJ5krrocWRBZ1thjL6ObGWboFzm8w/Ns= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=j3rMRnP4; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="j3rMRnP4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD5001F00893; Tue, 15 Sep 2026 11:36:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789472182; bh=oZh0vLqcxduUWTFynumJFhxFNW42oEX6Rn3UwZlew10=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=j3rMRnP4Yq76LugZgcTC3Qf0Ci80ZsR1Bjf4RalPTu0XQJWg3exDlCNJpfFK/5MxM WYaKKc+iEEvUbRPZPKxBSCicd83hSTqA7oZhBEyYRVXy1eWTpEG9V0qCpYWagSWyJM LMC9aTfO6/vIRu0BhEoAicivAddy21JTUJ9Ey/WFXSkOgO7lRUm/69w2OsJiTlTGJJ PVaIxbRP2QqlmQ8miseIjAxpQqw4BFWTU0OlqdE4kvqHra2NIRZhFlj+TvL3m+l5UE la7dnSw8kYUKUgJ4W/pOpOV1l55Kv3959gLF9FNT0wDZZqyVfgaqZTmzG3/cOJbMQV 93dOclKCiZGPQ== From: Christian Brauner Date: Tue, 15 Sep 2026 13:31:25 +0200 Subject: [PATCH RFC POC 39/50] seccomp: stop putting the listener descriptor back on failure Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260915-work-fd-reserve-unify-folded-v1-39-4d5217d6b246@kernel.org> References: <20260915-work-fd-reserve-unify-folded-v1-0-4d5217d6b246@kernel.org> In-Reply-To: <20260915-work-fd-reserve-unify-folded-v1-0-4d5217d6b246@kernel.org> To: Linus Torvalds Cc: Alexander Viro , Jann Horn , Jan Kara , Ingo Molnar , Peter Zijlstra , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Oleg Nesterov , linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, Jens Axboe , io-uring@vger.kernel.org, netdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-gpio@vger.kernel.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, bpf@vger.kernel.org, David Airlie , virtualization@lists.linux.dev, kvm@vger.kernel.org, kexec@lists.infradead.org, linux-hyperv@vger.kernel.org, "Christian Brauner (Amutable)" X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=openpgp-sha256; l=1590; i=brauner@kernel.org; h=from:subject:message-id; bh=SoVog+6B8HBuyIDP19b0KqkTeSBHFQ/u5Q+O82974JE=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMWSt1Kl7drfm0vIrUa8YdK4pvXG67XDtwdnLWZ9s8lgOH X5/t2WKdEcpC4MYF4OsmCKLQ7tJuNxynorNRpkaMHNYmUCGMHBxCsBEGD4xMjwJva2x4G9RxkHX XU1ZZuuPNKZYpJh/z8h6/EhWU//pvNcM/2vKj01as7z7q8HKc/dLTVZVbHkiJn/kXu5zo+cFdn4 LL/MDAA== X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Rely on the fd exit path machinery. Signed-off-by: Christian Brauner (Amutable) --- kernel/seccomp.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 86cf4460d69e..dc275ab1e031 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -1957,7 +1957,7 @@ static long seccomp_set_mode_filter(unsigned int flags, const unsigned long seccomp_mode = SECCOMP_MODE_FILTER; struct seccomp_filter *prepared = NULL; long ret = -EINVAL; - int listener = -1; + const struct fd_slot *listener = NULL; struct file *listener_f = NULL; /* Validate flags. */ @@ -1990,15 +1990,14 @@ static long seccomp_set_mode_filter(unsigned int flags, return PTR_ERR(prepared); if (flags & SECCOMP_FILTER_FLAG_NEW_LISTENER) { - listener = get_unused_fd_flags(O_CLOEXEC); - if (listener < 0) { - ret = listener; + listener = fd_prepare(O_CLOEXEC); + if (IS_ERR(listener)) { + ret = PTR_ERR(listener); goto out_free; } listener_f = init_listener(prepared); if (IS_ERR(listener_f)) { - put_unused_fd(listener); ret = PTR_ERR(listener_f); goto out_free; } @@ -2038,11 +2037,9 @@ static long seccomp_set_mode_filter(unsigned int flags, if (ret) { listener_f->private_data = NULL; fput(listener_f); - put_unused_fd(listener); seccomp_notify_detach(prepared); } else { - fd_install(listener, listener_f); - ret = listener; + ret = fd_stage(listener, listener_f); } } out_free: -- 2.53.0