Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp5322671img; Wed, 27 Mar 2019 06:29:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqy8E6jgG+4fnWyomVTxJ6I+uibLBvYsGW02zFChvN8Y3zwJrOKQ6FLN3zkf8cBB2IiFpLbx X-Received: by 2002:a65:6389:: with SMTP id h9mr16581221pgv.398.1553693361186; Wed, 27 Mar 2019 06:29:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553693361; cv=none; d=google.com; s=arc-20160816; b=R7lzAxxI8HaeH7Odxks07AR1YeTCJDUiNlZaVKo+H9ZTh5g1dfCZqZE+Sy/Wyn59ae qgYlYM/WWBpQAR7s3LqIKdv/tfGuw+sD8K1EnYpAP0RcjqaEvzormofH5jIk0LGanm/l 86WARj0nkEMZ4zJjYABurRxpfOfnPd8NFstosQmSrf2Q3PGJnKmUN8s/ArvuHT1uYLdB fw85flM4066Y+PowlLrxOjcLHtSsWCXPBIigF66pI5FN1TIBVhaGZ+qgu8e27RIKTybc fTxBfSArPvE3djVRPZVFdBu03Xpq5E036JK6mpsYwCt+xKYmJtGPIjOiNBEYMB8tPRzL Mb7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition :content-transfer-encoding:mime-version:robot-unsubscribe:robot-id :git-commit-id:subject:to:references:in-reply-to:reply-to:cc :message-id:from:date; bh=qzp/c+qaJPBxv+rxDkZvseMlHOV9GYUQ94Le6DfGSQo=; b=SjMy95skqQ92gmHHuFbt1tYYbwpFSuQ/AiDpbHq9yLPUbcl4QuCxuHV8Iy6bEw+YN+ 947zXLupfctFG0CduGyg7lo6mWIEvpoOhZRAKJiRiN4GnCnkc+WzawPvBQm9HP3/mdBl 2Ti9GSHvMJV5Qe5nhfuUAiJ8moS5wElqRe5vt1JEGwAbLhpypAjlKO3/aqLjIT1I5jn+ ehKf+EBSz37+6jNzjA9F8H5UrzhCJ8iVHow0rRJClJjLkXVILfdy4eD9ClbPXUtHsStV +gnncRvdB6fo6Blrqd7riJpabKmaSJzskUk6YeWBFd3gXWvcJZmplIw5I6rmOr8bgjqp IcKA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i128si19098188pfc.0.2019.03.27.06.29.05; Wed, 27 Mar 2019 06:29:21 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730098AbfC0N2R (ORCPT + 99 others); Wed, 27 Mar 2019 09:28:17 -0400 Received: from terminus.zytor.com ([198.137.202.136]:58367 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726598AbfC0N2R (ORCPT ); Wed, 27 Mar 2019 09:28:17 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id x2RDS2EJ2873970 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 27 Mar 2019 06:28:02 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id x2RDS2JV2873967; Wed, 27 Mar 2019 06:28:02 -0700 Date: Wed, 27 Mar 2019 06:28:02 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Matteo Croce Message-ID: Cc: hpa@zytor.com, bp@suse.de, x86@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, mingo@kernel.org, mcroce@redhat.com Reply-To: mcroce@redhat.com, mingo@kernel.org, x86@kernel.org, hpa@zytor.com, bp@suse.de, linux-kernel@vger.kernel.org, mingo@redhat.com, tglx@linutronix.de In-Reply-To: <20190326203046.20787-1-mcroce@redhat.com> References: <20190326203046.20787-1-mcroce@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/realmode: Don't leak the trampoline kernel address Git-Commit-ID: b929a500d68479163c48739d809cbf4c1335db6f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Spam-Status: No, score=0.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DATE_IN_FUTURE_03_06 autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on terminus.zytor.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b929a500d68479163c48739d809cbf4c1335db6f Gitweb: https://git.kernel.org/tip/b929a500d68479163c48739d809cbf4c1335db6f Author: Matteo Croce AuthorDate: Tue, 26 Mar 2019 21:30:46 +0100 Committer: Borislav Petkov CommitDate: Wed, 27 Mar 2019 14:22:08 +0100 x86/realmode: Don't leak the trampoline kernel address 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 --- 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)