[1/8] cifs: Fix xattr name checks

Message ID	1460586620-5717-2-git-send-email-agruenba@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-cifs-owner@kernel.org> From: Andreas Gruenbacher <agruenba@redhat.com> To: Al Viro <viro@zeniv.linux.org.uk> Cc: Steve French <sfrench@samba.org>, linux-cifs@vger.kernel.org, ceph-devel@vger.kernel.org, cluster-devel@redhat.com Subject: [PATCH 1/8] cifs: Fix xattr name checks Date: Thu, 14 Apr 2016 00:30:13 +0200 Message-Id: <1460586620-5717-2-git-send-email-agruenba@redhat.com> In-Reply-To: <1460586620-5717-1-git-send-email-agruenba@redhat.com> References: <1460586620-5717-1-git-send-email-agruenba@redhat.com> In-Reply-To: <20160413182026.GR25498@ZenIV.linux.org.uk> References: <20160413182026.GR25498@ZenIV.linux.org.uk> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk

Andreas Gruenbacher April 13, 2016, 10:30 p.m. UTC

Use strcmp(str, name) instead of strncmp(str, name, strlen(name)) for
checking if str and name are the same (as opposed to name being a prefix
of str) in the gexattr and setxattr inode operations.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
 fs/cifs/xattr.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

Steve French April 14, 2016, 4:26 a.m. UTC | #1

Thanks for spotting this - merged into cifs-2.6.git.   checkpatch
spotted and old indentation issue so I cleaned that up in a followon
patch that I will send.

