# git rev-parse -q --verify baa888d25ea64d0c59344d474284ca99cfdd449a^{commit} baa888d25ea64d0c59344d474284ca99cfdd449a already have revision, skipping fetch # git checkout -q -f -B kisskb baa888d25ea64d0c59344d474284ca99cfdd449a # git clean -qxdf # < git log -1 # commit baa888d25ea64d0c59344d474284ca99cfdd449a # Merge: 7260935d71b6 64ae16dfeefe # Author: Linus Torvalds # Date: Thu Nov 1 15:23:59 2018 -0700 # # Merge branch 'next-keys2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security # # Pull keys updates from James Morris: # "Provide five new operations in the key_type struct that can be used to # provide access to asymmetric key operations. These will be implemented # for the asymmetric key type in a later patch and may refer to a key # retained in RAM by the kernel or a key retained in crypto hardware. # # int (*asym_query)(const struct kernel_pkey_params *params, # struct kernel_pkey_query *info); # int (*asym_eds_op)(struct kernel_pkey_params *params, # const void *in, void *out); # int (*asym_verify_signature)(struct kernel_pkey_params *params, # const void *in, const void *in2); # # Since encrypt, decrypt and sign are identical in their interfaces, # they're rolled together in the asym_eds_op() operation and there's an # operation ID in the params argument to distinguish them. # # Verify is different in that we supply the data and the signature # instead and get an error value (or 0) as the only result on the # expectation that this may well be how a hardware crypto device may # work" # # * 'next-keys2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (22 commits) # KEYS: asym_tpm: Add support for the sign operation [ver #2] # KEYS: asym_tpm: Implement tpm_sign [ver #2] # KEYS: asym_tpm: Implement signature verification [ver #2] # KEYS: asym_tpm: Implement the decrypt operation [ver #2] # KEYS: asym_tpm: Implement tpm_unbind [ver #2] # KEYS: asym_tpm: Add loadkey2 and flushspecific [ver #2] # KEYS: Move trusted.h to include/keys [ver #2] # KEYS: trusted: Expose common functionality [ver #2] # KEYS: asym_tpm: Implement encryption operation [ver #2] # KEYS: asym_tpm: Implement pkey_query [ver #2] # KEYS: Add parser for TPM-based keys [ver #2] # KEYS: asym_tpm: extract key size & public key [ver #2] # KEYS: asym_tpm: add skeleton for asym_tpm [ver #2] # crypto: rsa-pkcs1pad: Allow hash to be optional [ver #2] # KEYS: Implement PKCS#8 RSA Private Key parser [ver #2] # KEYS: Implement encrypt, decrypt and sign for software asymmetric key [ver #2] # KEYS: Allow the public_key struct to hold a private key [ver #2] # KEYS: Provide software public key query function [ver #2] # KEYS: Make the X.509 and PKCS7 parsers supply the sig encoding type [ver #2] # KEYS: Provide missing asymmetric key subops for new key type ops [ver #2] # ... # < /opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux-gcc --version # < git log --format=%s --max-count=1 baa888d25ea64d0c59344d474284ca99cfdd449a # < make -s -j 10 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # yes \n | make -s -j 10 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux- oldconfig yes: standard output: Broken pipe # make -s -j 10 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux- /kisskb/src/kernel/cgroup/cgroup-v1.c: In function 'cgroup1_mount': /kisskb/src/kernel/cgroup/cgroup-v1.c:1256:20: warning: 'root' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/events/core.c: In function 'perf_log_throttle': /kisskb/src/kernel/events/core.c:7651:1: warning: 'perf_log_throttle' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/core.c: In function 'perf_swevent_hrtimer': /kisskb/src/kernel/events/core.c:9163:1: warning: 'perf_swevent_hrtimer' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/core.c: In function 'perf_log_itrace_start': /kisskb/src/kernel/events/core.c:7692:1: warning: 'perf_log_itrace_start' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/core.c: In function 'perf_event_read_event': /kisskb/src/kernel/events/core.c:6581:1: warning: 'perf_event_read_event' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/core.c: In function 'perf_event_task_output': /kisskb/src/kernel/events/core.c:6860:1: warning: 'perf_event_task_output' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/core.c: In function 'perf_event_mmap_output': /kisskb/src/kernel/events/core.c:7216:1: warning: 'perf_event_mmap_output' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/core.c: In function 'perf_event_namespaces_output': /kisskb/src/kernel/events/core.c:7053:1: warning: 'perf_event_namespaces_output' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/core.c: In function 'perf_event_comm_output': /kisskb/src/kernel/events/core.c:6954:1: warning: 'perf_event_comm_output' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/core.c: In function 'perf_event_switch_output': /kisskb/src/kernel/events/core.c:7580:1: warning: 'perf_event_switch_output' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/core.c: In function 'perf_event_aux_event': /kisskb/src/kernel/events/core.c:7488:1: warning: 'perf_event_aux_event' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/core.c: In function 'perf_log_lost_samples': /kisskb/src/kernel/events/core.c:7521:1: warning: 'perf_log_lost_samples' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/core.c: In function 'perf_tp_event': /kisskb/src/kernel/events/core.c:8331:1: warning: 'perf_tp_event' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/core.c: In function '___perf_sw_event': /kisskb/src/kernel/events/core.c:8017:1: warning: '___perf_sw_event' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/ring_buffer.c: In function 'perf_output_begin_forward': /kisskb/src/kernel/events/ring_buffer.c:238:1: warning: 'perf_output_begin_forward' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/ring_buffer.c: In function 'perf_output_begin_backward': /kisskb/src/kernel/events/ring_buffer.c:244:1: warning: 'perf_output_begin_backward' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/events/ring_buffer.c: In function 'perf_output_begin': /kisskb/src/kernel/events/ring_buffer.c:252:1: warning: 'perf_output_begin' uses dynamic stack allocation [enabled by default] /kisskb/src/fs/afs/dynroot.c: In function 'afs_lookup_atcell': /kisskb/src/fs/afs/dynroot.c:126:6: warning: 'len' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/arch/s390/kernel/nospec-branch.c: In function '__nospec_revert': /kisskb/src/arch/s390/kernel/nospec-branch.c:130:61: error: macro "memcpy" passed 6 arguments, but takes just 3 /kisskb/src/arch/s390/kernel/nospec-branch.c:130:3: warning: statement with no effect [-Wunused-value] make[3]: *** [/kisskb/src/scripts/Makefile.build:293: arch/s390/kernel/nospec-branch.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:518: arch/s390/kernel] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1060: arch/s390] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:186:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/mm/hugetlb.c: In function 'alloc_pool_huge_page': /kisskb/src/mm/hugetlb.c:1433:5: warning: 'page' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/mm/slub.c: In function 'deactivate_slab.isra.37': /kisskb/src/mm/slub.c:2170:1: warning: 'deactivate_slab.isra.37' uses dynamic stack allocation [enabled by default] /kisskb/src/mm/slub.c: In function 'unfreeze_partials.isra.38': /kisskb/src/mm/slub.c:2238:1: warning: 'unfreeze_partials.isra.38' uses dynamic stack allocation [enabled by default] /kisskb/src/mm/slub.c: In function 'get_partial_node.isra.39': /kisskb/src/mm/slub.c:1870:1: warning: 'get_partial_node.isra.39' uses dynamic stack allocation [enabled by default] /kisskb/src/mm/slub.c: In function '___slab_alloc': /kisskb/src/mm/slub.c:2625:1: warning: '___slab_alloc' uses dynamic stack allocation [enabled by default] /kisskb/src/mm/slub.c: In function '__slab_free': /kisskb/src/mm/slub.c:2926:1: warning: '__slab_free' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/sched/psi.c: In function 'cgroup_move_task': /kisskb/src/kernel/sched/sched.h:1063:8: warning: 'rq' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/sched/psi.c:639:13: note: 'rq' was declared here /kisskb/src/fs/btrfs/ref-verify.c: In function 'process_extent_item.isra.2': /kisskb/src/fs/btrfs/ref-verify.c:503:2: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/btrfs/ref-verify.c: In function 'process_leaf.isra.3': /kisskb/src/fs/btrfs/ref-verify.c:555:2: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/f2fs/file.c: In function 'f2fs_precache_extents': /kisskb/src/fs/f2fs/file.c:2926:6: warning: 'err' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/smp.c: In function 'smp_call_function_single': /kisskb/src/kernel/smp.c:307:1: warning: 'smp_call_function_single' uses dynamic stack allocation [enabled by default] /kisskb/src/fs/nfs/super.c: In function 'nfs_show_stats': /kisskb/src/fs/nfs/super.c:890:1: warning: 'nfs_show_stats' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/rseq.c: In function 'rseq_ip_fixup': /kisskb/src/kernel/rseq.c:249:1: warning: 'rseq_ip_fixup' uses dynamic stack allocation [enabled by default] /kisskb/src/kernel/rseq.c: In function 'rseq_syscall': /kisskb/src/kernel/rseq.c:301:1: warning: 'rseq_syscall' uses dynamic stack allocation [enabled by default] /kisskb/src/fs/nfsd/nfs4xdr.c: In function 'nfsd4_encode_components_esc': /kisskb/src/fs/nfsd/nfs4xdr.c:2076:9: warning: 'str' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/nfsd/nfs4xdr.c:2081:42: warning: 'end' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:341:21: note: 'pdeo' was declared here make: *** [Makefile:152: sub-make] Error 2 Command 'make -s -j 10 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_s390-allmodconfig_s390x # Build took: 0:01:47.921223