Message ID | 1468169506-27038-1-git-send-email-soheil.kdev@gmail.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
From: Soheil Hassas Yeganeh <soheil.kdev@gmail.com> Date: Sun, 10 Jul 2016 12:51:46 -0400 > From: Soheil Hassas Yeganeh <soheil@google.com> > > 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 <soheil@google.com> > Reported-by: Sergei Trofimovich <slyfox@gentoo.org> > Tested-by: Sergei Trofimovich <slyfox@gentoo.org> Please resubmit this with a proper "Fixes: " tag which tells which commit introduced this regression.
On Mon, Jul 11, 2016 at 4:39 PM, David Miller <davem@davemloft.net> wrote: > > From: Soheil Hassas Yeganeh <soheil.kdev@gmail.com> > Date: Sun, 10 Jul 2016 12:51:46 -0400 > > > From: Soheil Hassas Yeganeh <soheil@google.com> > > > > 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 <soheil@google.com> > > Reported-by: Sergei Trofimovich <slyfox@gentoo.org> > > Tested-by: Sergei Trofimovich <slyfox@gentoo.org> > > Please resubmit this with a proper "Fixes: " tag which tells which > commit introduced this regression. Sorry David that I forgot the Fixes tag. I just updated the patch and resubmitted. Thanks! Soheil
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; }