From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751066AbbCHFjl (ORCPT ); Sun, 8 Mar 2015 00:39:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50921 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750872AbbCHFjk (ORCPT ); Sun, 8 Mar 2015 00:39:40 -0500 From: Baoquan He To: keescook@chromium.org, yinghai@kernel.org, hpa@zytor.com, mingo@redhat.com, bp@suse.de, matt.fleming@intel.com, vgoyal@redhat.com, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Baoquan He Subject: [Patch v3 1/7] x86, kaslr: Fix a bug that relocation can not be handled when kernel is loaded above 2G Date: Sun, 8 Mar 2015 13:38:49 +0800 Message-Id: <1425793135-2833-2-git-send-email-bhe@redhat.com> In-Reply-To: <1425793135-2833-1-git-send-email-bhe@redhat.com> References: <1425793135-2833-1-git-send-email-bhe@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When process 32 bit relocation tables a local variable extended is defined to calculate the physical address of relocs entry. However it's type is int which is enough for i386, for x86_64 not enough. That's why relocation can only be handled when kernel is loaded below 2G, otherwise a overflow will happen and cause system hang. Here change it to long as 32 bit inverse relocation processing does, and this change is safe for i386 relocation handling too. Signed-off-by: Baoquan He --- arch/x86/boot/compressed/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index 51e9e54..f3ca33e 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -278,7 +278,7 @@ static void handle_relocations(void *output, unsigned long output_len) * So we work backwards from the end of the decompressed image. */ for (reloc = output + output_len - sizeof(*reloc); *reloc; reloc--) { - int extended = *reloc; + long extended = *reloc; extended += map; ptr = (unsigned long)extended; -- 1.9.3