summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMalahal Naineni <malahal@us.ibm.com>2012-09-09 10:25:47 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-21 09:27:57 -0700
commit2bb06038d0dfb47acb64de01a13a7bf963d216f4 (patch)
tree404bca367815d4caef9489b881c6623353ecfabb /fs
parent17170f0bbf4842a5a52dc61cf4d66a824fee9aaf (diff)
downloadlinux-3.10-2bb06038d0dfb47acb64de01a13a7bf963d216f4.tar.gz
linux-3.10-2bb06038d0dfb47acb64de01a13a7bf963d216f4.tar.bz2
linux-3.10-2bb06038d0dfb47acb64de01a13a7bf963d216f4.zip
NFSD: pass null terminated buf to kstrtouint()
commit 9959ba0c241a71c7ed8133401cfbbee2720da0b5 upstream. The 'buf' is prepared with null termination with intention of using it for this purpose, but 'name' is passed instead! Signed-off-by: Malahal Naineni <malahal@us.ibm.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4idmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index 322d11ce06a..01b090d135b 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -581,7 +581,7 @@ numeric_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namel
/* Just to make sure it's null-terminated: */
memcpy(buf, name, namelen);
buf[namelen] = '\0';
- ret = kstrtouint(name, 10, id);
+ ret = kstrtouint(buf, 10, id);
return ret == 0;
}