From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B0931DE841 for ; Wed, 7 Aug 2024 10:33:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723026830; cv=none; b=IdGAMRimgNjFgeGSoJsd8wb7F9txWJJrsMr8nalURHCyPA7vJzz89bclMZtIowUbycijPekvziknOVM/jRZK6FWa5GL3eQs2IqZYM6CXjWipB+GWZyHdE1hqLa356qY5387xA8vkthwsxD/yva35xE5swlmXJeU5KBua/4nk6wA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723026830; c=relaxed/simple; bh=8wNno8zJKsfD2+iFnTG4mqxseKhxAbo/fRpV964Ztjo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Lt8vIgX66aAX0MjiK29gIZX+dIFo1AF+Q7M6CkFkImXya5OKB2S/50EizJPkKnI1fq813m067fkVrSLFfYQx8K5O/2iRc6Dd9dHHfqNJiOpNawS3mGXalDdLjxSPdreMIuGDTE2wPW4w+fD6FZxMTmZVQLbw5ZFNErUozcbmLzY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=XMzAC1YM; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=XMzAC1YM; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="XMzAC1YM"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="XMzAC1YM" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 3BC0F1F8BD; Wed, 7 Aug 2024 10:33:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1723026827; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5V+UOas05CCJX1lp+n/kvQ+Bo/4QFe3PiFfjQw3draY=; b=XMzAC1YMl90C7b1lVoVe6deG5bKZooG8TmMQhahGnwg6aWvmq0vJFZ9nmZPrBRF534vb66 xGDhq+YFNo0Q8FG5uvGfspmj9WNymK02YjHn4RwxOoPJ1sMl0sSvT1YZ/PtiMEJ9HbmN97 2tfpQijyy76Q81Pl+n7mvY/4AFs4iWs= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1723026827; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5V+UOas05CCJX1lp+n/kvQ+Bo/4QFe3PiFfjQw3draY=; b=XMzAC1YMl90C7b1lVoVe6deG5bKZooG8TmMQhahGnwg6aWvmq0vJFZ9nmZPrBRF534vb66 xGDhq+YFNo0Q8FG5uvGfspmj9WNymK02YjHn4RwxOoPJ1sMl0sSvT1YZ/PtiMEJ9HbmN97 2tfpQijyy76Q81Pl+n7mvY/4AFs4iWs= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id E0A1013297; Wed, 7 Aug 2024 10:33:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 2lNkNYpNs2blHwAAD6G6ig (envelope-from ); Wed, 07 Aug 2024 10:33:46 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , xen-devel@lists.xenproject.org Subject: [PATCH 1/5] xen: use correct end address of kernel for conflict checking Date: Wed, 7 Aug 2024 12:33:32 +0200 Message-ID: <20240807103338.22007-2-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240807103338.22007-1-jgross@suse.com> References: <20240807103338.22007-1-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-3.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_SEVEN(0.00)[10]; RCVD_TLS_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email] X-Spam-Score: -3.30 X-Spam-Flag: NO X-Spam-Level: When running as a Xen PV dom0 the kernel is loaded by the hypervisor using a different memory map than that of the host. In order to minimize the required changes in the kernel, the kernel adapts its memory map to that of the host. In order to do that it is checking for conflicts of its load address with the host memory map. Unfortunately the tested memory range does not include the .brk area, which might result in crashes or memory corruption when this area does conflict withe the memory map of the host. Fix the test by using the _end label instead of __bss_stop. Fixes: 808fdb71936c ("xen: check for kernel memory conflicting with memory layout") Signed-off-by: Juergen Gross Marek Marczykowski-Górecki --- arch/x86/xen/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 806ddb2391d9..4bcc70a71b7d 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -825,7 +825,7 @@ char * __init xen_memory_setup(void) * to relocating (and even reusing) pages with kernel text or data. */ if (xen_is_e820_reserved(__pa_symbol(_text), - __pa_symbol(__bss_stop) - __pa_symbol(_text))) { + __pa_symbol(_end) - __pa_symbol(_text))) { xen_raw_console_write("Xen hypervisor allocated kernel memory conflicts with E820 map\n"); BUG(); } -- 2.43.0