From mboxrd@z Thu Jan 1 00:00:00 1970 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 5B161C7EE23 for ; Tue, 23 May 2023 07:42:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB2C8900003; Tue, 23 May 2023 03:42:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C3C036B0078; Tue, 23 May 2023 03:42:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ADABD900003; Tue, 23 May 2023 03:42:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 99DFD6B0075 for ; Tue, 23 May 2023 03:42:27 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 5B70EC06A0 for ; Tue, 23 May 2023 07:42:27 +0000 (UTC) X-FDA: 80820727134.02.910BDF3 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by imf04.hostedemail.com (Postfix) with ESMTP id 6734340002 for ; Tue, 23 May 2023 07:42:25 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=VBksCNIh; spf=pass (imf04.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684827745; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=s31X+dH39BfhZ2YOL6vkW3ng692uRsODYiuHdEJt6mQ=; b=mfWs7PxPnqxY6GaJa0NhB1Fle6X+6LH+v63mZWyGzegCiIZWaRDrUXHl2GnlX6z+5lLtrG cjw/XnsHWsVy+cwpemCNgeK57VLj82OSljXr4PQQN3f69+JWMhgFfbO74o9AT6bQmBq3t/ KB1U6NS8bLXx2AO1DDOfUMZdDLDKxG4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684827745; a=rsa-sha256; cv=none; b=mw+yUglrFNFFjKPpJ6u3l0+zywIa6XqDyZ8LKBJiJsPwCOjQYAgsM9WkYz5GpWtyoQtUvj nEmthWDWHOwpq8pc10kFdDId2NNI/tii4T5SxNqwfQkLurd7wICkTti8S5FuLAVJo6e5GI ak4jbmespGcuszLjREpprTk8lCZ8vEo= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=VBksCNIh; spf=pass (imf04.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-3f423521b10so45338315e9.0 for ; Tue, 23 May 2023 00:42:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684827744; x=1687419744; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=s31X+dH39BfhZ2YOL6vkW3ng692uRsODYiuHdEJt6mQ=; b=VBksCNIhqZ2ik3L1QCbmJQ7nz9900GoqegY7JqClevxcmWuBYb640XQMx3CgaX2bXt dRXoYVcOuhd1gex415FiIe4qFyTjXnr1uteCjbo9p58uEjstQB5rcgEdlUjEBvAKqzdu PzBxjkWAJTOn+86aYcPlfWGpjxsexi3Z6OjRTIZKDnV4kCh1PUGFOaW7eQxIJsfAobz3 HWjk8iGapyYa3w/wlDjzd1AWlH7A2r7nXrVMs0V7/LL7KLKe5ch30JZ/AFTJ4CYWlhVC w8OZ4/T+UHvXLHpnYCY8xY8Ncwrxp8B4Vd7L5aX+ZbVUAqwO5FJdHwBGfhgd5gtqBfne XSHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684827744; x=1687419744; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=s31X+dH39BfhZ2YOL6vkW3ng692uRsODYiuHdEJt6mQ=; b=QcYLSgpMNkadQnukk4RWES48R9bgguKzH4mgZ/8FLfzBWRRzXZvvGP7CRugJ0jrw5B 2d0frf71OEJNk2tUQdyLNTU/osgBhO7KlxrQed6MHQCkhaWPeMQ246aiNNuOCd5/B9xC fXV+QRFO5b+MOjJlOcA7NHmOMJc6hxdS/M9MABrFsbbRkRP8ntY8DpDfQKzB7FyugINS BmJ+7YFvGvVH+d1noUgJMPvN4v9kUjSWOe+v8RgNAv4/BDYyJIrU6kP3KmaqJ8OUUjsQ rnAElRzqbBeesqtw5wX/SwUcYHyJPB/OU25ssxROd06vEzwFQGmr+tD/RSIKfVgMHPJv IEPg== X-Gm-Message-State: AC+VfDyb3rH6+rIwDNgM/m2LlbyIM+09uVdjjRMWsmQ2Rze9n96hbmd+ wrgtJDR3jgY6lFyFMcziQQw= X-Google-Smtp-Source: ACHHUZ70nLnWyddNm83xHQcgMWDvEGGRF2urF+lDsb3LmnEA43JMJZAoRwPp2ewfkwo8HNfWqc9HYA== X-Received: by 2002:a05:600c:294c:b0:3f5:fa8e:aaa3 with SMTP id n12-20020a05600c294c00b003f5fa8eaaa3mr6983948wmd.28.1684827743725; Tue, 23 May 2023 00:42:23 -0700 (PDT) Received: from localhost (host81-154-179-160.range81-154.btcentralplus.com. [81.154.179.160]) by smtp.gmail.com with ESMTPSA id a12-20020a05600c224c00b003edc4788fa0sm14091106wmm.2.2023.05.23.00.42.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 00:42:22 -0700 (PDT) Date: Tue, 23 May 2023 08:42:21 +0100 From: Lorenzo Stoakes To: Vlastimil Babka Cc: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Kees Cook , linux-mm@kvack.org, linux-hardening@vger.kernel.org, patches@lists.linux.dev, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm/slab: remove HAVE_HARDENED_USERCOPY_ALLOCATOR Message-ID: <310077ed-6f3f-41fe-afcf-36500a9408ec@lucifer.local> References: <20230523073136.4900-1-vbabka@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230523073136.4900-1-vbabka@suse.cz> X-Stat-Signature: 3ixbxpkq8nspa1pd1suqo8rwoshnr936 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 6734340002 X-Rspam-User: X-HE-Tag: 1684827745-609011 X-HE-Meta: U2FsdGVkX1+zHjvfH4vlARNFUX7vECnyDI+6kRKZWve6pJ70twp2RleQFuRq68+YZd6M3kNoJU53EP+vvdltwtQAol/Yjfz40ZZKFgaGVjba+/1DJNfUs6pJ/w124Igf7LANCR6x34oyd93c0Ngo6X0O+0EpNGg1CMdb3QwXsT+agYbBjFEXFGkYdVzswujW0bokUmfAWtPoiB3pEjPXEHC3Ym0758+LxAvPn4bONfx27xeTW6YWI8CBPO2dTNUb81d1Wh9hS18gViZeOI8ncdQ5InIPmV2iIFk0oexkdh+L7xATTEvHyulQFwuOLp0MN7thcuJEAGzpzNdbFs/kSPCWu8NfMmBZbGNlRQo67YVkY8BgSzRR+1jw5dw901nhr4BJmcRc0nJg4KqwV4Fbjy1vn0x+baMzK2/FvgHUGgfm5/YG6A0jA6Ux4t/b1aXiRaWzfP6mSic8fAL7aYNv9EON/v2Uo44vzliomLrH1V8p8yEQXl3VlMxv9Qn+pEniidGoMiBStZywPxvEk0sy1ZRkNJOxiK4GxGQI2wZM91XYfYzWoZBn193uJ/TNLhQNt7TPCpgetJ9pgnwk8IRGdkgh0pOTb898aCsTHs7a3m98dPB99Y7GmFVBGf2LbxffzsznfcNl55Kr+egOyJzpyYvM+/8i4PXBknW0dUAIVf5ZURNoR617Ser95WGGr0tP97bX8JI1jQLAT9vfd6vWekF754Pnev2NpkgUE7HIOSSp6Fh5xUF48NqOHdkQVKBeIbc5iBUvMUH0+JtVdtqIMPSSD1/z/CUpof3cR31SeyLz3bcIC7IHDXgEep+JuDgc/Hx89cby2WvOt8Q9LqbLu00JxMaHlnoPIloFlPsbwc/BzcSwVaYCneLQSkfoyIlZRB9why34VcJDa82/yT4Jplvla14H+dSYdF82WFI9TDse21e3M729caZf4d+n0gqRYHk2PzS/AcyWtDpWQop remXMr5P yKGux9vWS/+XwQ7X/ggpXHyUfrdNsPS9iwqUvIQVmPVs3GpvGlFn2UFLI23TFmF19OHwsPmAIcJ1ehKhnHpuCFPsA7Mfm0t/Z3+Q//8eeVCOXpcWVm1Y39gXwRzjhltsSp08CvRozokkog4CsK3PH7hXyeb1NdjV0AkF+3KiK6PFleui1u3nUQ7YEMhw838mfXX30/nyfkD5ixWi9pOpSODQJJd3G7ArEjYZNqu6LFJRFayM4WfnUgxHztZigRsxtw6sFXy/ACMP4xMCqRqqqkONMfhsuY+0Kdw3pP5O741nrhS+XMu2IcXhNqhhKggnhi6WbjTMlwF3Z1xAY7G562ALqH+iFvRSbN4Ux2fIbm/khpDc4sImlAkxjRMQXAMXZlENVquBV3qbrjRxe2ZhozRHsmYWBJpXStVow1rRHl2y9zrEOyDURJq+c5I+uFnfpRsS31s63LezjnFOYOSZem7JpKYnz1xtNmxMwo7yMOfwlKoYYbsh1++NFR9AM32Uj5Y7Q 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: On Tue, May 23, 2023 at 09:31:36AM +0200, Vlastimil Babka wrote: > With SLOB removed, both remaining allocators support hardened usercopy, > so remove the config and associated #ifdef. > > Signed-off-by: Vlastimil Babka > --- > mm/Kconfig | 2 -- > mm/slab.h | 9 --------- > security/Kconfig | 8 -------- > 3 files changed, 19 deletions(-) > > diff --git a/mm/Kconfig b/mm/Kconfig > index 7672a22647b4..041f0da42f2b 100644 > --- a/mm/Kconfig > +++ b/mm/Kconfig > @@ -221,7 +221,6 @@ choice > config SLAB > bool "SLAB" > depends on !PREEMPT_RT > - select HAVE_HARDENED_USERCOPY_ALLOCATOR > help > The regular slab allocator that is established and known to work > well in all environments. It organizes cache hot objects in > @@ -229,7 +228,6 @@ config SLAB > > config SLUB > bool "SLUB (Unqueued Allocator)" > - select HAVE_HARDENED_USERCOPY_ALLOCATOR > help > SLUB is a slab allocator that minimizes cache line usage > instead of managing queues of cached objects (SLAB approach). > diff --git a/mm/slab.h b/mm/slab.h > index f01ac256a8f5..695ef96b4b5b 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -832,17 +832,8 @@ struct kmem_obj_info { > void __kmem_obj_info(struct kmem_obj_info *kpp, void *object, struct slab *slab); > #endif > > -#ifdef CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR > void __check_heap_object(const void *ptr, unsigned long n, > const struct slab *slab, bool to_user); > -#else > -static inline > -void __check_heap_object(const void *ptr, unsigned long n, > - const struct slab *slab, bool to_user) > -{ > -} > -#endif Hm, this is still defined in slab.c/slub.c and invoked in usercopy.c, do we not want the prototype? Perhaps replacing with #ifdef CONFIG_HARDENED_USERCOPY instead? I may be missing something here :) > - > #ifdef CONFIG_SLUB_DEBUG > void skip_orig_size_check(struct kmem_cache *s, const void *object); > #endif > diff --git a/security/Kconfig b/security/Kconfig > index 97abeb9b9a19..52c9af08ad35 100644 > --- a/security/Kconfig > +++ b/security/Kconfig > @@ -127,16 +127,8 @@ config LSM_MMAP_MIN_ADDR > this low address space will need the permission specific to the > systems running LSM. > > -config HAVE_HARDENED_USERCOPY_ALLOCATOR > - bool > - help > - The heap allocator implements __check_heap_object() for > - validating memory ranges against heap object sizes in > - support of CONFIG_HARDENED_USERCOPY. > - > config HARDENED_USERCOPY > bool "Harden memory copies between kernel and userspace" > - depends on HAVE_HARDENED_USERCOPY_ALLOCATOR > imply STRICT_DEVMEM > help > This option checks for obviously wrong memory regions when > -- > 2.40.1 >