diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-12-16 18:52:26 -0500 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-01-30 20:43:30 -0500 |
commit | c7c545d4a34872f4a3d710e22f21fb61f7258706 (patch) | |
tree | 4722f62ab165f67b6637be5783b034a5bda20729 | |
parent | 3a7ed3fff3bb22828f7d7ba6b75c7d22ee54df38 (diff) |
NFS: a couple off by ones
These tests are off by one because if len == sizeof(nfs_export_path)
then we have truncated the name.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r-- | fs/nfs/nfsroot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index cd3c910d2d12..9bc9f04fb7f6 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c | |||
@@ -261,11 +261,11 @@ static int __init root_nfs_data(char *cmdline) | |||
261 | */ | 261 | */ |
262 | len = snprintf(nfs_export_path, sizeof(nfs_export_path), | 262 | len = snprintf(nfs_export_path, sizeof(nfs_export_path), |
263 | tmp, utsname()->nodename); | 263 | tmp, utsname()->nodename); |
264 | if (len > (int)sizeof(nfs_export_path)) | 264 | if (len >= (int)sizeof(nfs_export_path)) |
265 | goto out_devnametoolong; | 265 | goto out_devnametoolong; |
266 | len = snprintf(nfs_root_device, sizeof(nfs_root_device), | 266 | len = snprintf(nfs_root_device, sizeof(nfs_root_device), |
267 | "%pI4:%s", &servaddr, nfs_export_path); | 267 | "%pI4:%s", &servaddr, nfs_export_path); |
268 | if (len > (int)sizeof(nfs_root_device)) | 268 | if (len >= (int)sizeof(nfs_root_device)) |
269 | goto out_devnametoolong; | 269 | goto out_devnametoolong; |
270 | 270 | ||
271 | retval = 0; | 271 | retval = 0; |