Commit 44180fea authored by Johannes Berg's avatar Johannes Berg Committed by Jakub Kicinski

net/sched: initialize noop_qdisc owner

When the noop_qdisc owner isn't initialized, then it will be 0,
so packets will erroneously be regarded as having been subject
to recursion as long as only CPU 0 queues them. For non-SMP,
that's all packets, of course. This causes a change in what's
reported to userspace, normally noop_qdisc would drop packets
silently, but with this change the syscall returns -ENOBUFS if
RECVERR is also set on the socket.

Fix this by initializing the owner field to -1, just like it
would be for dynamically allocated qdiscs by qdisc_alloc().

Fixes: 0f022d32 ("net/sched: Fix mirred deadlock on device recursion")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20240607175340.786bfb938803.I493bf8422e36be4454c08880a8d3703cea8e421a@changeidSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 93792130
...@@ -676,6 +676,7 @@ struct Qdisc noop_qdisc = { ...@@ -676,6 +676,7 @@ struct Qdisc noop_qdisc = {
.qlen = 0, .qlen = 0,
.lock = __SPIN_LOCK_UNLOCKED(noop_qdisc.skb_bad_txq.lock), .lock = __SPIN_LOCK_UNLOCKED(noop_qdisc.skb_bad_txq.lock),
}, },
.owner = -1,
}; };
EXPORT_SYMBOL(noop_qdisc); EXPORT_SYMBOL(noop_qdisc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment