[PATCH 1/4] stack overflow safe kdump ( 2.6.15-rc3-i386) - safe_smp_processor_id

From: Fernando Luis Vazquez Cao (fernando_at_intellilink.co.jp)
Date: 11/30/05

  • Next message: Fernando Luis Vazquez Cao: "Re: [Fastboot] Re: [PATCH 1/4] stack overflow safe kdump (i386) - safe_smp_processor_id" 
    To: "Eric W. Biederman" <ebiederm@xmission.com>
Date:	Wed, 30 Nov 2005 16:35:13 +0900

    On the event of a stack overflow critical data that usually resides at
    the bottom of the stack is likely to be stomped and, consequently, its
    use should be avoided.

    In particular, in the i386 and IA64 architectures the macro
    smp_processor_id ultimately makes use of the "cpu" member of struct
    thread_info which resides at the bottom of the stack (see code snips
    below). x86_64, on the other hand, is not affected by this problem
    because it benefits from the PDA infrastructure.

    To circumvent this problem I suggest implementing
    "safe_smp_processor_id()" (it already exists on x86_64) for i386 and
    IA64 and use it as a replacement for smp_processor_id in the reboot path
    to the dump capture kernel. This is a possible implementation for i386. 

    ---
diff -urNp linux-2.6.15-rc3/arch/i386/kernel/smp.c linux-2.6.15-rc3-sov/arch/i386/kernel/smp.c
--- linux-2.6.15-rc3/arch/i386/kernel/smp.c	2005-10-28 09:02:08.000000000 +0900
+++ linux-2.6.15-rc3-sov/arch/i386/kernel/smp.c	2005-11-30 16:00:38.000000000 +0900
@@ -628,3 +628,28 @@ fastcall void smp_call_function_interrup
 	}
 }
 
+static int convert_apicid_to_cpu(int apic_id)
+{
+	int i;
+
+	for (i = 0; i < NR_CPUS; i++) {
+		if (x86_cpu_to_apicid[i] == apic_id)
+		return i;
+	}
+	return -1;
+}
+
+int safe_smp_processor_id(void) {
+	int apicid, cpuid;
+
+	if (!boot_cpu_has(X86_FEATURE_APIC))
+		return 0;
+
+	apicid = hard_smp_processor_id();
+	if (apicid == BAD_APICID)
+		return 0;
+
+	cpuid = convert_apicid_to_cpu(apicid);
+
+	return cpuid >= 0 ? cpuid : 0;
+}
diff -urNp linux-2.6.15-rc3/include/asm-i386/smp.h linux-2.6.15-rc3-sov/include/asm-i386/smp.h
--- linux-2.6.15-rc3/include/asm-i386/smp.h	2005-11-30 14:51:55.000000000 +0900
+++ linux-2.6.15-rc3-sov/include/asm-i386/smp.h	2005-11-30 14:56:11.000000000 +0900
@@ -90,12 +90,14 @@ static __inline int logical_smp_processo
 
 #endif
 
+extern int safe_smp_processor_id(void);
 extern int __cpu_disable(void);
 extern void __cpu_die(unsigned int cpu);
 #endif /* !__ASSEMBLY__ */
 
 #else /* CONFIG_SMP */
 
+#define safe_smp_processor_id() 0
 #define cpu_physical_id(cpu)		boot_cpu_physical_apicid
 
 #define NO_PROC_ID		0xFF		/* No processor magic marker */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
  • Next message: Fernando Luis Vazquez Cao: "Re: [Fastboot] Re: [PATCH 1/4] stack overflow safe kdump (i386) - safe_smp_processor_id"

    Relevant Pages