Merge "udp: fix jump label misuse" (79376733) · Commits · e / devices / android_kernel_fairphone_FP4

include/linux/udp.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,12 @@ static inline void udp_cmsg_recv(struct msghdr msg, struct sock sk,
		}
		}

		static inline bool udp_unexpected_gso(struct sock sk, struct sk_buff skb)
		{
		return !udp_sk(sk)->gro_enabled && skb_is_gso(skb) &&
		skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4;
		}

		#define udp_portaddr_for_each_entry(__sk, list) \
		hlist_for_each_entry(__sk, list, __sk_common.skc_portaddr_node)

include/net/ip.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,7 @@ int ip_rcv(struct sk_buff skb, struct net_device dev, struct packet_type *pt,
		void ip_list_rcv(struct list_head head, struct packet_type pt,
		struct net_device *orig_dev);
		int ip_local_deliver(struct sk_buff *skb);
		void ip_protocol_deliver_rcu(struct net net, struct sk_buff skb, int proto);
		int ip_mr_input(struct sk_buff *skb);
		int ip_output(struct net net, struct sock sk, struct sk_buff *skb);
		int ip_mc_output(struct net net, struct sock sk, struct sk_buff *skb);

include/net/ipv6.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -975,6 +975,8 @@ int ip6_output(struct net net, struct sock sk, struct sk_buff *skb);
		int ip6_forward(struct sk_buff *skb);
		int ip6_input(struct sk_buff *skb);
		int ip6_mc_input(struct sk_buff *skb);
		void ip6_protocol_deliver_rcu(struct net net, struct sk_buff skb, int nexthdr,
		bool have_final);

		int __ip6_local_out(struct net net, struct sock sk, struct sk_buff *skb);
		int ip6_local_out(struct net net, struct sock sk, struct sk_buff *skb);

include/net/udp.h

+37 −8

Original line number	Diff line number	Diff line
		@@ -406,17 +406,24 @@ static inline int copy_linear_skb(struct sk_buff *skb, int len, int off,
		} while(0)

		#if IS_ENABLED(CONFIG_IPV6)
		#define __UDPX_INC_STATS(sk, field) \
		do { \
		if ((sk)->sk_family == AF_INET) \
		__UDP_INC_STATS(sock_net(sk), field, 0); \
		else \
		__UDP6_INC_STATS(sock_net(sk), field, 0); \
		} while (0)
		#define __UDPX_MIB(sk, ipv4) \
		({ \
		ipv4 ? (IS_UDPLITE(sk) ? sock_net(sk)->mib.udplite_statistics : \
		sock_net(sk)->mib.udp_statistics) : \
		(IS_UDPLITE(sk) ? sock_net(sk)->mib.udplite_stats_in6 : \
		sock_net(sk)->mib.udp_stats_in6); \
		})
		#else
		#define __UDPX_INC_STATS(sk, field) __UDP_INC_STATS(sock_net(sk), field, 0)
		#define __UDPX_MIB(sk, ipv4) \
		({ \
		IS_UDPLITE(sk) ? sock_net(sk)->mib.udplite_statistics : \
		sock_net(sk)->mib.udp_statistics; \
		})
		#endif

		#define __UDPX_INC_STATS(sk, field) \
		__SNMP_INC_STATS(__UDPX_MIB(sk, (sk)->sk_family == AF_INET), field)

		#ifdef CONFIG_PROC_FS
		struct udp_seq_afinfo {
		sa_family_t family;
		@@ -448,4 +455,26 @@ void udp_encap_enable(void);
		void udpv6_encap_enable(void);
		#endif

		static inline struct sk_buff udp_rcv_segment(struct sock sk,
		struct sk_buff *skb, bool ipv4)
		{
		struct sk_buff *segs;

		/* the GSO CB lays after the UDP one, no need to save and restore any
		* CB fragment
		*/
		segs = __skb_gso_segment(skb, NETIF_F_SG, false);
		if (unlikely(IS_ERR_OR_NULL(segs))) {
		int segs_nr = skb_shinfo(skb)->gso_segs;

		atomic_add(segs_nr, &sk->sk_drops);
		SNMP_ADD_STATS(__UDPX_MIB(sk, ipv4), UDP_MIB_INERRORS, segs_nr);
		kfree_skb(skb);
		return NULL;
		}

		consume_skb(skb);
		return segs;
		}

		#endif /* _UDP_H */

net/ipv4/ip_input.c

+36 −37

Original line number	Diff line number	Diff line
		@@ -188,27 +188,20 @@ bool ip_call_ra_chain(struct sk_buff *skb)
		return false;
		}

		static int ip_local_deliver_finish(struct net net, struct sock sk, struct sk_buff *skb)
		{
		__skb_pull(skb, skb_network_header_len(skb));

		rcu_read_lock();
		void ip_protocol_deliver_rcu(struct net net, struct sk_buff skb, int protocol)
		{
		int protocol = ip_hdr(skb)->protocol;
		const struct net_protocol *ipprot;
		int raw;
		int raw, ret;

		resubmit:
		raw = raw_local_deliver(skb, protocol);

		ipprot = rcu_dereference(inet_protos[protocol]);
		if (ipprot) {
		int ret;

		if (!ipprot->no_policy) {
		if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
		kfree_skb(skb);
		goto out;
		return;
		}
		nf_reset(skb);
		}
		@@ -232,7 +225,13 @@ static int ip_local_deliver_finish(struct net net, struct sock sk, struct sk_b
		}
		}
		}
		out:

		static int ip_local_deliver_finish(struct net net, struct sock sk, struct sk_buff *skb)
		{
		__skb_pull(skb, skb_network_header_len(skb));

		rcu_read_lock();
		ip_protocol_deliver_rcu(net, skb, ip_hdr(skb)->protocol);
		rcu_read_unlock();

		return 0;