diff options
| author | Thomas Graf <tgraf@redhat.com> | 2011-12-21 21:05:07 -0500 |
|---|---|---|
| committer | Brad Figg <brad.figg@canonical.com> | 2012-01-23 18:36:11 -0500 |
| commit | 311515dbf9789ce1d88e8ee518e3fd8e4832f4d9 (patch) | |
| tree | ecea8c88942db36ada1272fb00110cf2ed65daac /net/sched | |
| parent | ad6286b9d93d59989609733e241df7ae4ad2ae51 (diff) | |
mqprio: Avoid panic if no options are provided
BugLink: http://bugs.launchpad.net/bugs/913373
[ 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>
Signed-off-by: Brad Figg <brad.figg@canonical.com>
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 ea17cbed29e..59b26b8ff4b 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) | |||
| 106 | if (!netif_is_multiqueue(dev)) | 106 | if (!netif_is_multiqueue(dev)) |
| 107 | return -EOPNOTSUPP; | 107 | return -EOPNOTSUPP; |
| 108 | 108 | ||
| 109 | if (nla_len(opt) < sizeof(*qopt)) | 109 | if (!opt || nla_len(opt) < sizeof(*qopt)) |
| 110 | return -EINVAL; | 110 | return -EINVAL; |
| 111 | 111 | ||
| 112 | qopt = nla_data(opt); | 112 | qopt = nla_data(opt); |