Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d54c5a3 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] smp: fix memory leak on __cpu_up 



If sigp_set_prefix fails on __cpu_up we leak the lowcore structures
and async+panic stacks for the failed cpu.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 008d2d11

arch/s390/kernel/smp.c

+3 −3
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ static int __cpuinit smp_alloc_lowcore(int cpu) 
	return -ENOMEM;

}



#ifdef CONFIG_HOTPLUG_CPU

static void smp_free_lowcore(int cpu)

{

	struct _lowcore *lowcore;
@@ -527,7 +526,6 @@ static void smp_free_lowcore(int cpu) 
	free_pages((unsigned long) lowcore, lc_order);

	lowcore_ptr[cpu] = NULL;

}

#endif /* CONFIG_HOTPLUG_CPU */



/* Upping and downing of CPUs */

int __cpuinit __cpu_up(unsigned int cpu)
@@ -544,8 +542,10 @@ int __cpuinit __cpu_up(unsigned int cpu) 


	ccode = signal_processor_p((__u32)(unsigned long)(lowcore_ptr[cpu]),

				   cpu, sigp_set_prefix);

	if (ccode)

	if (ccode) {

		smp_free_lowcore(cpu);

		return -EIO;

	}



	idle = current_set[cpu];

	cpu_lowcore = lowcore_ptr[cpu];

arch/s390/kernel/vdso.c

+0 −2
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ int vdso_alloc_per_cpu(int cpu, struct _lowcore *lowcore) 
	return -ENOMEM;

}



#ifdef CONFIG_HOTPLUG_CPU

void vdso_free_per_cpu(int cpu, struct _lowcore *lowcore)

{

	unsigned long segment_table, page_table, page_frame;
@@ -163,7 +162,6 @@ void vdso_free_per_cpu(int cpu, struct _lowcore *lowcore) 
	free_page(page_table);

	free_pages(segment_table, SEGMENT_ORDER);

}

#endif /* CONFIG_HOTPLUG_CPU */



static void __vdso_init_cr5(void *dummy)

{