Commit c2cbcf53 authored Jun 24, 2014 by Laurent Dufour Committed by Benjamin Herrenschmidt Jun 25, 2014

powerpc/module: Fix TOC symbol CRC

The commit 71ec7c55 introduced the magic symbol ".TOC." for ELFv2 ABI.
This symbol is built manually and has no CRC value computed. A zero value
is put in the CRC section to avoid modpost complaining about a missing CRC.
Unfortunately, this breaks the kernel module loading when the kernel is
relocated (kdump case for instance) because of the relocation applied to
the kcrctab values.

This patch compute a CRC value for the TOC symbol which will match the one
compute by the kernel when it is relocated - aka '0 - relocate_start' done in
maybe_relocated called by check_version (module.c).

Signed-off-by: Laurent Dufour <ldufour@linux.vnet.ibm.com>
Cc: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent e2500be2

arch/powerpc/kernel/module_64.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -315,8 +315,17 @@ static void dedotify_versions(struct modversion_info *vers,
		struct modversion_info *end;

		for (end = (void *)vers + size; vers < end; vers++)
		if (vers->name[0] == '.')
		if (vers->name[0] == '.') {
		memmove(vers->name, vers->name+1, strlen(vers->name));
		#ifdef ARCH_RELOCATES_KCRCTAB
		/* The TOC symbol has no CRC computed. To avoid CRC
		* check failing, we must force it to the expected
		* value (see CRC check in module.c).
		*/
		if (!strcmp(vers->name, "TOC."))
		vers->crc = -(unsigned long)reloc_start;
		#endif
		}
		}

		/* Undefined symbols which refer to .funcname, hack to funcname (or .TOC.) */