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

Commit 488c8ef0 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

ocfs2: Compare kuids and kgids using uid_eq and gid_eq 



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

fs/ocfs2/file.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1175,14 +1175,14 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 
		}

		}

	}

	}





	if ((attr->ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||

	if ((attr->ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||

	    (attr->ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {

	    (attr->ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {

		/*

		/*

		 * Gather pointers to quota structures so that allocation /

		 * Gather pointers to quota structures so that allocation /

		 * freeing of quota structures happens here and not inside

		 * freeing of quota structures happens here and not inside

		 * dquot_transfer() where we have problems with lock ordering

		 * dquot_transfer() where we have problems with lock ordering

		 */

		 */

		if (attr->ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid

		if (attr->ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)

		    && OCFS2_HAS_RO_COMPAT_FEATURE(sb,

		    && OCFS2_HAS_RO_COMPAT_FEATURE(sb,

		    OCFS2_FEATURE_RO_COMPAT_USRQUOTA)) {

		    OCFS2_FEATURE_RO_COMPAT_USRQUOTA)) {

			transfer_to[USRQUOTA] = dqget(sb, make_kqid_uid(attr->ia_uid));

			transfer_to[USRQUOTA] = dqget(sb, make_kqid_uid(attr->ia_uid));
@@ -1191,7 +1191,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 
				goto bail_unlock;

				goto bail_unlock;

			}

			}

		}

		}

		if (attr->ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid

		if (attr->ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)

		    && OCFS2_HAS_RO_COMPAT_FEATURE(sb,

		    && OCFS2_HAS_RO_COMPAT_FEATURE(sb,

		    OCFS2_FEATURE_RO_COMPAT_GRPQUOTA)) {

		    OCFS2_FEATURE_RO_COMPAT_GRPQUOTA)) {

			transfer_to[GRPQUOTA] = dqget(sb, make_kqid_gid(attr->ia_gid));

			transfer_to[GRPQUOTA] = dqget(sb, make_kqid_gid(attr->ia_gid));

fs/ocfs2/refcounttree.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4407,7 +4407,7 @@ static int ocfs2_vfs_reflink(struct dentry *old_dentry, struct inode *dir, 
	 * rights to do so.

	 * rights to do so.

	 */

	 */

	if (preserve) {

	if (preserve) {

		if ((current_fsuid() != inode->i_uid) && !capable(CAP_CHOWN))

		if (!uid_eq(current_fsuid(), inode->i_uid) && !capable(CAP_CHOWN))

			return -EPERM;

			return -EPERM;

		if (!in_group_p(inode->i_gid) && !capable(CAP_CHOWN))

		if (!in_group_p(inode->i_gid) && !capable(CAP_CHOWN))

			return -EPERM;

			return -EPERM;