diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2017-10-30 13:28:03 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-08 10:08:31 +0100 |
| commit | 5e8b028abaf85502c53fb3af795f3c61d7cbcdc8 (patch) | |
| tree | 37c9de28d2a31d077744c9a902d9b86c3be02194 /fs | |
| parent | ffb76bb8aa9e18e97b40cd60f9cb0670cc1b8096 (diff) | |
| download | linux-stable-5e8b028abaf85502c53fb3af795f3c61d7cbcdc8.tar.gz linux-stable-5e8b028abaf85502c53fb3af795f3c61d7cbcdc8.tar.bz2 linux-stable-5e8b028abaf85502c53fb3af795f3c61d7cbcdc8.zip | |
cifs: check MaxPathNameComponentLength != 0 before using it
commit f74bc7c6679200a4a83156bb89cbf6c229fe8ec0 upstream.
And fix tcon leak in error path.
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/dir.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index dd3e236d7a2b..d9cbda269462 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -193,7 +193,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; @@ -509,7 +510,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; |