# git rev-parse -q --verify 6bdfe2d88b9ff8b0cce32ce87cd47c0e9d665f48^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master # git rev-parse -q --verify 6bdfe2d88b9ff8b0cce32ce87cd47c0e9d665f48^{commit} 6bdfe2d88b9ff8b0cce32ce87cd47c0e9d665f48 # git checkout -q -f -B kisskb 6bdfe2d88b9ff8b0cce32ce87cd47c0e9d665f48 # git clean -qxdf # < git log -1 # commit 6bdfe2d88b9ff8b0cce32ce87cd47c0e9d665f48 # Merge: 136cc1e1f5be 6cede10161be # Author: Linus Torvalds # Date: Fri Nov 3 09:48:17 2023 -1000 # # Merge tag 'apparmor-pr-2023-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor # # Pull apparmor updates from John Johansen: # "This adds initial support for mediating io_uring and userns creation. # Adds a new restriction that tightens the use of change_profile, and a # couple of optimizations to reduce performance bottle necks that have # been found when retrieving the current task's secid and allocating # work buffers. # # The majority of the patch set continues cleaning up and simplifying # the code (fixing comments, removing now dead functions, and macros # etc). Finally there are 4 bug fixes, with the regression fix having # had a couple months of testing. # # Features: # - optimize retrieving current task secid # - add base io_uring mediation # - add base userns mediation # - improve buffer allocation # - allow restricting unprivilege change_profile # # Cleanups: # - Fix kernel doc comments # - remove unused declarations # - remove unused functions # - remove unneeded #ifdef # - remove unused macros # - mark fns static # - cleanup fn with unused return values # - cleanup audit data # - pass cred through to audit data # - refcount the pdb instead of using duplicates # - make SK_CTX macro an inline fn # - some comment cleanups # # Bug fixes: # - fix regression in mount mediation # - fix invalid refenece # - use passed in gfp flags # - advertise avaiability of extended perms and disconnected.path" # # * tag 'apparmor-pr-2023-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor: (39 commits) # apparmor: Fix some kernel-doc comments # apparmor: Fix one kernel-doc comment # apparmor: Fix some kernel-doc comments # apparmor: mark new functions static # apparmor: Fix regression in mount mediation # apparmor: cache buffers on percpu list if there is lock contention # apparmor: add io_uring mediation # apparmor: add user namespace creation mediation # apparmor: allow restricting unprivileged change_profile # apparmor: advertise disconnected.path is available # apparmor: refcount the pdb # apparmor: provide separate audit messages for file and policy checks # apparmor: pass cred through to audit info. # apparmor: rename audit_data->label to audit_data->subj_label # apparmor: combine common_audit_data and apparmor_audit_data # apparmor: rename SK_CTX() to aa_sock and make it an inline fn # apparmor: Optimize retrieving current task secid # apparmor: remove unused functions in policy_ns.c/.h # apparmor: remove unneeded #ifdef in decompress_zstd() # apparmor: fix invalid reference on profile->disconnected # ... # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 6bdfe2d88b9ff8b0cce32ce87cd47c0e9d665f48 # make -s -j 40 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- defconfig # < make -s -j 40 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 40 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 40 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- /kisskb/src/kernel/bpf/task_iter.c: In function 'bpf_iter_css_task_new': /kisskb/src/kernel/bpf/task_iter.c:917:7: error: 'CSS_TASK_ITER_PROCS' undeclared (first use in this function); did you mean 'BPF_TASK_ITER_TGID'? case CSS_TASK_ITER_PROCS | CSS_TASK_ITER_THREADED: ^~~~~~~~~~~~~~~~~~~ BPF_TASK_ITER_TGID /kisskb/src/kernel/bpf/task_iter.c:917:7: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/kernel/bpf/task_iter.c:917:29: error: 'CSS_TASK_ITER_THREADED' undeclared (first use in this function); did you mean 'BPF_TASK_ITER_TGID'? case CSS_TASK_ITER_PROCS | CSS_TASK_ITER_THREADED: ^~~~~~~~~~~~~~~~~~~~~~ BPF_TASK_ITER_TGID /kisskb/src/kernel/bpf/task_iter.c:925:53: error: invalid application of 'sizeof' to incomplete type 'struct css_task_iter' kit->css_it = bpf_mem_alloc(&bpf_global_ma, sizeof(struct css_task_iter)); ^~~~~~ /kisskb/src/kernel/bpf/task_iter.c:928:2: error: implicit declaration of function 'css_task_iter_start'; did you mean 'task_seq_start'? [-Werror=implicit-function-declaration] css_task_iter_start(css, flags, kit->css_it); ^~~~~~~~~~~~~~~~~~~ task_seq_start /kisskb/src/kernel/bpf/task_iter.c: In function 'bpf_iter_css_task_next': /kisskb/src/kernel/bpf/task_iter.c:938:9: error: implicit declaration of function 'css_task_iter_next'; did you mean 'class_dev_iter_next'? [-Werror=implicit-function-declaration] return css_task_iter_next(kit->css_it); ^~~~~~~~~~~~~~~~~~ class_dev_iter_next /kisskb/src/kernel/bpf/task_iter.c:938:9: warning: returning 'int' from a function with return type 'struct task_struct *' makes pointer from integer without a cast [-Wint-conversion] return css_task_iter_next(kit->css_it); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/kernel/bpf/task_iter.c: In function 'bpf_iter_css_task_destroy': /kisskb/src/kernel/bpf/task_iter.c:947:2: error: implicit declaration of function 'css_task_iter_end'; did you mean 'vma_iter_end'? [-Werror=implicit-function-declaration] css_task_iter_end(kit->css_it); ^~~~~~~~~~~~~~~~~ vma_iter_end cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: kernel/bpf/task_iter.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:480: kernel/bpf] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:480: kernel] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/Makefile:1913: .] Error 2 make[1]: *** [/kisskb/src/Makefile:234: __sub-make] Error 2 make: *** [Makefile:234: __sub-make] Error 2 Command 'make -s -j 40 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_defconfig_m68k-gcc8 # Build took: 0:00:58.035457