Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[deliverable/linux.git] / net / sched / cls_cgroup.c

diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index 0f815cc6a3dba491b0caee43abb44af613bc890e..e4877ca6727c4b098ef1b6f08163fd7702d3eea2 100644 (file)
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -161,6 +161,9 @@ static int cls_cgroup_change(struct tcf_proto *tp, unsigned long base,
        struct tcf_exts e;
        int err;
 
+       if (!tca[TCA_OPTIONS])
+               return -EINVAL;
+
        if (head == NULL) {
                if (!handle)
                        return -EINVAL;