On Wed, Apr 13, 2016 at 5:30 PM, Andreas Gruenbacher
<agruenba@redhat.com> wrote:
> Use strcmp(str, name) instead of strncmp(str, name, strlen(name)) for
> checking if str and name are the same (as opposed to name being a prefix
> of str) in the gexattr and setxattr inode operations.
>
> Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
> ---
>  fs/cifs/xattr.c | 24 ++++++++----------------
>  1 file changed, 8 insertions(+), 16 deletions(-)
>
> diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c
> index 5d57c85..6e73ba9 100644
> --- a/fs/cifs/xattr.c
> +++ b/fs/cifs/xattr.c
> @@ -129,7 +129,7 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
>                    == 0) {
>                 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
>                         goto set_ea_exit;
> -               if (strncmp(ea_name, CIFS_XATTR_DOS_ATTRIB, 14) == 0)
> +               if (strcmp(ea_name, CIFS_XATTR_DOS_ATTRIB) == 0)
>                         cifs_dbg(FYI, "attempt to set cifs inode metadata\n");
>
>                 ea_name += XATTR_USER_PREFIX_LEN; /* skip past user. prefix */
> @@ -147,8 +147,7 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
>                         rc = pTcon->ses->server->ops->set_EA(xid, pTcon,
>                                 full_path, ea_name, ea_value, (__u16)value_size,
>                                 cifs_sb->local_nls, cifs_remap(cifs_sb));
> -       } else if (strncmp(ea_name, CIFS_XATTR_CIFS_ACL,
> -                       strlen(CIFS_XATTR_CIFS_ACL)) == 0) {
> +       } else if (strcmp(ea_name, CIFS_XATTR_CIFS_ACL) == 0) {
>  #ifdef CONFIG_CIFS_ACL
>                 struct cifs_ntsd *pacl;
>                 pacl = kmalloc(value_size, GFP_KERNEL);
> @@ -170,10 +169,7 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
>                 cifs_dbg(FYI, "Set CIFS ACL not supported yet\n");
>  #endif /* CONFIG_CIFS_ACL */
>         } else {
> -               int temp;
> -               temp = strncmp(ea_name, XATTR_NAME_POSIX_ACL_ACCESS,
> -                       strlen(XATTR_NAME_POSIX_ACL_ACCESS));
> -               if (temp == 0) {
> +               if (strcmp(ea_name, XATTR_NAME_POSIX_ACL_ACCESS) == 0) {
>  #ifdef CONFIG_CIFS_POSIX
>                         if (sb->s_flags & MS_POSIXACL)
>                                 rc = CIFSSMBSetPosixACL(xid, pTcon, full_path,
> @@ -184,8 +180,7 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
>  #else
>                         cifs_dbg(FYI, "set POSIX ACL not supported\n");
>  #endif
> -               } else if (strncmp(ea_name, XATTR_NAME_POSIX_ACL_DEFAULT,
> -                                  strlen(XATTR_NAME_POSIX_ACL_DEFAULT)) == 0) {
> +               } else if (strcmp(ea_name, XATTR_NAME_POSIX_ACL_DEFAULT) == 0) {
>  #ifdef CONFIG_CIFS_POSIX
>                         if (sb->s_flags & MS_POSIXACL)
>                                 rc = CIFSSMBSetPosixACL(xid, pTcon, full_path,
> @@ -246,7 +241,7 @@ ssize_t cifs_getxattr(struct dentry *direntry, struct inode *inode,
>                 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
>                         goto get_ea_exit;
>
> -               if (strncmp(ea_name, CIFS_XATTR_DOS_ATTRIB, 14) == 0) {
> +               if (strcmp(ea_name, CIFS_XATTR_DOS_ATTRIB) == 0) {
>                         cifs_dbg(FYI, "attempt to query cifs inode metadata\n");
>                         /* revalidate/getattr then populate from inode */
>                 } /* BB add else when above is implemented */
> @@ -264,8 +259,7 @@ ssize_t cifs_getxattr(struct dentry *direntry, struct inode *inode,
>                         rc = pTcon->ses->server->ops->query_all_EAs(xid, pTcon,
>                                 full_path, ea_name, ea_value, buf_size,
>                                 cifs_sb->local_nls, cifs_remap(cifs_sb));
> -       } else if (strncmp(ea_name, XATTR_NAME_POSIX_ACL_ACCESS,
> -                         strlen(XATTR_NAME_POSIX_ACL_ACCESS)) == 0) {
> +       } else if (strcmp(ea_name, XATTR_NAME_POSIX_ACL_ACCESS) == 0) {
>  #ifdef CONFIG_CIFS_POSIX
>                 if (sb->s_flags & MS_POSIXACL)
>                         rc = CIFSSMBGetPosixACL(xid, pTcon, full_path,
> @@ -275,8 +269,7 @@ ssize_t cifs_getxattr(struct dentry *direntry, struct inode *inode,
>  #else
>                 cifs_dbg(FYI, "Query POSIX ACL not supported yet\n");
>  #endif /* CONFIG_CIFS_POSIX */
> -       } else if (strncmp(ea_name, XATTR_NAME_POSIX_ACL_DEFAULT,
> -                         strlen(XATTR_NAME_POSIX_ACL_DEFAULT)) == 0) {
> +       } else if (strcmp(ea_name, XATTR_NAME_POSIX_ACL_DEFAULT) == 0) {
>  #ifdef CONFIG_CIFS_POSIX
>                 if (sb->s_flags & MS_POSIXACL)
>                         rc = CIFSSMBGetPosixACL(xid, pTcon, full_path,
> @@ -286,8 +279,7 @@ ssize_t cifs_getxattr(struct dentry *direntry, struct inode *inode,
>  #else
>                 cifs_dbg(FYI, "Query POSIX default ACL not supported yet\n");
>  #endif /* CONFIG_CIFS_POSIX */
> -       } else if (strncmp(ea_name, CIFS_XATTR_CIFS_ACL,
> -                               strlen(CIFS_XATTR_CIFS_ACL)) == 0) {
> +       } else if (strcmp(ea_name, CIFS_XATTR_CIFS_ACL) == 0) {
>  #ifdef CONFIG_CIFS_ACL
>                         u32 acllen;
>                         struct cifs_ntsd *pacl;
> --
> 2.4.11
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Al Viro April 14, 2016, 4:37 a.m. UTC | #2

On Wed, Apr 13, 2016 at 11:26:24PM -0500, Steve French wrote:
> Thanks for spotting this - merged into cifs-2.6.git.   checkpatch
> spotted and old indentation issue so I cleaned that up in a followon
> patch that I will send.

*ugh*

And in the meanwhile I'd picked those into my queue...  Could you put that
stuff on a separate branch so that both cifs-2.6.git and vfs.git could
merge it?
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Steve French April 14, 2016, 4:43 a.m. UTC | #3

If you are planning to merge it in next few weeks (they fix bugs, and
are safe so why not),  I can simply just back out my changes from
cifs-2.6.git for-next branch and let you merge the trivial checkpatch
cleanup attached.

On Wed, Apr 13, 2016 at 11:37 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> On Wed, Apr 13, 2016 at 11:26:24PM -0500, Steve French wrote:
>> Thanks for spotting this - merged into cifs-2.6.git.   checkpatch
>> spotted and old indentation issue so I cleaned that up in a followon
>> patch that I will send.
>
> *ugh*
>
> And in the meanwhile I'd picked those into my queue...  Could you put that
> stuff on a separate branch so that both cifs-2.6.git and vfs.git could
> merge it?

Steve French April 14, 2016, 4:49 a.m. UTC | #4

If you prefer merging those out of your tree, you can add my
Reviewed-by if needed (for the three cifs patches)

On Wed, Apr 13, 2016 at 11:43 PM, Steve French <smfrench@gmail.com> wrote:
> If you are planning to merge it in next few weeks (they fix bugs, and
> are safe so why not),  I can simply just back out my changes from
> cifs-2.6.git for-next branch and let you merge the trivial checkpatch
> cleanup attached.
>
> On Wed, Apr 13, 2016 at 11:37 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
>> On Wed, Apr 13, 2016 at 11:26:24PM -0500, Steve French wrote:
>>> Thanks for spotting this - merged into cifs-2.6.git.   checkpatch
>>> spotted and old indentation issue so I cleaned that up in a followon
>>> patch that I will send.
>>
>> *ugh*
>>
>> And in the meanwhile I'd picked those into my queue...  Could you put that
>> stuff on a separate branch so that both cifs-2.6.git and vfs.git could
>> merge it?
>
>
>
> --
> Thanks,
>
> Steve

Al Viro April 14, 2016, 4:59 a.m. UTC | #5

On Wed, Apr 13, 2016 at 11:43:19PM -0500, Steve French wrote:
> If you are planning to merge it in next few weeks (they fix bugs, and
> are safe so why not),  I can simply just back out my changes from
> cifs-2.6.git for-next branch and let you merge the trivial checkpatch
> cleanup attached.

Do you want it in mainline before 4.6-final?  If that can wait until 4.7-rc1
(and these are both old and not earth-shattering), I've no problem with
putting the entire series (including cleanup) into a branch merged into
vfs.git#for-next; if you consider it 4.6-final fodder, it's probably better
be your pull request.

PS: are there any docs re setup for cifs testing?
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Steve French April 15, 2016, 3:01 a.m. UTC | #6

On Wed, Apr 13, 2016 at 11:59 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> On Wed, Apr 13, 2016 at 11:43:19PM -0500, Steve French wrote:
>> If you are planning to merge it in next few weeks (they fix bugs, and
>> are safe so why not),  I can simply just back out my changes from
>> cifs-2.6.git for-next branch and let you merge the trivial checkpatch
>> cleanup attached.
>
> Do you want it in mainline before 4.6-final?  If that can wait until 4.7-rc1
> (and these are both old and not earth-shattering), I've no problem with
> putting the entire series (including cleanup) into a branch merged into
> vfs.git#for-next; if you consider it 4.6-final fodder, it's probably better
> be your pull request.

They are old, but I don't mind taking care of them now, and seem
low risk.

> PS: are there any docs re setup for cifs testing?
There are probably more but I have been using the page

https://wiki.samba.org/index.php/Xfstesting-cifs

cifs has more xfstest issues than NFS, but some of
the same kinds of problems (caching of metadata
time stamps e.g.) are similar.

[1/8] cifs: Fix xattr name checks

Commit Message

Comments

Patch