Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6] / net / sched / sch_gred.c

diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index 6b78483..3a9d226 100644 (file)
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -356,7 +356,7 @@ static inline int gred_change_table_def(struct Qdisc *sch, struct nlattr *dps)
        struct tc_gred_sopt *sopt;
        int i;
 
-       if (dps == NULL || nla_len(dps) < sizeof(*sopt))
+       if (dps == NULL)
                return -EINVAL;
 
        sopt = nla_data(dps);
@@ -425,26 +425,35 @@ static inline int gred_change_vq(struct Qdisc *sch, int dp,
        return 0;
 }
 
+static const struct nla_policy gred_policy[TCA_GRED_MAX + 1] = {
+       [TCA_GRED_PARMS]        = { .len = sizeof(struct tc_gred_qopt) },
+       [TCA_GRED_STAB]         = { .len = 256 },
+       [TCA_GRED_DPS]          = { .len = sizeof(struct tc_gred_sopt) },
+};
+
 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, gred_policy);
+       if (err < 0)
+               return err;
+
        if (tb[TCA_GRED_PARMS] == NULL && tb[TCA_GRED_STAB] == NULL)
                return gred_change_table_def(sch, opt);
 
        if (tb[TCA_GRED_PARMS] == NULL ||
-           nla_len(tb[TCA_GRED_PARMS]) < sizeof(*ctl) ||
-           tb[TCA_GRED_STAB] == NULL ||
-           nla_len(tb[TCA_GRED_STAB]) < 256)
+           tb[TCA_GRED_STAB] == NULL)
                return -EINVAL;
 
+       err = -EINVAL;
        ctl = nla_data(tb[TCA_GRED_PARMS]);
        stab = nla_data(tb[TCA_GRED_STAB]);
 
@@ -489,10 +498,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, gred_policy);
+       if (err < 0)
+               return err;
+
        if (tb[TCA_GRED_PARMS] || tb[TCA_GRED_STAB])
                return -EINVAL;