diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-12-10 19:32:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-12-10 19:33:03 +0100 |
| commit | 05453d36a2fcaf1ea49939f8f9a8cd9dcd516159 (patch) | |
| tree | cb43431bb6d4dbd428e43680cc070935a2bf6268 /security/selinux/hooks.c | |
| parent | x86/apic: Remove "disablelapic" cmdline option (diff) | |
| parent | Merge tag 'locking_urgent_for_v6.13_rc3' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | linux-05453d36a2fcaf1ea49939f8f9a8cd9dcd516159.tar.gz linux-05453d36a2fcaf1ea49939f8f9a8cd9dcd516159.zip | |
Merge branch 'linus' into x86/cleanups, to resolve conflict
These two commits interact:
upstream: 73da582a476e ("x86/cpu/topology: Remove limit of CPUs due to disabled IO/APIC")
x86/cleanups: 13148e22c151 ("x86/apic: Remove "disablelapic" cmdline option")
Resolve it.
Conflicts:
arch/x86/kernel/cpu/topology.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index f5a08f94e094..366c87a40bd1 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -5738,7 +5738,7 @@ static unsigned int selinux_ip_output(void *priv, struct sk_buff *skb, /* we do this in the LOCAL_OUT path and not the POST_ROUTING path * because we want to make sure we apply the necessary labeling * before IPsec is applied so we can leverage AH protection */ - sk = skb->sk; + sk = sk_to_full_sk(skb->sk); if (sk) { struct sk_security_struct *sksec; |