Commit e50a8038 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull s390 fixes from Vasily Gorbik:

 - Update defconfigs

 - Fix early boot code by adding missing intersection check to prevent
   potential overwriting of the ipl report

 - Fix a use-after-free issue in s390-specific code related to PCI
   resources being retained after hot-unplugging individual functions,
   by removing the resources from the PCI bus's resource list and using
   the zpci_bar_struct's resource pointer directly

* tag 's390-6.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: update defconfigs
  PCI: s390: Fix use-after-free of PCI resources with per-function hotplug
  s390/ipl: add missing intersection check to ipl_report handling
parents 17adaeae d7a0bdbf

arch/s390/boot/ipl_report.c

+8 −0
Original line number Diff line number Diff line
@@ -57,11 +57,19 @@ static unsigned long find_bootdata_space(struct ipl_rb_components *comps, 
	if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && initrd_data.start && initrd_data.size &&

	    intersects(initrd_data.start, initrd_data.size, safe_addr, size))

		safe_addr = initrd_data.start + initrd_data.size;

	if (intersects(safe_addr, size, (unsigned long)comps, comps->len)) {

		safe_addr = (unsigned long)comps + comps->len;

		goto repeat;

	}

	for_each_rb_entry(comp, comps)

		if (intersects(safe_addr, size, comp->addr, comp->len)) {

			safe_addr = comp->addr + comp->len;

			goto repeat;

		}

	if (intersects(safe_addr, size, (unsigned long)certs, certs->len)) {

		safe_addr = (unsigned long)certs + certs->len;

		goto repeat;

	}

	for_each_rb_entry(cert, certs)

		if (intersects(safe_addr, size, cert->addr, cert->len)) {

			safe_addr = cert->addr + cert->len;

arch/s390/configs/debug_defconfig

+4 −9
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ CONFIG_NUMA_BALANCING=y 
CONFIG_MEMCG=y

CONFIG_BLK_CGROUP=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_RDMA=y

CONFIG_CGROUP_FREEZER=y
@@ -90,7 +89,6 @@ CONFIG_MINIX_SUBPARTITION=y 
CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_UNIXWARE_DISKLABEL=y

CONFIG_IOSCHED_BFQ=y

CONFIG_BFQ_GROUP_IOSCHED=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC_STAT=y
@@ -298,7 +296,6 @@ CONFIG_IP_NF_TARGET_REJECT=m 
CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m
@@ -340,7 +337,6 @@ CONFIG_BRIDGE_MRP=y 
CONFIG_VLAN_8021Q=m

CONFIG_VLAN_8021Q_GVRP=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_CBQ=m

CONFIG_NET_SCH_HTB=m

CONFIG_NET_SCH_HFSC=m

CONFIG_NET_SCH_PRIO=m
@@ -351,7 +347,6 @@ CONFIG_NET_SCH_SFQ=m 
CONFIG_NET_SCH_TEQL=m

CONFIG_NET_SCH_TBF=m

CONFIG_NET_SCH_GRED=m

CONFIG_NET_SCH_DSMARK=m

CONFIG_NET_SCH_NETEM=m

CONFIG_NET_SCH_DRR=m

CONFIG_NET_SCH_MQPRIO=m
@@ -363,14 +358,11 @@ CONFIG_NET_SCH_INGRESS=m 
CONFIG_NET_SCH_PLUG=m

CONFIG_NET_SCH_ETS=m

CONFIG_NET_CLS_BASIC=m

CONFIG_NET_CLS_TCINDEX=m

CONFIG_NET_CLS_ROUTE4=m

CONFIG_NET_CLS_FW=m

CONFIG_NET_CLS_U32=m

CONFIG_CLS_U32_PERF=y

CONFIG_CLS_U32_MARK=y

CONFIG_NET_CLS_RSVP=m

CONFIG_NET_CLS_RSVP6=m

CONFIG_NET_CLS_FLOW=m

CONFIG_NET_CLS_CGROUP=y

CONFIG_NET_CLS_BPF=m
@@ -584,7 +576,7 @@ CONFIG_DIAG288_WATCHDOG=m 
CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_HID is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_INFINIBAND=m

CONFIG_INFINIBAND_USER_ACCESS=m
@@ -828,6 +820,7 @@ CONFIG_PANIC_ON_OOPS=y 
CONFIG_DETECT_HUNG_TASK=y

CONFIG_WQ_WATCHDOG=y

CONFIG_TEST_LOCKUP=m

CONFIG_DEBUG_PREEMPT=y

CONFIG_PROVE_LOCKING=y

CONFIG_LOCK_STAT=y

CONFIG_DEBUG_ATOMIC_SLEEP=y
@@ -843,6 +836,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=300 
# CONFIG_RCU_TRACE is not set

CONFIG_LATENCYTOP=y

CONFIG_BOOTTIME_TRACING=y

CONFIG_FPROBE=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_STACK_TRACER=y

CONFIG_IRQSOFF_TRACER=y
@@ -857,6 +851,7 @@ CONFIG_SAMPLES=y 
CONFIG_SAMPLE_TRACE_PRINTK=m

CONFIG_SAMPLE_FTRACE_DIRECT=m

CONFIG_SAMPLE_FTRACE_DIRECT_MULTI=m

CONFIG_SAMPLE_FTRACE_OPS=m

CONFIG_DEBUG_ENTRY=y

CONFIG_CIO_INJECT=y

CONFIG_KUNIT=m

arch/s390/configs/defconfig

+3 −9
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ CONFIG_NUMA_BALANCING=y 
CONFIG_MEMCG=y

CONFIG_BLK_CGROUP=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_RDMA=y

CONFIG_CGROUP_FREEZER=y
@@ -85,7 +84,6 @@ CONFIG_MINIX_SUBPARTITION=y 
CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_UNIXWARE_DISKLABEL=y

CONFIG_IOSCHED_BFQ=y

CONFIG_BFQ_GROUP_IOSCHED=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC_STAT=y
@@ -289,7 +287,6 @@ CONFIG_IP_NF_TARGET_REJECT=m 
CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m
@@ -330,7 +327,6 @@ CONFIG_BRIDGE_MRP=y 
CONFIG_VLAN_8021Q=m

CONFIG_VLAN_8021Q_GVRP=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_CBQ=m

CONFIG_NET_SCH_HTB=m

CONFIG_NET_SCH_HFSC=m

CONFIG_NET_SCH_PRIO=m
@@ -341,7 +337,6 @@ CONFIG_NET_SCH_SFQ=m 
CONFIG_NET_SCH_TEQL=m

CONFIG_NET_SCH_TBF=m

CONFIG_NET_SCH_GRED=m

CONFIG_NET_SCH_DSMARK=m

CONFIG_NET_SCH_NETEM=m

CONFIG_NET_SCH_DRR=m

CONFIG_NET_SCH_MQPRIO=m
@@ -353,14 +348,11 @@ CONFIG_NET_SCH_INGRESS=m 
CONFIG_NET_SCH_PLUG=m

CONFIG_NET_SCH_ETS=m

CONFIG_NET_CLS_BASIC=m

CONFIG_NET_CLS_TCINDEX=m

CONFIG_NET_CLS_ROUTE4=m

CONFIG_NET_CLS_FW=m

CONFIG_NET_CLS_U32=m

CONFIG_CLS_U32_PERF=y

CONFIG_CLS_U32_MARK=y

CONFIG_NET_CLS_RSVP=m

CONFIG_NET_CLS_RSVP6=m

CONFIG_NET_CLS_FLOW=m

CONFIG_NET_CLS_CGROUP=y

CONFIG_NET_CLS_BPF=m
@@ -573,7 +565,7 @@ CONFIG_DIAG288_WATCHDOG=m 
CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_HID is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_INFINIBAND=m

CONFIG_INFINIBAND_USER_ACCESS=m
@@ -795,6 +787,7 @@ CONFIG_RCU_REF_SCALE_TEST=m 
CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_LATENCYTOP=y

CONFIG_BOOTTIME_TRACING=y

CONFIG_FPROBE=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_STACK_TRACER=y

CONFIG_SCHED_TRACER=y
@@ -805,6 +798,7 @@ CONFIG_SAMPLES=y 
CONFIG_SAMPLE_TRACE_PRINTK=m

CONFIG_SAMPLE_FTRACE_DIRECT=m

CONFIG_SAMPLE_FTRACE_DIRECT_MULTI=m

CONFIG_SAMPLE_FTRACE_OPS=m

CONFIG_KUNIT=m

CONFIG_KUNIT_DEBUGFS=y

CONFIG_LKDTM=m

arch/s390/configs/zfcpdump_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ CONFIG_ZFCP=y 
# CONFIG_VMCP is not set

# CONFIG_MONWRITER is not set

# CONFIG_S390_VMUR is not set

# CONFIG_HID is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

arch/s390/pci/pci.c

+10 −6
Original line number Diff line number Diff line
@@ -544,8 +544,7 @@ static struct resource *__alloc_res(struct zpci_dev *zdev, unsigned long start, 
	return r;

}



int zpci_setup_bus_resources(struct zpci_dev *zdev,

			     struct list_head *resources)

int zpci_setup_bus_resources(struct zpci_dev *zdev)

{

	unsigned long addr, size, flags;

	struct resource *res;
@@ -581,7 +580,6 @@ int zpci_setup_bus_resources(struct zpci_dev *zdev, 
			return -ENOMEM;

		}

		zdev->bars[i].res = res;

		pci_add_resource(resources, res);

	}

	zdev->has_resources = 1;
@@ -590,17 +588,23 @@ int zpci_setup_bus_resources(struct zpci_dev *zdev, 


static void zpci_cleanup_bus_resources(struct zpci_dev *zdev)

{

	struct resource *res;

	int i;



	pci_lock_rescan_remove();

	for (i = 0; i < PCI_STD_NUM_BARS; i++) {

		if (!zdev->bars[i].size || !zdev->bars[i].res)

		res = zdev->bars[i].res;

		if (!res)

			continue;



		release_resource(res);

		pci_bus_remove_resource(zdev->zbus->bus, res);

		zpci_free_iomap(zdev, zdev->bars[i].map_idx);

		release_resource(zdev->bars[i].res);

		kfree(zdev->bars[i].res);

		zdev->bars[i].res = NULL;

		kfree(res);

	}

	zdev->has_resources = 0;

	pci_unlock_rescan_remove();

}



int pcibios_device_add(struct pci_dev *pdev)