path: root/net
diff options
authorThomas Graf <>2011-12-22 02:05:07 +0000
committerRohan Somvanshi <>2012-01-11 10:22:25 -0800
commitd9e062cc32ae75bd4656fc5232cb477ae0edf7fe (patch)
treeb814b2e1bd5a979977b1cafa7b07ad78f9e61142 /net
parent2c4f8dd8dc5066030cd01559a574b999e967610d (diff)
mqprio: Avoid panic if no options are provided
[ Upstream commit 7838f2ce36b6ab5c13ef20b1857e3bbd567f1759 ] Userspace may not provide TCA_OPTIONS, in fact tc currently does so not do so if no arguments are specified on the command line. Return EINVAL instead of panicing. Signed-off-by: Thomas Graf <> Signed-off-by: David S. Miller <> Signed-off-by: Greg Kroah-Hartman <> Change-Id: Iad24a5287dd16619b31b9c30917615ab1fcb56b0 Reviewed-on: http://git-master/r/74216 Reviewed-by: Varun Wadekar <> Tested-by: Varun Wadekar <>
Diffstat (limited to 'net')
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c
index ea17cbed29ef..59b26b8ff4b0 100644
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c
@@ -106,7 +106,7 @@ static int mqprio_init(struct Qdisc *sch, struct nlattr *opt)
if (!netif_is_multiqueue(dev))
- if (nla_len(opt) < sizeof(*qopt))
+ if (!opt || nla_len(opt) < sizeof(*qopt))
return -EINVAL;
qopt = nla_data(opt);