From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932537Ab2F2Qqg (ORCPT ); Fri, 29 Jun 2012 12:46:36 -0400 Received: from bhuna.collabora.co.uk ([93.93.135.160]:42781 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755927Ab2F2Qq2 (ORCPT ); Fri, 29 Jun 2012 12:46:28 -0400 From: Vincent Sanders To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" Cc: Javier Martinez Canillas , Vincent Sanders Subject: [PATCH net-next 07/15] scm: allow AF_BUS sockets to send ancillary data Date: Fri, 29 Jun 2012 17:45:46 +0100 Message-Id: <1340988354-26981-8-git-send-email-vincent.sanders@collabora.co.uk> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1340988354-26981-1-git-send-email-vincent.sanders@collabora.co.uk> References: <1340988354-26981-1-git-send-email-vincent.sanders@collabora.co.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Javier Martinez Canillas Similar to UNIX domain sockets AF_BUS sockets support passing file descriptors and process credentials which requires supporting passing control messages. The core socket level control messages processing requires extending to allow sockets other than PF_UNIX to send SCM_RIGHTS type messages. Signed-off-by: Javier Martinez Canillas Signed-off-by: Vincent Sanders --- net/core/scm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/core/scm.c b/net/core/scm.c index 611c5ef..87e3152 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -158,7 +158,8 @@ int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p) switch (cmsg->cmsg_type) { case SCM_RIGHTS: - if (!sock->ops || sock->ops->family != PF_UNIX) + if (!sock->ops || (sock->ops->family != PF_UNIX && + sock->ops->family != PF_BUS)) goto error; err=scm_fp_copy(cmsg, &p->fp); if (err<0) -- 1.7.10