Commit 26a9a47c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-6.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Heiko Carstens:

 - Fix potential use-after-free bug and missing error handling in PCI
   code

 - Fix dcssblk build error

 - Fix last breaking event handling in case of stack corruption to allow
   for better error reporting

 - Update defconfigs

* tag 's390-6.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/pci: Fix duplicate pci_dev_put() in disable_slot() when PF has child VFs
  s390/pci: Fix missing check for zpci_create_device() error return
  s390: Update defconfigs
  s390/dcssblk: Fix build error with CONFIG_DAX=m and CONFIG_DCSSBLK=y
  s390/entry: Fix last breaking event handling in case of stack corruption
  s390/configs: Enable options required for TC flow offload
  s390/configs: Enable VDPA on Nvidia ConnectX-6 network card
parents 80ae5fb2 05a2538f

arch/s390/configs/debug_defconfig

+19 −9
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ CONFIG_USER_NS=y 
CONFIG_CHECKPOINT_RESTORE=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_PROFILING=y

CONFIG_KEXEC=y

CONFIG_KEXEC_FILE=y
@@ -92,7 +91,6 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_IOSCHED_BFQ=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_SLAB_BUCKETS=y

CONFIG_SLUB_STATS=y
@@ -395,6 +393,9 @@ CONFIG_CLS_U32_MARK=y 
CONFIG_NET_CLS_FLOW=m

CONFIG_NET_CLS_CGROUP=y

CONFIG_NET_CLS_BPF=m

CONFIG_NET_CLS_FLOWER=m

CONFIG_NET_CLS_MATCHALL=m

CONFIG_NET_EMATCH=y

CONFIG_NET_CLS_ACT=y

CONFIG_NET_ACT_POLICE=m

CONFIG_NET_ACT_GACT=m
@@ -405,6 +406,9 @@ CONFIG_NET_ACT_PEDIT=m 
CONFIG_NET_ACT_SIMP=m

CONFIG_NET_ACT_SKBEDIT=m

CONFIG_NET_ACT_CSUM=m

CONFIG_NET_ACT_VLAN=m

CONFIG_NET_ACT_TUNNEL_KEY=m

CONFIG_NET_ACT_CT=m

CONFIG_NET_ACT_GATE=m

CONFIG_NET_TC_SKB_EXT=y

CONFIG_DNS_RESOLVER=y
@@ -628,8 +632,16 @@ CONFIG_VIRTIO_PCI=m 
CONFIG_VIRTIO_BALLOON=m

CONFIG_VIRTIO_MEM=m

CONFIG_VIRTIO_INPUT=y

CONFIG_VDPA=m

CONFIG_VDPA_SIM=m

CONFIG_VDPA_SIM_NET=m

CONFIG_VDPA_SIM_BLOCK=m

CONFIG_VDPA_USER=m

CONFIG_MLX5_VDPA_NET=m

CONFIG_VP_VDPA=m

CONFIG_VHOST_NET=m

CONFIG_VHOST_VSOCK=m

CONFIG_VHOST_VDPA=m

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y
@@ -654,7 +666,6 @@ CONFIG_NILFS2_FS=m 
CONFIG_BCACHEFS_FS=y

CONFIG_BCACHEFS_QUOTA=y

CONFIG_BCACHEFS_POSIX_ACL=y

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_VERITY=y
@@ -724,11 +735,10 @@ CONFIG_NLS_UTF8=m 
CONFIG_DLM=m

CONFIG_UNICODE=y

CONFIG_PERSISTENT_KEYRINGS=y

CONFIG_BIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_KEY_NOTIFICATIONS=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_LOCKDOWN_LSM=y
@@ -741,6 +751,8 @@ CONFIG_IMA=y 
CONFIG_IMA_DEFAULT_HASH_SHA256=y

CONFIG_IMA_WRITE_POLICY=y

CONFIG_IMA_APPRAISE=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_CRYPTO_USER=m

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
@@ -756,7 +768,6 @@ CONFIG_CRYPTO_AES_TI=m 
CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m
@@ -801,7 +812,6 @@ CONFIG_CRYPTO_SHA3_512_S390=m 
CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_CHACHA_S390=m

CONFIG_CRYPTO_HMAC_S390=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m
@@ -812,9 +822,9 @@ CONFIG_PKEY_UV=m 
CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_SYSTEM_BLACKLIST_KEYRING=y

CONFIG_CRYPTO_KRB5=m

CONFIG_CRYPTO_KRB5_SELFTESTS=y

CONFIG_CORDIC=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

CONFIG_RANDOM32_SELFTEST=y

CONFIG_XZ_DEC_MICROLZMA=y

CONFIG_DMA_CMA=y

arch/s390/configs/defconfig

+17 −7
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ CONFIG_USER_NS=y 
CONFIG_CHECKPOINT_RESTORE=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_PROFILING=y

CONFIG_KEXEC=y

