From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx1-f42.google.com (mail-yx1-f42.google.com [74.125.224.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 193E51B81CA for ; Sat, 18 Apr 2026 17:01:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776531686; cv=none; b=kgtX4kEwDBgbNHNEvc938rWTWfKza5R460A7aEs26xJfiQ+Bs0iVM6baCmsnD5xC+jpm9SsqJHeDSuOVzjy1U4z0MPKYuFbmgTFcHtcSfCX40CHopT4gxt+pUrLXEZBP9ORw+EKjEjeXkPJzYUNBL8Ul6ulMJj5uCA+HGwlqu4A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776531686; c=relaxed/simple; bh=9OvJAySVnJT6emSweYvbg3dtprGlyfnChgfLzQwxBdE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fWZSil6gnN33ql1ybe8NMUGO81miPFPIH3Kd/wbS0pIkq8O6vR+mSu02cdSc7QiV+WEah25a3UDKw/rb0XgVjWvLcnnoiycYAuyw7rcEc5TKRucoK2EO4TPailQE6PWJcDS+KEE91USWj3/enfq3UVysV6I/q8DS9J8T06IUVPk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lyUd1z4a; arc=none smtp.client-ip=74.125.224.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lyUd1z4a" Received: by mail-yx1-f42.google.com with SMTP id 956f58d0204a3-651b8d1830bso225465d50.0 for ; Sat, 18 Apr 2026 10:01:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776531684; x=1777136484; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cFom3GqY7i4bOkS6YmLFc+xoimFf3UEXYzV7a+y0rXE=; b=lyUd1z4aBianXyyB1g//vPa5DcqZ+Eg1Fxw0XRyJgsuRoqivoVOo4E9lBRE/q9soVj XQt7m4DCigoAeYVTN3EirahJV5f6nOpjDnx3FD9pz1hMWZdvWcjfKjtYzkXEJg5FxnU4 RyOnd2gnMq2LJYbEia8OlWYvwP6NCZUOIgHmICYQzGlgomY/HhFPt+YvblWXq7BFmjy/ ahp1YYZCZy3jyx2sx+6gc/jdVFja9u7iIeU8LLC9z1Sgcb97AUwjg81Dw8xo2tqICyK1 i/7Z9CavKdEuHhEetICgn13D3mhv9xy6c91sJmwWO5ZqEcGzi4KYBzx6PruWtLmCp6lY FFew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776531684; x=1777136484; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=cFom3GqY7i4bOkS6YmLFc+xoimFf3UEXYzV7a+y0rXE=; b=Drm+d0nQTYb6eO/SZ0QJ8RxY0vHvRh3XQB9Ekqm7UjrgzwF3f2Yzm6U4Hn8/YZUOhH UhkKFW0mp7ho2IVSJwgDhoV/wp9BrqivTDRgMagVCqvPkKK35vXn4kwXzakSE31+/uoM IFXBFiSdt9U+Dc7FjhLGHLSb2mMb3+DeP1UBUFXTmZSJXStNAUMEF+0hvKOPHlJ8IHPl Yo9kAt/DzQOLeLvxaHbFd6Tw6xyNVf/EMPhOao3/fPyoakBG6ANlG8WqF5X7vuc9fw+Z uiKBM/2aIr0PXc+VRjjlbe9yXTullPGRHWq5ezNL1wBSE+KSpCc6pZbk1K0t/fbG6IBA UwiQ== X-Gm-Message-State: AOJu0YxMPiW5hDd1gfRhs/hcTVEX80OYtDa/Mw9pRuvwzwZi3T0N8mKj Q3QTgzxUgmlMof4W4R6p0f5+w9tGPAoRyaI47zQru6UeetDPvAZ3nutoJf8JbQ== X-Gm-Gg: AeBDieufbvfl6CQu+Bx6uxTl6soglFdaC4gspw9JfNg0f5mz9i3pDbtngMduflrgNXF HXyHZYe6eSRC7gNRdS86xWiOAaMjsYs/5UvVEN4Ptdifxo/Fd2XfQk6nmuEXwrCpSygZFc6iz8R QqGlkxUQ8AqNtP13pls818Au9ZG8Mc6cqC/YBD+Hri4P+dQgojeXEdXMe1Ue+yTX8u9eXyf6I7f gUcyF3eguwLqk/IEZAq/eoT7nlhpbowSrRitmYXrG9sCWihf0YoP/fEOAfrzWAP6O7jKdtLxHDP eoWmylkmt8UkhZOMsiLfQtFTwHPpLAohbeocjQ/FVao2iFl7lUAX48+q8M2GBHp6G5gdzzB4p6V jigwxpzM1LQ7W+68UJGw7wz6xqtrNL3Jv1dVp4N6gmhFoPhWpfG/2lDVNAShhM5AGn9mD2iuGgM wPyt4Cw9cp/g2Q1Z3AgGWEf82RGl8kN0ydBNo= X-Received: by 2002:a05:690e:480e:b0:649:bf2a:71d with SMTP id 956f58d0204a3-653109b6d43mr2693711d50.4.1776531683805; Sat, 18 Apr 2026 10:01:23 -0700 (PDT) Received: from localhost ([2a03:2880:21ff:51::]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-65314b26598sm2499613d50.2.2026.04.18.10.01.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2026 10:01:23 -0700 (PDT) From: Wei Wang To: netdev@vger.kernel.org, Jakub Kicinski , Daniel Zahka , Willem de Bruijn , David Wei , Andrew Lunn , "David S . Miller" , Eric Dumazet , Simon Horman , Paolo Abeni Cc: Wei Wang Subject: [PATCH v12 net-next 1/5] psp: add admin/non-admin version of psp_device_get_locked Date: Sat, 18 Apr 2026 10:00:51 -0700 Message-ID: <20260418170056.3490525-2-weibunny.kernel@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260418170056.3490525-1-weibunny.kernel@gmail.com> References: <20260418170056.3490525-1-weibunny.kernel@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Wei Wang Introduce 2 versions of psp_device_get_locked: 1. psp_device_get_locked_admin(): This version is used for operations that would change the status of the psd, and are currently used for dev-set and key-rotation. 2. psp_device_get_locked(): This is the non-admin version, which are used for broader user issued operations including: dev-get, rx-assoc, tx-assoc, get-stats. Following commit will be implementing both of the checks. Signed-off-by: Wei Wang Reviewed-by: Daniel Zahka --- Documentation/netlink/specs/psp.yaml | 4 ++-- net/psp/psp-nl-gen.c | 4 ++-- net/psp/psp-nl-gen.h | 2 ++ net/psp/psp.h | 2 +- net/psp/psp_main.c | 7 +++++- net/psp/psp_nl.c | 33 ++++++++++++++++++++-------- 6 files changed, 37 insertions(+), 15 deletions(-) diff --git a/Documentation/netlink/specs/psp.yaml b/Documentation/netlink/specs/psp.yaml index 100c36cda8e5..c54e1202cbe0 100644 --- a/Documentation/netlink/specs/psp.yaml +++ b/Documentation/netlink/specs/psp.yaml @@ -195,7 +195,7 @@ operations: - psp-versions-ena reply: attributes: [] - pre: psp-device-get-locked + pre: psp-device-get-locked-admin post: psp-device-unlock - name: dev-change-ntf @@ -214,7 +214,7 @@ operations: reply: attributes: - id - pre: psp-device-get-locked + pre: psp-device-get-locked-admin post: psp-device-unlock - name: key-rotate-ntf diff --git a/net/psp/psp-nl-gen.c b/net/psp/psp-nl-gen.c index 22a48d0fa378..1f5e73e7ccc1 100644 --- a/net/psp/psp-nl-gen.c +++ b/net/psp/psp-nl-gen.c @@ -71,7 +71,7 @@ static const struct genl_split_ops psp_nl_ops[] = { }, { .cmd = PSP_CMD_DEV_SET, - .pre_doit = psp_device_get_locked, + .pre_doit = psp_device_get_locked_admin, .doit = psp_nl_dev_set_doit, .post_doit = psp_device_unlock, .policy = psp_dev_set_nl_policy, @@ -80,7 +80,7 @@ static const struct genl_split_ops psp_nl_ops[] = { }, { .cmd = PSP_CMD_KEY_ROTATE, - .pre_doit = psp_device_get_locked, + .pre_doit = psp_device_get_locked_admin, .doit = psp_nl_key_rotate_doit, .post_doit = psp_device_unlock, .policy = psp_key_rotate_nl_policy, diff --git a/net/psp/psp-nl-gen.h b/net/psp/psp-nl-gen.h index 599c5f1c82f2..977355455395 100644 --- a/net/psp/psp-nl-gen.h +++ b/net/psp/psp-nl-gen.h @@ -17,6 +17,8 @@ extern const struct nla_policy psp_keys_nl_policy[PSP_A_KEYS_SPI + 1]; int psp_device_get_locked(const struct genl_split_ops *ops, struct sk_buff *skb, struct genl_info *info); +int psp_device_get_locked_admin(const struct genl_split_ops *ops, + struct sk_buff *skb, struct genl_info *info); int psp_assoc_device_get_locked(const struct genl_split_ops *ops, struct sk_buff *skb, struct genl_info *info); void diff --git a/net/psp/psp.h b/net/psp/psp.h index 9f19137593a0..0f9c4e4e52cb 100644 --- a/net/psp/psp.h +++ b/net/psp/psp.h @@ -14,7 +14,7 @@ extern struct xarray psp_devs; extern struct mutex psp_devs_lock; void psp_dev_free(struct psp_dev *psd); -int psp_dev_check_access(struct psp_dev *psd, struct net *net); +int psp_dev_check_access(struct psp_dev *psd, struct net *net, bool admin); void psp_nl_notify_dev(struct psp_dev *psd, u32 cmd); diff --git a/net/psp/psp_main.c b/net/psp/psp_main.c index 9508b6c38003..82de78a1d6bd 100644 --- a/net/psp/psp_main.c +++ b/net/psp/psp_main.c @@ -27,10 +27,15 @@ struct mutex psp_devs_lock; * psp_dev_check_access() - check if user in a given net ns can access PSP dev * @psd: PSP device structure user is trying to access * @net: net namespace user is in + * @admin: If true, only allow access from @psd's main device's netns, + * for admin operations like config changes and key rotation. + * If false, also allow access from network namespaces that have + * an associated device with @psd, for read-only and association + * management operations. * * Return: 0 if PSP device should be visible in @net, errno otherwise. */ -int psp_dev_check_access(struct psp_dev *psd, struct net *net) +int psp_dev_check_access(struct psp_dev *psd, struct net *net, bool admin) { if (dev_net(psd->main_netdev) == net) return 0; diff --git a/net/psp/psp_nl.c b/net/psp/psp_nl.c index 6afd7707ec12..eb47a9ee4438 100644 --- a/net/psp/psp_nl.c +++ b/net/psp/psp_nl.c @@ -41,7 +41,8 @@ static int psp_nl_reply_send(struct sk_buff *rsp, struct genl_info *info) /* Device stuff */ static struct psp_dev * -psp_device_get_and_lock(struct net *net, struct nlattr *dev_id) +psp_device_get_and_lock(struct net *net, struct nlattr *dev_id, + bool admin) { struct psp_dev *psd; int err; @@ -56,7 +57,7 @@ psp_device_get_and_lock(struct net *net, struct nlattr *dev_id) mutex_lock(&psd->lock); mutex_unlock(&psp_devs_lock); - err = psp_dev_check_access(psd, net); + err = psp_dev_check_access(psd, net, admin); if (err) { mutex_unlock(&psd->lock); return ERR_PTR(err); @@ -65,17 +66,31 @@ psp_device_get_and_lock(struct net *net, struct nlattr *dev_id) return psd; } -int psp_device_get_locked(const struct genl_split_ops *ops, - struct sk_buff *skb, struct genl_info *info) +static int __psp_device_get_locked(const struct genl_split_ops *ops, + struct sk_buff *skb, struct genl_info *info, + bool admin) { if (GENL_REQ_ATTR_CHECK(info, PSP_A_DEV_ID)) return -EINVAL; info->user_ptr[0] = psp_device_get_and_lock(genl_info_net(info), - info->attrs[PSP_A_DEV_ID]); + info->attrs[PSP_A_DEV_ID], + admin); return PTR_ERR_OR_ZERO(info->user_ptr[0]); } +int psp_device_get_locked_admin(const struct genl_split_ops *ops, + struct sk_buff *skb, struct genl_info *info) +{ + return __psp_device_get_locked(ops, skb, info, true); +} + +int psp_device_get_locked(const struct genl_split_ops *ops, + struct sk_buff *skb, struct genl_info *info) +{ + return __psp_device_get_locked(ops, skb, info, false); +} + void psp_device_unlock(const struct genl_split_ops *ops, struct sk_buff *skb, struct genl_info *info) @@ -160,7 +175,7 @@ static int psp_nl_dev_get_dumpit_one(struct sk_buff *rsp, struct netlink_callback *cb, struct psp_dev *psd) { - if (psp_dev_check_access(psd, sock_net(rsp->sk))) + if (psp_dev_check_access(psd, sock_net(rsp->sk), false)) return 0; return psp_nl_dev_fill(psd, rsp, genl_info_dump(cb)); @@ -305,7 +320,7 @@ int psp_assoc_device_get_locked(const struct genl_split_ops *ops, psd = psp_dev_get_for_sock(socket->sk); if (psd) { - err = psp_dev_check_access(psd, genl_info_net(info)); + err = psp_dev_check_access(psd, genl_info_net(info), false); if (err) { psp_dev_put(psd); psd = NULL; @@ -330,7 +345,7 @@ int psp_assoc_device_get_locked(const struct genl_split_ops *ops, psp_dev_put(psd); } else { - psd = psp_device_get_and_lock(genl_info_net(info), id); + psd = psp_device_get_and_lock(genl_info_net(info), id, false); if (IS_ERR(psd)) { err = PTR_ERR(psd); goto err_sock_put; @@ -573,7 +588,7 @@ static int psp_nl_stats_get_dumpit_one(struct sk_buff *rsp, struct netlink_callback *cb, struct psp_dev *psd) { - if (psp_dev_check_access(psd, sock_net(rsp->sk))) + if (psp_dev_check_access(psd, sock_net(rsp->sk), false)) return 0; return psp_nl_stats_fill(psd, rsp, genl_info_dump(cb)); -- 2.52.0