lockd: Store the lockd client credential in struct nlm_host

When we create a new lockd client, we want to be able to pass the
correct credential of the process that created the struct nlm_host.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

4 files changed, 14 insertions, 4 deletions

diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index c2a128678e6e..70f520b41a19 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -63,7 +63,7 @@ struct nlm_host *nlmclnt_init(const struct nlmclnt_initdata *nlm_init)
         host = nlmclnt_lookup_host(nlm_init->address, nlm_init->addrlen,
                                    nlm_init->protocol, nlm_version,
                                    nlm_init->hostname, nlm_init->noresvport,
-                                   nlm_init->net);
+                                   nlm_init->net, nlm_init->cred);
         if (host == NULL)
                 goto out_nohost;
         if (host->h_rpcclnt == NULL && nlm_bind_host(host) == NULL)
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index d46081123f7c..7d46fafdbbe5 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -60,6 +60,7 @@ struct nlm_lookup_host_info {
         const size_t            hostname_len;   /* it's length */
         const int               noresvport;     /* use non-priv port */
         struct net              *net;           /* network namespace to bind */
+        const struct cred       *cred;
 };
 
 /*
@@ -162,6 +163,7 @@ static struct nlm_host *nlm_alloc_host(struct nlm_lookup_host_info *ni,
         host->h_nsmhandle  = nsm;
         host->h_addrbuf    = nsm->sm_addrbuf;
         host->net          = ni->net;
+        host->h_cred       = get_cred(ni->cred),
         strlcpy(host->nodename, utsname()->nodename, sizeof(host->nodename));
 
 out:
@@ -188,6 +190,7 @@ static void nlm_destroy_host_locked(struct nlm_host *host)
         clnt = host->h_rpcclnt;
         if (clnt != NULL)
                 rpc_shutdown_client(clnt);
+        put_cred(host->h_cred);
         kfree(host);
 
         ln->nrhosts--;
@@ -202,6 +205,8 @@ static void nlm_destroy_host_locked(struct nlm_host *host)
  * @version: NLM protocol version
  * @hostname: '\0'-terminated hostname of server
  * @noresvport: 1 if non-privileged port should be used
+ * @net: pointer to net namespace
+ * @cred: pointer to cred
  *
  * Returns an nlm_host structure that matches the passed-in
  * [server address, transport protocol, NLM version, server hostname].
@@ -214,7 +219,8 @@ struct nlm_host *nlmclnt_lookup_host(const struct sockaddr *sap,
                                      const u32 version,
                                      const char *hostname,
                                      int noresvport,
-                                     struct net *net)
+                                     struct net *net,
+                                     const struct cred *cred)
 {
         struct nlm_lookup_host_info ni = {
                 .server         = 0,
@@ -226,6 +232,7 @@ struct nlm_host *nlmclnt_lookup_host(const struct sockaddr *sap,
                 .hostname_len   = strlen(hostname),
                 .noresvport     = noresvport,
                 .net            = net,
+                .cred           = cred,
         };
         struct hlist_head *chain;
         struct nlm_host *host;
@@ -458,7 +465,7 @@ nlm_bind_host(struct nlm_host *host)
                         .authflavor     = RPC_AUTH_UNIX,
                         .flags          = (RPC_CLNT_CREATE_NOPING |
                                            RPC_CLNT_CREATE_AUTOBIND),
-                        .cred           = current_cred(),
+                        .cred           = host->h_cred,
                 };
 
                 /*
diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
index 053a4ef3d431..8c0cf1059443 100644
--- a/include/linux/lockd/bind.h
+++ b/include/linux/lockd/bind.h
@@ -46,6 +46,7 @@ struct nlmclnt_initdata {
         int                     noresvport;
         struct net              *net;
         const struct nlmclnt_operations *nlmclnt_ops;
+        const struct cred       *cred;
 };
 
 /*
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index b065ef406770..c9b422dde542 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -70,6 +70,7 @@ struct nlm_host {
         struct nsm_handle       *h_nsmhandle;   /* NSM status handle */
         char                    *h_addrbuf;     /* address eyecatcher */
         struct net              *net;           /* host net */
+        const struct cred       *h_cred;
         char                    nodename[UNX_MAXNODENAME + 1];
         const struct nlmclnt_operations *h_nlmclnt_ops; /* Callback ops for NLM users */
 };
@@ -229,7 +230,8 @@ struct nlm_host  *nlmclnt_lookup_host(const struct sockaddr *sap,
                                         const u32 version,
                                         const char *hostname,
                                         int noresvport,
-                                        struct net *net);
+                                        struct net *net,
+                                        const struct cred *cred);
 void              nlmclnt_release_host(struct nlm_host *);
 struct nlm_host  *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
                                         const char *hostname,