github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-05 21:15:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

selinux/stable-6.16 PR 20250624

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCgAyFiEES0KozwfymdVUl37v6iDy2pc3iXMFAmhbPQcUHHBhdWxAcGF1
 bC1tb29yZS5jb20ACgkQ6iDy2pc3iXNwaA//VNF5wWWsUdTzX9THvylI18EjRwY0
 A4FjifBYUb2Rb9KesZ40UXqqDyItHrLP1vpPuc6K6m1nYU5R1p4pnlX0RL7sXHum
 KoDJIf1P4EbFxvcr3VvyfXVC0ibeAVhIb7ZvU8Kx6x2sWSCWroE1Rh/tzk1vHE19
 zIqyEOEp3qg4mP4GNBWDmBxv3+Xy4784roW+bf2lHXbyAuacb28Qwc6bCwU39Yt9
 2jBxLP7ACOMWk5mOG5+Koj+CD7FYD7AO8e5NuKY1bQ484z6EEOUKAUXNiYYrQAmF
 aPg0CQ1T4ufJzehdAH8diHSTTFYi1fYVvdYFApUgydyYlhQP29epSU8U9oAFjdnu
 PZdYI5DoISrAWFEf7WU5G5qeAfqvkgo3uNNsEpNRR7vJQzguCctmOxr87W78ISQr
 XJZQ4EAutieVP5Nv0r3kCc95LWpc+rI6kEcFOTD01clMZcDQoR9Wikcg8gmORxHn
 TdeTdOn5TU9CjsBJ1kyZhBTB+RWEYkP8mkwTIX4Q+MLKH5Hy7q+/jAjxh6S+ryzq
 yk7a4ytzaH1vIXq1DFUEGIxwJhrWKlZxHroS2BU6rIm9waftz4brYKa0rS1EllAi
 ILStzgBEuUOQv77eCxgBtcU+7KTGttQm94RMom+E+WNpU/Ectm6PwHlwhyZd5ke/
 Z+uqUufaHe098lg=
 =6VNx
 -----END PGP SIGNATURE-----

Merge tag 'selinux-pr-20250624' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/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
This commit is contained in:
Linus Torvalds 2025-06-24 17:20:43 -07:00
commit 7595b66ae9
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
security/selinux/ss/services.c
View File

@ -1909,11 +1909,17 @@ static int security_compute_sid(u32 ssid,
goto out_unlock;
}
/* Obtain the sid for the context. */
rc = sidtab_context_to_sid(sidtab, &newcontext, out_sid);
if (rc == -ESTALE) {
rcu_read_unlock();
context_destroy(&newcontext);
goto retry;
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();