From: David Ahern <dsahern@kernel.org>
To: Tobias Brunner <tobias@strongswan.org>,
"David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org,
Steffen Klassert <steffen.klassert@secunet.com>,
Herbert Xu <herbert@gondor.apana.org.au>
Subject: Re: [PATCH net v2] ipv4: raw: Fix sending packets from raw sockets via IPsec tunnels
Date: Fri, 15 Mar 2024 08:55:31 -0600 [thread overview]
Message-ID: <dfe28f4e-183b-4df1-a8e9-2f7fe6439fe0@kernel.org> (raw)
In-Reply-To: <c5d9a947-eb19-4164-ac99-468ea814ce20@strongswan.org>
On 3/15/24 8:35 AM, Tobias Brunner wrote:
> Since the referenced commit, the xfrm_inner_extract_output() function
> uses the protocol field to determine the address family. So not setting
> it for IPv4 raw sockets meant that such packets couldn't be tunneled via
> IPsec anymore.
>
> IPv6 raw sockets are not affected as they already set the protocol since
> 9c9c9ad5fae7 ("ipv6: set skb->protocol on tcp, raw and ip6_append_data
> genereated skbs").
>
> Fixes: f4796398f21b ("xfrm: Remove inner/outer modes from output path")
> Signed-off-by: Tobias Brunner <tobias@strongswan.org>
> ---
> net/ipv4/raw.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
> index 42ac434cfcfa..322e389021c3 100644
> --- a/net/ipv4/raw.c
> +++ b/net/ipv4/raw.c
> @@ -357,6 +357,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4,
> goto error;
> skb_reserve(skb, hlen);
>
> + skb->protocol = htons(ETH_P_IP);
> skb->priority = READ_ONCE(sk->sk_priority);
> skb->mark = sockc->mark;
> skb->tstamp = sockc->transmit_time;
Reviewed-by: David Ahern <dsahern@kernel.org>
next prev parent reply other threads:[~2024-03-15 14:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-15 14:35 [PATCH net v2] ipv4: raw: Fix sending packets from raw sockets via IPsec tunnels Tobias Brunner
2024-03-15 14:55 ` David Ahern [this message]
2024-03-19 9:43 ` Nicolas Dichtel
2024-03-19 12:50 ` 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=dfe28f4e-183b-4df1-a8e9-2f7fe6439fe0@kernel.org \
--to=dsahern@kernel.org \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=netdev@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
--cc=tobias@strongswan.org \
/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).