xfs: don't generate selinux audit messages for capability testing
Subsystems (2)
PATCH 1/1 xfs: don't generate selinux audit messages for capability testing
From: Darrick J. Wong <[email protected]>
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.
--- fs/xfs/xfs_fsmap.c | 4 ++-- fs/xfs/xfs_ioctl.c | 2 +- fs/xfs/xfs_iops.c | 2 +- kernel/capability.c | 1 + 4 files changed, 5 insertions(+), 4 deletions(-)
fs/xfs/xfs_fsmap.c +2 -2
@@ -864,8 +864,8 @@ xfs_getfsmap( !xfs_getfsmap_is_valid_device(mp, &head->fmh_keys[1]))return -EINVAL ; - use_rmap =capable (CAP_SYS_ADMIN ) && -xfs_has_rmapbt (mp); + use_rmap =xfs_has_rmapbt (mp) && +has_capability_noaudit (current,CAP_SYS_ADMIN ); head->fmh_entries =0 ;/* Set up our device handlers. */
fs/xfs/xfs_ioctl.c +1 -1
@@ -1189,7 +1189,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
@@ -723,7 +723,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
@@ -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,
Darrick J. Wong
NAKQuoted 7 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
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.
Quoted 5 lines
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 tohas_capability_noaudit.Signed-off-by Darrick J. Wong <[email protected]>
NAK, I'll resend with all the people I was supposed to cc an dforgot.
--D
Quoted 60 lines
--- fs/xfs/xfs_fsmap.c | 4 ++-- fs/xfs/xfs_ioctl.c | 2 +- fs/xfs/xfs_iops.c | 2 +- kernel/capability.c | 1 + 4 files changed, 5 insertions(+), 4 deletions(-)fs/xfs/xfs_fsmap.c +2
-2@@ -864,8 +864,8 @@ xfs_getfsmap( !xfs_getfsmap_is_valid_device(mp, &head->fmh_keys[1]))return -EINVAL ; - use_rmap =capable (CAP_SYS_ADMIN ) && -xfs_has_rmapbt (mp); + use_rmap =xfs_has_rmapbt (mp) && +has_capability_noaudit (current,CAP_SYS_ADMIN ); head->fmh_entries =0 ;/* Set up our device handlers. */ fs/xfs/xfs_ioctl.c +1
-1@@ -1189,7 +1189,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@@ -723,7 +723,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@@ -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,