diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index 87d5f7523e6d..e6573a6c4d44 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -11,6 +11,7 @@ #include #include #include +#include #include @@ -27,6 +28,8 @@ #define QRTR_STATE_MULTI -2 #define QRTR_STATE_INIT -1 +#define AID_VENDOR_QRTR KGIDT_INIT(2906) + /** * struct qrtr_hdr_v1 - (I|R)PCrouter packet header version 1 * @version: protocol version @@ -1044,7 +1047,10 @@ static int qrtr_port_assign(struct qrtr_sock *ipc, int *port) QRTR_MAX_EPH_SOCKET + 1, GFP_ATOMIC); if (rc >= 0) *port = rc; - } else if (*port < QRTR_MIN_EPH_SOCKET && !capable(CAP_NET_ADMIN)) { + } else if (*port < QRTR_MIN_EPH_SOCKET && + !(capable(CAP_NET_ADMIN) || + in_egroup_p(AID_VENDOR_QRTR) || + in_egroup_p(GLOBAL_ROOT_GID))) { rc = -EACCES; } else if (*port == QRTR_PORT_CTRL) { rc = idr_alloc(&qrtr_ports, ipc, 0, 1, GFP_ATOMIC); @@ -1645,9 +1651,6 @@ static int qrtr_addr_doit(struct sk_buff *skb, struct nlmsghdr *nlh, if (!netlink_capable(skb, CAP_NET_ADMIN)) return -EPERM; - if (!netlink_capable(skb, CAP_SYS_ADMIN)) - return -EPERM; - ASSERT_RTNL(); rc = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,