From: Simon Horman <horms@kernel.org>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: netdev@vger.kernel.org,
Budimir Markovic <markovicbudimir@gmail.com>,
Jamal Hadi Salim <jhs@mojatatu.com>,
Cong Wang <xiyou.wangcong@gmail.com>,
Jiri Pirko <jiri@resnulli.us>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Sheng Lan <lansheng@huawei.com>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] netem: fix return value if duplicate enqueue fails
Date: Tue, 20 Aug 2024 16:42:13 +0100 [thread overview]
Message-ID: <20240820154213.GA1962@kernel.org> (raw)
In-Reply-To: <20240819175753.5151-1-stephen@networkplumber.org>
On Mon, Aug 19, 2024 at 10:56:45AM -0700, Stephen Hemminger wrote:
> There is a bug in netem_enqueue() introduced by
> commit 5845f706388a ("net: netem: fix skb length BUG_ON in __skb_to_sgvec")
> that can lead to a use-after-free.
>
> This commit made netem_enqueue() always return NET_XMIT_SUCCESS
> when a packet is duplicated, which can cause the parent qdisc's q.qlen to be
> mistakenly incremented. When this happens qlen_notify() may be skipped on the
> parent during destruction, leaving a dangling pointer for some classful qdiscs
> like DRR.
>
> There are two ways for the bug happen:
>
> - If the duplicated packet is dropped by rootq->enqueue() and then the original
> packet is also dropped.
> - If rootq->enqueue() sends the duplicated packet to a different qdisc and the
> original packet is dropped.
>
> In both cases NET_XMIT_SUCCESS is returned even though no packets are enqueued
> at the netem qdisc.
>
> The fix is to defer the enqueue of the duplicate packet until after the
> original packet has been guaranteed to return NET_XMIT_SUCCESS.
>
> Fixes: 5845f706388a ("net: netem: fix skb length BUG_ON in __skb_to_sgvec")
> Reported-by: Budimir Markovic <markovicbudimir@gmail.com>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Thanks Stephen,
The code changes all make sense to me.
Reviewed-by: Simon Horman <horms@kernel.org>
next prev parent reply other threads:[~2024-08-20 15:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-19 17:56 [PATCH] netem: fix return value if duplicate enqueue fails Stephen Hemminger
2024-08-20 15:42 ` Simon Horman [this message]
2024-08-20 20:22 ` Stephen Hemminger
2024-08-21 0:40 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240820154213.GA1962@kernel.org \
--to=horms@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=lansheng@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=markovicbudimir@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=stephen@networkplumber.org \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).