---

yaml --- r: 276988 b: refs/heads/master c: 7838f2c h: refs/heads/master v: v3
git-mirror · Dec 23, 2011 · a04052c · a04052c
1 parent 50d6e2d
commit a04052c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a13861a28b90541aa207532d237e7a940f1b1c7b
+refs/heads/master: 7838f2ce36b6ab5c13ef20b1857e3bbd567f1759
diff --git a/trunk/net/sched/sch_mqprio.c b/trunk/net/sched/sch_mqprio.c
@@ -107,7 +107,7 @@ static int mqprio_init(struct Qdisc *sch, struct nlattr *opt)
 	if (!netif_is_multiqueue(dev))
 		return -EOPNOTSUPP;
 
-	if (nla_len(opt) < sizeof(*qopt))
+	if (!opt || nla_len(opt) < sizeof(*qopt))
 		return -EINVAL;
 
 	qopt = nla_data(opt);