aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4state.c4
-rw-r--r--fs/nfsd/nfsctl.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index b0bebc552a11..16efb8f8e062 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -719,8 +719,8 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
719 status = nfserr_clid_inuse; 719 status = nfserr_clid_inuse;
720 if (!same_creds(&conf->cl_cred, &rqstp->rq_cred) 720 if (!same_creds(&conf->cl_cred, &rqstp->rq_cred)
721 || conf->cl_addr != sin->sin_addr.s_addr) { 721 || conf->cl_addr != sin->sin_addr.s_addr) {
722 dprintk("NFSD: setclientid: string in use by client" 722 dprintk("NFSD: setclientid: string in use by clientat %pI4\n",
723 "at %u.%u.%u.%u\n", NIPQUAD(conf->cl_addr)); 723 &conf->cl_addr);
724 goto out; 724 goto out;
725 } 725 }
726 } 726 }
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index e3f9783fdcf7..77d7b8c531a6 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -330,7 +330,7 @@ static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size)
330 return -EINVAL; 330 return -EINVAL;
331 331
332 /* get ipv4 address */ 332 /* get ipv4 address */
333 if (sscanf(fo_path, NIPQUAD_FMT "%c", &b1, &b2, &b3, &b4, &c) != 4) 333 if (sscanf(fo_path, "%u.%u.%u.%u%c", &b1, &b2, &b3, &b4, &c) != 4)
334 return -EINVAL; 334 return -EINVAL;
335 if (b1 > 255 || b2 > 255 || b3 > 255 || b4 > 255) 335 if (b1 > 255 || b2 > 255 || b3 > 255 || b4 > 255)
336 return -EINVAL; 336 return -EINVAL;