Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3593979pxb; Mon, 24 Jan 2022 13:04:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJxc8UxnCUr59H8+TOjxbpDLhLeL5bt1YPMu55LIxpS9CnTiFY3Ao6eLIWqfAzhcF3lRyctf X-Received: by 2002:a17:903:2284:b0:14b:2764:8ffc with SMTP id b4-20020a170903228400b0014b27648ffcmr12709251plh.35.1643058283028; Mon, 24 Jan 2022 13:04:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643058283; cv=none; d=google.com; s=arc-20160816; b=POgtunSMvxarnz752lPKjAUSysGEo4FgWrJIEFsfgXANb+pFVe1wi5syNwBW1cjMID K6ibV7uzCEJqW5CnmxUloVH3+71r2NR0dpJ9kyBJBrRE3cpU2QjlBRMMT/ssmnOiPNVi ShUG4/KpDOYwGZYD4RVo56JxoltqgQZa6MpPV/99a1+QcVSpgXqyGJnJb4XIBMkSUYGM DaiWciNdh0iH5azDr4OGExUEUcbXRnnDhwnX+biZaeZzTyI1TCbRl+6fxY0Mxd0iCObJ Zd5bKHOLbUI05MuFgnmXYl2x9+F/X1CXLi/RcTowFmuzatujTkyrj7dRj8ybscisa3uY YV3g== 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=TJQDFDYpXZP5xcsDXuxN3zjy3Me8ZgaFd4DkfsVZnB/NNGppN35rWNtddUQLf9wCci D1AM3r8Ac6zdL5DXUUy5JmerpLhOiPlqPzec9kWbQFcmQyRLj17CLKQOAqflnkKrcvCB UJ70LZLdpvaca3crJXUKL9JtdYm+x21FWueLiocf2H2MfhhNbViOj0vu20m/pvWa7/kC F9aZE0O3dOZoT6CA2A6OuINVydkxeKALlhNtwKkWU1+NEr2HMaCl+OTTEE/DHFEkewRY 9SZgo3lTM+NyWmeYOyPDG7ZPic6c9LYfvlnDSAn1Az2EtK+SYUYljAh5lA/BaN3yRueR e9qQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Kl3Nre77; 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 on7si388564pjb.69.2022.01.24.13.04.20; Mon, 24 Jan 2022 13:04:43 -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=Kl3Nre77; 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 S1383953AbiAXU2D (ORCPT + 99 others); Mon, 24 Jan 2022 15:28:03 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:49082 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377971AbiAXUGE (ORCPT ); Mon, 24 Jan 2022 15:06:04 -0500 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 B741EB81215; Mon, 24 Jan 2022 20:06:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2F46C340E5; Mon, 24 Jan 2022 20:06:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643054761; bh=vwRGDU4N4TbEApmcUFKQ4hpx5acenT08Vv9AbCWceh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kl3Nre77F2SH0prH9ZGLj73Cdb9wF5KnVrCWuM8yBiQy6AtHyK98Q5xts/uGKCEHm 4jmwKGZ+yJticKJmQxEAtLwDH3IRnFaxL8fjxIQWXxbLsmUZ/gstpmNUVbAv4P9BRF dknzDoEJFMP2OnrFpSqp/7F06Fpwcucho1zeJrYc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lukas Bulwahn , Jonathan Corbet Subject: [PATCH 5.10 493/563] Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization Date: Mon, 24 Jan 2022 19:44:18 +0100 Message-Id: <20220124184041.499757730@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184024.407936072@linuxfoundation.org> References: <20220124184024.407936072@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.