# git rev-parse -q --verify 467f8165a2b0e6accf3d0dd9c8089b1dbde29f7f^{commit} 467f8165a2b0e6accf3d0dd9c8089b1dbde29f7f already have revision, skipping fetch # git checkout -q -f -B kisskb 467f8165a2b0e6accf3d0dd9c8089b1dbde29f7f # git clean -qxdf # < git log -1 # commit 467f8165a2b0e6accf3d0dd9c8089b1dbde29f7f # Merge: 3872f516aab3 6abc20f8f879 # Author: Linus Torvalds # Date: Sat Dec 19 13:03:12 2020 -0800 # # Merge tag 'close-range-cloexec-unshare-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux # # Pull close_range fix from Christian Brauner: # "syzbot reported a bug when asking close_range() to unshare the file # descriptor table and making all fds close-on-exec. # # If CLOSE_RANGE_UNSHARE the caller will receive a private file # descriptor table in case their file descriptor table is currently # shared before operating on the requested file descriptor range. # # For the case where the caller has requested all file descriptors to be # actually closed via e.g. close_range(3, ~0U, CLOSE_RANGE_UNSHARE) the # kernel knows that the caller does not need any of the file descriptors # anymore and will optimize the close operation by only copying all # files in the range from 0 to 3 and no others. # # However, if the caller requested CLOSE_RANGE_CLOEXEC together with # CLOSE_RANGE_UNSHARE the caller wants to still make use of the file # descriptors so the kernel needs to copy all of them and can't # optimize. # # The original patch didn't account for this and thus could cause oopses # as evidenced by the syzbot report because it assumed that all fds had # been copied. Fix this by handling the CLOSE_RANGE_CLOEXEC case and # copying all fds if the two flags are specified together. # # This should've been caught in the selftests but the original patch # didn't cover this case and I didn't catch it during review. So in # addition to the bugfix I'm also adding selftests. They will reliably # reproduce the bug on a non-fixed kernel and allows us to catch # regressions and verify correct behavior. # # Note, the kernel selftest tree contained a bunch of changes that made # the original selftest fail to compile so there are small fixups in # here make them compile without warnings" # # * tag 'close-range-cloexec-unshare-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux: # selftests/core: add regression test for CLOSE_RANGE_UNSHARE | CLOSE_RANGE_CLOEXEC # selftests/core: add test for CLOSE_RANGE_UNSHARE | CLOSE_RANGE_CLOEXEC # selftests/core: handle missing syscall number for close_range # selftests/core: fix close_range_test build after XFAIL removal # close_range: unshare all fds for CLOSE_RANGE_UNSHARE | CLOSE_RANGE_CLOEXEC # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux-ld --version # < git log --format=%s --max-count=1 467f8165a2b0e6accf3d0dd9c8089b1dbde29f7f # < make -s -j 48 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- defconfig arch/ia64/configs/generic_defconfig:58:warning: override: reassigning to symbol ATA arch/ia64/configs/generic_defconfig:59:warning: override: reassigning to symbol ATA_PIIX # < make -s -j 48 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- help # make -s -j 48 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- olddefconfig # make -s -j 48 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] In file included from /kisskb/src/include/linux/numa.h:25:0, from /kisskb/src/include/linux/async.h:13, from /kisskb/src/kernel/async.c:47: /kisskb/src/arch/ia64/include/asm/sparsemem.h:14:40: warning: "PAGE_SHIFT" is not defined [-Wundef] #if ((CONFIG_FORCE_MAX_ZONEORDER - 1 + PAGE_SHIFT) > SECTION_SIZE_BITS) ^ In file included from /kisskb/src/include/linux/gfp.h:6:0, from /kisskb/src/include/linux/xarray.h:14, from /kisskb/src/include/linux/radix-tree.h:19, from /kisskb/src/include/linux/idr.h:15, from /kisskb/src/include/linux/kernfs.h:13, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/energy_model.h:7, from /kisskb/src/include/linux/device.h:16, from /kisskb/src/include/linux/async.h:14, from /kisskb/src/kernel/async.c:47: /kisskb/src/include/linux/mmzone.h:1156:2: error: #error Allocator MAX_ORDER exceeds SECTION_SIZE #error Allocator MAX_ORDER exceeds SECTION_SIZE ^ make[2]: *** [/kisskb/src/scripts/Makefile.build:279: kernel/async.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1805: kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/numa.h:25:0, from /kisskb/src/include/linux/async.h:13, from /kisskb/src/drivers/base/bus.c:11: /kisskb/src/arch/ia64/include/asm/sparsemem.h:14:40: warning: "PAGE_SHIFT" is not defined [-Wundef] #if ((CONFIG_FORCE_MAX_ZONEORDER - 1 + PAGE_SHIFT) > SECTION_SIZE_BITS) ^ In file included from /kisskb/src/include/linux/gfp.h:6:0, from /kisskb/src/include/linux/xarray.h:14, from /kisskb/src/include/linux/radix-tree.h:19, from /kisskb/src/include/linux/idr.h:15, from /kisskb/src/include/linux/kernfs.h:13, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/energy_model.h:7, from /kisskb/src/include/linux/device.h:16, from /kisskb/src/include/linux/async.h:14, from /kisskb/src/drivers/base/bus.c:11: /kisskb/src/include/linux/mmzone.h:1156:2: error: #error Allocator MAX_ORDER exceeds SECTION_SIZE #error Allocator MAX_ORDER exceeds SECTION_SIZE ^ make[3]: *** [/kisskb/src/scripts/Makefile.build:279: drivers/base/bus.o] Error 1 make[3]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/gpu/drm/ttm/ttm_pool.c:243:21: warning: 'ttm_pool_type_count' defined but not used [-Wunused-function] static unsigned int ttm_pool_type_count(struct ttm_pool_type *pt) ^ make[2]: *** [/kisskb/src/scripts/Makefile.build:496: drivers/base] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/numa.h:25:0, from /kisskb/src/include/linux/async.h:13, from /kisskb/src/drivers/acpi/battery.c:13: /kisskb/src/arch/ia64/include/asm/sparsemem.h:14:40: warning: "PAGE_SHIFT" is not defined [-Wundef] #if ((CONFIG_FORCE_MAX_ZONEORDER - 1 + PAGE_SHIFT) > SECTION_SIZE_BITS) ^ In file included from /kisskb/src/include/linux/gfp.h:6:0, from /kisskb/src/include/linux/xarray.h:14, from /kisskb/src/include/linux/radix-tree.h:19, from /kisskb/src/include/linux/idr.h:15, from /kisskb/src/include/linux/kernfs.h:13, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/energy_model.h:7, from /kisskb/src/include/linux/device.h:16, from /kisskb/src/include/linux/async.h:14, from /kisskb/src/drivers/acpi/battery.c:13: /kisskb/src/include/linux/mmzone.h:1156:2: error: #error Allocator MAX_ORDER exceeds SECTION_SIZE #error Allocator MAX_ORDER exceeds SECTION_SIZE ^ make[3]: *** [/kisskb/src/scripts/Makefile.build:279: drivers/acpi/battery.o] Error 1 make[3]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/ia64/include/uapi/asm/intrinsics.h:22:0, from /kisskb/src/arch/ia64/include/asm/intrinsics.h:11, from /kisskb/src/arch/ia64/include/asm/timex.h:14, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/time32.h:13, from /kisskb/src/include/linux/time.h:60, from /kisskb/src/fs/nfs/read.c:11: /kisskb/src/fs/nfs/read.c: In function 'nfs_read_completion': /kisskb/src/arch/ia64/include/uapi/asm/cmpxchg.h:57:2: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr))) __xchg((unsigned long) (x), (ptr), sizeof(*(ptr)))) ^ /kisskb/src/fs/nfs/read.c:196:5: note: in expansion of macro 'xchg' xchg(&nfs_req_openctx(req)->error, error); ^ /kisskb/src/fs/nfs/read.c: In function 'nfs_readpage': /kisskb/src/arch/ia64/include/uapi/asm/cmpxchg.h:57:2: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr))) __xchg((unsigned long) (x), (ptr), sizeof(*(ptr)))) ^ /kisskb/src/fs/nfs/read.c:355:2: note: in expansion of macro 'xchg' xchg(&ctx->error, 0); ^ In file included from /kisskb/src/include/linux/numa.h:25:0, from /kisskb/src/include/linux/nodemask.h:96, from /kisskb/src/include/linux/mount.h:15, from /kisskb/src/fs/pnode.c:9: /kisskb/src/arch/ia64/include/asm/sparsemem.h:14:40: warning: "PAGE_SHIFT" is not defined [-Wundef] #if ((CONFIG_FORCE_MAX_ZONEORDER - 1 + PAGE_SHIFT) > SECTION_SIZE_BITS) ^ In file included from /kisskb/src/include/linux/gfp.h:6:0, from /kisskb/src/include/linux/xarray.h:14, from /kisskb/src/include/linux/radix-tree.h:19, from /kisskb/src/include/linux/fs.h:15, from /kisskb/src/fs/pnode.c:10: /kisskb/src/include/linux/mmzone.h:1156:2: error: #error Allocator MAX_ORDER exceeds SECTION_SIZE #error Allocator MAX_ORDER exceeds SECTION_SIZE ^ In file included from /kisskb/src/include/linux/numa.h:25:0, from /kisskb/src/include/linux/nodemask.h:96, from /kisskb/src/include/linux/mount.h:15, from /kisskb/src/fs/utimes.c:3: /kisskb/src/arch/ia64/include/asm/sparsemem.h:14:40: warning: "PAGE_SHIFT" is not defined [-Wundef] #if ((CONFIG_FORCE_MAX_ZONEORDER - 1 + PAGE_SHIFT) > SECTION_SIZE_BITS) ^ make[2]: *** [/kisskb/src/scripts/Makefile.build:279: fs/pnode.o] Error 1 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/gfp.h:6:0, from /kisskb/src/include/linux/xarray.h:14, from /kisskb/src/include/linux/radix-tree.h:19, from /kisskb/src/include/linux/fs.h:15, from /kisskb/src/include/linux/namei.h:5, from /kisskb/src/fs/utimes.c:4: /kisskb/src/include/linux/mmzone.h:1156:2: error: #error Allocator MAX_ORDER exceeds SECTION_SIZE #error Allocator MAX_ORDER exceeds SECTION_SIZE ^ make[2]: *** [/kisskb/src/scripts/Makefile.build:279: fs/utimes.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:496: drivers/acpi] Error 2 make[1]: *** [/kisskb/src/Makefile:1805: drivers] Error 2 make[1]: *** [/kisskb/src/Makefile:1805: fs] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 48 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 # Build took: 0:01:48.605617