From: Steffen Klassert <steffen.klassert@secunet.com>
To: "Günther Muller" <gunther.muller2008@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2] xfrm: fix missing headroom check in xfrm_dev_direct_output
Date: Wed, 20 May 2026 08:50:01 +0200 [thread overview]
Message-ID: <ag1ZmRYxpWBkhba4@secunet.com> (raw)
In-Reply-To: <20260518080410.11119-1-gunther.muller2008@gmail.com>
On Mon, May 18, 2026 at 10:04:09AM +0200, Günther Muller wrote:
> Ensure the skb has enough headroom for the hardware offload device's
> hard_header_len. If the headroom is insufficient (e.g., when routing
> through certain virtual or tunnel devices), __skb_push() underflows
> skb->data below skb->head, causing silent memory corruption.
>
> Fix this by using skb_cow_head() to dynamically expand headroom if
> needed, and switch to the checked skb_push() variant.
>
> Fixes: 5eddd76ec2fd ("xfrm: fix tunnel mode TX datapath in packet offload mode")
>
> Signed-off-by: Günther Muller <gunther.muller2008@gmail.com>
> ---
> net/xfrm/xfrm_output.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
> index cc35c2fcbb..35f974d209 100644
> --- a/net/xfrm/xfrm_output.c
> +++ b/net/xfrm/xfrm_output.c
> @@ -649,7 +649,10 @@ static int xfrm_dev_direct_output(struct sock *sk, struct xfrm_state *x,
> * to netdevice.
> */
> skb->dev = x->xso.dev;
> - __skb_push(skb, skb->dev->hard_header_len);
> + err = skb_cow_head(skb, skb->dev->hard_header_len);
> + if (err)
> + return err;
You leak skb here. Also, we should bump a statistic counter
when droping the packet.
next prev parent reply other threads:[~2026-05-20 6:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-17 11:19 [PATCH] xfrm: fix missing headroom check in xfrm_dev_direct_output Günther Muller
2026-05-18 6:27 ` Steffen Klassert
2026-05-18 8:04 ` [PATCH v2] " Günther Muller
2026-05-18 12:30 ` Leon Romanovsky
2026-05-20 6:51 ` Steffen Klassert
2026-05-20 6:50 ` Steffen Klassert [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-05-18 8:23 Günther Muller
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=ag1ZmRYxpWBkhba4@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gunther.muller2008@gmail.com \
--cc=herbert@gondor.apana.org.au \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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