From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ewsoutbound.kpnmail.nl (ewsoutbound.kpnmail.nl [195.121.94.183]) (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 6D5F4360ED0 for ; Sun, 5 Jul 2026 12:38:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.121.94.183 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783255128; cv=none; b=WihP0vBXvAkcyvf3kMp8G5j0yvhd6+wgB+i2fHsFVdXwyj4yvpYUDttvJHYuSeoVXIACDE3ZAssV7uZUzZ8V5ADDoizT8fWOznCeDm7oeJkvNqwGqTVIAFYwCiC5/OJIuuFL2feLKXm6GxAK7JPzRaZn1s46lpKIVwiLscT+d1A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783255128; c=relaxed/simple; bh=zqv3Np8ys3PYoKLLnoNREbJb5Mli48vuqtrDU10NNhk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PcusaSXuhTu3iXSePhp9NbwcczldmaIRF0x4iW2YQroCfXg1CJpPzjqOxPBmPjiZSoGsBnXJWjto+UFPdLZIyZqq87n8eqqmdXxqw4YFhi/9W11jY/e9pbnjqcE0pLIhJa4i8VEXHLwAEqReEDy8uCfrWQ2UndXvGcueRJV1XLA= 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=IzG5IH95; arc=none smtp.client-ip=195.121.94.183 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="IzG5IH95" X-KPN-MessageId: 4e0af6d7-786e-11f1-8f53-005056992ed3 Received: from smtp.kpnmail.nl (unknown [10.31.155.7]) by ewsoutbound.so.kpn.org (Halon) with ESMTPS id 4e0af6d7-786e-11f1-8f53-005056992ed3; Sun, 05 Jul 2026 14:37:37 +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=G6fztcr09RgbS+JSICNlygpsayswdGMK5f5FkM7aTAk=; b=IzG5IH95P4wmLVa0KruZ5dZQGJodw729jeKsRjqqlEMm7iHXl6G+7hRZeIdc2WM5FklEL4E2oo9ke N/FXDrKPKRIv4yKR8BTmE4WVDayeFQg5AdR30J3LM9F0oZ7nGyXgzhsQTQ4QOTblqK2NUu/vCeRCRe HnAgqhWEDHC2d0lB7U0Obd6mHfQaRrzXFSYyWdZ4ix1Jc+aUmDct4eN4bVzZBYM6vPCTbY5l2vjHax UWcOD/FvZXOXJIUUl0VB9Okdfmf0Y8r/wwNU5LBYAeyJywYIVs4nVLqFuUu+U6E+xRghwyDQ7vnlc8 H9x+qNWZyRYWbhnElU5lKS2LH8g+fbw== X-KPN-MID: 33|wEc7jfyWzf9CugYpFP6w9sqKBkTxhK95MK2sb4HTvvENzBMc2vJ2x1Y963A3m8/ jjLC6PxnRB7GaYl7jWxFzt7GvhQhzZ1EP+vleIDknt9w= X-KPN-VerifiedSender: Yes X-CMASSUN: 33|cEtDrH7Kt1jankJseMmrjF2N74kqtZhtDY68l3AVei+1WGbqYfy/nbYfIaVDAFG iIbt00gLCqw5dqTyF9lLXPQ== Received: from daedalus.home (unknown [178.231.11.83]) by smtp.xs4all.nl (Halon) with ESMTPSA id 4dc6cd53-786e-11f1-807b-005056998788; Sun, 05 Jul 2026 14:37:37 +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 v4 1/3] net: scm: move scm_detach_fds() from common path to scm_recv_unix() Date: Sun, 5 Jul 2026 14:38:24 +0200 Message-ID: <20260705123826.3818443-2-jkoolstra@xs4all.nl> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260705123826.3818443-1-jkoolstra@xs4all.nl> References: <20260705123826.3818443-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(). 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