From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ewsoutbound.kpnmail.nl (ewsoutbound.kpnmail.nl [195.121.94.185]) (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 A7CF53B2FFF for ; Sun, 12 Jul 2026 19:29:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.121.94.185 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783884558; cv=none; b=LNK6ybG1u/FyzmL2/SvLbDs1qe1F94g+HTs/JvU5kRiWjRF32RV17oS6QWxA9iEdmaTMfp62XiJPpbtVVLB3IUBUko5Yx8Xc06Fp6PEl9Ln0lAx/1kOoDLJHXUCV/Ak5oSlWBUZcvNoiABpGxZKcJdjUC7+oc2Pvof3+1TImU+4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783884558; c=relaxed/simple; bh=QJQE/GXd0K169a8mwkplKKdkmQ5sBJfTjp2LDq9OYG0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iONYdzOe3gnGj07/ufkiyKFpnn0Si7u99qaxbJ0jiHEUOUEMWeVOlBSm4QHhnCqTmDUlE6S+cARAbVLc7Q6tCH1si7slLyZRRUUnewCrrjYpZOWmz8PjoHgS/pAIrw18yPMSZzR3D3/26w6fAPZ0J8OkNtfKIkSmp7jXGXV94IM= 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=P4xxHuf9; arc=none smtp.client-ip=195.121.94.185 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="P4xxHuf9" X-KPN-MessageId: f798f299-7e27-11f1-9e8e-005056999439 Received: from smtp.kpnmail.nl (unknown [10.31.155.8]) by ewsoutbound.so.kpn.org (Halon) with ESMTPS id f798f299-7e27-11f1-9e8e-005056999439; Sun, 12 Jul 2026 21:29:14 +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=jTewONXvFxgGhvbpYUlhsacZJwkbZKyIKe17J6I4b48=; b=P4xxHuf9t62cHKEpGb8t8CYqH1Jo9Yzt4DwnlWQdIvKB5c/bifaVrVkLK21nLkdXiDOEw6J0TrH7u 5X8mBl4JeOjrgEqzn2I5w4BlZYBBGaXZgHxHZd/XMHeChXLIfSjTs29IaLtg8jMzJPDfOXBRYDYxd8 M9FH4lyE+Diyax8ZS2FYC9Do0vGMUGpn4Vunqn0mpLgrV7l9jKRTO9KmP7277dekfVIGO01MTkvAKS 2B1bRypjDG+MahpGNzYoYoi/7uKuin1gAXXcbY2k+5Xs83vTWaCPJgmEZAvxrrdsUXd+jYe6Y58tTf iEMuUJ/kv3SXrU0pa5ecQeWF7SMcAhg== X-KPN-MID: 33|CwIQjKs957AdyUdlOp28+PvDB5Y+7tZPq2VDRTbC4dBudSZCQT7UlPggFgSIGBk 0a9iTxHxpnTlNdDTQVGrIQzku4B7uHbphAiBJbSelbKM= X-KPN-VerifiedSender: Yes X-CMASSUN: 33|NTLceOVGjkZuZpL9PCIGW5OMiyJ1Uw8ilTMavKGxPBNhuwrZUZcnYJg6hQHzEKF 2D3BmVEg5K2TpefHHy1d+8A== Received: from daedalus.home (unknown [178.230.226.124]) by smtp.xs4all.nl (Halon) with ESMTPSA id f757ec1f-7e27-11f1-8dcc-00505699d6e5; Sun, 12 Jul 2026 21:29:14 +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: [net-next v5 2/4] net: scm: move scm_detach_fds() from common path to scm_recv_unix() Date: Sun, 12 Jul 2026 21:29:56 +0200 Message-ID: <20260712192958.1631672-3-jkoolstra@xs4all.nl> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260712192958.1631672-1-jkoolstra@xs4all.nl> References: <20260712192958.1631672-1-jkoolstra@xs4all.nl> Precedence: bulk X-Mailing-List: netdev@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(). Reviewed-by: Kuniyuki Iwashima 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.55.0