From a04052cd1bf3c1ae82edf8e9fef8ae8529ebc303 Mon Sep 17 00:00:00 2001
From: Thomas Graf <tgraf@redhat.com>
Date: Thu, 22 Dec 2011 02:05:07 +0000
Subject: [PATCH] --- yaml --- r: 276988 b: refs/heads/master c:
 7838f2ce36b6ab5c13ef20b1857e3bbd567f1759 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/sched/sch_mqprio.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c03655109738..ad0c5aaa03d8 100644
--- 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
index f88256cbacbf..28de43092330 100644
--- 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);