Эх сурвалжийг харах

NFS: nfs_prime_dcache must validate the filename

Before we try to stash it in the dcache, we need to at least check
that the filename passed to us by the server is non-empty and doesn't
contain any illegal '\0' or '/' characters.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Trond Myklebust 9 жил өмнө
parent
commit
78d04af499
1 өөрчлөгдсөн 8 нэмэгдсэн , 0 устгасан
  1. 8 0
      fs/nfs/dir.c

+ 8 - 0
fs/nfs/dir.c

@@ -496,6 +496,14 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
 		return;
 		return;
 	if (!(entry->fattr->valid & NFS_ATTR_FATTR_FSID))
 	if (!(entry->fattr->valid & NFS_ATTR_FATTR_FSID))
 		return;
 		return;
+	if (filename.len == 0)
+		return;
+	/* Validate that the name doesn't contain any illegal '\0' */
+	if (strnlen(filename.name, filename.len) != filename.len)
+		return;
+	/* ...or '/' */
+	if (strnchr(filename.name, filename.len, '/'))
+		return;
 	if (filename.name[0] == '.') {
 	if (filename.name[0] == '.') {
 		if (filename.len == 1)
 		if (filename.len == 1)
 			return;
 			return;