Page migration: Do not accept invalid nodes in the target nodeset

[safe/jmp/linux-2.6] / net / sunrpc / svcauth_unix.c

diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 9bae409..4114794 100644 (file)
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -5,6 +5,7 @@
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/svcsock.h>
 #include <linux/sunrpc/svcauth.h>
+#include <linux/sunrpc/gss_api.h>
 #include <linux/err.h>
 #include <linux/seq_file.h>
 #include <linux/hash.h>
@@ -383,7 +384,10 @@ void svcauth_unix_purge(void)
 static inline struct ip_map *
 ip_map_cached_get(struct svc_rqst *rqstp)
 {
-       struct ip_map *ipm = rqstp->rq_sock->sk_info_authunix;
+       struct ip_map *ipm;
+       struct svc_sock *svsk = rqstp->rq_sock;
+       spin_lock(&svsk->sk_lock);
+       ipm = svsk->sk_info_authunix;
        if (ipm != NULL) {
                if (!cache_valid(&ipm->h)) {
                        /*
@@ -391,12 +395,14 @@ ip_map_cached_get(struct svc_rqst *rqstp)
                         * remembered, e.g. by a second mount from the
                         * same IP address.
                         */
-                       rqstp->rq_sock->sk_info_authunix = NULL;
+                       svsk->sk_info_authunix = NULL;
+                       spin_unlock(&svsk->sk_lock);
                        cache_put(&ipm->h, &ip_map_cache);
                        return NULL;
                }
                cache_get(&ipm->h);
        }
+       spin_unlock(&svsk->sk_lock);
        return ipm;
 }
 
@@ -405,9 +411,15 @@ ip_map_cached_put(struct svc_rqst *rqstp, struct ip_map *ipm)
 {
        struct svc_sock *svsk = rqstp->rq_sock;
 
-       if (svsk->sk_sock->type == SOCK_STREAM && svsk->sk_info_authunix == NULL)
-               svsk->sk_info_authunix = ipm;   /* newly cached, keep the reference */
-       else
+       spin_lock(&svsk->sk_lock);
+       if (svsk->sk_sock->type == SOCK_STREAM &&
+           svsk->sk_info_authunix == NULL) {
+               /* newly cached, keep the reference */
+               svsk->sk_info_authunix = ipm;
+               ipm = NULL;
+       }
+       spin_unlock(&svsk->sk_lock);
+       if (ipm)
                cache_put(&ipm->h, &ip_map_cache);
 }
 
@@ -626,7 +638,7 @@ static int unix_gid_find(uid_t uid, struct group_info **gip,
        }
 }
 
-static int
+int
 svcauth_unix_set_client(struct svc_rqst *rqstp)
 {
        struct sockaddr_in *sin = svc_addr_in(rqstp);
@@ -661,6 +673,8 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
        return SVC_OK;
 }
 
+EXPORT_SYMBOL(svcauth_unix_set_client);
+
 static int
 svcauth_null_accept(struct svc_rqst *rqstp, __be32 *authp)
 {
@@ -696,6 +710,7 @@ svcauth_null_accept(struct svc_rqst *rqstp, __be32 *authp)
        svc_putnl(resv, RPC_AUTH_NULL);
        svc_putnl(resv, 0);
 
+       rqstp->rq_flavor = RPC_AUTH_NULL;
        return SVC_OK;
 }
 
@@ -773,6 +788,7 @@ svcauth_unix_accept(struct svc_rqst *rqstp, __be32 *authp)
        svc_putnl(resv, RPC_AUTH_NULL);
        svc_putnl(resv, 0);
 
+       rqstp->rq_flavor = RPC_AUTH_UNIX;
        return SVC_OK;
 
 badcred: