Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp3084944yba; Mon, 22 Apr 2019 19:34:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqwhc5stD+90K0b0CpCLUGFI+NxuEuVxGHOU8pBX+MVDUctsi2Jb9F1mFhhgXVOPgFSEeYuw X-Received: by 2002:a65:4802:: with SMTP id h2mr20588360pgs.98.1555986857361; Mon, 22 Apr 2019 19:34:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555986857; cv=none; d=google.com; s=arc-20160816; b=JHNDZKWSJVvTdqDoK9Qpualzvaq3Z62Nyc8zG4LPXnvumMUrr2mvr6qWzoGO+fCBpG 6M9EaQd+RLR2oCCi3MEAUEB5chnHT8la+I6mmdyBEkwgcZI5QTg/itxIO1nXiKsQqvgu q4glr91SrQPjECaSYrUq94IMwggAbjIHMcKyfaatUvg4jrNkaKctyMvU401kgfU47WiY /AmrBCkgUAypf0Dx72ZrlWHO/kNwNoUQD1Lv6k0Lgkn0qemVJDJDs6m4ePAfpAwwX3QU dVp0Ezpe3KqnnFd2nawweNn/I+thFG6aGQQkoD+8+ZPdwy28a2gXytBpCRCw+C6zlC8g 8Q5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7R8/06BoO1er2RPhPvVv8pLFILnzfw73XlMguC8EgT4=; b=T4WOE5VYT6+qTthfIm9mDKrga5WvKcTxVzftg5m4MuNkxwsb/Uqd/QzuuBCo+w3V80 H/5+UTeXwwhEhS14X5UAT5BJo8yLpzw/feHyEjCIxMNVGQxvUXd77Z88DOWC8SGXi9Mj YLcISlDpE0tYWhROTJwoew7bW6G1+zaIeNW4ZcfQkyugQZP+/2mNSa+86YUrmJPDWJg5 pnHaBNR5VpugY8HeFFFk4BgPJnO4BVgVmkmiN3nOapX97w8YffYMitYVMiQzQImGp745 QRKBfu7o1c60+GTK706zEp6q9wWgxmePupRIdvqVDFM+OuHJR6Y9FvKjD8y2c8AFXFH7 d3Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2EfAanza; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a13si15244223pfn.70.2019.04.22.19.34.00; Mon, 22 Apr 2019 19:34:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2EfAanza; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731940AbfDVUBH (ORCPT + 99 others); Mon, 22 Apr 2019 16:01:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:49680 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730152AbfDVTrE (ORCPT ); Mon, 22 Apr 2019 15:47:04 -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 5961A21909; Mon, 22 Apr 2019 19:47:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962423; bh=Zl/SdUUDIJr4Qb4gdRngfELW4MGeRxPUNwgbO9pkDKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2EfAanzas8jQnHrnVePIbEr8whsiAhuC6rY42+tr+uC/JgRIO0kLVORWDOvRdu/j2 BXLbhO4MOfqhsjvgdK1GRRbyEQ0wuTdfZUc5F3X55s4JPZ5B5NaXdncGm28ug0dFrt DmuJx8NMcH4vyLCtk1ECzNQAmZIurjGDD+P4XoSU= 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 4.19 54/68] x86/realmode: Don't leak the trampoline kernel address Date: Mon, 22 Apr 2019 15:45:02 -0400 Message-Id: <20190422194516.11634-54-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194516.11634-1-sashal@kernel.org> References: <20190422194516.11634-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