# 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/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < git log --format=%s --max-count=1 baa888d25ea64d0c59344d474284ca99cfdd449a # < make -s -j 8 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # yes \n | make -s -j 8 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 oldconfig yes: standard output: Broken pipe # make -s -j 8 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/scripts/unifdef.c: In function 'Mpass': /kisskb/src/scripts/unifdef.c:453:28: warning: 'strncpy' output truncated before terminating nul copying 4 bytes from a string of the same length [-Wstringop-truncation] static void Mpass (void) { strncpy(keyword, "if ", 4); Pelif(); } ^~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/um/os-Linux/umid.c: In function 'is_umdir_used': /kisskb/src/arch/um/os-Linux/umid.c:138:2: warning: ISO C90 forbids variable length array 'file' [-Wvla] char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")]; ^ /kisskb/src/arch/um/os-Linux/umid.c: In function 'create_pid_file': /kisskb/src/arch/um/os-Linux/umid.c:213:2: warning: ISO C90 forbids variable length array 'file' [-Wvla] char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")]; ^ /kisskb/src/arch/um/os-Linux/umid.c: In function 'remove_umid_dir': /kisskb/src/arch/um/os-Linux/umid.c:388:2: warning: ISO C90 forbids variable length array 'dir' [-Wvla] char dir[strlen(uml_dir) + UMID_LEN + 1], err; ^ /kisskb/src/kernel/cgroup/cgroup-v1.c: In function 'cgroup1_mount': /kisskb/src/kernel/cgroup/cgroup-v1.c:1256:3: warning: 'root' may be used uninitialized in this function [-Wmaybe-uninitialized] percpu_ref_reinit(&root->cgrp.self.refcnt); ^ In file included from /kisskb/src/kernel/sched/psi.c:135:0: /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 [-Wmaybe-uninitialized] if (rq->clock_update_flags > RQCF_ACT_SKIP) ^ /kisskb/src/kernel/sched/psi.c:639:13: note: 'rq' was declared here struct rq *rq; ^ /kisskb/src/security/apparmor/policy_unpack.c: In function 'unpack_trans_table': /kisskb/src/security/apparmor/policy_unpack.c:483:9: warning: 'pos' may be used uninitialized in this function [-Wmaybe-uninitialized] str[pos] = ':'; ^ /kisskb/src/lib/lz4/lz4hc_compress.c: In function 'LZ4HC_compress_generic': /kisskb/src/lib/lz4/lz4hc_compress.c:579:1: warning: the frame size of 2144 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/i2c/i2c-core-base.c: In function 'i2c_generic_scl_recovery': /kisskb/src/drivers/i2c/i2c-core-base.c:235:5: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized] if (ret == -EOPNOTSUPP) ^ LINK linux Completed OK # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:07:27.333993