diff options
| author |  Johannes Berg <johannes.berg@intel.com>
| 2024-06-07 17:53:32 +0200 |
|---|---|---|
| committer |  Jakub Kicinski <kuba@kernel.org>
| 2024-06-10 19:36:49 -0700 |
| commit | 44180feaccf266d9b0b28cc4ceaac019817deb5c (patch) | |
| tree | 17cae917ba6f0002a17d93e878861926da9405f1 | |
| parent | Merge branch 'geneve-fixes' (diff) | |
| download | linux-44180feaccf266d9b0b28cc4ceaac019817deb5c.tar.gz linux-44180feaccf266d9b0b28cc4ceaac019817deb5c.tar.bz2 linux-44180feaccf266d9b0b28cc4ceaac019817deb5c.zip | |
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: 0f022d32c3ec ("net/sched: Fix mirred deadlock on device recursion")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20240607175340.786bfb938803.I493bf8422e36be4454c08880a8d3703cea8e421a@changeid
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | net/sched/sch_generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 2a637a17061b..e22ff003d52e 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -676,6 +676,7 @@ struct Qdisc noop_qdisc = { .qlen = 0, .lock = __SPIN_LOCK_UNLOCKED(noop_qdisc.skb_bad_txq.lock), }, + .owner = -1, }; EXPORT_SYMBOL(noop_qdisc); |