From nobody Thu Apr 25 19:09:42 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp941480uad; Fri, 5 Aug 2022 04:50:37 -0700 (PDT) X-Google-Smtp-Source: AA6agR6Z68ljeb5ZsCjzEDWoNqXxmoxxotyICPkbPP4lQTpV42TuGKZFulJhpG6aO7xV6zmaDsNT X-Received: by 2002:a05:622a:1301:b0:31f:373e:b8b1 with SMTP id v1-20020a05622a130100b0031f373eb8b1mr5499610qtk.387.1659700237380; Fri, 05 Aug 2022 04:50:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659700237; cv=none; d=google.com; s=arc-20160816; b=in7GdMOm9xjom/MllnDzzyCpKigDwxrM7ZIHn70ZJV3v4VYN8J9zoOB+XkVlKNqAQF OpNlM8ujC5n0frmhkRonZw0uoxEhLaO7Fy5WiIZbY4oDLVFitPAY8ljETR/KlkBwC6Z5 kf/JvtKv+Y4zsNEa9pkw++wNc9PT1/bj+85hwTGEJb5DcNhOzft+3uuJPWBKRnDtUWZW Ppi1UNySIuNJxTEF9f8IlpXGZsCNUnBaH53rRuTsfr3N3E1MDHYfrbVXKj0E/8EJlsJI vC0GfYnm+f6HDn2r3Qm2WCz3mCw2b9uSDZuiOmIu+nroTDgtVuI2M4LuLkAE6WHStQHG f9VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=PA1iZbZfGn1+lXzDyZdvVs/eG9qxHtUO+Mk7lsjsY6k=; b=KkZAQc01SVlf2DHxXgZlWPZTy5Y8H1Zq2au/RvLsutkmrh02nZjttFbBbIRBCJ377s fRaRluSh4NGOr7J4BokAt4qdt4Uci8eIOECm5fWYkpddc4ddUDyjvD/NfqgIYoek+TBQ Sd00OaS+PPfDYQH9UKohRP3y202POWcSeEWm26Xup0Eixp5ce6qHF+TJgLxlxYCcvvxi n/o8YteeyTM5IsaHqc/SKxkvOTVtR4z0bHHIbwjtzEnG/eAYW+HEbd5oNEcQh3Ine27M QeX0OaDaK2fN5DtdWyuLLNZT1Z1ssq7KAOSs7WGqPUl2UAc1AnSeBRSB7+w2hZDIOVws Kgtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JyukVIvW; spf=pass (google.com: domain of mptcp+bounces-6127-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-6127-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id q7-20020a056214194700b004771d22f053si2508310qvk.112.2022.08.05.04.50.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Aug 2022 04:50:37 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6127-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JyukVIvW; spf=pass (google.com: domain of mptcp+bounces-6127-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-6127-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id E9F2D1C20968 for ; Fri, 5 Aug 2022 11:50:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CBE43ECE; Fri, 5 Aug 2022 11:50:35 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E7457C for ; Fri, 5 Aug 2022 11:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659700232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PA1iZbZfGn1+lXzDyZdvVs/eG9qxHtUO+Mk7lsjsY6k=; b=JyukVIvW1rpFJqM3HtKqxt4gaTC7AC6FonVLvHFuroOEnYYlAE5vqkqpTyrskhvQ8ntI7e xA04Ra84YtKMkYP34OJZKvATIFw5k0v5wKSnU0xnmpDQFH7lP751LHUxhQvhjD4bxWcB+i 0o0NAwEGI9ZXGZkood/TjZvnfxnDRbM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-609-axumRqx-PIKHg_TR9BVsaQ-1; Fri, 05 Aug 2022 07:50:31 -0400 X-MC-Unique: axumRqx-PIKHg_TR9BVsaQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2A27085A585 for ; Fri, 5 Aug 2022 11:50:31 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 98E1B909FE; Fri, 5 Aug 2022 11:50:29 +0000 (UTC) From: Thomas Haller To: mptcp@lists.linux.dev Cc: pabeni@redhat.com, Thomas Haller Subject: [PATCH] mptcp: allow priviledged operations from user namespaces Date: Fri, 5 Aug 2022 13:50:20 +0200 Message-Id: <20220805115020.525181-1-thaller@redhat.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" GENL_ADMIN_PERM checks that the user has CAP_NET_ADMIN in the initial namespace by calling netlink_capable(). Instead, use GENL_UNS_ADMIN_PERM which uses netlink_ns_capable(). This checks that the caller has CAP_NET_ADMIN in the current user namespace. See also commit 4a92602aa1cd ('openvswitch: allow management from inside user namespaces') which introduced this mechanism. See also commit 5617c6cd6f84 ('nl80211: Allow privileged operations from user namespaces'), which introduced this for nl80211. Signed-off-by: Thomas Haller --- net/mptcp/pm_netlink.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 291b5da42fdb..2c145cdc7bdc 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -2218,17 +2218,17 @@ static const struct genl_small_ops mptcp_pm_ops[] = =3D { { .cmd =3D MPTCP_PM_CMD_ADD_ADDR, .doit =3D mptcp_nl_cmd_add_addr, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_DEL_ADDR, .doit =3D mptcp_nl_cmd_del_addr, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_FLUSH_ADDRS, .doit =3D mptcp_nl_cmd_flush_addrs, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_GET_ADDR, @@ -2238,7 +2238,7 @@ static const struct genl_small_ops mptcp_pm_ops[] =3D= { { .cmd =3D MPTCP_PM_CMD_SET_LIMITS, .doit =3D mptcp_nl_cmd_set_limits, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_GET_LIMITS, @@ -2247,27 +2247,27 @@ static const struct genl_small_ops mptcp_pm_ops[] = =3D { { .cmd =3D MPTCP_PM_CMD_SET_FLAGS, .doit =3D mptcp_nl_cmd_set_flags, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_ANNOUNCE, .doit =3D mptcp_nl_cmd_announce, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_REMOVE, .doit =3D mptcp_nl_cmd_remove, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_SUBFLOW_CREATE, .doit =3D mptcp_nl_cmd_sf_create, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_SUBFLOW_DESTROY, .doit =3D mptcp_nl_cmd_sf_destroy, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, }; =20 --=20 2.37.1