1 files changed, 56 insertions, 13 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 5c5db6636704..9e481992dbae 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -370,7 +370,11 @@ lookup_protocol:
                  */
                 inet->inet_sport = htons(inet->inet_num);
                 /* Add to protocol hash chains. */
-                sk->sk_prot->hash(sk);
+                err = sk->sk_prot->hash(sk);
+                if (err) {
+                        sk_common_release(sk);
+                        goto out;
+                }
         }
 
         if (sk->sk_prot->init) {
@@ -1091,12 +1095,6 @@ void inet_unregister_protosw(struct inet_protosw *p)
 }
 EXPORT_SYMBOL(inet_unregister_protosw);
 
-/*
- *      Shall we try to damage output packets if routing dev changes?
- */
-
-int sysctl_ip_dynaddr __read_mostly;
-
 static int inet_sk_reselect_saddr(struct sock *sk)
 {
         struct inet_sock *inet = inet_sk(sk);
@@ -1127,7 +1125,7 @@ static int inet_sk_reselect_saddr(struct sock *sk)
         if (new_saddr == old_saddr)
                 return 0;
 
-        if (sysctl_ip_dynaddr > 1) {
+        if (sock_net(sk)->ipv4.sysctl_ip_dynaddr > 1) {
                 pr_info("%s(): shifting inet->saddr from %pI4 to %pI4\n",
                         __func__, &old_saddr, &new_saddr);
         }
@@ -1142,8 +1140,7 @@ static int inet_sk_reselect_saddr(struct sock *sk)
          * Besides that, it does not check for connection
          * uniqueness. Wait for troubles.
          */
-        __sk_prot_rehash(sk);
-        return 0;
+        return __sk_prot_rehash(sk);
 }
 
 int inet_sk_rebuild_header(struct sock *sk)
@@ -1183,7 +1180,7 @@ int inet_sk_rebuild_header(struct sock *sk)
                  * Other protocols have to map its equivalent state to TCP_SYN_SENT.
                  * DCCP maps its DCCP_REQUESTING state to TCP_SYN_SENT. -acme
                  */
-                if (!sysctl_ip_dynaddr ||
+                if (!sock_net(sk)->ipv4.sysctl_ip_dynaddr ||
                     sk->sk_state != TCP_SYN_SENT ||
                     (sk->sk_userlocks & SOCK_BINDADDR_LOCK) ||
                     (err = inet_sk_reselect_saddr(sk)) != 0)
@@ -1383,6 +1380,45 @@ out:
         return pp;
 }
 
+static struct sk_buff **ipip_gro_receive(struct sk_buff **head,
+                                         struct sk_buff *skb)
+{
+        if (NAPI_GRO_CB(skb)->encap_mark) {
+                NAPI_GRO_CB(skb)->flush = 1;
+                return NULL;
+        }
+
+        NAPI_GRO_CB(skb)->encap_mark = 1;
+
+        return inet_gro_receive(head, skb);
+}
+
+#define SECONDS_PER_DAY 86400
+
+/* inet_current_timestamp - Return IP network timestamp
+ *
+ * Return milliseconds since midnight in network byte order.
+ */
+__be32 inet_current_timestamp(void)
+{
+        u32 secs;
+        u32 msecs;
+        struct timespec64 ts;
+
+        ktime_get_real_ts64(&ts);
+
+        /* Get secs since midnight. */
+        (void)div_u64_rem(ts.tv_sec, SECONDS_PER_DAY, &secs);
+        /* Convert to msecs. */
+        msecs = secs * MSEC_PER_SEC;
+        /* Convert nsec to msec. */
+        msecs += (u32)ts.tv_nsec / NSEC_PER_MSEC;
+
+        /* Convert to network byte order. */
+        return htonl(msecs);
+}
+EXPORT_SYMBOL(inet_current_timestamp);
+
 int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
 {
         if (sk->sk_family == AF_INET)
@@ -1425,6 +1461,13 @@ out_unlock:
         return err;
 }
 
+static int ipip_gro_complete(struct sk_buff *skb, int nhoff)
+{
+        skb->encapsulation = 1;
+        skb_shinfo(skb)->gso_type |= SKB_GSO_IPIP;
+        return inet_gro_complete(skb, nhoff);
+}
+
 int inet_ctl_sock_create(struct sock **sk, unsigned short family,
                          unsigned short type, unsigned char protocol,
                          struct net *net)
@@ -1652,8 +1695,8 @@ static struct packet_offload ip_packet_offload __read_mostly = {
 static const struct net_offload ipip_offload = {
         .callbacks = {
                 .gso_segment    = inet_gso_segment,
-                .gro_receive    = inet_gro_receive,
-                .gro_complete   = inet_gro_complete,
+                .gro_receive    = ipip_gro_receive,
+                .gro_complete   = ipip_gro_complete,
         },
 };