Commit eba0549b authored by Darrick J. Wong's avatar Darrick J. Wong

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

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>
parent 1a39ae41
...@@ -864,8 +864,8 @@ xfs_getfsmap( ...@@ -864,8 +864,8 @@ xfs_getfsmap(
!xfs_getfsmap_is_valid_device(mp, &head->fmh_keys[1])) !xfs_getfsmap_is_valid_device(mp, &head->fmh_keys[1]))
return -EINVAL; return -EINVAL;
use_rmap = capable(CAP_SYS_ADMIN) && use_rmap = xfs_has_rmapbt(mp) &&
xfs_has_rmapbt(mp); has_capability_noaudit(current, CAP_SYS_ADMIN);
head->fmh_entries = 0; head->fmh_entries = 0;
/* Set up our device handlers. */ /* Set up our device handlers. */
......
...@@ -1189,7 +1189,7 @@ xfs_ioctl_setattr_get_trans( ...@@ -1189,7 +1189,7 @@ xfs_ioctl_setattr_get_trans(
goto out_error; goto out_error;
error = xfs_trans_alloc_ichange(ip, NULL, NULL, pdqp, error = xfs_trans_alloc_ichange(ip, NULL, NULL, pdqp,
capable(CAP_FOWNER), &tp); has_capability_noaudit(current, CAP_FOWNER), &tp);
if (error) if (error)
goto out_error; goto out_error;
......
...@@ -723,7 +723,7 @@ xfs_setattr_nonsize( ...@@ -723,7 +723,7 @@ xfs_setattr_nonsize(
} }
error = xfs_trans_alloc_ichange(ip, udqp, gdqp, NULL, error = xfs_trans_alloc_ichange(ip, udqp, gdqp, NULL,
capable(CAP_FOWNER), &tp); has_capability_noaudit(current, CAP_FOWNER), &tp);
if (error) if (error)
goto out_dqrele; goto out_dqrele;
......
...@@ -360,6 +360,7 @@ bool has_capability_noaudit(struct task_struct *t, int cap) ...@@ -360,6 +360,7 @@ bool has_capability_noaudit(struct task_struct *t, int cap)
{ {
return has_ns_capability_noaudit(t, &init_user_ns, 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, static bool ns_capable_common(struct user_namespace *ns,
int cap, int cap,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment