From 52e2d8f83150203c153e5d9ca4e83712098c9528 Mon Sep 17 00:00:00 2001
From: Minoru Usui <usui@mxm.nes.nec.co.jp>
Date: Tue, 9 Jun 2009 04:03:09 -0700
Subject: [PATCH] --- yaml --- r: 145557 b: refs/heads/master c:
 52ea3a56a3268bc2a5a7c75e98c81463004e38ef h: refs/heads/master i:   145555:
 6e70b9c6fd022ee6545032d2cbebbd16de7d1bab v: v3

---
 [refs]                       | 2 +-
 trunk/net/sched/cls_cgroup.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7b916c2e937c..461650f0fb92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdd7b4c3302c93f6833e338903ea77245eb510b4
+refs/heads/master: 52ea3a56a3268bc2a5a7c75e98c81463004e38ef
diff --git a/trunk/net/sched/cls_cgroup.c b/trunk/net/sched/cls_cgroup.c
index cc29b44b1500..e5becb92b3e7 100644
--- a/trunk/net/sched/cls_cgroup.c
+++ b/trunk/net/sched/cls_cgroup.c
@@ -167,6 +167,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;