diff options
| author | Vlad Buslov <vladbu@mellanox.com> | 2018-06-04 18:32:23 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-04 17:31:44 -0400 |
| commit | 0e3990356d2518691e17c1ecbf7868833b6e6704 (patch) | |
| tree | a67ada4b6cf1eee2b4cb494658b3a04d6c730293 /net | |
| parent | 25ea66544bfd1d9df1b7e1502f8717e85fa1e6e6 (diff) | |
| download | linux-0-day-0e3990356d2518691e17c1ecbf7868833b6e6704.tar.gz linux-0-day-0e3990356d2518691e17c1ecbf7868833b6e6704.tar.xz | |
net: sched: return error code when tcf proto is not found
If requested tcf proto is not found, get and del filter netlink protocol
handlers output error message to extack, but do not return actual error
code. Add check to return ENOENT when result of tp find function is NULL
pointer.
Fixes: c431f89b18a2 ("net: sched: split tc_ctl_tfilter into three handlers")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/cls_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index c06585fb2dc6f..cdc3c87c53e62 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -1274,7 +1274,7 @@ static int tc_del_tfilter(struct sk_buff *skb, struct nlmsghdr *n, prio, false); if (!tp || IS_ERR(tp)) { NL_SET_ERR_MSG(extack, "Filter with specified priority/protocol not found"); - err = PTR_ERR(tp); + err = tp ? PTR_ERR(tp) : -ENOENT; goto errout; } else if (tca[TCA_KIND] && nla_strcmp(tca[TCA_KIND], tp->ops->kind)) { NL_SET_ERR_MSG(extack, "Specified filter kind does not match existing one"); @@ -1374,7 +1374,7 @@ static int tc_get_tfilter(struct sk_buff *skb, struct nlmsghdr *n, prio, false); if (!tp || IS_ERR(tp)) { NL_SET_ERR_MSG(extack, "Filter with specified priority/protocol not found"); - err = PTR_ERR(tp); + err = tp ? PTR_ERR(tp) : -ENOENT; goto errout; } else if (tca[TCA_KIND] && nla_strcmp(tca[TCA_KIND], tp->ops->kind)) { NL_SET_ERR_MSG(extack, "Specified filter kind does not match existing one"); |