]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
projects / mirror_ubuntu-jammy-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f676cc0) | patch
UBUNTU: SAUCE: apparmor: rename aa_sock() to aa_unix_sk()
authorJohn Johansen <john.johansen@canonical.com>
Tue, 6 Oct 2020 21:01:04 +0000 (14:01 -0700)
committerPaolo Pisati <paolo.pisati@canonical.com>
Tue, 2 Nov 2021 07:24:51 +0000 (08:24 +0100)
commit6e6d3c16ddf3ff2446098f0fa0bc9d216e397029
tree4319cfed43cbf68a93921b08c4d0cfdd4b380070tree
parentf676cc049daa0ec47697b1532486b8b7d228dd58commit | diff
UBUNTU: SAUCE: apparmor: rename aa_sock() to aa_unix_sk()

The LSM stacking patches introduce and use a macro aa_sock
which conflicts with the apparmor unix mediation patches. Rename
aa_sock() in apparmor to avoid a conflict.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Andrea Righi <andrea.righi@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
security/apparmor/af_unix.c diff | blob | blame | history
Ubuntu Jammy Linux kernel mirror