ipv4: raw: Fix sending packets from raw sockets via IPsec tunnels

BugLink: https://bugs.launchpad.net/bugs/2060097

[ Upstream commit c9b3b81716c5b92132a6c1d4ac3c48a7b44082ab ]

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
9c9c9ad5fa ("ipv6: set skb->protocol on tcp, raw and ip6_append_data
genereated skbs").

Fixes: f4796398f2 ("xfrm: Remove inner/outer modes from output path")
Signed-off-by: Tobias Brunner <tobias@strongswan.org>
Reviewed-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Link: https://lore.kernel.org/r/c5d9a947-eb19-4164-ac99-468ea814ce20@strongswan.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit ac935a605cab6b03fdce3c0e1e25f0de125aea1e)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

This commit is contained in:

Tobias Brunner

2024-03-15 15:35:40 +01:00

committed by

Roxana Nicolescu

parent 6d8bcd8490

commit 158b7be22a

1 changed files with 1 additions and 0 deletions

									
										net/ipv4/raw.c
									
		+1
		
												View File
												
				@@ -350,6 +350,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;