Skip to content

apparmor patches are not compatible with 5.15.150 or 5.10.210 #56

@zyga

Description

@zyga

Kirkstone 5.10 and 5.15 kernels are no longer compatible with out-of-tree apparmor patches.

On 5.15.150 we see:

| /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/af_unix.c: In function 'unix_state_double_lock':
| /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/af_unix.c:583:17: error: too few arguments to function 'unix_state_lock_nested'
|   583 |                 unix_state_lock_nested(sk2);
|       |                 ^~~~~~~~~~~~~~~~~~~~~~
| In file included from /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/include/af_unix.h:15,
|                  from /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/af_unix.c:17:
| /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/include/net/af_unix.h:82:20: note: declared here
|    82 | static inline void unix_state_lock_nested(struct sock *sk,
|       |                    ^~~~~~~~~~~~~~~~~~~~~~
| /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/af_unix.c:586:17: error: too few arguments to function 'unix_state_lock_nested'
|   586 |                 unix_state_lock_nested(sk1);
|       |                 ^~~~~~~~~~~~~~~~~~~~~~
| In file included from /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/include/af_unix.h:15,
|                  from /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/af_unix.c:17:
| /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/include/net/af_unix.h:82:20: note: declared here
|    82 | static inline void unix_state_lock_nested(struct sock *sk,
|       |                    ^~~~~~~~~~~~~~~~~~~~~~
| make[3]: *** [/home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/scripts/Makefile.build:286: security/apparmor/af_unix.o] Error 1
| make[3]: *** Waiting for unfinished jobs....

On a 5.10.210 kernel we see:

| /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/af_unix.c: In function 'unix_state_double_lock':
| /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/af_unix.c:583:17: error: too few arguments to function 'unix_state_lock_nested'
|   583 |                 unix_state_lock_nested(sk2);
|       |                 ^~~~~~~~~~~~~~~~~~~~~~
| In file included from /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/include/af_unix.h:15,
|                  from /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/af_unix.c:17:
| /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/include/net/af_unix.h:82:20: note: declared here
|    82 | static inline void unix_state_lock_nested(struct sock *sk,
|       |                    ^~~~~~~~~~~~~~~~~~~~~~
| /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/af_unix.c:586:17: error: too few arguments to function 'unix_state_lock_nested'
|   586 |                 unix_state_lock_nested(sk1);
|       |                 ^~~~~~~~~~~~~~~~~~~~~~
| In file included from /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/include/af_unix.h:15,
|                  from /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/security/apparmor/af_unix.c:17:
| /home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/include/net/af_unix.h:82:20: note: declared here
|    82 | static inline void unix_state_lock_nested(struct sock *sk,
|       |                    ^~~~~~~~~~~~~~~~~~~~~~
| make[3]: *** [/home/zyga/Canonical/meta-snapd/build/tmp/work-shared/qemux86-64/kernel-source/scripts/Makefile.build:286: security/apparmor/af_unix.o] Error 1

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions