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 710E1C7EE2A for ; Tue, 23 May 2023 08:14:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EF0556B0078; Tue, 23 May 2023 04:14:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EA06F900003; Tue, 23 May 2023 04:14:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D4163900002; Tue, 23 May 2023 04:14:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C5AEA6B0078 for ; Tue, 23 May 2023 04:14:31 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 8EB91806C4 for ; Tue, 23 May 2023 08:14:31 +0000 (UTC) X-FDA: 80820807942.14.A431F28 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 461AF40006 for ; Tue, 23 May 2023 08:14:29 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AQjk4+6v; spf=pass (imf01.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684829669; 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=pK75x5ErRQbR7sZTyIQvs8c6Qw3cdzJ6+CtVUWa6Arg=; b=j7k5Me65mtn748fX0GwcXCR+0e4upagnlHQTbvH7TPLa9kKt2HjdsrzV5ZyYO+yT9fOfWS Uttg2BLG1x67sgQWO+0wRB0o7/gkVF2rrL40ZDsbTbi03fl/2VvMuqN19QZGG7i/fymnf5 TUb9yubkmY/iDAJJALoKJG9P0KUh0jk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684829669; a=rsa-sha256; cv=none; b=TWzkswCfaLv3mrimGWGyyAZdUC/UqnURJA9J/4dFyfEZNQfwb7RDUEBGtPNzsd0aVelhiG Nv/fwqn2yhEQYhAXUID6cYPC0AYgh6CX2gxkLVo5rSwlzrecR6NU8BECKYio+FA4RPs8jN lgHT5OPsPK6HXv0p8yzkaQGSSHleSxk= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AQjk4+6v; spf=pass (imf01.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684829668; 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=pK75x5ErRQbR7sZTyIQvs8c6Qw3cdzJ6+CtVUWa6Arg=; b=AQjk4+6vhrQGvGYf8L6tDhOWFfEqacUgqNgg8X7UYWepwuVIL2PKJ47js16/NaAgCMJCw/ KmkV2oAvJ3ljevYSr2Reh5Miv47cDyFp4gGn9A9zJdM4fnPZ9f9RWvg2uDSJaKP1OdyMkw 4pMhEHo0wGy8JJqQoXPLDlbx6+qfMB4= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-383-K3TFtQwYMfGHAfDMkFsAvw-1; Tue, 23 May 2023 04:14:27 -0400 X-MC-Unique: K3TFtQwYMfGHAfDMkFsAvw-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-309542498deso2148554f8f.0 for ; Tue, 23 May 2023 01:14:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684829666; x=1687421666; 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=pK75x5ErRQbR7sZTyIQvs8c6Qw3cdzJ6+CtVUWa6Arg=; b=jKu5Fg5M2niNvkcPMEhB77FwQ6WGR7XH5B8ESjR79BMAMMV+gI8/l44D+xZ1nrwfR4 ObINeS/0vDjq3xDtGHNIBH+Bt7VBf+AAjzttenmYgWh9UZoxBhtcIb/wfXSCBWWTfysF qFNko1Zlbbw/aqO0osWVhlGwEk4sb4W0ZnsAfKUrSGYbI8Zynh1rlI0GEPGD76x7EnJd EkdY4Obq/ZBNxYjOi4OqMy48ePnMZRud/ryTYvDd8wdBtiqmzkLKeL7yhYakb16YmWM8 3oWriw8KWNcHHQhtSctZ2tZ9z8R4LPgBba9ko0OYk1Jnf80G/mP4VU5Dug++mmQ6SQWe TmLg== X-Gm-Message-State: AC+VfDw6nBG5h8j7hivOo5vUinXuEb0D0I6WF4MrQw1FXdtBht9aOimy MpolWqYJF63FlI3B27znXxc1NWU0cW1+yeDzZooEcsZcKgMePeXOdT3WrkdLZeAV9hzBYO4lX3R go+LDjYE1MFk= X-Received: by 2002:adf:ea82:0:b0:30a:8f9e:8ee6 with SMTP id s2-20020adfea82000000b0030a8f9e8ee6mr4507352wrm.22.1684829666191; Tue, 23 May 2023 01:14:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6H1MPKDPiSbV8c1ccyUYy2bHzIhCHQ2vPFAk/Ser7s8xXZJeKgLdg+5PD28Od7MlUSBAjG7A== X-Received: by 2002:adf:ea82:0:b0:30a:8f9e:8ee6 with SMTP id s2-20020adfea82000000b0030a8f9e8ee6mr4507320wrm.22.1684829665772; Tue, 23 May 2023 01:14:25 -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 c11-20020adfe74b000000b00306281cfa59sm10367794wrn.47.2023.05.23.01.14.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 23 May 2023 01:14:25 -0700 (PDT) Message-ID: Date: Tue, 23 May 2023 10:14:24 +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 , 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 References: <20230523073136.4900-1-vbabka@suse.cz> <310077ed-6f3f-41fe-afcf-36500a9408ec@lucifer.local> <623a87c6-c0d2-799a-c39e-0d14dcdfa6df@suse.cz> From: David Hildenbrand Organization: Red Hat In-Reply-To: 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: 461AF40006 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 1ozs6zq31xtj64gb59xmuhdnw6e6d7qr X-HE-Tag: 1684829669-1261 X-HE-Meta: U2FsdGVkX18uNuTCtW4E/1U1U8dYJCZrXqES+knfE2PztzYkhlhxO7FEueZuIfb7q3wxTIwZ41ZB1stqmVELC34G30CMNJRXKHAMV+nqxFFCpn4znIgBLLgLo/11peS+4j0Lpg4CUHPDjfJMOBG0t2ptR19NjZT4slyaNtR36Yp2V/MSq1NcjqP4DjY1hU1njy9wk778KGH/qG8opbldFRE6pNp7iD4vx6JuPyMd3qOFikYH/Zwj11n5vqdpyEuHqIEgdnbmRkRBlt4JkuoKXRxAGCqvDebp7TG0rtUoARHCV7Pqx0LOuMChOTnPtHS4lgxqMuIB3ICTtq4yQQdYPerJikMBsr9raZRjyU73KbahVgsMmjGsujaM/+1VputinFbn+NwFsw99cM9lYIsimF6U2sUushSpKwGDgsYTPDwhGpPGsh3qMm2wgXAQTOxVyqtZv99dmnPoq8W6beAiQfx/AkKHIiQvHnOOt3uWO/esrW/J923jOEDaDDL1DuHQeE2+wRDL6XRnU8lVwv0RKfk3FgBItOjI2sAAQqSYgoxh40662rRbQPJioVZJiXZfdKzltP1rrB/jGIFCR9Hyewo7oH8XdSlppHg8cKXThd83d73n6MByjaupE3dJHfPFhd8ZpcpsV4ZV8b0oOQSd7cqI07+KXiJAfKClriLgnwYsE4XVIl2CQtots+xxxed/tlIW9wehuf4AHx0mSNUfzoqhVqiulY4+TFeDV5WeHK6IXahTt0YSNZpHRKNvfFldSoCAUKjc/E16k4Dvd5i0r2OJh+qncES50x6lwCiP61SLm7s3arsM3+9SQRAMlUOOzmfrfA4sgK7wOBxH+EAhfUjIO2cnPXSHgcFNlk7fCammTLoI5nAWjnHmf2/0c3qjnLTX072AdO3BJ9A5rhEfD1AZbowd99AerX6j1ZR958LrefUMq4WWpNk8rli7QNoZCW0/97NYGSe1EnE8gkd 1p3c14ZZ XfXk9ONOQ2OHwnP2aEOwJf6U0DQlSnc4d9avgaZsUdj7XTwb8j9HE8J7jIcOE5K0jQIulZuulUpxepfpz09F2VFC8pNnTiZg7KBihUaJKPO1AiaGUigYb9MKMx0+inV+Z3pMbO5h4J4tWUisy80tHhAtO1aie6w2eDVdF+NfARhGgzhqUnkT/Eg58ndRnxc/uCxjeK/Ae2+UKMRWfYiXpodJXS9vQvi62qODdQwbS96ESUs8XDSPCsPHkWv3NaPRkm2PqI/fUwPvQ/a+CACAuwmZg4GaQiNXqry8AUAYU6JvS6HNvijHJBXdNI2ASJ8nEalRX/Jf+FKeutpYs9+EtlwonQePCeGTC8b36LiKLs0WylMtmelsmBKiLl1agm2gGB59WWKne6w7J2TZRurf6hicygFseNRfidXsPbvqq/YhNWI3frR/8GLP4R/QxLVCKmgziU5ZmqfuBhcpMclUgbs8gRHTr1fxlCre/BzUHUtKwBNMix7Gkn7ae/JSGBVDdRcZN01faVqTpZjS3MKy6c74Kfw== 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 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 Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb