.. 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.
Unified · Split
| @@ -746,7 +746,6 @@ inline int avc_has_perm_noaudit(u32 ssid, u32 tsid, · 745 unmodified lines | ||
| 746 | 746 | * @tclass: target security class |
| 747 | 747 | * @requested: requested permissions, interpreted based on @tclass |
| 748 | 748 | * @auditdata: auxiliary audit data |
| 749 | − * @flags: VFS walk flags | |
| 750 | 749 | * |
| 751 | 750 | * Check the AVC to determine whether the @requested permissions are granted |
| 752 | 751 | * 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 | 755 | * permissions are granted, -%EACCES if any permissions are denied, or |
| 757 | 756 | * another -errno upon other errors. |
| 758 | 757 | */ |
| 759 | −int avc_has_perm_flags(u32 ssid, u32 tsid, u16 tclass, | |
| 760 | − u32 requested, struct common_audit_data *auditdata, | |
| 761 | − unsigned flags) | |
| 758 | +int avc_has_perm(u32 ssid, u32 tsid, u16 tclass, | |
| 759 | + u32 requested, struct common_audit_data *auditdata) | |
| 762 | 760 | { |
| 763 | 761 | struct av_decision avd; |
| 764 | 762 | int rc, rc2; |
| 765 | 763 | |
| 766 | 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, | |
| 769 | − flags); | |
| 766 | + rc2 = avc_audit(ssid, tsid, tclass, requested, &avd, rc, auditdata, 0); | |
| 770 | 767 | if (rc2) |
| 771 | 768 | return rc2; |
| 772 | 769 | return rc; |
| @@ -147,17 +147,9 @@ int avc_has_perm_noaudit(u32 ssid, u32 tsid, · 146 unmodified lines | ||
| 147 | 147 | unsigned flags, |
| 148 | 148 | struct av_decision *avd); |
| 149 | 149 | |
| 150 | −int avc_has_perm_flags(u32 ssid, u32 tsid, | |
| 151 | − u16 tclass, u32 requested, | |
| 152 | − struct common_audit_data *auditdata, | |
| 153 | − unsigned); | |
| 154 | − | |
| 155 | −static 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 | −} | |
| 150 | +int avc_has_perm(u32 ssid, u32 tsid, | |
| 151 | + u16 tclass, u32 requested, | |
| 152 | + struct common_audit_data *auditdata); | |
| 161 | 153 | |
| 162 | 154 | u32 avc_policy_seqno(void); |
| 163 | 155 | |