APPLIED[L]: [Lunar][PULL] LSM stacking and AppArmor refresh for 6.2 kernel

[Andrea Righi]

On Wed, Mar 22, 2023 at 08:39:23AM +0100, Andrea Righi wrote:
> On Tue, Mar 21, 2023 at 01:20:13PM -0700, John Johansen wrote:
> > << snip >>
> > 
> > > John - patch 25 fails to apply. Please rebase against current tip Ubuntu-6.2.0-18.18
> > 
> > done (below), if we want a new request email lmk
> 
> Not needed, already applied to lunar/linux.
> 
> Thanks!
> -Andrea

Actually there are some build issues with the new patch set on armhf and ppc64:

 - armhf:

/build/lunar/include/linux/syscalls.h:242:25: error: conflicting types for 'sys_lsm_self_attr'; have 'long int(struct lsm_ctx *, size_t *, int)' {aka 'long int(struct lsm_ctx *, unsigned int *, int)'}
  242 |         asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))       \
      |                         ^~~
/build/lunar/include/linux/syscalls.h:228:9: note: in expansion of macro '__SYSCALL_DEFINEx'
  228 |         __SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~
/build/lunar/include/linux/syscalls.h:219:36: note: in expansion of macro 'SYSCALL_DEFINEx'
  219 | #define SYSCALL_DEFINE3(name, ...) SYSCALL_DEFINEx(3, _##name, __VA_ARGS__)
      |                                    ^~~~~~~~~~~~~~~
/build/lunar/security/lsm_syscalls.c:47:1: note: in expansion of macro 'SYSCALL_DEFINE3'
   47 | SYSCALL_DEFINE3(lsm_self_attr,
      | ^~~~~~~~~~~~~~~
/build/lunar/include/linux/syscalls.h:1061:17: note: previous declaration of 'sys_lsm_self_attr' with type 'long int(struct lsm_ctx *, size_t *, int)' {aka 'long int(struct lsm_ctx *, unsigned int *, int)'}
 1061 | asmlinkage long sys_lsm_self_attr(struct lsm_ctx *ctx, size_t *size, int flags);
      |                 ^~~~~~~~~~~~~~~~~

 - ppc64el:

/build/lunar/include/linux/syscalls.h:242:25: error: conflicting types for 'sys_lsm_self_attr'; have 'long int(struct lsm_ctx *, size_t *, int)' {aka 'long int(struct lsm_ctx *, long unsigned int *, int)'}
  242 |         asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))       \
      |                         ^~~
/build/lunar/include/linux/syscalls.h:228:9: note: in expansion of macro '__SYSCALL_DEFINEx'
  228 |         __SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
      |         ^~~~~~~~~~~~~~~~~
/build/lunar/include/linux/syscalls.h:219:36: note: in expansion of macro 'SYSCALL_DEFINEx'
  219 | #define SYSCALL_DEFINE3(name, ...) SYSCALL_DEFINEx(3, _##name, __VA_ARGS__)
      |                                    ^~~~~~~~~~~~~~~
/build/lunar/security/lsm_syscalls.c:47:1: note: in expansion of macro 'SYSCALL_DEFINE3'
   47 | SYSCALL_DEFINE3(lsm_self_attr,
      | ^~~~~~~~~~~~~~~
/build/lunar/include/linux/syscalls.h:1061:17: note: previous declaration of 'sys_lsm_self_attr' with type 'long int(struct lsm_ctx *, size_t *, int)' {aka 'long int(struct lsm_ctx *, long unsigned int *, int)'}
 1061 | asmlinkage long sys_lsm_self_attr(struct lsm_ctx *ctx, size_t *size, int flags);
      |                 ^~~~~~~~~~~~~~~~~

In file included from /build/lunar/arch/powerpc/kernel/ptrace/ptrace.c:22:
/build/lunar/include/linux/syscalls.h:1061:42: error: 'struct lsm_ctx' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
 1061 | asmlinkage long sys_lsm_self_attr(struct lsm_ctx *ctx, size_t *size, int flags);
      |                                          ^~~~~~~

-Andrea