Commit 108d0ef5 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by sanglipeng
Browse files

ipv{4,6}/raw: fix output xfrm lookup wrt protocol 

stable inclusion
from stable-v5.10.182
commit 18c14d3028c001a0be15685a550dbabf67b6382d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8GJZJ

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=18c14d3028c001a0be15685a550dbabf67b6382d



--------------------------------

commit 3632679d upstream.

With a raw socket bound to IPPROTO_RAW (ie with hdrincl enabled), the
protocol field of the flow structure, build by raw_sendmsg() /
rawv6_sendmsg()),  is set to IPPROTO_RAW. This breaks the ipsec policy
lookup when some policies are defined with a protocol in the selector.

For ipv6, the sin6_port field from 'struct sockaddr_in6' could be used to
specify the protocol. Just accept all values for IPPROTO_RAW socket.

For ipv4, the sin_port field of 'struct sockaddr_in' could not be used
without breaking backward compatibility (the value of this field was never
checked). Let's add a new kind of control message, so that the userland
could specify which protocol is used.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
CC: stable@vger.kernel.org
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Link: https://lore.kernel.org/r/20230522120820.1319391-1-nicolas.dichtel@6wind.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 954393f1

include/net/ip.h

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ struct ipcm_cookie { 
	__be32			addr;

	int			oif;

	struct ip_options_rcu	*opt;

	__u8			protocol;

	__u8			ttl;

	__s16			tos;

	char			priority;
@@ -94,6 +95,7 @@ static inline void ipcm_init_sk(struct ipcm_cookie *ipcm, 
	ipcm->sockc.tsflags = inet->sk.sk_tsflags;

	ipcm->oif = inet->sk.sk_bound_dev_if;

	ipcm->addr = inet->inet_saddr;

	ipcm->protocol = inet->inet_num;

}



#define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb))

include/uapi/linux/in.h

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ struct in_addr { 
#define MCAST_MSFILTER			48

#define IP_MULTICAST_ALL		49

#define IP_UNICAST_IF			50

#define IP_LOCAL_PORT_RANGE		51

#define IP_PROTOCOL			52



#define MCAST_EXCLUDE	0

#define MCAST_INCLUDE	1

net/ipv4/ip_sockglue.c

+11 −1
Original line number Diff line number Diff line
@@ -317,7 +317,14 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc, 
			ipc->tos = val;

			ipc->priority = rt_tos2priority(ipc->tos);

			break;



		case IP_PROTOCOL:

			if (cmsg->cmsg_len != CMSG_LEN(sizeof(int)))

				return -EINVAL;

			val = *(int *)CMSG_DATA(cmsg);

			if (val < 1 || val > 255)

				return -EINVAL;

			ipc->protocol = val;

			break;

		default:

			return -EINVAL;

		}
@@ -1724,6 +1731,9 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, 
	case IP_MINTTL:

		val = inet->min_ttl;

		break;

	case IP_PROTOCOL:

		val = inet_sk(sk)->inet_num;

		break;

	default:

		release_sock(sk);

		return -ENOPROTOOPT;

net/ipv4/raw.c

+4 −1
Original line number Diff line number Diff line
@@ -531,6 +531,9 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	}



	ipcm_init_sk(&ipc, inet);

	/* Keep backward compat */

	if (hdrincl)

		ipc.protocol = IPPROTO_RAW;



	if (msg->msg_controllen) {

		err = ip_cmsg_send(sk, msg, &ipc, false);
@@ -598,7 +601,7 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 


	flowi4_init_output(&fl4, ipc.oif, ipc.sockc.mark, tos,

			   RT_SCOPE_UNIVERSE,

			   hdrincl ? IPPROTO_RAW : sk->sk_protocol,

			   hdrincl ? ipc.protocol : sk->sk_protocol,

			   inet_sk_flowi_flags(sk) |

			    (hdrincl ? FLOWI_FLAG_KNOWN_NH : 0),

			   daddr, saddr, 0, 0, sk->sk_uid);

net/ipv6/raw.c

+2 −1
Original line number Diff line number Diff line
@@ -794,7 +794,8 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 


		if (!proto)

			proto = inet->inet_num;

		else if (proto != inet->inet_num)

		else if (proto != inet->inet_num &&

			 inet->inet_num != IPPROTO_RAW)

			return -EINVAL;



		if (proto > 255)