Commit 93ff9f13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents d1a88690 f5711f9d

arch/s390/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -685,16 +685,6 @@ config STACK_GUARD 
	  The minimum size for the stack guard should be 256 for 31 bit and

	  512 for 64 bit.



config WARN_DYNAMIC_STACK

	def_bool n

	prompt "Emit compiler warnings for function with dynamic stack usage"

	help

	  This option enables the compiler option -mwarn-dynamicstack. If the

	  compiler supports this options generates warnings for functions

	  that dynamically allocate stack space using alloca.



	  Say N if you are unsure.



endmenu



menu "I/O subsystem"

arch/s390/Makefile

+0 −7
Original line number Diff line number Diff line
@@ -85,13 +85,6 @@ cflags-$(CONFIG_CHECK_STACK) += -mstack-guard=$(CONFIG_STACK_GUARD) 
endif

endif



ifdef CONFIG_WARN_DYNAMIC_STACK

  ifneq ($(call cc-option,-mwarn-dynamicstack),)

    KBUILD_CFLAGS += -mwarn-dynamicstack

    KBUILD_CFLAGS_DECOMPRESSOR += -mwarn-dynamicstack

  endif

endif



ifdef CONFIG_EXPOLINE

  ifneq ($(call cc-option,$(CC_FLAGS_MARCH) -mindirect-branch=thunk),)

    CC_FLAGS_EXPOLINE := -mindirect-branch=thunk

arch/s390/configs/debug_defconfig

+5 −3
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ CONFIG_BPF_JIT=y 
CONFIG_BPF_JIT_ALWAYS_ON=y

CONFIG_BPF_LSM=y

CONFIG_PREEMPT=y

CONFIG_SCHED_CORE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_TASKSTATS=y
@@ -503,6 +504,7 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MICROSOFT is not set

# CONFIG_NET_VENDOR_LITEX is not set

# CONFIG_NET_VENDOR_MARVELL is not set

CONFIG_MLX4_EN=m

CONFIG_MLX5_CORE=m
@@ -661,7 +663,6 @@ CONFIG_NFSD_V3_ACL=y 
CONFIG_NFSD_V4=y

CONFIG_NFSD_V4_SECURITY_LABEL=y

CONFIG_CIFS=m

CONFIG_CIFS_WEAK_PW_HASH=y

CONFIG_CIFS_UPCALL=y

CONFIG_CIFS_XATTR=y

CONFIG_CIFS_POSIX=y
@@ -720,6 +721,8 @@ CONFIG_CRYPTO_XCBC=m 
CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m
@@ -774,7 +777,6 @@ CONFIG_RANDOM32_SELFTEST=y 
CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=0

CONFIG_DMA_API_DEBUG=y

CONFIG_STRING_SELFTEST=y

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y
@@ -853,12 +855,12 @@ CONFIG_FAIL_FUNCTION=y 
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

CONFIG_LKDTM=m

CONFIG_TEST_MIN_HEAP=y

CONFIG_TEST_SORT=y

CONFIG_KPROBES_SANITY_TEST=y

CONFIG_RBTREE_TEST=y

CONFIG_INTERVAL_TREE_TEST=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_STRING_SELFTEST=y

CONFIG_TEST_BITOPS=m

CONFIG_TEST_BPF=m

CONFIG_TEST_LIVEPATCH=m

arch/s390/configs/defconfig

+4 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ CONFIG_BPF_SYSCALL=y 
CONFIG_BPF_JIT=y

CONFIG_BPF_JIT_ALWAYS_ON=y

CONFIG_BPF_LSM=y

CONFIG_SCHED_CORE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_TASKSTATS=y
@@ -494,6 +495,7 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MICROSOFT is not set

# CONFIG_NET_VENDOR_LITEX is not set

# CONFIG_NET_VENDOR_MARVELL is not set

CONFIG_MLX4_EN=m

CONFIG_MLX5_CORE=m
@@ -648,7 +650,6 @@ CONFIG_NFSD_V3_ACL=y 
CONFIG_NFSD_V4=y

CONFIG_NFSD_V4_SECURITY_LABEL=y

CONFIG_CIFS=m

CONFIG_CIFS_WEAK_PW_HASH=y

CONFIG_CIFS_UPCALL=y

CONFIG_CIFS_XATTR=y

CONFIG_CIFS_POSIX=y
@@ -708,6 +709,8 @@ CONFIG_CRYPTO_XCBC=m 
CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

arch/s390/pci/pci_mmio.c

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ SYSCALL_DEFINE3(s390_pci_mmio_write, unsigned long, mmio_addr, 


	mmap_read_lock(current->mm);

	ret = -EINVAL;

	vma = find_vma(current->mm, mmio_addr);

	vma = vma_lookup(current->mm, mmio_addr);

	if (!vma)

		goto out_unlock_mmap;

	if (!(vma->vm_flags & (VM_IO | VM_PFNMAP)))
@@ -298,7 +298,7 @@ SYSCALL_DEFINE3(s390_pci_mmio_read, unsigned long, mmio_addr, 


	mmap_read_lock(current->mm);

	ret = -EINVAL;

	vma = find_vma(current->mm, mmio_addr);

	vma = vma_lookup(current->mm, mmio_addr);

	if (!vma)

		goto out_unlock_mmap;

	if (!(vma->vm_flags & (VM_IO | VM_PFNMAP)))