summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorVladyslav Tarasiuk <vladyslavt@mellanox.com>2019-12-06 16:51:05 +0300
committerDavid S. Miller <davem@davemloft.net>2019-12-06 22:58:45 +0300
commit9f104c7736904ac72385bbb48669e0c923ca879b (patch)
tree7b1ea2418814ac3fdeafca6b51a5f191d6de6d0d /net
parentf421031e3ff0dd288a6e1bbde9aa41a25bb814e6 (diff)
downloadlinux-9f104c7736904ac72385bbb48669e0c923ca879b.tar.xz
mqprio: Fix out-of-bounds access in mqprio_dump
When user runs a command like tc qdisc add dev eth1 root mqprio KASAN stack-out-of-bounds warning is emitted. Currently, NLA_ALIGN macro used in mqprio_dump provides too large buffer size as argument for nla_put and memcpy down the call stack. The flow looks like this: 1. nla_put expects exact object size as an argument; 2. Later it provides this size to memcpy; 3. To calculate correct padding for SKB, nla_put applies NLA_ALIGN macro itself. Therefore, NLA_ALIGN should not be applied to the nla_put parameter. Otherwise it will lead to out-of-bounds memory access in memcpy. Fixes: 4e8b86c06269 ("mqprio: Introduce new hardware offload mode and shaper in mqprio") Signed-off-by: Vladyslav Tarasiuk <vladyslavt@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_mqprio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c
index de4e00a58bc6..8766ab5b8788 100644
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c
@@ -434,7 +434,7 @@ static int mqprio_dump(struct Qdisc *sch, struct sk_buff *skb)
opt.offset[tc] = dev->tc_to_txq[tc].offset;
}
- if (nla_put(skb, TCA_OPTIONS, NLA_ALIGN(sizeof(opt)), &opt))
+ if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
goto nla_put_failure;
if ((priv->flags & TC_MQPRIO_F_MODE) &&