--- zzzz-none-000/linux-4.9.231/net/ipv6/udp.c	2020-07-22 07:10:54.000000000 +0000
+++ falcon-5590-729/linux-4.9.231/net/ipv6/udp.c	2022-03-30 12:03:35.000000000 +0000
@@ -55,6 +55,10 @@
 #include <trace/events/skb.h>
 #include "udp_impl.h"
 
+#ifdef CONFIG_AVM_PA
+#include <avm/pa/avm_pa.h>
+#endif
+
 static u32 udp6_ehashfn(const struct net *net,
 			const struct in6_addr *laddr,
 			const u16 lport,
@@ -563,6 +567,10 @@
 	if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
 		goto drop;
 
+#ifdef CONFIG_AVM_PA
+	avm_pa_add_local_session(skb, sk);
+#endif
+
 	if (static_key_false(&udpv6_encap_needed) && up->encap_type) {
 		int (*encap_rcv)(struct sock *sk, struct sk_buff *skb);
 
@@ -1162,6 +1170,7 @@
 		fl6.flowi6_oif = np->sticky_pktinfo.ipi6_ifindex;
 
 	fl6.flowi6_mark = sk->sk_mark;
+	fl6.flowi6_uid = sk->sk_uid;
 
 	if (msg->msg_controllen) {
 		opt = &opt_space;