# git rev-parse -q --verify 96d4f267e40f9509e8a66e2b39e8b95655617693^{commit} 96d4f267e40f9509e8a66e2b39e8b95655617693 already have revision, skipping fetch # git checkout -q -f -B kisskb 96d4f267e40f9509e8a66e2b39e8b95655617693 # git clean -qxdf # < git log -1 # commit 96d4f267e40f9509e8a66e2b39e8b95655617693 # Author: Linus Torvalds # Date: Thu Jan 3 18:57:57 2019 -0800 # # Remove 'type' argument from access_ok() function # # Nobody has actually used the type (VERIFY_READ vs VERIFY_WRITE) argument # of the user address range verification function since we got rid of the # old racy i386-only code to walk page tables by hand. # # It existed because the original 80386 would not honor the write protect # bit when in kernel mode, so you had to do COW by hand before doing any # user access. But we haven't supported that in a long time, and these # days the 'type' argument is a purely historical artifact. # # A discussion about extending 'user_access_begin()' to do the range # checking resulted this patch, because there is no way we're going to # move the old VERIFY_xyz interface to that model. And it's best done at # the end of the merge window when I've done most of my merges, so let's # just get this done once and for all. # # This patch was mostly done with a sed-script, with manual fix-ups for # the cases that weren't of the trivial 'access_ok(VERIFY_xyz' form. # # There were a couple of notable cases: # # - csky still had the old "verify_area()" name as an alias. # # - the iter_iov code had magical hardcoded knowledge of the actual # values of VERIFY_{READ,WRITE} (not that they mattered, since nothing # really used it) # # - microblaze used the type argument for a debug printout # # but other than those oddities this should be a total no-op patch. # # I tried to fix up all architectures, did fairly extensive grepping for # access_ok() uses, and the changes are trivial, but I may have missed # something. Any missed conversion should be trivially fixable, though. # # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 96d4f267e40f9509e8a66e2b39e8b95655617693 # < make -s -j 10 ARCH=powerpc O=/kisskb/build/linus_ppc64le_defconfig+NO_KVM_ppc64le-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc64le_defconfig # Added to kconfig CONFIG_KVM_BOOK3S_64=n # Added to kconfig CONFIG_KVM=n # yes \n | make -s -j 10 ARCH=powerpc O=/kisskb/build/linus_ppc64le_defconfig+NO_KVM_ppc64le-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- oldconfig yes: standard output: Broken pipe # make -s -j 10 ARCH=powerpc O=/kisskb/build/linus_ppc64le_defconfig+NO_KVM_ppc64le-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:10:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/preempt.h:11, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/uaccess.h: In function 'clear_user': /kisskb/src/arch/powerpc/include/asm/uaccess.h:66:32: error: 'type' undeclared (first use in this function) (__chk_user_ptr(addr), (void)(type), \ ^ /kisskb/src/include/linux/compiler.h:76:40: note: in definition of macro 'likely' # define likely(x) __builtin_expect(!!(x), 1) ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:377:13: note: in expansion of macro 'access_ok' if (likely(access_ok(addr, size))) ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:66:32: note: each undeclared identifier is reported only once for each function it appears in (__chk_user_ptr(addr), (void)(type), \ ^ /kisskb/src/include/linux/compiler.h:76:40: note: in definition of macro 'likely' # define likely(x) __builtin_expect(!!(x), 1) ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:377:13: note: in expansion of macro 'access_ok' if (likely(access_ok(addr, size))) ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:66:37: warning: left-hand operand of comma expression has no effect [-Wunused-value] (__chk_user_ptr(addr), (void)(type), \ ^ /kisskb/src/include/linux/compiler.h:76:40: note: in definition of macro 'likely' # define likely(x) __builtin_expect(!!(x), 1) ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:377:13: note: in expansion of macro 'access_ok' if (likely(access_ok(addr, size))) ^ In file included from /kisskb/src/include/linux/uaccess.h:11:0, from /kisskb/src/include/linux/crypto.h:26, from /kisskb/src/include/crypto/hash.h:16, from /kisskb/src/include/linux/uio.h:14, from /kisskb/src/include/linux/socket.h:8, from /kisskb/src/include/linux/compat.h:15, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/include/linux/uaccess.h: In function 'copy_in_user': /kisskb/src/arch/powerpc/include/asm/uaccess.h:66:32: error: 'type' undeclared (first use in this function) (__chk_user_ptr(addr), (void)(type), \ ^ /kisskb/src/include/linux/uaccess.h:160:6: note: in expansion of macro 'access_ok' if (access_ok(to, n) && access_ok(from, n)) ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:66:37: warning: left-hand operand of comma expression has no effect [-Wunused-value] (__chk_user_ptr(addr), (void)(type), \ ^ /kisskb/src/include/linux/uaccess.h:160:6: note: in expansion of macro 'access_ok' if (access_ok(to, n) && access_ok(from, n)) ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:66:37: warning: left-hand operand of comma expression has no effect [-Wunused-value] (__chk_user_ptr(addr), (void)(type), \ ^ /kisskb/src/include/linux/uaccess.h:160:26: note: in expansion of macro 'access_ok' if (access_ok(to, n) && access_ok(from, n)) ^ make[2]: *** [/kisskb/src/scripts/Makefile.build:110: arch/powerpc/kernel/asm-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1100: prepare0] Error 2 make: *** [Makefile:152: sub-make] Error 2 Command 'make -s -j 10 ARCH=powerpc O=/kisskb/build/linus_ppc64le_defconfig+NO_KVM_ppc64le-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_ppc64le_defconfig+NO_KVM_ppc64le-gcc5 # Build took: 0:00:07.214753