9 files changed, 22 insertions, 12 deletions

diff --git a/net/core/flow.c b/net/core/flow.c
index a77531c139b7..19991175fdeb 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -23,7 +23,6 @@
 #include <linux/mutex.h>
 #include <net/flow.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
 #include <linux/security.h>
 
 struct flow_cache_entry {
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index a4c1b36f4bc7..9dfe2470962c 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -27,7 +27,6 @@
 #include <net/xfrm.h>
 
 #include <asm/ioctls.h>
-#include <asm/semaphore.h>
 #include <linux/spinlock.h>
 #include <linux/timer.h>
 #include <linux/delay.h>
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index fb53ddfea5b5..a75807b971b3 100644
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -14,7 +14,6 @@
  *   - Adaptive compression.
  */
 #include <linux/module.h>
-#include <asm/semaphore.h>
 #include <linux/crypto.h>
 #include <linux/err.h>
 #include <linux/pfkeyv2.h>
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 0c95cd5872f3..2767841a8cef 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -259,6 +259,7 @@ config NF_NAT_PROTO_SCTP
         tristate
         default NF_NAT && NF_CT_PROTO_SCTP
         depends on NF_NAT && NF_CT_PROTO_SCTP
+        select LIBCRC32C
 
 config NF_NAT_FTP
         tristate
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index e3dcfa2f436b..ee6de425ce6b 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -34,7 +34,6 @@
 #include <net/ip.h>
 #include <net/xfrm.h>
 #include <net/ipcomp.h>
-#include <asm/semaphore.h>
 #include <linux/crypto.h>
 #include <linux/err.h>
 #include <linux/pfkeyv2.h>
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 65b3ba57a3b7..9f4900069561 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -781,7 +781,7 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb,
                     nfct_help(exp->master)->helper != nfct_help(ct)->helper ||
                     exp->class != class)
                         break;
-
+#ifdef CONFIG_NF_NAT_NEEDED
                 if (exp->tuple.src.l3num == AF_INET && !direct_rtp &&
                     (exp->saved_ip != exp->tuple.dst.u3.ip ||
                      exp->saved_proto.udp.port != exp->tuple.dst.u.udp.port) &&
@@ -791,6 +791,7 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb,
                         tuple.dst.u.udp.port    = exp->saved_proto.udp.port;
                         direct_rtp = 1;
                 } else
+#endif
                         skip_expect = 1;
         } while (!skip_expect);
         rcu_read_unlock();
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index d1ff3f885c5d..1ebf65294405 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -760,8 +760,10 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le
 
         rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause,
                                          &diagnostic);
-        if (!rose->neighbour)
-                return -ENETUNREACH;
+        if (!rose->neighbour) {
+                err = -ENETUNREACH;
+                goto out_release;
+        }
 
         rose->lci = rose_new_lci(rose->neighbour);
         if (!rose->lci) {
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index a290e1523297..090af78d68b5 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -301,7 +301,6 @@ static inline int
 svc_pool_map_set_cpumask(unsigned int pidx, cpumask_t *oldmask)
 {
         struct svc_pool_map *m = &svc_pool_map;
-        unsigned int node; /* or cpu */
 
         /*
          * The caller checks for sv_nrpools > 1, which
@@ -314,16 +313,23 @@ svc_pool_map_set_cpumask(unsigned int pidx, cpumask_t *oldmask)
         default:
                 return 0;
         case SVC_POOL_PERCPU:
-                node = m->pool_to[pidx];
+        {
+                unsigned int cpu = m->pool_to[pidx];
+
                 *oldmask = current->cpus_allowed;
-                set_cpus_allowed(current, cpumask_of_cpu(node));
+                set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
                 return 1;
+        }
         case SVC_POOL_PERNODE:
-                node = m->pool_to[pidx];
+        {
+                unsigned int node = m->pool_to[pidx];
+                node_to_cpumask_ptr(nodecpumask, node);
+
                 *oldmask = current->cpus_allowed;
-                set_cpus_allowed(current, node_to_cpumask(node));
+                set_cpus_allowed_ptr(current, nodecpumask);
                 return 1;
         }
+        }
 }
 
 /*
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 2851d0d15048..1454afcc06c4 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -819,7 +819,11 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
                  */
                 mode = S_IFSOCK |
                        (SOCK_INODE(sock)->i_mode & ~current->fs->umask);
+                err = mnt_want_write(nd.path.mnt);
+                if (err)
+                        goto out_mknod_dput;
                 err = vfs_mknod(nd.path.dentry->d_inode, dentry, mode, 0);
+                mnt_drop_write(nd.path.mnt);
                 if (err)
                         goto out_mknod_dput;
                 mutex_unlock(&nd.path.dentry->d_inode->i_mutex);