1 files changed, 3 insertions, 22 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 24b384b7903e..e225a4e5b572 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -263,21 +263,6 @@ void build_ehash_secret(void)
 }
 EXPORT_SYMBOL(build_ehash_secret);
 
-static inline int inet_netns_ok(struct net *net, __u8 protocol)
-{
-        const struct net_protocol *ipprot;
-
-        if (net_eq(net, &init_net))
-                return 1;
-
-        ipprot = rcu_dereference(inet_protos[protocol]);
-        if (ipprot == NULL) {
-                /* raw IP is OK */
-                return 1;
-        }
-        return ipprot->netns_ok;
-}
-
 /*
  *      Create an inet socket.
  */
@@ -350,10 +335,6 @@ lookup_protocol:
             !ns_capable(net->user_ns, CAP_NET_RAW))
                 goto out_rcu_unlock;
 
-        err = -EAFNOSUPPORT;
-        if (!inet_netns_ok(net, protocol))
-                goto out_rcu_unlock;
-
         sock->ops = answer->ops;
         answer_prot = answer->prot;
         answer_no_check = answer->no_check;
@@ -1306,6 +1287,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
                        SKB_GSO_UDP |
                        SKB_GSO_DODGY |
                        SKB_GSO_TCP_ECN |
+                       SKB_GSO_GRE |
                        0)))
                 goto out;
 
@@ -1333,7 +1315,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
                 segs = ops->callbacks.gso_segment(skb, features);
         rcu_read_unlock();
 
-        if (!segs || IS_ERR(segs))
+        if (IS_ERR_OR_NULL(segs))
                 goto out;
 
         skb = segs;
@@ -1705,12 +1687,11 @@ static struct packet_type ip_packet_type __read_mostly = {
 
 static int __init inet_init(void)
 {
-        struct sk_buff *dummy_skb;
         struct inet_protosw *q;
         struct list_head *r;
         int rc = -EINVAL;
 
-        BUILD_BUG_ON(sizeof(struct inet_skb_parm) > sizeof(dummy_skb->cb));
+        BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb));
 
         sysctl_local_reserved_ports = kzalloc(65536 / 8, GFP_KERNEL);
         if (!sysctl_local_reserved_ports)