CONFIG_KEXEC_FILE=y
@@ -86,7 +85,6 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_IOSCHED_BFQ=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_SLAB_BUCKETS=y

# CONFIG_COMPAT_BRK is not set
@@ -385,6 +383,9 @@ CONFIG_CLS_U32_MARK=y 
CONFIG_NET_CLS_FLOW=m

CONFIG_NET_CLS_CGROUP=y

CONFIG_NET_CLS_BPF=m

CONFIG_NET_CLS_FLOWER=m

CONFIG_NET_CLS_MATCHALL=m

CONFIG_NET_EMATCH=y

CONFIG_NET_CLS_ACT=y

CONFIG_NET_ACT_POLICE=m

CONFIG_NET_ACT_GACT=m
@@ -395,6 +396,9 @@ CONFIG_NET_ACT_PEDIT=m 
CONFIG_NET_ACT_SIMP=m

CONFIG_NET_ACT_SKBEDIT=m

CONFIG_NET_ACT_CSUM=m

CONFIG_NET_ACT_VLAN=m

CONFIG_NET_ACT_TUNNEL_KEY=m

CONFIG_NET_ACT_CT=m

CONFIG_NET_ACT_GATE=m

CONFIG_NET_TC_SKB_EXT=y

CONFIG_DNS_RESOLVER=y
@@ -618,8 +622,16 @@ CONFIG_VIRTIO_PCI=m 
CONFIG_VIRTIO_BALLOON=m

CONFIG_VIRTIO_MEM=m

CONFIG_VIRTIO_INPUT=y

CONFIG_VDPA=m

CONFIG_VDPA_SIM=m

CONFIG_VDPA_SIM_NET=m

CONFIG_VDPA_SIM_BLOCK=m

CONFIG_VDPA_USER=m

CONFIG_MLX5_VDPA_NET=m

CONFIG_VP_VDPA=m

CONFIG_VHOST_NET=m

CONFIG_VHOST_VSOCK=m

CONFIG_VHOST_VDPA=m

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y
@@ -641,7 +653,6 @@ CONFIG_NILFS2_FS=m 
CONFIG_BCACHEFS_FS=m

CONFIG_BCACHEFS_QUOTA=y

CONFIG_BCACHEFS_POSIX_ACL=y

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_VERITY=y
@@ -711,6 +722,7 @@ CONFIG_NLS_UTF8=m 
CONFIG_DLM=m

CONFIG_UNICODE=y

CONFIG_PERSISTENT_KEYRINGS=y

CONFIG_BIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_KEY_NOTIFICATIONS=y

CONFIG_SECURITY=y
@@ -742,7 +754,6 @@ CONFIG_CRYPTO_AES_TI=m 
CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m
@@ -788,7 +799,6 @@ CONFIG_CRYPTO_SHA3_512_S390=m 
CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_CHACHA_S390=m

CONFIG_CRYPTO_HMAC_S390=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m
@@ -799,10 +809,10 @@ CONFIG_PKEY_UV=m 
CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_SYSTEM_BLACKLIST_KEYRING=y

CONFIG_CRYPTO_KRB5=m

CONFIG_CRYPTO_KRB5_SELFTESTS=y

CONFIG_CORDIC=m

CONFIG_PRIME_NUMBERS=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

CONFIG_XZ_DEC_MICROLZMA=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=0

arch/s390/configs/zfcpdump_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ CONFIG_DEBUG_KERNEL=y 
CONFIG_DEBUG_INFO_DWARF4=y

CONFIG_DEBUG_FS=y

CONFIG_PANIC_ON_OOPS=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_RCU_CPU_STALL_TIMEOUT=60

# CONFIG_RCU_TRACE is not set

# CONFIG_FTRACE is not set

arch/s390/kernel/entry.S

+2 −1
Original line number Diff line number Diff line
@@ -602,7 +602,8 @@ SYM_CODE_START(stack_invalid) 
	stmg	%r0,%r7,__PT_R0(%r11)

	stmg	%r8,%r9,__PT_PSW(%r11)

	mvc	__PT_R8(64,%r11),0(%r14)

	stg	%r10,__PT_ORIG_GPR2(%r11) # store last break to orig_gpr2

	GET_LC	%r2

	mvc	__PT_ORIG_GPR2(8,%r11),__LC_PGM_LAST_BREAK(%r2)

	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)

	lgr	%r2,%r11		# pass pointer to pt_regs

	jg	kernel_stack_invalid

arch/s390/pci/pci_clp.c

+2 −0
Original line number Diff line number Diff line
@@ -428,6 +428,8 @@ static void __clp_add(struct clp_fh_list_entry *entry, void *data) 
		return;

	}

	zdev = zpci_create_device(entry->fid, entry->fh, entry->config_state);

	if (IS_ERR(zdev))

		return;

	list_add_tail(&zdev->entry, scan_list);

}