Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 's390-5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Vasily Gorbik:

- Fix potential out-of-range access during secure boot facility
detection.

- Fully validate the VMA before calling follow_pte() in pci code.

- Remove arch specific WARN_DYNAMIC_STACK config option.

- Fix zcrypto kernel doc comments.

- Update defconfigs.

* tag 's390-5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: remove WARN_DYNAMIC_STACK
s390/ap: fix kernel doc comments
s390: update defconfigs
s390/sclp: fix Secure-IPL facility detection
s390/pci_mmio: fully validate the VMA before calling follow_pte()

+17 -27
-10
arch/s390/Kconfig
··· 685 685 The minimum size for the stack guard should be 256 for 31 bit and 686 686 512 for 64 bit. 687 687 688 - config WARN_DYNAMIC_STACK 689 - def_bool n 690 - prompt "Emit compiler warnings for function with dynamic stack usage" 691 - help 692 - This option enables the compiler option -mwarn-dynamicstack. If the 693 - compiler supports this options generates warnings for functions 694 - that dynamically allocate stack space using alloca. 695 - 696 - Say N if you are unsure. 697 - 698 688 endmenu 699 689 700 690 menu "I/O subsystem"
-7
arch/s390/Makefile
··· 85 85 endif 86 86 endif 87 87 88 - ifdef CONFIG_WARN_DYNAMIC_STACK 89 - ifneq ($(call cc-option,-mwarn-dynamicstack),) 90 - KBUILD_CFLAGS += -mwarn-dynamicstack 91 - KBUILD_CFLAGS_DECOMPRESSOR += -mwarn-dynamicstack 92 - endif 93 - endif 94 - 95 88 ifdef CONFIG_EXPOLINE 96 89 ifneq ($(call cc-option,$(CC_FLAGS_MARCH) -mindirect-branch=thunk),) 97 90 CC_FLAGS_EXPOLINE := -mindirect-branch=thunk
+5 -3
arch/s390/configs/debug_defconfig
··· 10 10 CONFIG_BPF_JIT_ALWAYS_ON=y 11 11 CONFIG_BPF_LSM=y 12 12 CONFIG_PREEMPT=y 13 + CONFIG_SCHED_CORE=y 13 14 CONFIG_BSD_PROCESS_ACCT=y 14 15 CONFIG_BSD_PROCESS_ACCT_V3=y 15 16 CONFIG_TASKSTATS=y ··· 504 503 # CONFIG_NET_VENDOR_HUAWEI is not set 505 504 # CONFIG_NET_VENDOR_INTEL is not set 506 505 # CONFIG_NET_VENDOR_MICROSOFT is not set 506 + # CONFIG_NET_VENDOR_LITEX is not set 507 507 # CONFIG_NET_VENDOR_MARVELL is not set 508 508 CONFIG_MLX4_EN=m 509 509 CONFIG_MLX5_CORE=m ··· 663 661 CONFIG_NFSD_V4=y 664 662 CONFIG_NFSD_V4_SECURITY_LABEL=y 665 663 CONFIG_CIFS=m 666 - CONFIG_CIFS_WEAK_PW_HASH=y 667 664 CONFIG_CIFS_UPCALL=y 668 665 CONFIG_CIFS_XATTR=y 669 666 CONFIG_CIFS_POSIX=y ··· 721 720 CONFIG_CRYPTO_VMAC=m 722 721 CONFIG_CRYPTO_CRC32=m 723 722 CONFIG_CRYPTO_BLAKE2S=m 723 + CONFIG_CRYPTO_MD4=m 724 + CONFIG_CRYPTO_MD5=y 724 725 CONFIG_CRYPTO_MICHAEL_MIC=m 725 726 CONFIG_CRYPTO_RMD160=m 726 727 CONFIG_CRYPTO_SHA3=m ··· 777 774 CONFIG_DMA_CMA=y 778 775 CONFIG_CMA_SIZE_MBYTES=0 779 776 CONFIG_DMA_API_DEBUG=y 780 - CONFIG_STRING_SELFTEST=y 781 777 CONFIG_PRINTK_TIME=y 782 778 CONFIG_DYNAMIC_DEBUG=y 783 779 CONFIG_DEBUG_INFO=y ··· 855 853 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y 856 854 CONFIG_LKDTM=m 857 855 CONFIG_TEST_MIN_HEAP=y 858 - CONFIG_TEST_SORT=y 859 856 CONFIG_KPROBES_SANITY_TEST=y 860 857 CONFIG_RBTREE_TEST=y 861 858 CONFIG_INTERVAL_TREE_TEST=m 862 859 CONFIG_PERCPU_TEST=m 863 860 CONFIG_ATOMIC64_SELFTEST=y 861 + CONFIG_STRING_SELFTEST=y 864 862 CONFIG_TEST_BITOPS=m 865 863 CONFIG_TEST_BPF=m 866 864 CONFIG_TEST_LIVEPATCH=m
+4 -1
arch/s390/configs/defconfig
··· 8 8 CONFIG_BPF_JIT=y 9 9 CONFIG_BPF_JIT_ALWAYS_ON=y 10 10 CONFIG_BPF_LSM=y 11 + CONFIG_SCHED_CORE=y 11 12 CONFIG_BSD_PROCESS_ACCT=y 12 13 CONFIG_BSD_PROCESS_ACCT_V3=y 13 14 CONFIG_TASKSTATS=y ··· 495 494 # CONFIG_NET_VENDOR_HUAWEI is not set 496 495 # CONFIG_NET_VENDOR_INTEL is not set 497 496 # CONFIG_NET_VENDOR_MICROSOFT is not set 497 + # CONFIG_NET_VENDOR_LITEX is not set 498 498 # CONFIG_NET_VENDOR_MARVELL is not set 499 499 CONFIG_MLX4_EN=m 500 500 CONFIG_MLX5_CORE=m ··· 650 648 CONFIG_NFSD_V4=y 651 649 CONFIG_NFSD_V4_SECURITY_LABEL=y 652 650 CONFIG_CIFS=m 653 - CONFIG_CIFS_WEAK_PW_HASH=y 654 651 CONFIG_CIFS_UPCALL=y 655 652 CONFIG_CIFS_XATTR=y 656 653 CONFIG_CIFS_POSIX=y ··· 709 708 CONFIG_CRYPTO_VMAC=m 710 709 CONFIG_CRYPTO_CRC32=m 711 710 CONFIG_CRYPTO_BLAKE2S=m 711 + CONFIG_CRYPTO_MD4=m 712 + CONFIG_CRYPTO_MD5=y 712 713 CONFIG_CRYPTO_MICHAEL_MIC=m 713 714 CONFIG_CRYPTO_RMD160=m 714 715 CONFIG_CRYPTO_SHA3=m
+2 -2
arch/s390/pci/pci_mmio.c
··· 159 159 160 160 mmap_read_lock(current->mm); 161 161 ret = -EINVAL; 162 - vma = find_vma(current->mm, mmio_addr); 162 + vma = vma_lookup(current->mm, mmio_addr); 163 163 if (!vma) 164 164 goto out_unlock_mmap; 165 165 if (!(vma->vm_flags & (VM_IO | VM_PFNMAP))) ··· 298 298 299 299 mmap_read_lock(current->mm); 300 300 ret = -EINVAL; 301 - vma = find_vma(current->mm, mmio_addr); 301 + vma = vma_lookup(current->mm, mmio_addr); 302 302 if (!vma) 303 303 goto out_unlock_mmap; 304 304 if (!(vma->vm_flags & (VM_IO | VM_PFNMAP)))
+2 -1
drivers/s390/char/sclp_early.c
··· 45 45 sclp.has_gisaf = !!(sccb->fac118 & 0x08); 46 46 sclp.has_hvs = !!(sccb->fac119 & 0x80); 47 47 sclp.has_kss = !!(sccb->fac98 & 0x01); 48 - sclp.has_sipl = !!(sccb->cbl & 0x4000); 49 48 if (sccb->fac85 & 0x02) 50 49 S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP; 51 50 if (sccb->fac91 & 0x40) 52 51 S390_lowcore.machine_flags |= MACHINE_FLAG_TLB_GUEST; 53 52 if (sccb->cpuoff > 134) 54 53 sclp.has_diag318 = !!(sccb->byte_134 & 0x80); 54 + if (sccb->cpuoff > 137) 55 + sclp.has_sipl = !!(sccb->cbl & 0x4000); 55 56 sclp.rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2; 56 57 sclp.rzm = sccb->rnsize ? sccb->rnsize : sccb->rnsize2; 57 58 sclp.rzm <<= 20;
+2 -1
drivers/s390/crypto/ap_bus.c
··· 213 213 * ap_init_qci_info(): Allocate and query qci config info. 214 214 * Does also update the static variables ap_max_domain_id 215 215 * and ap_max_adapter_id if this info is available. 216 - 217 216 */ 218 217 static void __init ap_init_qci_info(void) 219 218 { ··· 438 439 /** 439 440 * ap_interrupt_handler() - Schedule ap_tasklet on interrupt 440 441 * @airq: pointer to adapter interrupt descriptor 442 + * @floating: ignored 441 443 */ 442 444 static void ap_interrupt_handler(struct airq_struct *airq, bool floating) 443 445 { ··· 1786 1786 /** 1787 1787 * ap_scan_bus(): Scan the AP bus for new devices 1788 1788 * Runs periodically, workqueue timer (ap_config_time) 1789 + * @unused: Unused pointer. 1789 1790 */ 1790 1791 static void ap_scan_bus(struct work_struct *unused) 1791 1792 {
+2 -2
drivers/s390/crypto/ap_queue.c
··· 20 20 21 21 /** 22 22 * ap_queue_enable_irq(): Enable interrupt support on this AP queue. 23 - * @qid: The AP queue number 23 + * @aq: The AP queue 24 24 * @ind: the notification indicator byte 25 25 * 26 26 * Enables interruption on AP queue via ap_aqic(). Based on the return ··· 311 311 312 312 /** 313 313 * ap_sm_reset(): Reset an AP queue. 314 - * @qid: The AP queue number 314 + * @aq: The AP queue 315 315 * 316 316 * Submit the Reset command to an AP queue. 317 317 */