From mboxrd@z Thu Jan 1 00:00:00 1970 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=ham 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 46F68C2D0DB for ; Fri, 24 Jan 2020 11:18:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 14CB92075D for ; Fri, 24 Jan 2020 11:18:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864708; bh=9u8ZdeYALsrZG/D77ADyMIlfNISPQvEldg7rLQhyxXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OsT6Q7JaLoDOQU3/3DdlGOSdTZeBWklc5e37TQJ8IFK5IBkS7QCmvk61s4VeYxebr PveKZcDanAANc5pjDgEAmnnznWlYaj427p8WyZwa92uIoUczHWpr26faZIZZTFyNrJ fPzsjm4claSSTXb+ujol6pScwARCGU8tSDlSt+dc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390215AbgAXLS1 (ORCPT ); Fri, 24 Jan 2020 06:18:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:55520 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390415AbgAXLSZ (ORCPT ); Fri, 24 Jan 2020 06:18:25 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 681E920704; Fri, 24 Jan 2020 11:18:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864705; bh=9u8ZdeYALsrZG/D77ADyMIlfNISPQvEldg7rLQhyxXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eWt+soH4gzqZJ2KUICL918OfR5prYowlAtcmTGTdsxbbbFM8oeVsP63LC/byHLqLK Hd7+K4WeL0fvlK07qDz8dGavCzTstjayLwF2hHT43VqeTGaU3FY2IVjnIROVp0Cr7e E+u/+nlh/55CF7fUeolUjLaJjy+Lgx2SdMbbOsOE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Philipp Rudo , Martin Schwidefsky , Sasha Levin Subject: [PATCH 4.19 329/639] s390/kexec_file: Fix potential segment overlap in ELF loader Date: Fri, 24 Jan 2020 10:28:19 +0100 Message-Id: <20200124093128.326895193@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Philipp Rudo [ Upstream commit 6339a3889ad4d0dd930ed7a1e873fb81d3e690f7 ] When loading an ELF image via kexec_file the segment alignment is ignored in the calculation for the load address of the next segment. When there are multiple segments this can lead to segment overlap and thus load failure. Signed-off-by: Philipp Rudo Fixes: 8be018827154 ("s390/kexec_file: Add ELF loader") Signed-off-by: Martin Schwidefsky Signed-off-by: Sasha Levin --- arch/s390/kernel/kexec_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/kernel/kexec_elf.c b/arch/s390/kernel/kexec_elf.c index 602e7cc26d118..5cf340b778f18 100644 --- a/arch/s390/kernel/kexec_elf.c +++ b/arch/s390/kernel/kexec_elf.c @@ -58,7 +58,7 @@ static int kexec_file_add_elf_kernel(struct kimage *image, if (ret) return ret; - data->memsz += buf.memsz; + data->memsz = ALIGN(data->memsz, phdr->p_align) + buf.memsz; } return 0; -- 2.20.1