Commit 7595b66a authored Jun 24, 2025 by Linus Torvalds

selinux

Pull selinux fix from Paul Moore:
 "Another small SELinux patch to fix a problem seen by the dracut-ng
  folks during early boot when SELinux is enabled, but the policy has
  yet to be loaded"

* tag 'selinux-pr-20250624' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: change security_compute_sid to return the ssid or tsid on match

parents 78f4e737 fde46f60

security/selinux/ss/services.c

+11 −5

Original line number	Diff line number	Diff line
		@@ -1909,12 +1909,18 @@ static int security_compute_sid(u32 ssid,
		goto out_unlock;
		}
		/* Obtain the sid for the context. */
		if (context_equal(scontext, &newcontext))
		*out_sid = ssid;
		else if (context_equal(tcontext, &newcontext))
		*out_sid = tsid;
		else {
		rc = sidtab_context_to_sid(sidtab, &newcontext, out_sid);
		if (rc == -ESTALE) {
		rcu_read_unlock();
		context_destroy(&newcontext);
		goto retry;
		}
		}
		out_unlock:
		rcu_read_unlock();
		context_destroy(&newcontext);