diff options
| author |   Patrick McHardy <kaber@trash.net> | 2008-01-23 20:33:32 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-01-28 15:11:18 -0800 |
| commit | cee63723b358e594225e812d6e14a2a0abfd5c88 (patch) | |
| tree | 847f929e0f445cca8cdf55d7c17a56b0d0f2ec68 /net/sched/act_pedit.c | |
| parent | [NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get (diff) | |
| download | linux-dev-cee63723b358e594225e812d6e14a2a0abfd5c88.tar.xz linux-dev-cee63723b358e594225e812d6e14a2a0abfd5c88.zip | |
[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.c | 8 |
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, { struct nlattr *tb[TCA_PEDIT_MAX + 1]; struct tc_pedit *parm; - int ret = 0; + int ret = 0, err; struct tcf_pedit *p; struct tcf_common *pc; struct tc_pedit_key *keys = NULL; int ksize; - if (nla == NULL || nla_parse_nested(tb, TCA_PEDIT_MAX, nla, NULL) < 0) + if (nla == NULL) return -EINVAL; + err = nla_parse_nested(tb, TCA_PEDIT_MAX, nla, NULL); + if (err < 0) + return err; + if (tb[TCA_PEDIT_PARMS] == NULL || nla_len(tb[TCA_PEDIT_PARMS]) < sizeof(*parm)) return -EINVAL; |