aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/act_pedit.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-01-23 23:33:32 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:11:18 -0500
commitcee63723b358e594225e812d6e14a2a0abfd5c88 (patch)
tree847f929e0f445cca8cdf55d7c17a56b0d0f2ec68 /net/sched/act_pedit.c
parentab27cfb85c5778400740ad0c401bde65616774eb (diff)
[NET_SCHED]: Propagate nla_parse return value
nla_parse() returns more detailed errno codes, propagate them back on error. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_pedit.c')
-rw-r--r--net/sched/act_pedit.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 88d8a15a1921..1b9ca45a78e5 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -38,15 +38,19 @@ static int tcf_pedit_init(struct nlattr *nla, struct nlattr *est,
38{ 38{
39 struct nlattr *tb[TCA_PEDIT_MAX + 1]; 39 struct nlattr *tb[TCA_PEDIT_MAX + 1];
40 struct tc_pedit *parm; 40 struct tc_pedit *parm;
41 int ret = 0; 41 int ret = 0, err;
42 struct tcf_pedit *p; 42 struct tcf_pedit *p;
43 struct tcf_common *pc; 43 struct tcf_common *pc;
44 struct tc_pedit_key *keys = NULL; 44 struct tc_pedit_key *keys = NULL;
45 int ksize; 45 int ksize;
46 46
47 if (nla == NULL || nla_parse_nested(tb, TCA_PEDIT_MAX, nla, NULL) < 0) 47 if (nla == NULL)
48 return -EINVAL; 48 return -EINVAL;
49 49
50 err = nla_parse_nested(tb, TCA_PEDIT_MAX, nla, NULL);
51 if (err < 0)
52 return err;
53
50 if (tb[TCA_PEDIT_PARMS] == NULL || 54 if (tb[TCA_PEDIT_PARMS] == NULL ||
51 nla_len(tb[TCA_PEDIT_PARMS]) < sizeof(*parm)) 55 nla_len(tb[TCA_PEDIT_PARMS]) < sizeof(*parm))
52 return -EINVAL; 56 return -EINVAL;