From patchwork Wed Jun 17 15:14:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 485464 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 9896C1401EF for ; Thu, 18 Jun 2015 01:15:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=cWutQ3ph; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932506AbbFQPPM (ORCPT ); Wed, 17 Jun 2015 11:15:12 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:34730 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932236AbbFQPPI (ORCPT ); Wed, 17 Jun 2015 11:15:08 -0400 Received: by wicnd19 with SMTP id nd19so86556849wic.1; Wed, 17 Jun 2015 08:15:07 -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=thzcemD3nGJkR3eEjySgKHA6ojCWdvBjj4VCrUxEMmM=; b=cWutQ3phK/ifh6rzNXhBacAylRUVrYsrQS8LjuQ/xvxeEQAGxJVTvDNVOtrgL7zTCU v6OrwxbsHls1M9kRT495ivAas5HOj8q/yKrD9aC2jUDGrRIe4olpNfbj4ILXR9as4uRo h05NUVfl8gT09xuQu1fqoy8r51tMmMvbykQqxAfiFF8yfckxidoHTFAdmreEa3ZWGRQQ 8dqKTzOJDGykYg0R/U2Vr6iVBx5jJBob+jcf7qToZXz0UeNEBQ5KVLEz6ZyoVUU2gcR3 IoehHn8TgoKsoJhUvZCBm3cUKmZVtquO4UqJd6BpetEaMSZGCJXWI2ejVitJekxwTK32 81XQ== X-Received: by 10.180.81.106 with SMTP id z10mr54560699wix.22.1434554107227; Wed, 17 Jun 2015 08:15:07 -0700 (PDT) Received: from david-t2.fritz.box ([37.120.74.148]) by mx.google.com with ESMTPSA id z9sm26443960wiv.9.2015.06.17.08.15.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Jun 2015 08:15:06 -0700 (PDT) From: David Herrmann To: netdev@vger.kernel.org Cc: "David S. Miller" , Thomas Graf , Herbert Xu , linux-kernel@vger.kernel.org, David Herrmann Subject: [PATCH v2] netlink: add API to retrieve all group memberships Date: Wed, 17 Jun 2015 17:14:33 +0200 Message-Id: <1434554073-23646-1-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 2.4.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds getsockopt(SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS) to retrieve all groups a socket is a member of. Currently, we have to use getsockname() and look at the nl.nl_groups bitmask. However, this mask is limited to 32 groups. Hence, similar to NETLINK_ADD_MEMBERSHIP and NETLINK_DROP_MEMBERSHIP, this adds a separate sockopt to manager higher groups IDs than 32. This new NETLINK_LIST_MEMBERSHIPS option takes a pointer to __u32 and the size of the array. The array is filled with the full membership-set of the socket, and the required array size is returned in optlen. Hence, user-space can retry with a properly sized array in case it was too small. Signed-off-by: David Herrmann --- v2: - rebase on top of net-next conflict due to 59324cf35ab ('netlink: allow to listen "all" netns') include/uapi/linux/netlink.h | 17 +++++++++-------- net/netlink/af_netlink.c | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h index 3e34b7d..cf6a65c 100644 --- a/include/uapi/linux/netlink.h +++ b/include/uapi/linux/netlink.h @@ -101,14 +101,15 @@ struct nlmsgerr { struct nlmsghdr msg; }; -#define NETLINK_ADD_MEMBERSHIP 1 -#define NETLINK_DROP_MEMBERSHIP 2 -#define NETLINK_PKTINFO 3 -#define NETLINK_BROADCAST_ERROR 4 -#define NETLINK_NO_ENOBUFS 5 -#define NETLINK_RX_RING 6 -#define NETLINK_TX_RING 7 -#define NETLINK_LISTEN_ALL_NSID 8 +#define NETLINK_ADD_MEMBERSHIP 1 +#define NETLINK_DROP_MEMBERSHIP 2 +#define NETLINK_PKTINFO 3 +#define NETLINK_BROADCAST_ERROR 4 +#define NETLINK_NO_ENOBUFS 5 +#define NETLINK_RX_RING 6 +#define NETLINK_TX_RING 7 +#define NETLINK_LISTEN_ALL_NSID 8 +#define NETLINK_LIST_MEMBERSHIPS 9 struct nl_pktinfo { __u32 group; diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 69d67c3..dea9253 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -2290,6 +2290,28 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname, return -EFAULT; err = 0; break; + case NETLINK_LIST_MEMBERSHIPS: { + int pos, idx, shift; + + err = 0; + netlink_table_grab(); + for (pos = 0; pos * 8 < nlk->ngroups; pos += sizeof(u32)) { + if (len - pos < sizeof(u32)) + break; + + idx = pos / sizeof(unsigned long); + shift = (pos % sizeof(unsigned long)) * 8; + if (put_user((u32)(nlk->groups[idx] >> shift), + (u32 __user *)(optval + pos))) { + err = -EFAULT; + break; + } + } + if (put_user(ALIGN(nlk->ngroups / 8, sizeof(u32)), optlen)) + err = -EFAULT; + netlink_table_ungrab(); + break; + } default: err = -ENOPROTOOPT; }