Commit ab485081 authored by Zhengchao Shao's avatar Zhengchao Shao Committed by Paolo Abeni
Browse files

net: sched: remove duplicate check of user rights in qdisc 



In rtnetlink_rcv_msg function, the permission for all user operations
is checked except the GET operation, which is the same as the checking
in qdisc. Therefore, remove the user rights check in qdisc.

Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Message-Id: <20220819041854.83372-1-shaozhengchao@huawei.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 97d29b92

net/sched/cls_api.c

+0 −10
Original line number Diff line number Diff line
@@ -1977,9 +1977,6 @@ static int tc_new_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
	bool rtnl_held = false;

	u32 flags;



	if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))

		return -EPERM;



replay:

	tp_created = 0;
@@ -2208,9 +2205,6 @@ static int tc_del_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
	int err;

	bool rtnl_held = false;



	if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))

		return -EPERM;



	err = nlmsg_parse_deprecated(n, sizeof(*t), tca, TCA_MAX,

				     rtm_tca_policy, extack);

	if (err < 0)
@@ -2826,10 +2820,6 @@ static int tc_ctl_chain(struct sk_buff *skb, struct nlmsghdr *n, 
	unsigned long cl;

	int err;



	if (n->nlmsg_type != RTM_GETCHAIN &&

	    !netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))

		return -EPERM;



replay:

	q = NULL;

	err = nlmsg_parse_deprecated(n, sizeof(*t), tca, TCA_MAX,

net/sched/sch_api.c

+0 −11
Original line number Diff line number Diff line
@@ -1425,10 +1425,6 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, 
	struct Qdisc *p = NULL;

	int err;



	if ((n->nlmsg_type != RTM_GETQDISC) &&

	    !netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))

		return -EPERM;



	err = nlmsg_parse_deprecated(n, sizeof(*tcm), tca, TCA_MAX,

				     rtm_tca_policy, extack);

	if (err < 0)
@@ -1509,9 +1505,6 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, 
	struct Qdisc *q, *p;

	int err;



	if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))

		return -EPERM;



replay:

	/* Reinit, just in case something touches this. */

	err = nlmsg_parse_deprecated(n, sizeof(*tcm), tca, TCA_MAX,
@@ -1993,10 +1986,6 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, 
	u32 qid;

	int err;



	if ((n->nlmsg_type != RTM_GETTCLASS) &&

	    !netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))

		return -EPERM;



	err = nlmsg_parse_deprecated(n, sizeof(*tcm), tca, TCA_MAX,

				     rtm_tca_policy, extack);

	if (err < 0)