From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EC0B2C982CA for ; Tue, 15 Sep 2026 11:37:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=oZh0vLqcxduUWTFynumJFhxFNW42oEX6Rn3UwZlew10=; b=Cc93W9n14l2TsvyXON7Wz21qxe 7xVbLANAGdJTLOzDcdlVzYrUg47dpGQLHKBxTyxFYEL2YXo8TD2Y8qn7/wjxJerxrYbEBvpBceyi5 /tlrC0QZfIk2kATRd6djrDGGW0mZp7A8tnrZPvYdPnAmrAZ9VSkBBcO9iEiorff87a4xIXo435j8X EgKclXNc5iHvN9P20m540wQ/exZy1u15DYYy3gTY+bXSn5098OOAjF4nd7fNi7DnKbMdLjsKrxDQ1 ol/9brnog31WCnFnbOA33N79xFwQIiHt0j6WLC3z84siIpBI6Q5r4nrIpr34/sdIZcV02LaK0+MgI Cgq0cQgQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x6RTM-00000006Duv-3oLF; Tue, 15 Sep 2026 11:37:12 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x6RSY-00000006CoC-2jO6; Tue, 15 Sep 2026 11:36:22 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 50DB3433C1; Tue, 15 Sep 2026 11:36:22 +0000 (UTC) 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 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 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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