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

Commit 45987e00 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Al Viro
Browse files

cifs: Check for equality with ACL_TYPE_ACCESS and ACL_TYPE_DEFAULT 



The two values ACL_TYPE_ACCESS and ACL_TYPE_DEFAULT are meant to be
enumerations, not bits in a bit mask.  Use '==' instead of '&' to check
for these values.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d9a15489

fs/cifs/cifssmb.c

+2 −2
Original line number Diff line number Diff line
@@ -3366,7 +3366,7 @@ static int cifs_copy_posix_acl(char *trgt, char *src, const int buflen, 
	if (le16_to_cpu(cifs_acl->version) != CIFS_ACL_VERSION)

		return -EOPNOTSUPP;



	if (acl_type & ACL_TYPE_ACCESS) {

	if (acl_type == ACL_TYPE_ACCESS) {

		count = le16_to_cpu(cifs_acl->access_entry_count);

		pACE = &cifs_acl->ace_array[0];

		size = sizeof(struct cifs_posix_acl);
@@ -3377,7 +3377,7 @@ static int cifs_copy_posix_acl(char *trgt, char *src, const int buflen, 
				 size_of_data_area, size);

			return -EINVAL;

		}

	} else if (acl_type & ACL_TYPE_DEFAULT) {

	} else if (acl_type == ACL_TYPE_DEFAULT) {

		count = le16_to_cpu(cifs_acl->access_entry_count);

		size = sizeof(struct cifs_posix_acl);

		size += sizeof(struct cifs_posix_ace) * count;