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

Commit 89db69d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'smb3-file-name-too-long-fix' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fix from Steve French:
 "smb3 file name too long fix"

* tag 'smb3-file-name-too-long-fix' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: check MaxPathNameComponentLength != 0 before using it
parents 7c404c62 f74bc7c6

fs/cifs/dir.c

+3 −2
Original line number Diff line number Diff line
@@ -204,7 +204,8 @@ 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 >

	if (unlikely(tcon->fsAttrInfo.MaxPathNameComponentLength &&

		     direntry->d_name.len >

		     le32_to_cpu(tcon->fsAttrInfo.MaxPathNameComponentLength)))

		return -ENAMETOOLONG;
@@ -520,7 +521,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, 


	rc = check_name(direntry, tcon);

	if (rc)

		goto out_free_xid;

		goto out;



	server = tcon->ses->server;