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 5128AC7EE23 for ; Tue, 23 May 2023 08:28:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C0377900003; Tue, 23 May 2023 04:28:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BB3A6900002; Tue, 23 May 2023 04:28:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A7BFD900003; Tue, 23 May 2023 04:28:40 -0400 (EDT) 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 98CF6900002 for ; Tue, 23 May 2023 04:28:40 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6A3DA4062E for ; Tue, 23 May 2023 08:28:40 +0000 (UTC) X-FDA: 80820843600.24.728DD5B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf15.hostedemail.com (Postfix) with ESMTP id 23E9DA000A for ; Tue, 23 May 2023 08:28:37 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SNEpTn1G; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684830518; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=O8I6tDWM1Iv9Bqf5hKdBFNuA+Ju2w9woV57Zdht2pj0=; b=T/VqYQ0nkP0a2Ccqhy1tNbL7hYPNgp010RQB4KjhzhCydS//2mrXxBJwb9LKLj3vZS1/C6 3fRDw4uMYK5CnTkpcqy12wQ9bQTB+8suSJN1awAOIun++RA/FmczI5fSeFZoHvJRhW4cJ0 tlCtv6ipgckk5OyHzMR/VAakZCUKcSw= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SNEpTn1G; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684830518; a=rsa-sha256; cv=none; b=0EXyvlY0xvJA3RrbSXg/CPfVKI+D62LHUxPyFU3I4HImO9x33XdawPtQaCK4weVUB41Gqi vok5Za9w6sRFdt93SkI8QbFMm14HKrjDZLlFARyMQeQU4JTn15WlJ/uJKcjfkKRGdsndMr nzdsq4CLJHLDcJ9XUjy/q3xNvIhnz8A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684830517; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O8I6tDWM1Iv9Bqf5hKdBFNuA+Ju2w9woV57Zdht2pj0=; b=SNEpTn1GrQQp0eJinObFxUNMcjU9ZSnDyknqABAWeHhy8nm8xOF1YPQAdzo+eEwPuPIYzu UI65+QzOLZysovpv5wRI9VJUavDRvxVEniVqj+PNLbEDBCQ1ucsN3rDjl6vTJaCrOGWSwu 9hudn2cqJ9m8l3rpLMpe6r0j4pgMz70= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-580-FwS2a-RvOk6O2czGwg8jXg-1; Tue, 23 May 2023 04:28:35 -0400 X-MC-Unique: FwS2a-RvOk6O2czGwg8jXg-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3f4fb0193c6so24104355e9.1 for ; Tue, 23 May 2023 01:28:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684830514; x=1687422514; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=O8I6tDWM1Iv9Bqf5hKdBFNuA+Ju2w9woV57Zdht2pj0=; b=jncIYLH4/+fsOoZOm2QoshNPMQ1dmod03hppyXI3BJsYBmxx4JKHTxeeM83zCdc01/ Pd12b1XcROJJrxKkX46Rwk6jDpBM4SktJQjrvfpk8mUkDjWgx9zkuYlVdz1C+vdDBpKA 9rcayqsq5BJ7B24QpIsgN8M1Vxikb+/ep+VDmQbDVelTqL4EDweNhs6zxlKlG8DFAT1p RHJ8prn3ta+/c9K9T4chhyd6up4JsPwRpXpDKlCLGV1ryUYq5nIj4VEpIYthbXtJV61H eGtbVOt8+ifvgllnw36PEqriyr4YkZC1pgPELKaqBxV/pHUq8IIYX1IMJBsuPeoLjaf2 d5IQ== X-Gm-Message-State: AC+VfDxMo4FoUk+alP5JbJFZl4+trw2oSbYBmxnuwnOvO+JR4IQvqKsD dJGDXmkxGW2Gh8sUruHG47PFgEc/3MWFx8haqrujk/hMj0/u0Yw/PPYyURUNK80iOfak7a5YAJ2 rGu1+Rr3eP9Q= X-Received: by 2002:a7b:c3cb:0:b0:3f6:2ee:6993 with SMTP id t11-20020a7bc3cb000000b003f602ee6993mr4905208wmj.4.1684830514704; Tue, 23 May 2023 01:28:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5gOQNX87suO0H8fn7p147MaVPUDFgkJ06tS0QzWI02kVwiGz/m2oMwNGzKIx1rTmFdrNHiOg== X-Received: by 2002:a7b:c3cb:0:b0:3f6:2ee:6993 with SMTP id t11-20020a7bc3cb000000b003f602ee6993mr4905180wmj.4.1684830514331; Tue, 23 May 2023 01:28:34 -0700 (PDT) Received: from ?IPV6:2003:cb:c74c:b400:5c8b:a0b2:f57e:e1cd? (p200300cbc74cb4005c8ba0b2f57ee1cd.dip0.t-ipconnect.de. [2003:cb:c74c:b400:5c8b:a0b2:f57e:e1cd]) by smtp.gmail.com with ESMTPSA id c4-20020a7bc004000000b003f42461ac75sm14155534wmb.12.2023.05.23.01.28.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 23 May 2023 01:28:33 -0700 (PDT) Message-ID: <9191d9b0-3318-4e70-a81b-69acff184fc6@redhat.com> Date: Tue, 23 May 2023 10:28:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH] mm/slab: remove HAVE_HARDENED_USERCOPY_ALLOCATOR To: Lorenzo Stoakes Cc: Vlastimil Babka , 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 References: <20230523073136.4900-1-vbabka@suse.cz> <310077ed-6f3f-41fe-afcf-36500a9408ec@lucifer.local> <623a87c6-c0d2-799a-c39e-0d14dcdfa6df@suse.cz> <4674f97f-5f97-45b7-a4b9-a19ca46b7ce1@lucifer.local> From: David Hildenbrand Organization: Red Hat In-Reply-To: <4674f97f-5f97-45b7-a4b9-a19ca46b7ce1@lucifer.local> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 23E9DA000A X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: hzhjqk857wxfsbmc8eoyks5hzxsqzrct X-HE-Tag: 1684830517-858197 X-HE-Meta: U2FsdGVkX1/xKR31ulFFhHKoUNAmGs9t8czFmqmzaRKT9XNB9e05kMgpo0aG7iVqbI9tO+IQMTHkiHAJXy6G2yeBUspqNINt778SRj07P7Dm2SVWeVrf73+G+JfC0EescrPjQeZVMtQTUeOqcW+Zdfdqi1DG3potWSMHWp57SHC4KF6+4gdFI66xrupbWvTBv/lWvfFigX6GvJH2EagUPV+D/IUdP4tFRiKOMCIO6fTbatiPylJc9qw/ib3UFU6xGC5+FvtgJW/wN0EnZkU2n5rvf/m2Zn/iPrxUEjAZ6w+X4sy6W1a/styyo4DnXjuB3nwYpj1afFqEKyjj8eWkozfHSuvJsR3W6uEH7BIUELHOQqKqLnZqdOn9NM28iGuRazLphR5RNxn/gNlmfNkunZCLE/R+wS8gAY00DWuh7D+kRZ6ikzCbp67FJRaEJls85IVWyUcBXFOVqwlNU6sy61PIV0Ry9b7RzUiRDjiurC7jqrB1dklfEJzgNzpdeeFFc0dBRzi+tIW4xIlJlMALnaozqmqdlgSMx22qeucPHI+fFCZ7eaRkTxB0VFI20tkP6hAFf6tbNWKK2vVxVPyua9UTEoXqF18eYz3beLfXMXSbXGa6QUAyBYsvsLTx65Kt6LjnL982ZBs+qTbIzg3oVVZ8+SoQ3+i+z3iJ7umfqSd7DOXjS9LW2fBt6WGIlAQeBpL2Nur/wcHf65Qw5myChxtEENUzGGgJe6VRBjZG2YM5R1QcPHq/maOIKjVg4qLT3qf1RwxuinNQuiUFLLL7HLE4wnN6MTAqurRCn6p8l3v23GqZnUBrhwPFoLn1sjLoFLbIKQHqrkkMBHIfPc6/98qCNSDYazUpqYjD9fyA8zLkybRlXAP9vn9FuUhPTa6cJ3FHHNJNJpKxeZhcWHmqAVKMb0MAiL4nmY9hRdvfOVfe/4eKqxPkwTC0AGrl1OqSuLdyW2JBeLEOVUUhPfu 7c+K/x24 VDsiPM3O7i+5uyv2pKyecBNq07zFUKVACRpV/fuwuzIg13OTAk9+AVaqVpQJt4uIQldemRPdpNics2Gd8ULVHJ3K3o6OzEAaLKZ660oMrLcJtSdnSQjfb0dUtcOj4qaR31pvF2LmtCA625EiQrtVJ9YUeF4itXKlDYNk66RXZOYbxXj9qjP9l/X96m8mg2Ri33sCgVAad3dCNZIQQuFmqJAb2rCfirXHYCmQ1CfWx4U+gh9LDMeyXTZ1BLpKGUqOaxH+FmJ4ISyiv4E6IFbX91yY1g67q8rzodCwB87lfPyf34S8HLRG507usy7Po+PcSMO+kYH/s1WN4tNxyDWyDsuz0uqiZcpxnVcOY9UtG5ZAergqpQ7CiU6poGBRYbkNo2ZwJri4Du1V+Fh1VuXui3HkA3y/zaMP7crKJxG/x5ANwXxvhkRo1+v+w8i91QquUuHljWiN4aYecmKJCAKKLqGq6lvcaD2TWZvBPmOa5Hq4dmRr0nuP/fzfkqw== 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 23.05.23 10:19, Lorenzo Stoakes wrote: > On Tue, May 23, 2023 at 10:14:24AM +0200, David Hildenbrand wrote: >> On 23.05.23 09:56, Lorenzo Stoakes wrote: >>> On Tue, May 23, 2023 at 09:46:46AM +0200, Vlastimil Babka wrote: >>>> On 5/23/23 09:42, Lorenzo Stoakes wrote: >>>>> 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? >>>> >>>> Well I didn't delete the prototype, just the ifdef/else around, so now it's >>>> there unconditionally. >>>> >>>>> Perhaps replacing with #ifdef >>>>> CONFIG_HARDENED_USERCOPY instead? I may be missing something here :) >>>> >>>> Putting it under that #ifdef would work and match that the implementations >>>> of that function are under that same ifdef, but maybe it's unnecessary noise >>>> in the header? >>>> >>> >>> Yeah my brain inserted extra '-'s there, sorry! >>> >>> Given we only define __check_heap_object() in sl[au]b.c if >>> CONFIG_HARDENED_USERCOPY wouldn't we need to keep the empty version around >>> if !CONFIG_HARDENED_USERCOPY since check_heap_object() appears to be called >>> unconditionally? >>> >> >> The file is only compiled with CONFIG_HARDENED_USERCOPY: >> >> mm/Makefile:obj-$(CONFIG_HARDENED_USERCOPY) += usercopy.o >> > > Yeah ugh at this sort of implicit thing. Anyway it'd be preferable to stick > #ifdef CONFIG_HARDENED_USERCOPY around the prototype just so it's > abundantly clear this function doesn't exist unless that is set. I recall that it is very common to not use ifdefs unless really required. Because less ifefs are obviously preferable ;) Compilation+linking will fail in any case. -- Thanks, David / dhildenb