From patchwork Wed Feb 8 19:47:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 13133634 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA630C636D7 for ; Wed, 8 Feb 2023 19:47:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6604E6B0071; Wed, 8 Feb 2023 14:47:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6108E6B0072; Wed, 8 Feb 2023 14:47:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B23D6B007D; Wed, 8 Feb 2023 14:47:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3A37F6B0071 for ; Wed, 8 Feb 2023 14:47:24 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id EF7B04019A for ; Wed, 8 Feb 2023 19:47:23 +0000 (UTC) X-FDA: 80445158766.21.F70C323 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf12.hostedemail.com (Postfix) with ESMTP id 1CFC740026 for ; Wed, 8 Feb 2023 19:47:20 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=XyHQIco0; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf12.hostedemail.com: domain of keescook@chromium.org designates 209.85.214.178 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675885641; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=brC7ZYjyc3j8bB5PrUFBP0Q4YonnqNt9B3ugO0VDvOM=; b=irqo1Y+klz6jqOG7DUQ4ZPAAhsOFzcv73saJ4nLlyyllT4VRl6XjKV7mA2cxjUzAXilgTK qeMH2GunFzsHOqIznK/X7SvPeGvwDfD7CtWFUlCCrm/p4la37LcuFEwaa5app+gsREprL+ D5S4lyCrMcsXQFJQHojaywZBezh+lvk= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=XyHQIco0; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf12.hostedemail.com: domain of keescook@chromium.org designates 209.85.214.178 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675885641; a=rsa-sha256; cv=none; b=ftUGdpDZNrsEey8Sz647VAB9pWyQGbX6NYPCXmxZaqnM2JePBikHywi7HJidw2l3sU8Yt8 sVz4CGQf/9MkkKVH/7q6p5+AN0uB3/AIUyPjopI/B/FUhmOKszjUMqvgvI/MVOeoXgaxhV W7uoUBe/hIbNKcnu6b9OtisgTn2VXOk= Received: by mail-pl1-f178.google.com with SMTP id u9so46229plf.3 for ; Wed, 08 Feb 2023 11:47:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=brC7ZYjyc3j8bB5PrUFBP0Q4YonnqNt9B3ugO0VDvOM=; b=XyHQIco0IOY9dG4wWkirUBexpmIEGsaN0oZPdRAAdC6TjWBES3V0aDEQ0wXmmb0eTi 5h7e88D8Ub7LU7S6Hj6Af0YQgsgNYwEM0gnURhDjt4beSp1PWidWYvSQfBAeV9jxPgjn tNJxmlZIVnPudiPkJdXIIX0Q7e4fHaQI+OOyY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=brC7ZYjyc3j8bB5PrUFBP0Q4YonnqNt9B3ugO0VDvOM=; b=c18EHDknu//vRgGIgp1MunpCOi8rdqTTNfKUIZtllI5qTKqiLCj3HR3IH393w4IRHI ZGyRh+nomoNoMiLXWEfvb/Io/b8jzyhSzz4Vm21U0xRJ9jOapTnKMjLlMWHZT9sTWJAR 7qGI8CTZMx9qkwNadZ2x0LsvtDcj45povKCRXYviWSMQhMsetfb4wmJIuNBuUhEs22sO XnI4ARFe3gONskoSXpm/pPWsImTI5uJkc1F4SiGcZTBtEC13UcbeCW8UUQp28uNTDV5p kkX9QYx6/zGx7hLfbzlyWa6MJBrfAJtI8FAmv5N75LdZ38Zx+MCuucKtHdYNt8AEoSoQ be2w== X-Gm-Message-State: AO0yUKX494Fe6k3zZZq8i7JTiQE4bVE2mzCZSQs0xkQJgGO5g4pvmKdi L0zbAKp/tuLu5otipKyqElqMAw== X-Google-Smtp-Source: AK7set/cQfxHzl5ZMC5P3I9HJYBt7B/d7dsyJhydqhY7pfA+m/nmRYDN+fINhs3jW+jfB1JGDxyefA== X-Received: by 2002:a17:902:eccf:b0:195:e834:31de with SMTP id a15-20020a170902eccf00b00195e83431demr9689202plh.27.1675885639902; Wed, 08 Feb 2023 11:47:19 -0800 (PST) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id o8-20020a170902778800b00194706d3f25sm11389978pll.144.2023.02.08.11.47.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 11:47:19 -0800 (PST) From: Kees Cook To: Vlastimil Babka Cc: Kees Cook , Stephen Boyd , concord@gentoo.org, Pekka Enberg , David Rientjes , Joonsoo Kim , Petr Mladek , linux-mm@kvack.org, stable@vger.kernel.org, Steven Rostedt , Sergey Senozhatsky , Andy Shevchenko , Rasmus Villemoes , Christoph Lameter , Andrew Morton , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Keith Busch , Jens Axboe , Bart Van Assche , Mikulas Patocka , Ard Biesheuvel , Mark Rutland , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] Revert "slub: force on no_hash_pointers when slub_debug is enabled" Date: Wed, 8 Feb 2023 11:47:17 -0800 Message-Id: <20230208194712.never.999-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2428; h=from:subject:message-id; bh=6D7ZqbugXds1gvfLc9iQr1w22R0H9eYp8Iez8DaC/qs=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBj4/xF3tfK5vpxA9509nOQT2yGg5T16Oo5l2e1JsUW iGsIFO+JAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCY+P8RQAKCRCJcvTf3G3AJk3pD/ 9pD5RZbkzjE0q5GtTBJ5pNbIAKm0Z1qM3Quhtx+IOQhfKbYyCD4Gn83VNS2W+0asUhgAKMq6J5pd+U e+tPGWlnR8pNYgG2PuGjvmlDroDWenmavyyi0a+Q1e/ulK0AUPPkTF+7Q90wykMwiJ/m7Onb3rY5l8 +j6bp1OVYg/wI+uoTSCLbhlb8wszsbWZoTH2G+GLSJ3BI0kOrm4N7yZg6j/uZph0PpzmDrDNsbHYb7 /RTI00+O9J2um4lezpgdes+LzTXUhRF8R9JyzKRbl4bUAHdeJI4fZp15y7qaZDEBrBFd5OS89+YelU 204ZGq+PF4U8Qvh+595ONipxPn+4GzXSxIlGGTncLqeDvyMK9GSOcZqtCNu8+sYqmkGN9Zqol1F9ub Y5kpNsAOiMnYEUaRoLPNpfTKJGZm+/fL/zoxc5vhIBuVc/BnmK6pohdg3qS42JwAj9kwoYNejFyAP1 tGTEm/1bml3vopP0C3nfN9oK/6P4anSO51hITjVTjx2db6NL9o7TFrN9XHaxIeiEXJ9D2rUfrOmeH7 440m6P1QFRL1StuZsoQB5WKyk2jsLma4GdXNylAFcMBi+zxDsjhi8NNembKT4rRhsp5hea9NKxZl0g XCyW205YraGQ6cq/nT3mX5hSqUGeWMyHy9tqmCJWlR6oEl/0sTZ30RFFMPuA== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 1CFC740026 X-Stat-Signature: 5cdwthj4qkwigatdyzs4gydc63ak9ijf X-HE-Tag: 1675885640-752371 X-HE-Meta: U2FsdGVkX18NuE4WfLPAj4pIOJsDAhaoVb5+iUZoPX3ON4bTeHdRE/4zwZp/Y52uSG764ed+XR81AfOJ3igPW7Gi1LeIVw5+5cg338DauWHcjn6+dM7GgK/epODIfUFYCdfwX2crH0woPEMt9CN23NUeFKENhfHiZXgaZWQ/lTiAOm2AF/JUU91/Rsaffh/hwzElfcjTuMTP7OtMblT7TSKZiTQjqFy0qhRrxj30bmxXTGIcNDCvunMhYyqne7r+eSsQLI1HnwuU+dg4F+b+RtY9XQt93FO6Fi+Whubbm9GZvYPVn0HYgueoUa6jbYd0/7rk2levY+H90grRgYD3KXQtkywkMn8i9i+fnQuo94Cf6C8X7AbIpRtAgspU6QvaB03Hm0s7Bx4xw8Ty/SaG5XLTIPM0pffxm7hivYtFBksqyVt73x6j6r7T40/2yRp3i2yWS/pEUGwP2NvlT2Q89fi6joqzN4wCGYTc9AfEIOF9y8qhowOmS5Q/5nXmVSPCTPqRr0N+SqW4R+Jn5XXsouvgngvlmzTjxjYBR4OPZuy0oHuG4OOjtiNIbeWz/fPpff9Sml0G7dDwtl8nzOsb9rjYjclXlNYGU5qJxGv/9PuKEkNLqJrf53m1sPrXBBHa5JeMdnHpUjpa9VhtZvGRXfJQm7Yu3gRMfAZBuk1pIuyMPSXz7zvCCQxbxfwA9zmaSu2VqAtP6C8cVc/acSQKCn9W+NQfIJ7D63vkluZh6+adRkCr3fsk6rq+dImAGPN8KADX5d+agD6bEiDg1Mnxvznt8cNQsi2syknz/vaPYxCruTbTU9a90521zqjUAtbz6bKLUeUONcMOfTdOVpaOEWA9AtRRbm2RUdwcnQaaUAewenR1WRLbEjuREZRWDFNmhWUHH2hwyhOgzZyUipSOcvCEz5uvRV/Tmrvc6XNwIWiUP2oVRoWnrF6Kj8L3Hh+LLUXg2vOXSrh8p7QR17l v0qPHzdn ROhOB/Jn6Q5CHDAwQcdRMkfKokV5J2PeLZ0G7xKVu3mD3JSmr/kMlzR27f7zwXYY+tm53tbJzvR10JakJIqP/akmm1fLsLImPeZeXt0xvwjWm4pePPc+HjmTaNueA3VpWa55ZVbU+2otqHcScKCbqFJWlpOzxlJ0y0kzpvaEkShn+Eh1sOeI71I9kNA1knIkDXplgl3aTriNRgHGYT9rDQ6f2ypfuoRN8N1ppK46NlaPAdSI5evm0jMxql5Az1IiWh4jmklugHaWK+mMcPZmrZbnYHbJ1Nx5Mc2KtdHHvG3bGVY06W1nMoWTn5azNwD23Y6Jl6t2J5IjvGqxKSWt2BeISDxSBJBXKZZUFIe4ubSeVl4x+49u86eZrv1Xg0IJ0LtZWtgHabmtkkK4t2XohQ8bd0/3xbTjq/Kih7Y5+uh41oB8dpw/J+AjIFACDOoGWPaRpN8FWTCCoeCsg4SBnIEGhkFUEdxpSgJnDLXWS3F1q7Ozf8L9/NeJu0aVUNp8N747K/WeC2tU6pN6lImFIloMkL/hizU9TxcqYviRvwRNC8nEEti43beDWsMzKq1mVRcALemUG34p8ATxTC9VCQ4qLIO+M/KQsGaMZbk/a32GlsvPh5gdSQGpH48tnoCTu9XCnfig+1Zc/IwrPeh9wegh/Z8oXJ9UnityO6s+Z/le0NS91kY8zaHW4rPD/x357/NBrTHsM056VwgcudNrslYBL8YBImJuAKkJKMDcBVpgxHfgRA9Fg4r2XeGP2bM11F3hr+fO1+75az4g5+bmrQa8UALqn3URWXWH0fDYoHs2BRZs4pCJ4ULYno98kMjtOUro/74Q8MzxhJDb8Vj6DuQSSbdbsEMZMJEgOFp4zVyjqBdk= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This reverts commit 792702911f581f7793962fbeb99d5c3a1b28f4c3. Linking no_hash_pointers() to slub_debug has had a chilling effect on using slub_debug features for security hardening, since system builders are forced to choose between redzoning and heap address location exposures. Instead, just require that the "no_hash_pointers" boot param needs to be used to expose pointers during slub_debug reports. Cc: Vlastimil Babka Cc: Stephen Boyd Cc: concord@gentoo.org Cc: Pekka Enberg Cc: David Rientjes Cc: Joonsoo Kim Cc: Petr Mladek Cc: linux-mm@kvack.org Cc: stable@vger.kernel.org Link: https://lore.kernel.org/lkml/202109200726.2EFEDC5@keescook/ Signed-off-by: Kees Cook --- include/linux/kernel.h | 2 -- lib/vsprintf.c | 2 +- mm/slub.c | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index fe6efb24d151..e3d9d3879495 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -229,8 +229,6 @@ int sscanf(const char *, const char *, ...); extern __scanf(2, 0) int vsscanf(const char *, const char *, va_list); -extern int no_hash_pointers_enable(char *str); - extern int get_option(char **str, int *pint); extern char *get_options(const char *str, int nints, int *ints); extern unsigned long long memparse(const char *ptr, char **retptr); diff --git a/lib/vsprintf.c b/lib/vsprintf.c index be71a03c936a..410b4a80a58a 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -2222,7 +2222,7 @@ char *fwnode_string(char *buf, char *end, struct fwnode_handle *fwnode, return widen_string(buf, buf - buf_start, end, spec); } -int __init no_hash_pointers_enable(char *str) +static int __init no_hash_pointers_enable(char *str) { if (no_hash_pointers) return 0; diff --git a/mm/slub.c b/mm/slub.c index 13459c69095a..63f7337dd433 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -5005,10 +5005,6 @@ void __init kmem_cache_init(void) if (debug_guardpage_minorder()) slub_max_order = 0; - /* Print slub debugging pointers without hashing */ - if (__slub_debug_enabled()) - no_hash_pointers_enable(NULL); - kmem_cache_node = &boot_kmem_cache_node; kmem_cache = &boot_kmem_cache;