From patchwork Tue May 26 18:52:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 225201 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 135BAC433E3 for ; Tue, 26 May 2020 19:32:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DCE9F20776 for ; Tue, 26 May 2020 19:32:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590521523; bh=tkjXbCIZU4cnQZYUNnAN08QTrDRjEyW2tJ4zBswjrrc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EJHgk+FAnEgqOw9x/9I2dimzANWGJlNFn8bbTKvn7HIucxv4+OjGB0iImIDkRsMsD g06g81t2fyLlaI/nwR6tbiutoxWJJj9QaUhAeIL8dbZGmkmfHQ5fkooQBpURuJLSUX 7iIsswY0/VhlXb3bY7CjkcS5jdsgPbmgOmj/Bez4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390264AbgEZS6Q (ORCPT ); Tue, 26 May 2020 14:58:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:51724 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389585AbgEZS6P (ORCPT ); Tue, 26 May 2020 14:58:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 81EB22086A; Tue, 26 May 2020 18:58:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590519495; bh=tkjXbCIZU4cnQZYUNnAN08QTrDRjEyW2tJ4zBswjrrc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oPwKrZNBE/u7E3u/HcN9LTG4SWOobp93N4KZyBWdTzbzFKiwGSWUOLeH4l8kSIiYu JScghD6tdFJpdk3oP6vxyimYFiMqNLztKYkio2tNeMHNYdUrH3Q23PJivlRb0H10Lf iIszysVHjVUvGO7H/bw5Z6juKgB+iyIop4xTdSaU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christoph Hellwig , Catalin Marinas , Sasha Levin Subject: [PATCH 4.9 25/64] arm64: fix the flush_icache_range arguments in machine_kexec Date: Tue, 26 May 2020 20:52:54 +0200 Message-Id: <20200526183920.689522330@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200526183913.064413230@linuxfoundation.org> References: <20200526183913.064413230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christoph Hellwig Commit d51c214541c5154dda3037289ee895ea3ded5ebd upstream. The second argument is the end "pointer", not the length. Fixes: d28f6df1305a ("arm64/kexec: Add core kexec support") Cc: # 4.8.x- Signed-off-by: Christoph Hellwig Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/kernel/machine_kexec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index bc96c8a7fc79..3e4b778f16a5 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -177,7 +177,8 @@ void machine_kexec(struct kimage *kimage) /* Flush the reboot_code_buffer in preparation for its execution. */ __flush_dcache_area(reboot_code_buffer, arm64_relocate_new_kernel_size); flush_icache_range((uintptr_t)reboot_code_buffer, - arm64_relocate_new_kernel_size); + (uintptr_t)reboot_code_buffer + + arm64_relocate_new_kernel_size); /* Flush the kimage list and its buffers. */ kexec_list_flush(kimage);