# 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/powerpc-linux/bin/powerpc-linux-gcc --version # < git log --format=%s --max-count=1 baa888d25ea64d0c59344d474284ca99cfdd449a # < make -s -j 10 ARCH=powerpc O=/kisskb/build/linus_ppc44x_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- ppc44x_defconfig # make -s -j 10 ARCH=powerpc O=/kisskb/build/linus_ppc44x_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- /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/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 [-Wuninitialized] /kisskb/src/net/bridge/br_netlink.c: In function 'br_afspec': /kisskb/src/net/bridge/br_netlink.c:647:7: warning: 'err' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c: In function 'tun_get_user': /kisskb/src/drivers/net/tun.c:1819:30: warning: 'copylen' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1729:46: warning: 'linear' 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 /kisskb/src/drivers/tty/serial/8250/8250_core.c: In function 'univ8250_release_irq': /kisskb/src/drivers/tty/serial/8250/8250_core.c:247:18: warning: 'i' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/tty/serial/8250/8250_core.c:227:19: note: 'i' was declared here arch/powerpc/boot/dts/katmai.dtb: Warning (pci_bridge): /plb/pciex@d00000000: node name is not "pci" or "pcie" arch/powerpc/boot/dts/katmai.dtb: Warning (pci_bridge): /plb/pciex@d20000000: node name is not "pci" or "pcie" arch/powerpc/boot/dts/katmai.dtb: Warning (pci_bridge): /plb/pciex@d40000000: node name is not "pci" or "pcie" arch/powerpc/boot/dts/katmai.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' INFO: Uncompressed kernel (size 0x553d34) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x553d34) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x553d34) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x553d34) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x553d34) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x553d34) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x553d34) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x543688) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x553d34) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x553d34) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) Image Name: Linux-4.19.0-gbaa888d25ea6 Created: Fri Nov 2 12:33:27 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2681722 Bytes = 2618.87 KiB = 2.56 MiB Load Address: 00000000 Entry Point: 00000000 INFO: Uncompressed kernel (size 0x553d34) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x553d34) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) Image Name: Linux-4.19.0-gbaa888d25ea6 Created: Fri Nov 2 12:33:28 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2713093 Bytes = 2649.50 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006000d4 Image Name: Linux-4.19.0-gbaa888d25ea6 Created: Fri Nov 2 12:33:28 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2713191 Bytes = 2649.60 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014ec Image Name: Linux-4.19.0-gbaa888d25ea6 Created: Fri Nov 2 12:33:28 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2713175 Bytes = 2649.58 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014cc Image Name: Linux-4.19.0-gbaa888d25ea6 Created: Fri Nov 2 12:33:28 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2713288 Bytes = 2649.70 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014e4 Image Name: Linux-4.19.0-gbaa888d25ea6 Created: Fri Nov 2 12:33:28 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2713143 Bytes = 2649.55 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014ec Image Name: Linux-4.19.0-gbaa888d25ea6 Created: Fri Nov 2 12:33:28 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2713269 Bytes = 2649.68 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014ec Image Name: Linux-4.19.0-gbaa888d25ea6 Created: Fri Nov 2 12:33:28 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2713105 Bytes = 2649.52 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006001c8 Image Name: Linux-4.19.0-gbaa888d25ea6 Created: Fri Nov 2 12:33:29 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2713210 Bytes = 2649.62 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014d8 Image Name: Linux-4.19.0-gbaa888d25ea6 Created: Fri Nov 2 12:33:29 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2713236 Bytes = 2649.64 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014f8 Completed OK # rm -rf /kisskb/build/linus_ppc44x_defconfig_powerpc # Build took: 0:01:25.325575