summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-06-14 13:29:31 +0300
committerDavid S. Miller <davem@davemloft.net>2017-06-14 15:24:18 -0400
commitc4f65b09b459c6f0ec27b1a1a65302f7fea5c96f (patch)
treedb762c6f2a74e89940d6e3221283637ab4a63c78
parentdb46a0e1be7eac45d0bb1bdcd438b8d47c920451 (diff)
downloadlinux-stable-c4f65b09b459c6f0ec27b1a1a65302f7fea5c96f.tar.gz
linux-stable-c4f65b09b459c6f0ec27b1a1a65302f7fea5c96f.tar.bz2
linux-stable-c4f65b09b459c6f0ec27b1a1a65302f7fea5c96f.zip
net/act_pedit: fix an error code
I'm reviewing static checker warnings where we do ERR_PTR(0), which is the same as NULL. I'm pretty sure we intended to return ERR_PTR(-EINVAL) here. Sometimes these bugs lead to a NULL dereference but I don't immediately see that problem here. Fixes: 71d0ed7079df ("net/act_pedit: Support using offset relative to the conventional network headers") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Amir Vadai <amir@vadai.me> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sched/act_pedit.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 164b5ac094be..7dc5892671c8 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -94,8 +94,10 @@ static struct tcf_pedit_key_ex *tcf_pedit_keys_ex_parse(struct nlattr *nla,
k++;
}
- if (n)
+ if (n) {
+ err = -EINVAL;
goto err_out;
+ }
return keys_ex;