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: Zhengchao Shao <shaozhengchao@huawei.com>
Message-Id: <20220819041854.83372-1-shaozhengchao@huawei.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 790d6809be813e82e2e612fb2ed444f27e6b3313..1ebab4b112623ee4555e08648a1e400ea559bc67 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -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,

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 9f7680728e2b3b0c6473538a1f5f99ec2db16563..db1569fac57c7305767e2fc0b3c29beb8c911565 100644 (file)
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -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)