Commit 66f6e9ab authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Zheng Zengkai
Browse files

xfs: don't generate selinux audit messages for capability testing 

mainline inclusion
from mainline-v5.16-rc3
commit eba0549b
category: bugfix
bugzilla: 187526,https://gitee.com/openeuler/kernel/issues/I4KIAO

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eba0549bc7d100691c13384b774346b8aa9cf9a9



--------------------------------

There are a few places where we test the current process' capability set
to decide if we're going to be more or less generous with resource
acquisition for a system call.  If the process doesn't have the
capability, we can continue the call, albeit in a degraded mode.

These are /not/ the actual security decisions, so it's not proper to use
capable(), which (in certain selinux setups) causes audit messages to
get logged.  Switch them to has_capability_noaudit.

Fixes: 7317a03d ("xfs: refactor inode ownership change transaction/inode/quota allocation idiom")
Fixes: ea9a46e1 ("xfs: only return detailed fsmap info if the caller has CAP_SYS_ADMIN")
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Cc: Dave Chinner <david@fromorbit.com>
Reviewed-by: default avatarOndrej Mosnacek <omosnace@redhat.com>
Acked-by: default avatarSerge Hallyn <serge@hallyn.com>
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarGuo Xuenan <guoxuenan@huawei.com>

Conflicts:
	fs/xfs/xfs_fsmap.c
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 7ba028af

fs/xfs/xfs_fsmap.c

+2 −2
Original line number Diff line number Diff line
@@ -848,8 +848,8 @@ xfs_getfsmap( 
	    !xfs_getfsmap_is_valid_device(mp, &head->fmh_keys[1]))

		return -EINVAL;



	use_rmap = capable(CAP_SYS_ADMIN) &&

		   xfs_sb_version_hasrmapbt(&mp->m_sb);

	use_rmap = xfs_sb_version_hasrmapbt(&mp->m_sb) &&

		   has_capability_noaudit(current, CAP_SYS_ADMIN);

	head->fmh_entries = 0;



	/* Set up our device handlers. */

fs/xfs/xfs_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1290,7 +1290,7 @@ xfs_ioctl_setattr_get_trans( 
		goto out_error;



	error = xfs_trans_alloc_ichange(ip, NULL, NULL, pdqp,

			capable(CAP_FOWNER), &tp);

			has_capability_noaudit(current, CAP_FOWNER), &tp);

	if (error)

		goto out_error;

fs/xfs/xfs_iops.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ xfs_setattr_nonsize( 
	}



	error = xfs_trans_alloc_ichange(ip, udqp, gdqp, NULL,

			capable(CAP_FOWNER), &tp);

			has_capability_noaudit(current, CAP_FOWNER), &tp);

	if (error)

		goto out_dqrele;

kernel/capability.c

+1 −0
Original line number Diff line number Diff line
@@ -360,6 +360,7 @@ bool has_capability_noaudit(struct task_struct *t, int cap) 
{

	return has_ns_capability_noaudit(t, &init_user_ns, cap);

}

EXPORT_SYMBOL(has_capability_noaudit);



static bool ns_capable_common(struct user_namespace *ns,

			      int cap,