1 files changed, 12 insertions, 9 deletions

diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 65631391d479..7b4bad6d572f 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -160,6 +160,7 @@ int ip_call_ra_chain(struct sk_buff *skb)
         struct ip_ra_chain *ra;
         u8 protocol = ip_hdr(skb)->protocol;
         struct sock *last = NULL;
+        struct net_device *dev = skb->dev;
 
         read_lock(&ip_ra_lock);
         for (ra = ip_ra_chain; ra; ra = ra->next) {
@@ -170,7 +171,8 @@ int ip_call_ra_chain(struct sk_buff *skb)
                  */
                 if (sk && inet_sk(sk)->num == protocol &&
                     (!sk->sk_bound_dev_if ||
-                     sk->sk_bound_dev_if == skb->dev->ifindex)) {
+                     sk->sk_bound_dev_if == dev->ifindex) &&
+                    sock_net(sk) == dev_net(dev)) {
                         if (ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) {
                                 if (ip_defrag(skb, IP_DEFRAG_CALL_RA_CHAIN)) {
                                         read_unlock(&ip_ra_lock);
@@ -197,6 +199,8 @@ int ip_call_ra_chain(struct sk_buff *skb)
 
 static int ip_local_deliver_finish(struct sk_buff *skb)
 {
+        struct net *net = dev_net(skb->dev);
+
         __skb_pull(skb, ip_hdrlen(skb));
 
         /* Point into the IP datagram, just past the header. */
@@ -212,7 +216,8 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
                 raw = raw_local_deliver(skb, protocol);
 
                 hash = protocol & (MAX_INET_PROTOS - 1);
-                if ((ipprot = rcu_dereference(inet_protos[hash])) != NULL) {
+                ipprot = rcu_dereference(inet_protos[hash]);
+                if (ipprot != NULL && (net == &init_net || ipprot->netns_ok)) {
                         int ret;
 
                         if (!ipprot->no_policy) {
@@ -283,13 +288,14 @@ static inline int ip_rcv_options(struct sk_buff *skb)
         }
 
         iph = ip_hdr(skb);
+        opt = &(IPCB(skb)->opt);
+        opt->optlen = iph->ihl*4 - sizeof(struct iphdr);
 
-        if (ip_options_compile(NULL, skb)) {
+        if (ip_options_compile(dev_net(dev), opt, skb)) {
                 IP_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);
                 goto drop;
         }
 
-        opt = &(IPCB(skb)->opt);
         if (unlikely(opt->srr)) {
                 struct in_device *in_dev = in_dev_get(dev);
                 if (in_dev) {
@@ -297,7 +303,7 @@ static inline int ip_rcv_options(struct sk_buff *skb)
                                 if (IN_DEV_LOG_MARTIANS(in_dev) &&
                                     net_ratelimit())
                                         printk(KERN_INFO "source route option "
-                                               "%u.%u.%u.%u -> %u.%u.%u.%u\n",
+                                               NIPQUAD_FMT " -> " NIPQUAD_FMT "\n",
                                                NIPQUAD(iph->saddr),
                                                NIPQUAD(iph->daddr));
                                 in_dev_put(in_dev);
@@ -351,7 +357,7 @@ static int ip_rcv_finish(struct sk_buff *skb)
         if (iph->ihl > 5 && ip_rcv_options(skb))
                 goto drop;
 
-        rt = (struct rtable*)skb->dst;
+        rt = skb->rtable;
         if (rt->rt_type == RTN_MULTICAST)
                 IP_INC_STATS_BH(IPSTATS_MIB_INMCASTPKTS);
         else if (rt->rt_type == RTN_BROADCAST)
@@ -372,9 +378,6 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
         struct iphdr *iph;
         u32 len;
 
-        if (dev->nd_net != &init_net)
-                goto drop;
-
         /* When the interface is in promisc. mode, drop all the crap
          * that it receives, do not try to analyse it.
          */