diff options
| author | Thomas Graf <tgraf@redhat.com> | 2011-12-22 02:05:07 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-06 14:14:08 -0800 |
| commit | 477a897533f9ab9a6ebb6eedfa9ca3760caa94b2 (patch) | |
| tree | c7b870384e18ec15602a765f5037c8cd4186ee35 /net/sched | |
| parent | 7eac8f9de24674cc55ee9797d05447bbfbdf1a96 (diff) | |
| download | kernel_samsung_smdk4412-477a897533f9ab9a6ebb6eedfa9ca3760caa94b2.zip kernel_samsung_smdk4412-477a897533f9ab9a6ebb6eedfa9ca3760caa94b2.tar.gz kernel_samsung_smdk4412-477a897533f9ab9a6ebb6eedfa9ca3760caa94b2.tar.bz2 | |
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 <tgraf@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_mqprio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c index ea17cbe..59b26b8 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)) return -EOPNOTSUPP; - if (nla_len(opt) < sizeof(*qopt)) + if (!opt || nla_len(opt) < sizeof(*qopt)) return -EINVAL; qopt = nla_data(opt); |