treewide: use kv[mz]alloc* rather than opencoded variants

[karo-tx-linux.git] / net / ipv6 / udp.c

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index e28082f0a307eb68ac13987580d8d9f65358212f..04862abfe4ec27d978adadd27735a9d19e3c4365 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -46,6 +46,7 @@
 #include <net/tcp_states.h>
 #include <net/ip6_checksum.h>
 #include <net/xfrm.h>
+#include <net/inet_hashtables.h>
 #include <net/inet6_hashtables.h>
 #include <net/busy_poll.h>
 #include <net/sock_reuseport.h>
@@ -864,6 +865,69 @@ discard:
        return 0;
 }
 
+
+static struct sock *__udp6_lib_demux_lookup(struct net *net,
+                       __be16 loc_port, const struct in6_addr *loc_addr,
+                       __be16 rmt_port, const struct in6_addr *rmt_addr,
+                       int dif)
+{
+       unsigned short hnum = ntohs(loc_port);
+       unsigned int hash2 = udp6_portaddr_hash(net, loc_addr, hnum);
+       unsigned int slot2 = hash2 & udp_table.mask;
+       struct udp_hslot *hslot2 = &udp_table.hash2[slot2];
+       const __portpair ports = INET_COMBINED_PORTS(rmt_port, hnum);
+       struct sock *sk;
+
+       udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) {
+               if (INET6_MATCH(sk, net, rmt_addr, loc_addr, ports, dif))
+                       return sk;
+               /* Only check first socket in chain */
+               break;
+       }
+       return NULL;
+}
+
+static void udp_v6_early_demux(struct sk_buff *skb)
+{
+       struct net *net = dev_net(skb->dev);
+       const struct udphdr *uh;
+       struct sock *sk;
+       struct dst_entry *dst;
+       int dif = skb->dev->ifindex;
+
+       if (!pskb_may_pull(skb, skb_transport_offset(skb) +
+           sizeof(struct udphdr)))
+               return;
+
+       uh = udp_hdr(skb);
+
+       if (skb->pkt_type == PACKET_HOST)
+               sk = __udp6_lib_demux_lookup(net, uh->dest,
+                                            &ipv6_hdr(skb)->daddr,
+                                            uh->source, &ipv6_hdr(skb)->saddr,
+                                            dif);
+       else
+               return;
+
+       if (!sk || !atomic_inc_not_zero_hint(&sk->sk_refcnt, 2))
+               return;
+
+       skb->sk = sk;
+       skb->destructor = sock_efree;
+       dst = READ_ONCE(sk->sk_rx_dst);
+
+       if (dst)
+               dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie);
+       if (dst) {
+               if (dst->flags & DST_NOCACHE) {
+                       if (likely(atomic_inc_not_zero(&dst->__refcnt)))
+                               skb_dst_set(skb, dst);
+               } else {
+                       skb_dst_set_noref(skb, dst);
+               }
+       }
+}
+
 static __inline__ int udpv6_rcv(struct sk_buff *skb)
 {
        return __udp6_lib_rcv(skb, &udp_table, IPPROTO_UDP);
@@ -1378,7 +1442,9 @@ int compat_udpv6_getsockopt(struct sock *sk, int level, int optname,
 }
 #endif
 
-static const struct inet6_protocol udpv6_protocol = {
+static struct inet6_protocol udpv6_protocol = {
+       .early_demux    =       udp_v6_early_demux,
+       .early_demux_handler =  udp_v6_early_demux,
        .handler        =       udpv6_rcv,
        .err_handler    =       udpv6_err,
        .flags          =       INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,