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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 20392C10F11 for ; Mon, 22 Apr 2019 20:07:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1F11204EC for ; Mon, 22 Apr 2019 20:07:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555963634; bh=Zl/SdUUDIJr4Qb4gdRngfELW4MGeRxPUNwgbO9pkDKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nzBRTtoLVCKQkvpp0dgKvZwdNjBoi/b8BZI4P0M03X+tQuHoxieU2KsflFFTrCgtC G4dNgX5UUiZEDuRIYzsCsb5/xgRcS62IEZpun340KhfFi5F6RfcLb4wUzqdokx+RTT nsmw4/j/w8JrULrKnmOR1j/AbGfDht/IzdCVQ384= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729443AbfDVToW (ORCPT ); Mon, 22 Apr 2019 15:44:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:45262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729414AbfDVToR (ORCPT ); Mon, 22 Apr 2019 15:44:17 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A2CC7204EC; Mon, 22 Apr 2019 19:44:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962256; bh=Zl/SdUUDIJr4Qb4gdRngfELW4MGeRxPUNwgbO9pkDKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=avrPLyLm1jFcpefbnxS5NxAu1W7FafFjPd23eEiNj/b6J6E554AfaRKl3FqdZ2Y38 DxxanD8Mhsyys/UW3LYadSmnsSV6wC03S7dqa9aOXQmmOvKxHAlMySWjW0sYB/AbMK bvfr5taHYlTZIMKuEIajLA1BCPO0cJ/fmTwPZV8E= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Matteo Croce , Borislav Petkov , "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , x86-ml , Sasha Levin Subject: [PATCH AUTOSEL 5.0 68/98] x86/realmode: Don't leak the trampoline kernel address Date: Mon, 22 Apr 2019 15:41:35 -0400 Message-Id: <20190422194205.10404-68-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194205.10404-1-sashal@kernel.org> References: <20190422194205.10404-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matteo Croce [ Upstream commit b929a500d68479163c48739d809cbf4c1335db6f ] Since commit ad67b74d2469 ("printk: hash addresses printed with %p") at boot "____ptrval____" is printed instead of the trampoline addresses: Base memory trampoline at [(____ptrval____)] 99000 size 24576 Remove the print as we don't want to leak kernel addresses and this statement is not needed anymore. Fixes: ad67b74d2469d9b8 ("printk: hash addresses printed with %p") Signed-off-by: Matteo Croce Signed-off-by: Borislav Petkov Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Thomas Gleixner Cc: x86-ml Link: https://lkml.kernel.org/r/20190326203046.20787-1-mcroce@redhat.com Signed-off-by: Sasha Levin (Microsoft) --- arch/x86/realmode/init.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c index d10105825d57..47d097946872 100644 --- a/arch/x86/realmode/init.c +++ b/arch/x86/realmode/init.c @@ -20,8 +20,6 @@ void __init set_real_mode_mem(phys_addr_t mem, size_t size) void *base = __va(mem); real_mode_header = (struct real_mode_header *) base; - printk(KERN_DEBUG "Base memory trampoline at [%p] %llx size %zu\n", - base, (unsigned long long)mem, size); } void __init reserve_real_mode(void) -- 2.19.1