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

Commit 9522751c authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

ocfs2: Handle kuids and kgids in acl/xattr conversions. 



Explicitly deal with the different kinds of acls because they need
different conversions.

Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 515ee7bd

fs/ocfs2/acl.c

+29 −2
Original line number Diff line number Diff line
@@ -65,7 +65,20 @@ static struct posix_acl *ocfs2_acl_from_xattr(const void *value, size_t size) 


		acl->a_entries[n].e_tag  = le16_to_cpu(entry->e_tag);

		acl->a_entries[n].e_perm = le16_to_cpu(entry->e_perm);

		acl->a_entries[n].e_id   = le32_to_cpu(entry->e_id);

		switch(acl->a_entries[n].e_tag) {

		case ACL_USER:

			acl->a_entries[n].e_uid =

				make_kuid(&init_user_ns,

					  le32_to_cpu(entry->e_id));

			break;

		case ACL_GROUP:

			acl->a_entries[n].e_gid =

				make_kgid(&init_user_ns,

					  le32_to_cpu(entry->e_id));

			break;

		default:

			break;

		}

		value += sizeof(struct posix_acl_entry);



	}
@@ -91,7 +104,21 @@ static void *ocfs2_acl_to_xattr(const struct posix_acl *acl, size_t *size) 
	for (n = 0; n < acl->a_count; n++, entry++) {

		entry->e_tag  = cpu_to_le16(acl->a_entries[n].e_tag);

		entry->e_perm = cpu_to_le16(acl->a_entries[n].e_perm);

		entry->e_id   = cpu_to_le32(acl->a_entries[n].e_id);

		switch(acl->a_entries[n].e_tag) {

		case ACL_USER:

			entry->e_id = cpu_to_le32(

				from_kuid(&init_user_ns,

					  acl->a_entries[n].e_uid));

			break;

		case ACL_GROUP:

			entry->e_id = cpu_to_le32(

				from_kgid(&init_user_ns,

					  acl->a_entries[n].e_gid));

			break;

		default:

			entry->e_id = cpu_to_le32(ACL_UNDEFINED_ID);

			break;

		}

	}

	return ocfs2_acl;

}