Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a5dda683328f99c781f92c66cc52ffc0639bef58

Authored by Eric Paris
Committed by James Morris
1 parent 4cb912f1d1
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

SELinux: check seqno when updating an avc_node 

The avc update node callbacks do not check the seqno of the caller with the
seqno of the node found.  It is possible that a policy change could happen
(although almost impossibly unlikely) in which a permissive or
permissive_domain decision is not valid for the entry found.  Simply pass
and check that the seqno of the caller and the seqno of the node found
match.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by:  Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>

Showing 1 changed file with 6 additions and 3 deletions Side-by-side Diff

security/selinux/avc.c
Diff comments   View file @ a5dda68
... ... @@ -742,13 +742,15 @@
742 742 * @event : Updating event
743 743 * @perms : Permission mask bits
744 744 * @ssid,@tsid,@tclass : identifier of an AVC entry
  745 + * @seqno : sequence number when decision was made
745 746 *
746 747 * if a valid AVC entry doesn't exist,this function returns -ENOENT.
747 748 * if kmalloc() called internal returns NULL, this function returns -ENOMEM.
748 749 * otherwise, this function update the AVC entry. The original AVC-entry object
749 750 * will release later by RCU.
750 751 */
751   -static int avc_update_node(u32 event, u32 perms, u32 ssid, u32 tsid, u16 tclass)
  752 +static int avc_update_node(u32 event, u32 perms, u32 ssid, u32 tsid, u16 tclass,
  753 + u32 seqno)
752 754 {
753 755 int hvalue, rc = 0;
754 756 unsigned long flag;
... ... @@ -767,7 +769,8 @@
767 769 list_for_each_entry(pos, &avc_cache.slots[hvalue], list) {
768 770 if (ssid == pos->ae.ssid &&
769 771 tsid == pos->ae.tsid &&
770   - tclass == pos->ae.tclass){
  772 + tclass == pos->ae.tclass &&
  773 + seqno == pos->ae.avd.seqno){
771 774 orig = pos;
772 775 break;
773 776 }
... ... @@ -908,7 +911,7 @@
908 911 rc = -EACCES;
909 912 else if (!selinux_enforcing || security_permissive_sid(ssid))
910 913 avc_update_node(AVC_CALLBACK_GRANT, requested, ssid,
911   - tsid, tclass);
  914 + tsid, tclass, p_ae->avd.seqno);
912 915 else
913 916 rc = -EACCES;
914 917 }