From patchwork Sun Jul 10 16:51:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soheil Hassas Yeganeh X-Patchwork-Id: 646779 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rnZ5v37T9z9sXx for ; Mon, 11 Jul 2016 02:52:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=NmRgKvyH; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757185AbcGJQwb (ORCPT ); Sun, 10 Jul 2016 12:52:31 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:35353 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757139AbcGJQwa (ORCPT ); Sun, 10 Jul 2016 12:52:30 -0400 Received: by mail-qk0-f193.google.com with SMTP id q62so1631657qkf.2 for ; Sun, 10 Jul 2016 09:52:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=/HSBRq5VlScOhm30QklMdbZ29YzIkPnxe4tiEdSWcFY=; b=NmRgKvyHkvZKcKOCc2+fwQM0PFqcJsjcJHgTCNPtdGa5MaeXREAuhlAWbm6t9/msq+ eQi1RLJCnfYFIAXd1RbcoOJ0ToT6/qw2Yh2E5fcblUT1tWAOjlBBwIzByeBbOdseRdJZ jy1qZ9MBYa4ySPVPDI4zSB/dnBM309ZJotaIc2/T8MJe/QutqcpPSIQkQ4C3/VJGihLG fkT73te9L0Svqdb2aRbj8CohJm92f5LHXorIwz6oiFtJ4dU5wkexYn2PpKgGOVRQgCIS E/u/M+vfaK1zSStC9Yq8/p61SxkdEWC1AeJoB5ZjPSgaAc65C7ZpTrS/2EmYjJvr/akj 1ABA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/HSBRq5VlScOhm30QklMdbZ29YzIkPnxe4tiEdSWcFY=; b=L+vUdxPGsoZYVs2RWVJtvryGg2SfuyZgM/0OeR2TfZ/tv4zCoC/C7Lvuq2q6al93l/ noa4NwHhr7Hj6gcjCsmS1je0N4InhuzfCZbUdC8jwzuIQBKEpnoyMFloAJ/NWVu4AcXG 6+ZSaJL5TE4lG3T589looS6mMWsJVAXpdEcEegqG/d5gBuXi+haq8jGjdIHeTDIaZavT BToa9fsTq+9gSH5ln4Cl7ldcIV6BrJYlJHSyn/qqFSnss2NaZhs1x3czs6nh2C7RYKH6 bnCDDveVHRtCohGdvbPrER8+e4/Jg4eqKiuoKr7pufnNG+5CVT48DMSEe8v2x0HWldBD zj/Q== X-Gm-Message-State: ALyK8tK3u/A46LwbzD1LKNpC6qBmiU/ILH3SbNBpVp16X6iPklMPEhyhtEgb+szwCUQYYw== X-Received: by 10.55.178.195 with SMTP id b186mr19083799qkf.81.1468169549788; Sun, 10 Jul 2016 09:52:29 -0700 (PDT) Received: from soheil.nyc.corp.google.com ([100.101.230.57]) by smtp.gmail.com with ESMTPSA id r74sm2505878qke.48.2016.07.10.09.52.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 10 Jul 2016 09:52:29 -0700 (PDT) From: Soheil Hassas Yeganeh To: davem@davemloft.net, netdev@vger.kernel.org Cc: slyfox@gentoo.org, Soheil Hassas Yeganeh , Eric Dumazet , Willem de Bruijn Subject: [PATCH net] sock: ignore SCM_RIGHTS and SCM_CREDENTIALS in __sock_cmsg_send Date: Sun, 10 Jul 2016 12:51:46 -0400 Message-Id: <1468169506-27038-1-git-send-email-soheil.kdev@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Soheil Hassas Yeganeh Sergei Trofimovich reported that pulse audio sends SCM_CREDENTIALS as a control message to TCP. Since __sock_cmsg_send does not support SCM_RIGHTS and SCM_CREDENTIALS, it returns an error and hence breaks pulse audio over TCP. SCM_RIGHTS and SCM_CREDENTIALS are sent on the SOL_SOCKET layer but they semantically belong to SOL_UNIX. Since all cmsg-processing functions including sock_cmsg_send ignore control messages of other layers, it is best to ignore SCM_RIGHTS and SCM_CREDENTIALS for consistency (and also for fixing pulse audio over TCP). Signed-off-by: Soheil Hassas Yeganeh Reported-by: Sergei Trofimovich Tested-by: Sergei Trofimovich Cc: Eric Dumazet Cc: Willem de Bruijn --- net/core/sock.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/core/sock.c b/net/core/sock.c index 08bf97e..b7f1263 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1938,6 +1938,10 @@ int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg, sockc->tsflags &= ~SOF_TIMESTAMPING_TX_RECORD_MASK; sockc->tsflags |= tsflags; break; + /* SCM_RIGHTS and SCM_CREDENTIALS are semantically in SOL_UNIX. */ + case SCM_RIGHTS: + case SCM_CREDENTIALS: + break; default: return -EINVAL; }