* [PATCH] cifs: check MaxPathNameComponentLength != 0 before using it
@ 2017-10-25 22:31 Ronnie Sahlberg
0 siblings, 0 replies; 3+ messages in thread
From: Ronnie Sahlberg @ 2017-10-25 22:31 UTC (permalink / raw)
To: linux-cifs; +Cc: Steve French
Signed-off-by: Ronnie Sahlberg <lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
fs/cifs/dir.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index e702d48bd023..513ff2986c97 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -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;
--
2.13.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] cifs: check MaxPathNameComponentLength != 0 before using it
@ 2017-10-30 2:28 Ronnie Sahlberg
[not found] ` <20171030022803.31066-1-lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Ronnie Sahlberg @ 2017-10-30 2:28 UTC (permalink / raw)
To: linux-cifs; +Cc: Steve French
And fix tcon leak in error path.
Signed-off-by: Ronnie Sahlberg <lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
fs/cifs/dir.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index e702d48bd023..81ba6e0d88d8 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -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;
--
2.13.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] cifs: check MaxPathNameComponentLength != 0 before using it
[not found] ` <20171030022803.31066-1-lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2017-10-30 7:17 ` Steve French
0 siblings, 0 replies; 3+ messages in thread
From: Steve French @ 2017-10-30 7:17 UTC (permalink / raw)
To: Ronnie Sahlberg; +Cc: linux-cifs
merged into cifs-2.6.git for-next
On Sun, Oct 29, 2017 at 9:28 PM, Ronnie Sahlberg <lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> And fix tcon leak in error path.
>
> Signed-off-by: Ronnie Sahlberg <lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
> fs/cifs/dir.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
> index e702d48bd023..81ba6e0d88d8 100644
> --- a/fs/cifs/dir.c
> +++ b/fs/cifs/dir.c
> @@ -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;
>
> --
> 2.13.3
>
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-10-30 7:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-25 22:31 [PATCH] cifs: check MaxPathNameComponentLength != 0 before using it Ronnie Sahlberg
-- strict thread matches above, loose matches on Subject: below --
2017-10-30 2:28 Ronnie Sahlberg
[not found] ` <20171030022803.31066-1-lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-10-30 7:17 ` Steve French
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox