Unverified Commit 5910bae2 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9173 MPTCP Upstream part 2 

Merge Pull Request from: @geliangtang 
 
Subsequent MPTCP upstream patches will rely on these five patches.
 
 
Link:https://gitee.com/openeuler/kernel/pulls/9173

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 79a0ead7 a6bb70f5

net/ipv4/datagram.c

+3 −3
Original line number Diff line number Diff line
@@ -39,11 +39,11 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len 
	saddr = inet->inet_saddr;

	if (ipv4_is_multicast(usin->sin_addr.s_addr)) {

		if (!oif || netif_index_is_l3_master(sock_net(sk), oif))

			oif = inet->mc_index;

			oif = READ_ONCE(inet->mc_index);

		if (!saddr)

			saddr = inet->mc_addr;

			saddr = READ_ONCE(inet->mc_addr);

	} else if (!oif) {

		oif = inet->uc_index;

		oif = READ_ONCE(inet->uc_index);

	}

	fl4 = &inet->cork.fl.u.ip4;

	rt = ip_route_connect(fl4, usin->sin_addr.s_addr, saddr, oif,

net/ipv4/ip_sockglue.c

+57 −62
Original line number Diff line number Diff line
@@ -1120,7 +1120,7 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname, 


		ifindex = (__force int)ntohl((__force __be32)val);

		if (ifindex == 0) {

			inet->uc_index = 0;

			WRITE_ONCE(inet->uc_index, 0);

			err = 0;

			break;

		}
@@ -1137,7 +1137,7 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname, 
		if (sk->sk_bound_dev_if && midx != sk->sk_bound_dev_if)

			break;



		inet->uc_index = ifindex;

		WRITE_ONCE(inet->uc_index, ifindex);

		err = 0;

		break;

	}
@@ -1175,8 +1175,8 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname, 


		if (!mreq.imr_ifindex) {

			if (mreq.imr_address.s_addr == htonl(INADDR_ANY)) {

				inet->mc_index = 0;

				inet->mc_addr  = 0;

				WRITE_ONCE(inet->mc_index, 0);

				WRITE_ONCE(inet->mc_addr, 0);

				err = 0;

				break;

			}
@@ -1201,8 +1201,8 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname, 
		    midx != sk->sk_bound_dev_if)

			break;



		inet->mc_index = mreq.imr_ifindex;

		inet->mc_addr  = mreq.imr_address.s_addr;

		WRITE_ONCE(inet->mc_index, mreq.imr_ifindex);

		WRITE_ONCE(inet->mc_addr, mreq.imr_address.s_addr);

		err = 0;

		break;

	}
