From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ewsoutbound.kpnmail.nl (ewsoutbound.kpnmail.nl [195.121.94.184]) (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 1279439DBEF for ; Mon, 29 Jun 2026 19:42:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.121.94.184 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782762153; cv=none; b=IxgnNMWt0FYw1zMEAl0xJ82J4o4/AwwkZ8NjFk9KqQ077EnFz293T1sYwjIQBc9tw9v7QEG4HIaYq+gonehWxM78nNFR6GtVLytD8wamO02k1v9tdx5NfgyXbYYXcvyUOCYw3X+Yg/dc6mnA2QgFqSjDqnmqwRMQiarlN30lunk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782762153; c=relaxed/simple; bh=Yb297ECq9ujErcZveMYJ/c8Xk1cehofejNyUSx2K2dE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FLl9EpHepVf3DP40beLh7/yuSBgQHUvQD3nY4AJXw8ck+wdcwjCridd3zcobp3bU9do0XYzCNIkBW50wJaIjyNFYkT0kJ+K2u2qUuVT7KBNe5Q6+kYWV+TXW1eRrX0voLNLNvqyWasE0vPY9HEr7oXma/VRqT2aMYuL1Bxvi0EE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl; spf=pass smtp.mailfrom=xs4all.nl; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b=pZe7J1tu; arc=none smtp.client-ip=195.121.94.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="pZe7J1tu" X-KPN-MessageId: a9ef72ff-73f2-11f1-a59f-005056994fde Received: from smtp.kpnmail.nl (unknown [10.31.155.7]) by ewsoutbound.so.kpn.org (Halon) with ESMTPS id a9ef72ff-73f2-11f1-a59f-005056994fde; Mon, 29 Jun 2026 21:42:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=xs4all01; h=mime-version:message-id:date:subject:to:from; bh=NlllJMej/M9JD4iLBjP7yjBgEn8/DtVneQJiI50FhXk=; b=pZe7J1tuyfikPKsKSdhVlJLDRWOZlV/X5O7dGUl44Jk+3e0d6d0upJ9su0bQkRheA2aG0hW2hmtvY jna1mzQ5JgiQqhN0f1dMckzQtQkx5uHNCvNsKsvhTdoT1Ck+W5Fcx2FLMYVD7yXA/3ba4g5F3olUGG XA0R1m1E7CPiVhTPvqNYOv5sQnumeHC6nPpAFqE8zdypyYX8POmcspaq0worY1Bp6StHD+hT/CAfcL XcJaL9M0CPBSrNgLacDEmbe25rRtWSEs8vGMMGih/Aob6xBWxt1Z7v+MAq0x4TzBwbpRYMu2/hRgvT KAu60aKEP+SwzLGKL13ur5/JcHnGPHQ== X-KPN-MID: 33|WNIPsB6Le/jLdCCOCfWspZGz/ZIqheenzbbeUWe5Kcpy7fq3KHZ85ldtlEg62J7 PkgmWU6Vl+nkksbnChsDtdDJC494G7vtPmuWVOBqKWOQ= X-KPN-VerifiedSender: Yes X-CMASSUN: 33|Ty5MopHgJvtKagMH31kx6cXCl8YkognnmX+Xk+kCcikoYjqRp3nmd14qKyTaZS4 ewEsOPsO2Z7NohC2aQpUCUg== Received: from daedalus.home (unknown [178.231.11.185]) by smtp.xs4all.nl (Halon) with ESMTPSA id a9a15b9e-73f2-11f1-8076-005056998788; Mon, 29 Jun 2026 21:42:29 +0200 (CEST) From: Jori Koolstra To: Christian Brauner , Aleksa Sarai , Kuniyuki Iwashima , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jori Koolstra Subject: [PATCH net-next v3 1/5] net: scm: move scm_detach_fds() from common path to scm_recv_unix() Date: Mon, 29 Jun 2026 21:43:23 +0200 Message-ID: <20260629194327.2270798-2-jkoolstra@xs4all.nl> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260629194327.2270798-1-jkoolstra@xs4all.nl> References: <20260629194327.2270798-1-jkoolstra@xs4all.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit scm->fp can only be set when using UNIX sockets, therefore we should move it out of the common path __scm_recv_common() into scm_recv_unix(). Signed-off-by: Jori Koolstra --- net/core/scm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/core/scm.c b/net/core/scm.c index eec13f50ecaf..a73b1eb30fd2 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -523,9 +523,6 @@ static bool __scm_recv_common(struct sock *sk, struct msghdr *msg, scm_passec(sk, msg, scm); - if (scm->fp) - scm_detach_fds(msg, scm); - return true; } @@ -545,6 +542,9 @@ void scm_recv_unix(struct socket *sock, struct msghdr *msg, if (!__scm_recv_common(sock->sk, msg, scm, flags)) return; + if (scm->fp) + scm_detach_fds(msg, scm); + if (sock->sk->sk_scm_pidfd) scm_pidfd_recv(msg, scm); -- 2.54.0