History

selinux: avc_has_perm_flags has no more users

.. so get rid of it. The only indirect users were all the avc_has_perm() callers which just expanded to have a zero flags argument.

Linus Torvalds committed 13 years ago

Commit cb4fbe51 parent 19e49832 files · +6 −17Browse files

Unified · Split

2 files
  1. security/selinux/avc.c +3 −6
  2. security/selinux/include/avc.h +3 −11
security/selinux/avc.c+3−6
@@ -746,7 +746,6 @@ inline int avc_has_perm_noaudit(u32 ssid, u32 tsid, · 745 unmodified lines
746 * @tclass: target security class746 * @tclass: target security class
747 * @requested: requested permissions, interpreted based on @tclass747 * @requested: requested permissions, interpreted based on @tclass
748 * @auditdata: auxiliary audit data748 * @auditdata: auxiliary audit data
749 * @flags: VFS walk flags
750 *749 *
751 * Check the AVC to determine whether the @requested permissions are granted750 * Check the AVC to determine whether the @requested permissions are granted
752 * for the SID pair (@ssid, @tsid), interpreting the permissions751 * for the SID pair (@ssid, @tsid), interpreting the permissions
@@ -756,17 +755,15 @@ inline int avc_has_perm_noaudit(u32 ssid, u32 tsid, · 3 unmodified lines
756 * permissions are granted, -%EACCES if any permissions are denied, or755 * permissions are granted, -%EACCES if any permissions are denied, or
757 * another -errno upon other errors.756 * another -errno upon other errors.
758 */757 */
759int avc_has_perm_flags(u32 ssid, u32 tsid, u16 tclass,758int avc_has_perm(u32 ssid, u32 tsid, u16 tclass,
760 u32 requested, struct common_audit_data *auditdata,759 u32 requested, struct common_audit_data *auditdata)
761 unsigned flags)
762{760{
763 struct av_decision avd;761 struct av_decision avd;
764 int rc, rc2;762 int rc, rc2;
765 763
766 rc = avc_has_perm_noaudit(ssid, tsid, tclass, requested, 0, &avd);764 rc = avc_has_perm_noaudit(ssid, tsid, tclass, requested, 0, &avd);
767 765
768 rc2 = avc_audit(ssid, tsid, tclass, requested, &avd, rc, auditdata,766 rc2 = avc_audit(ssid, tsid, tclass, requested, &avd, rc, auditdata, 0);
769 flags);
770 if (rc2)767 if (rc2)
771 return rc2;768 return rc2;
772 return rc;769 return rc;
security/selinux/include/avc.h+3−11
@@ -147,17 +147,9 @@ int avc_has_perm_noaudit(u32 ssid, u32 tsid, · 146 unmodified lines
147 unsigned flags,147 unsigned flags,
148 struct av_decision *avd);148 struct av_decision *avd);
149 149
150int avc_has_perm_flags(u32 ssid, u32 tsid,150int avc_has_perm(u32 ssid, u32 tsid,
151 u16 tclass, u32 requested,151 u16 tclass, u32 requested,
152 struct common_audit_data *auditdata,152 struct common_audit_data *auditdata);
153 unsigned);
154
155static inline int avc_has_perm(u32 ssid, u32 tsid,
156 u16 tclass, u32 requested,
157 struct common_audit_data *auditdata)
158{
159 return avc_has_perm_flags(ssid, tsid, tclass, requested, auditdata, 0);
160}
161 153
162u32 avc_policy_seqno(void);154u32 avc_policy_seqno(void);
163 155