@@ -1600,27 +1600,20 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, 
	case IP_TOS:

		val = READ_ONCE(inet->tos);

		goto copyval;

	}



	if (needs_rtnl)

		rtnl_lock();

	sockopt_lock_sock(sk);



	switch (optname) {

	case IP_OPTIONS:

	{

		unsigned char optbuf[sizeof(struct ip_options)+40];

		struct ip_options *opt = (struct ip_options *)optbuf;

		struct ip_options_rcu *inet_opt;



		inet_opt = rcu_dereference_protected(inet->inet_opt,

						     lockdep_sock_is_held(sk));

		rcu_read_lock();

		inet_opt = rcu_dereference(inet->inet_opt);

		opt->optlen = 0;

		if (inet_opt)

			memcpy(optbuf, &inet_opt->opt,

			       sizeof(struct ip_options) +

			       inet_opt->opt.optlen);

		sockopt_release_sock(sk);

		rcu_read_unlock();



		if (opt->optlen == 0) {

			len = 0;
@@ -1645,21 +1638,55 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, 
			val = dst_mtu(dst);

			dst_release(dst);

		}

		if (!val) {

			sockopt_release_sock(sk);

		if (!val)

			return -ENOTCONN;

		goto copyval;

	}

		break;

	case IP_PKTOPTIONS:

	{

		struct msghdr msg;



		if (sk->sk_type != SOCK_STREAM)

			return -ENOPROTOOPT;



		if (optval.is_kernel) {

			msg.msg_control_is_user = false;

			msg.msg_control = optval.kernel;

		} else {

			msg.msg_control_is_user = true;

			msg.msg_control_user = optval.user;

		}

		msg.msg_controllen = len;

		msg.msg_flags = in_compat_syscall() ? MSG_CMSG_COMPAT : 0;



		if (inet_test_bit(PKTINFO, sk)) {

			struct in_pktinfo info;



			info.ipi_addr.s_addr = READ_ONCE(inet->inet_rcv_saddr);

			info.ipi_spec_dst.s_addr = READ_ONCE(inet->inet_rcv_saddr);

			info.ipi_ifindex = READ_ONCE(inet->mc_index);

			put_cmsg(&msg, SOL_IP, IP_PKTINFO, sizeof(info), &info);

		}

		if (inet_test_bit(TTL, sk)) {

			int hlim = READ_ONCE(inet->mc_ttl);



			put_cmsg(&msg, SOL_IP, IP_TTL, sizeof(hlim), &hlim);

		}

		if (inet_test_bit(TOS, sk)) {

			int tos = READ_ONCE(inet->rcv_tos);

			put_cmsg(&msg, SOL_IP, IP_TOS, sizeof(tos), &tos);

		}

		len -= msg.msg_controllen;

		return copy_to_sockptr(optlen, &len, sizeof(int));

	}

	case IP_UNICAST_IF:

		val = (__force int)htonl((__u32) inet->uc_index);

		break;

		val = (__force int)htonl((__u32) READ_ONCE(inet->uc_index));

		goto copyval;

	case IP_MULTICAST_IF:

	{

		struct in_addr addr;

		len = min_t(unsigned int, len, sizeof(struct in_addr));

		addr.s_addr = inet->mc_addr;

		sockopt_release_sock(sk);

		addr.s_addr = READ_ONCE(inet->mc_addr);



		if (copy_to_sockptr(optlen, &len, sizeof(int)))

			return -EFAULT;
@@ -1667,6 +1694,13 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, 
			return -EFAULT;

		return 0;

	}

	}



	if (needs_rtnl)

		rtnl_lock();

	sockopt_lock_sock(sk);



	switch (optname) {

	case IP_MSFILTER:

	{

		struct ip_msfilter msf;
@@ -1689,45 +1723,6 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, 
		else

			err = ip_get_mcast_msfilter(sk, optval, optlen, len);

		goto out;

	case IP_PKTOPTIONS:

	{

		struct msghdr msg;



		sockopt_release_sock(sk);



		if (sk->sk_type != SOCK_STREAM)

			return -ENOPROTOOPT;



		if (optval.is_kernel) {

			msg.msg_control_is_user = false;

			msg.msg_control = optval.kernel;

		} else {

			msg.msg_control_is_user = true;

			msg.msg_control_user = optval.user;

		}

		msg.msg_controllen = len;

		msg.msg_flags = in_compat_syscall() ? MSG_CMSG_COMPAT : 0;



		if (inet_test_bit(PKTINFO, sk)) {

			struct in_pktinfo info;



			info.ipi_addr.s_addr = inet->inet_rcv_saddr;

			info.ipi_spec_dst.s_addr = inet->inet_rcv_saddr;

			info.ipi_ifindex = inet->mc_index;

			put_cmsg(&msg, SOL_IP, IP_PKTINFO, sizeof(info), &info);

		}

		if (inet_test_bit(TTL, sk)) {

			int hlim = READ_ONCE(inet->mc_ttl);



			put_cmsg(&msg, SOL_IP, IP_TTL, sizeof(hlim), &hlim);

		}

		if (inet_test_bit(TOS, sk)) {

			int tos = inet->rcv_tos;

			put_cmsg(&msg, SOL_IP, IP_TOS, sizeof(tos), &tos);

		}

		len -= msg.msg_controllen;

		return copy_to_sockptr(optlen, &len, sizeof(int));

	}

	case IP_LOCAL_PORT_RANGE:

		val = inet->local_port_range.hi << 16 | inet->local_port_range.lo;

		break;

net/ipv4/ping.c

+3 −3
Original line number Diff line number Diff line
@@ -773,11 +773,11 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 


	if (ipv4_is_multicast(daddr)) {

		if (!ipc.oif || netif_index_is_l3_master(sock_net(sk), ipc.oif))

			ipc.oif = inet->mc_index;

			ipc.oif = READ_ONCE(inet->mc_index);

		if (!saddr)

			saddr = inet->mc_addr;

			saddr = READ_ONCE(inet->mc_addr);

	} else if (!ipc.oif)

		ipc.oif = inet->uc_index;

		ipc.oif = READ_ONCE(inet->uc_index);



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

			   sk->sk_protocol, inet_sk_flowi_flags(sk), faddr,

net/ipv4/raw.c

+9 −8
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	int free = 0;

	__be32 daddr;

	__be32 saddr;

	int err;

	int uc_index, err;

	struct ip_options_data opt_copy;

	struct raw_frag_vec rfv;

	int hdrincl;
@@ -577,24 +577,25 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	tos = get_rttos(&ipc, inet);

	scope = ip_sendmsg_scope(inet, &ipc, msg);



	uc_index = READ_ONCE(inet->uc_index);

	if (ipv4_is_multicast(daddr)) {

		if (!ipc.oif || netif_index_is_l3_master(sock_net(sk), ipc.oif))

			ipc.oif = inet->mc_index;

			ipc.oif = READ_ONCE(inet->mc_index);

		if (!saddr)

			saddr = inet->mc_addr;

			saddr = READ_ONCE(inet->mc_addr);

	} else if (!ipc.oif) {

		ipc.oif = inet->uc_index;

	} else if (ipv4_is_lbcast(daddr) && inet->uc_index) {

		ipc.oif = uc_index;

	} else if (ipv4_is_lbcast(daddr) && uc_index) {

		/* oif is set, packet is to local broadcast

		 * and uc_index is set. oif is most likely set

		 * by sk_bound_dev_if. If uc_index != oif check if the

		 * oif is an L3 master and uc_index is an L3 slave.

		 * If so, we want to allow the send using the uc_index.

		 */

		if (ipc.oif != inet->uc_index &&

		if (ipc.oif != uc_index &&

		    ipc.oif == l3mdev_master_ifindex_by_index(sock_net(sk),

							      inet->uc_index)) {

			ipc.oif = inet->uc_index;

							      uc_index)) {

			ipc.oif = uc_index;

		}

	}

net/ipv4/udp.c

+9 −7
Original line number Diff line number Diff line
@@ -1063,6 +1063,7 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	int (*getfrag)(void *, char *, int, int, int, struct sk_buff *);

	struct sk_buff *skb;

	struct ip_options_data opt_copy;

	int uc_index;



	if (len > 0xFFFF)

		return -EMSGSIZE;
@@ -1184,25 +1185,26 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	if (scope == RT_SCOPE_LINK)

		connected = 0;



	uc_index = READ_ONCE(inet->uc_index);

	if (ipv4_is_multicast(daddr)) {

		if (!ipc.oif || netif_index_is_l3_master(sock_net(sk), ipc.oif))

			ipc.oif = inet->mc_index;

			ipc.oif = READ_ONCE(inet->mc_index);

		if (!saddr)

			saddr = inet->mc_addr;

			saddr = READ_ONCE(inet->mc_addr);

		connected = 0;

	} else if (!ipc.oif) {

		ipc.oif = inet->uc_index;

	} else if (ipv4_is_lbcast(daddr) && inet->uc_index) {

		ipc.oif = uc_index;

	} else if (ipv4_is_lbcast(daddr) && uc_index) {

		/* oif is set, packet is to local broadcast and

		 * uc_index is set. oif is most likely set

		 * by sk_bound_dev_if. If uc_index != oif check if the

		 * oif is an L3 master and uc_index is an L3 slave.

		 * If so, we want to allow the send using the uc_index.

		 */

		if (ipc.oif != inet->uc_index &&

		if (ipc.oif != uc_index &&

		    ipc.oif == l3mdev_master_ifindex_by_index(sock_net(sk),

							      inet->uc_index)) {

			ipc.oif = inet->uc_index;

							      uc_index)) {

			ipc.oif = uc_index;

		}

	}