From patchwork Tue May 3 10:21:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 9002441 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9A6B1BF29F for ; Tue, 3 May 2016 10:26:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC2BE2028D for ; Tue, 3 May 2016 10:26:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A3C6320222 for ; Tue, 3 May 2016 10:26:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1axXVk-0002cl-79; Tue, 03 May 2016 10:25:00 +0000 Received: from pandora.arm.linux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1axXUV-0006xA-Rn for linux-arm-kernel@lists.infradead.org; Tue, 03 May 2016 10:24:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References:In-Reply-To; bh=aP9Wxqw3NIfFybyfav+7MUpgo5ke5mULHfhQDDNOOTI=; b=Obw2eWo60AiF88xJkyWb8HVVxcpQ7df5D7IFgEhi9id3PzIKzHoDgqYf6Ps85Ph9SnGC3Ra57n3cE/idIYLe+DK8pQn2fQBzbAKn4rz7t04qbxvVHBXh2Jn4nToE74XWM6WfIdR/XOjigwo4TeaH+y89SK2NdPU8bBu6Ew4WlHY=; Received: from [fd8f:7570:feb6:1:452d:3855:1c55:6d46] (port=42008 helo=e0050434b2927.dyn.arm.linux.org.uk) by pandora.arm.linux.org.uk with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1axXS9-0004vr-Ic; Tue, 03 May 2016 11:21:17 +0100 Received: from rmk by e0050434b2927.dyn.arm.linux.org.uk with local (Exim 4.82) (envelope-from ) id 1axXS5-0004h5-Cb; Tue, 03 May 2016 11:21:13 +0100 In-Reply-To: References: From: Russell King To: kexec@lists.infradead.org,linux-arm-kernel@lists.infradead.org Subject: [PATCH kexec-tools 02/32] kdump: fix multiple program header entries MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Tue, 03 May 2016 11:21:13 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160503_032345_141090_A3B774AC X-CRM114-Status: GOOD ( 11.59 ) X-Spam-Score: -5.3 (-----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pratyush Anand Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP generate_new_headers() forgot to increment the program header pointer after adding each program header from the kexec template. Fix it to increment it correctly. Without this, the program headers contain only the last entry, which means we will be missing most of the kernel image in the dump. Signed-off-by: Russell King Reviewed-by: Pratyush Anand --- kdump/kdump.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kdump/kdump.c b/kdump/kdump.c index 3247a54..99a1789 100644 --- a/kdump/kdump.c +++ b/kdump/kdump.c @@ -192,6 +192,7 @@ static void *generate_new_headers( } memcpy(nphdr, &phdr[i], sizeof(*nphdr)); nphdr->p_offset = offset; + nphdr++; offset += phdr[i].p_filesz; }