Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3729097pxb; Mon, 24 Jan 2022 16:31:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJw68mEEEHwU1fhzRm/PJvBPc1JG5p0vCNKyv5sU0BbcMOSJKTYXe9ufdkqKyLZ2QajcANmE X-Received: by 2002:a65:6bca:: with SMTP id e10mr10723615pgw.335.1643070702908; Mon, 24 Jan 2022 16:31:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643070702; cv=none; d=google.com; s=arc-20160816; b=Ct+t6QCS+e9jeKiKFiwWb+lpmWuaOv0T2NXGgoKVT7f8PZHhMLGwdK1YtUfeyBMpdl a98TsPw/UmhA/8vfaDgE/An7njmB5WdyBFHmztMOd4YlUPPS9V4bdkpqsLot0LNfKQeM 0+nvaLlvhoVymqQ+Vz0jlV2AbStPIhKVw07Tdom3W9CpFruHl8njB+t2i/PCfuVCm28G L/qL+veHl9nSAcj/xzeWcJjpUgJ41YHVKQeXO/vGkrIbvf5jyDlKRx3h+McQy3EC5PPI EaCb6yYsUti7Uotfzx6sjuRJuv7VdBGaHwU5EJIoYa6j0KKBzuIpt8OFmUyrrUSCj9EB cODw== 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=gObovXohI7YZkUOpXoZMzPOLZctmpcqQ/85Urvmyqh4i2sR1k57ISB+W7MYsiJRabe Rv2UZBD5lmcuPh9zQwJje6zIPys2WQIgr3oEZrszPSytoMC0Buum/rTtbOLx45X1fkr+ adZyoNRNVzyd5RBWdVYvZ7m8IKXvTn6M/otzJ9y2U1VguqhURPv8p1nBHUlLPTtCC+F7 ApdGnmM5+75zkv2vZsMRCWx72sxwcxL5MhA8bj1aNFRYgw4PlYK2AqVQOeWOaQnnDKNS n3cQaNEaOjyB4TmwTfZwD3OLU/NwOaYSavhJzALrTzi0sdLgOYoVGUYI6QTRsWxQ2lm7 oXhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kWJo4+MX; 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 x6si743486pja.149.2022.01.24.16.31.30; Mon, 24 Jan 2022 16:31:42 -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=kWJo4+MX; 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 S3409009AbiAYAYi (ORCPT + 99 others); Mon, 24 Jan 2022 19:24:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2362629AbiAXXmn (ORCPT ); Mon, 24 Jan 2022 18:42:43 -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 35906C0FCECE; Mon, 24 Jan 2022 13:38:59 -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 E89F3B8121C; Mon, 24 Jan 2022 21:38:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BBBEC340E4; Mon, 24 Jan 2022 21:38:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643060336; bh=vwRGDU4N4TbEApmcUFKQ4hpx5acenT08Vv9AbCWceh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kWJo4+MXs8juUGHnYUcYkMd5YtKkvijh/4bnQE9AcPQ12km19/8UtpG6LN3uhCthI DW1cylHLOxiEa2It5YAuUOL8NXAbilCv2WiiTNoxqkhIZqb/vt1l2YMg0kDZYuVxqs GU2YTioeRAobYDGEF7dQ9vdp1+sRLaWHfmFYAqw8= 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.16 0915/1039] Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization Date: Mon, 24 Jan 2022 19:45:04 +0100 Message-Id: <20220124184156.054826542@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184125.121143506@linuxfoundation.org> References: <20220124184125.121143506@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.