diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-01-24 05:33:32 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-29 00:11:18 +0100 |
| commit | cee63723b358e594225e812d6e14a2a0abfd5c88 (patch) | |
| tree | 847f929e0f445cca8cdf55d7c17a56b0d0f2ec68 /net/sched/sch_gred.c | |
| parent | [NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get (diff) | |
| download | linux-cee63723b358e594225e812d6e14a2a0abfd5c88.tar.xz linux-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/sch_gred.c')
| -rw-r--r-- | net/sched/sch_gred.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c index 6b784838a534..365c7d8b17ab 100644 --- a/net/sched/sch_gred.c +++ b/net/sched/sch_gred.c @@ -430,12 +430,16 @@ static int gred_change(struct Qdisc *sch, struct nlattr *opt) struct gred_sched *table = qdisc_priv(sch); struct tc_gred_qopt *ctl; struct nlattr *tb[TCA_GRED_MAX + 1]; - int err = -EINVAL, prio = GRED_DEF_PRIO; + int err, prio = GRED_DEF_PRIO; u8 *stab; - if (opt == NULL || nla_parse_nested(tb, TCA_GRED_MAX, opt, NULL)) + if (opt == NULL) return -EINVAL; + err = nla_parse_nested(tb, TCA_GRED_MAX, opt, NULL); + if (err < 0) + return err; + if (tb[TCA_GRED_PARMS] == NULL && tb[TCA_GRED_STAB] == NULL) return gred_change_table_def(sch, opt); @@ -445,6 +449,7 @@ static int gred_change(struct Qdisc *sch, struct nlattr *opt) nla_len(tb[TCA_GRED_STAB]) < 256) return -EINVAL; + err = -EINVAL; ctl = nla_data(tb[TCA_GRED_PARMS]); stab = nla_data(tb[TCA_GRED_STAB]); @@ -489,10 +494,15 @@ errout: static int gred_init(struct Qdisc *sch, struct nlattr *opt) { struct nlattr *tb[TCA_GRED_MAX + 1]; + int err; - if (opt == NULL || nla_parse_nested(tb, TCA_GRED_MAX, opt, NULL)) + if (opt == NULL) return -EINVAL; + err = nla_parse_nested(tb, TCA_GRED_MAX, opt, NULL); + if (err < 0) + return err; + if (tb[TCA_GRED_PARMS] || tb[TCA_GRED_STAB]) return -EINVAL; |