Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6066962 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Greg Kroah-Hartman
Browse files

cifs: return ENAMETOOLONG for overlong names in cifs_open()/cifs_lookup() 



commit d3edede29f74d335f81d95a4588f5f136a9f7dcf upstream.

Add checking for the path component length and verify it is <= the maximum
that the server advertizes via FileFsAttributeInformation.

With this patch cifs.ko will now return ENAMETOOLONG instead of ENOENT
when users to access an overlong path.

To test this, try to cd into a (non-existing) directory on a CIFS share
that has a too long name:
cd /mnt/aaaaaaaaaaaaaaa...

and it now should show a good error message from the shell:
bash: cd: /mnt/aaaaaaaaaaaaaaaa...aaaaaa: File name too long

rh bz 1153996

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 210b41b4

fs/cifs/dir.c

+12 −6
Original line number Diff line number Diff line
@@ -183,15 +183,20 @@ cifs_bp_rename_retry: 
}



/*

 * Don't allow path components longer than the server max.

 * Don't allow the separator character in a path component.

 * The VFS will not allow "/", but "\" is allowed by posix.

 */

static int

check_name(struct dentry *direntry)

check_name(struct dentry *direntry, struct cifs_tcon *tcon)

{

	struct cifs_sb_info *cifs_sb = CIFS_SB(direntry->d_sb);

	int i;



	if (unlikely(direntry->d_name.len >

		     tcon->fsAttrInfo.MaxPathNameComponentLength))

		return -ENAMETOOLONG;



	if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)) {

		for (i = 0; i < direntry->d_name.len; i++) {

			if (direntry->d_name.name[i] == '\\') {
@@ -489,10 +494,6 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, 
		return finish_no_open(file, res);

	}



	rc = check_name(direntry);

	if (rc)

		return rc;



	xid = get_xid();



	cifs_dbg(FYI, "parent inode = 0x%p name is: %pd and dentry = 0x%p\n",
@@ -505,6 +506,11 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, 
	}



	tcon = tlink_tcon(tlink);



	rc = check_name(direntry, tcon);

	if (rc)

		goto out_free_xid;



	server = tcon->ses->server;



	if (server->ops->new_lease_key)
@@ -765,7 +771,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, 
	}

	pTcon = tlink_tcon(tlink);



	rc = check_name(direntry);

	rc = check_name(direntry, pTcon);

	if (rc)

		goto lookup_out;