Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3586056pxb; Mon, 24 Jan 2022 12:53:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJy8/PDbx9sWwQYyH7+iFh6/gW2cjbERqlK+DvOO2oQc3xuvf+8aYkrRW5oTvMRC+Qup7YTQ X-Received: by 2002:a17:902:8307:b0:14a:8dc0:8fed with SMTP id bd7-20020a170902830700b0014a8dc08fedmr15589121plb.53.1643057586287; Mon, 24 Jan 2022 12:53:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643057586; cv=none; d=google.com; s=arc-20160816; b=TDdxVkQ7f9sj2QCTVT4lZv63vgcXmSb1YhUO6GA3EHXdy6Q0tdFeb8V+3QaueUyvs7 QAWkC59wie+4yKn5H6NOacJRHx+/TEeKhBOos4c3vYJJqMQSrRSha6OitRU89ynuATAU P4nwJ2oXPBo1lTQ7SbRPPposes/Nb/M+gv+L0nXrUerwX/zx3ZowBfavkbGrSGhkrAqp c36J1OkKqswx9zRAYC8wygtoEoRSZg/SORU0uqSSFGsQYqaKv2VsUOkIXa+HXpFDDumj L2AzuS7Vh0m5IDg6f09hz+M1r258tMsh3n7eakETTE20Iry5RUsymMMGInnk2aya6GjV HQ3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7RuBJqsE9zd2CKw7RpGqNI5iBgBGF89wwoKLbZZicr0=; b=PCRWLotZd3FFGpdIrSs1iXj5kponzQJhtQFHcvLKGF9LRMm4eKCcCrQB23WN7XKjH7 FXpMecCKJPZRKWFGfPSbbng1W4xHYaHsBa79oUmF8MpY5PMx9mXoMH5TvkjOvfPUvBPd ly7PvoWh1AN5Zeoo/XzDQRn5HGPXqQWkRJ+BWXqzMAIi0KyaTIksPzhPvGAKdPsvzvIT NMkO0tmJ+0Uaj6xiehvTQupx+KlD3DupsRfaXoxWHlpqCImrZJHVLFaMGByzfOIsx5FI wGhufFh5NmtFWowuWJ9lq+Kor5bWupET6zKirvuCZvcTYauUp3GzJ2MEVYzLrZ9P8jIC tb8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FbsR3AsD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e3si1152600plh.181.2022.01.24.12.52.54; Mon, 24 Jan 2022 12:53:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FbsR3AsD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378580AbiAXUHl (ORCPT + 99 others); Mon, 24 Jan 2022 15:07:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353876AbiAXTtF (ORCPT ); Mon, 24 Jan 2022 14:49:05 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66857C02B847; Mon, 24 Jan 2022 11:23:54 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2F005B810BD; Mon, 24 Jan 2022 19:23:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D3EFC340E5; Mon, 24 Jan 2022 19:23:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643052231; bh=vwRGDU4N4TbEApmcUFKQ4hpx5acenT08Vv9AbCWceh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FbsR3AsDrMbeBvEpyLfBdV8P2vDlATc0LlmkkQ2qw333MQwU2w1YQWEISNrB7LPYU PJ6BLC3NP0DZZAKj+y/sLqEZhwU/cifIhb65YSAa17l4t6PWnunfZIzfMjDt4HkdcN NJcIYIB2ty9YXJYAhtrpTYDRXiMiDITKTzx6cbZ4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lukas Bulwahn , Jonathan Corbet Subject: [PATCH 4.19 214/239] Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization Date: Mon, 24 Jan 2022 19:44:12 +0100 Message-Id: <20220124183949.917800767@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124183943.102762895@linuxfoundation.org> References: <20220124183943.102762895@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lukas Bulwahn commit 82ca67321f55a8d1da6ac3ed611da3c32818bb37 upstream. The config RANDOMIZE_SLAB does not exist, the authors probably intended to refer to the config RANDOMIZE_BASE, which provides kernel address-space randomization. They probably just confused SLAB with BASE (these two four-letter words coincidentally share three common letters), as they also point out the config SLAB_FREELIST_RANDOM as further randomization within the same sentence. Fix the reference of the config for kernel address-space randomization to the config that provides that. Fixes: 6e88559470f5 ("Documentation: Add section about CPU vulnerabilities for Spectre") Signed-off-by: Lukas Bulwahn Link: https://lore.kernel.org/r/20211230171940.27558-1-lukas.bulwahn@gmail.com Signed-off-by: Jonathan Corbet Signed-off-by: Greg Kroah-Hartman --- Documentation/admin-guide/hw-vuln/spectre.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/Documentation/admin-guide/hw-vuln/spectre.rst +++ b/Documentation/admin-guide/hw-vuln/spectre.rst @@ -468,7 +468,7 @@ Spectre variant 2 before invoking any firmware code to prevent Spectre variant 2 exploits using the firmware. - Using kernel address space randomization (CONFIG_RANDOMIZE_SLAB=y + Using kernel address space randomization (CONFIG_RANDOMIZE_BASE=y and CONFIG_SLAB_FREELIST_RANDOM=y in the kernel configuration) makes attacks on the kernel generally more difficult.