diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2017-08-23 07:48:14 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-11-11 16:34:31 +0300 |
| commit | ae91ea20bd9da01e477bfcc474f717f2a1b36ff8 (patch) | |
| tree | d935b10ab1a971488b4dd123ad86c56ac2ad1ede | |
| parent | 88658a57f08e627849fce1bf154d54811742057c (diff) | |
| download | linux-ae91ea20bd9da01e477bfcc474f717f2a1b36ff8.tar.xz | |
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: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
[bwh: Backported to 3.2: name checks are done only in cifs_lookup()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | fs/cifs/dir.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 6937e7c19ee3..1c4b50fba74a 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -520,6 +520,13 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, oplock = pTcon->ses->server->oplocks ? REQ_OPLOCK : 0; + /* Don't allow path components longer than the server max. */ + if (unlikely(direntry->d_name.len > + pTcon->fsAttrInfo.MaxPathNameComponentLength)) { + rc = -ENAMETOOLONG; + goto lookup_out; + } + /* * Don't allow the separator character in a path component. * The VFS will not allow "/", but "\" is allowed by posix. |