From patchwork Thu Aug 8 18:30:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jann Horn X-Patchwork-Id: 13758041 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 24474C52D71 for ; Thu, 8 Aug 2024 18:31:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BDBB06B0082; Thu, 8 Aug 2024 14:31:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B8AB06B0085; Thu, 8 Aug 2024 14:31:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7BD7C6B0083; Thu, 8 Aug 2024 14:31:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 554BB6B0082 for ; Thu, 8 Aug 2024 14:31:12 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E8C3DC15FF for ; Thu, 8 Aug 2024 18:31:11 +0000 (UTC) X-FDA: 82429920342.03.EA1701E Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by imf01.hostedemail.com (Postfix) with ESMTP id CF82440023 for ; Thu, 8 Aug 2024 18:31:08 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=WlQ2dCnZ; spf=pass (imf01.hostedemail.com: domain of jannh@google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=jannh@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723141782; 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: references:dkim-signature; bh=DLW6erLEdD1RJkfioQR08NW01BP8YceiCQUjS50VurI=; b=Ugp3LNB8RvTpgZ+hiZKPYx+vFgt3w1pl77oAbCZsPLDRUZw2cvDbH+bpRsLlIhrvB6CGYX kv3Gzin+/g48tpMZp+EIfclKbpFcp72yYcb9QNsLIAtFD8l2U6o0uGBuUeOSy8bwkCxMo8 z1vTv5PQxfHTB9oYhiyoomQKpHvxKgg= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=WlQ2dCnZ; spf=pass (imf01.hostedemail.com: domain of jannh@google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=jannh@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723141782; a=rsa-sha256; cv=none; b=KC2aF7fSPQWrRJWCmp+n1cxWlBMlDw37r3Byara0XIDZikLJbahcjGcA7cHzKkBEedSkn/ DCuZU0gphgEaFZek5o1d+MytD7tPGPpi6vqx1EIXri2zUil0TfDm8wdvcSXp+cZVqOMK9h Pp764+P5dg5TVcayPrWDzk7w07YQkRo= Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-42807cb6afdso1775e9.1 for ; Thu, 08 Aug 2024 11:31:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723141867; x=1723746667; darn=kvack.org; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:from:to:cc:subject:date:message-id:reply-to; bh=DLW6erLEdD1RJkfioQR08NW01BP8YceiCQUjS50VurI=; b=WlQ2dCnZ+Yi3zH48a9sq0rXyum7vMwdGRz0Xt9+EronW0/3g9a7Fppp7Y97pKGHjVJ SvLo4rgR5ljOO7kIwA0/+bc2qKz2sRLRzFjqhY3aM5I4ri0hUzPcz8arLdboyy+Z4+cE Gk/1b5N2Aq8ZXaGj/S3IhOf2EhA3ocT4S5LZ74evClrmMi2+UH4tVb+8dYAFIPhEAEfL JhyqP9WLq+bPToY6H2K7RsIf77QOcfaqOoidcnOFzcQADmdDZqPcAu3/rSIioyavccUN nOfqT5Qzc0qEfVLeQIXgfO10h1vP/6XIvrAaVk/fCE+48/+mBuSuQCidGjuUHpPaHdWu fpGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723141867; x=1723746667; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DLW6erLEdD1RJkfioQR08NW01BP8YceiCQUjS50VurI=; b=BHHlzsDWLV3hYncTTLLQ9p3phph1rUa6VX2ZmLJ+W4yVZbK7gf82xLDCOocN9XoS7Y hQK23vd0nAyY09YXEOb5bYE8GRLbGhPHITw6ULQLslNcpQsId/CpSu4pAjFqVLU+qUNn UfXOP1esY3PoETeW3GFFgegzvLHhdcqCmcHNThjLupLFf742J9I/IMvCLT5VSnn3W2uD X0moqFbgPQMiNico7dBVWebnMkstVhOSh0OQFBq2WtXTsdF4W1RxKowzcdC7saPrZfnl fNlRXNHYh9Z0efbiRvSuZfbCi3g1MeJ5GIgrl1uQaoW9KkC/7j5pjDi04MLBJLU14mjU G4zQ== X-Forwarded-Encrypted: i=1; AJvYcCVpNRMK14PK83RtCKB6pBRhl3Ezrc0VZK3+9l7Til5rRGGMGPJPqIHw9Hd+mxHitPxP+dqt0i4HeMvHDmyzn7KKoUY= X-Gm-Message-State: AOJu0Ywp2gJP1ZiSTmDzvj9mQfHSabClI/WkuTddUlg/O/q19587kd64 WzCZDz/SPzIVKiGmL3c88ZeELJUtH1JdLLBg4kZVBQ9+0fKA3JkEtDMNQrdsDQ== X-Google-Smtp-Source: AGHT+IEes4I4p3Fnb4Injx44lWLQVTr1WKKg+sngYdrFL/lTimO2lDONHMBTA/ilsUgj8WAiaMWvLg== X-Received: by 2002:a05:600c:1e16:b0:428:31c:5a42 with SMTP id 5b1f17b1804b1-429c17bb78fmr111085e9.3.1723141866523; Thu, 08 Aug 2024 11:31:06 -0700 (PDT) Received: from localhost ([2a00:79e0:9d:4:fc0e:258b:99ae:88ba]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4290c79f345sm34845495e9.39.2024.08.08.11.31.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Aug 2024 11:31:05 -0700 (PDT) From: Jann Horn Subject: [PATCH v7 0/2] allow KASAN to detect UAF in SLAB_TYPESAFE_BY_RCU slabs Date: Thu, 08 Aug 2024 20:30:44 +0200 Message-Id: <20240808-kasan-tsbrcu-v7-0-0d0590c54ae6@google.com> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIANQOtWYC/2XOTU7DMBCG4atUXmM0/p+w4h6IhTOxUwuIkV0iU JW741RCpMnys/S84yuroaRQ2dPpykqYU015asM9nBid/TQGnoa2mQSpwUnF33z1E7/UvtAX750 wvgMRnbOskc8SYvq+5V5e2z6nesnl51af5fr6F9L3oVly4NpE7BCs1hafx5zH9/BI+YOtpVltt dlp1bQR1MmIUQgQB623uttpvWoXCE2ICGQP2my0gp02689xUNQPkYjMQdt/jSB32jZtYUAbvEM t7m8vy/ILNCRnOKEBAAA= To: Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Andrew Morton , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Vlastimil Babka , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com> Cc: Marco Elver , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, David Sterba , Jann Horn , syzbot+263726e59eab6b442723@syzkaller.appspotmail.com X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1723141862; l=7163; i=jannh@google.com; s=20240730; h=from:subject:message-id; bh=ifhhMKUq3wZYmlKPhfOQuDlC/AkSNxHfHxamMzAf6II=; b=2aRS0R6BoACVWuuRvijlpPNLmH0ucoBGDBTgCdvc6f0r9/4Ft9gdMXDBQEo9ihbyrZK2ppxJK OguwRRT1ftBCFRFsZPbdjylmtvCUY6szc+i4JLXWejdDPMROUVi361k X-Developer-Key: i=jannh@google.com; a=ed25519; pk=AljNtGOzXeF6khBXDJVVvwSEkVDGnnZZYqfWhP1V+C8= X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: CF82440023 X-Stat-Signature: me6rjfyo5kqt7a96349xzemuwba5575m X-Rspam-User: X-HE-Tag: 1723141868-453376 X-HE-Meta: U2FsdGVkX18cnv/xRJQCMmF4WTCsxr/PuoET5FDPMKjWBXwr28qF2QOd6YKaW43vrPuwIBFDtSFfy6JFvdTC7VQZHhoMYRGJLU1sALb5Uoq6k6iBzOFPUEFtVgK44RL7hpnFLpUgzFjon73IH8xx6TXOEgg9rLaK+dJpxM+w41GWWsfQyFZo4yFZqKOKcDfg43J1Af3YR0TceFXf78Jn1O17EvR/c0s3rxmPg+XvQmKZWozFAC0r7m5fgZj9ey2zui16EpYJ7O+u9U89/v5CvOSQuZuLHOzFEK5DgGdFvP7JdiPva7Pxq50zbMXiSESA6TO15cLb3F5zWbnY29UliR1UNYcBy9k8UratU6CJ8pl4kPlN9QtGP4TKjy4m5/VVNDOZgK7VKOZFzemWUhQrWhA/6qen2yBOfL603xdOcR340T+2RnNW67IJCIq1emPWZN9XIz/QLOxivXw2VK7QyR+uD3Ho12VxxzgKgE7nvocmArkw7ZUhQdemFp2zEkjP0CDByrZROgU7ckGjwrSCeB41JxRIDyQnnjX3seHudKinCH3lLAlVoFNdJeY/aITL0vIrdHah4e+fAMYlhUkjUX2onLswzq47CJEuCJcAIaPqwcbk7vyRhpeBBJqJsPze6v1oHHWApIaNwrUo3oYZbVMQp/ZRui1/xD35XE3KpWi8NzR3Ntnq9OZSZTMdwHvCOMV7BahIx18WnJq28L3wwjWuqpKR88VYesJgceWHbqBIkKOoRkPzbmk5uVp12sPUDQypFfHdw+W+ylU28ISL6yWOtlA3EqLnNiw7YGMUP/vfhqtNNDSJstUpfprudABTA7GYGzaERcpmasJOasVKJrhwnO9UkJ0l0XXW0KsbsAGKkqzknLxyj2eJvXf1Z4Hc8Qhs0SGhywi9MGz8QjaPx2RM+UdhziyQkAyvhgsOt9BWi91kdhBaz6JTABWO1Iy3bPhMJp/W6KNuqwiXE+l MS0MRFvo kk5sYjlZs81vXmHWIPbt8CvdvNNoz0gU8gcbw9ME7am6rQjXgVdwXNsyYAuXNTUa19iGdTaV9X62PHgxwztW8jCZ3kLhxk8yMpC6cv5DV/yT0gWmDM+KUvckORj5rBsLRBuLDM5RJuellT8AKP6OlXHZwRIvIwXwo2AMfxfjv55DIEHahk6syuSGKflBQISRF6unGXq86zQkdzernnyez7pya3PyEb8CpbtYI/ztXOeABj72eA9Zrfrlbp1abkiFfcuyKkSyd0XH9jwZLMC7ZPZHriiKUlfrXFildVkSr07a8PgygafvkoaMSEpY15On9/VTDftmTSVon0kiFcQRj0yvtfI4alD2oAiOvay4aKTTy2jyV2SJxIoMdEh0Tq7356KV8XOaJnCmOyYYwYGZLSjGGMuLiOdkeRxyTABoGL/S8rRu/ok+wglbVW7FzHO9HGn/VNhV2idsgZBrjFZD/jt55mY/rOsRS5MQ437WAWtBDpiyz06PjSj5UTA== 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: List-Subscribe: List-Unsubscribe: Hi! The purpose of the series is to allow KASAN to detect use-after-free access in SLAB_TYPESAFE_BY_RCU slab caches, by essentially making them behave as if the cache was not SLAB_TYPESAFE_BY_RCU but instead every kfree() in the cache was a kfree_rcu(). This is gated behind a config flag that is supposed to only be enabled in fuzzing/testing builds where the performance impact doesn't matter. Output of the new kunit testcase I added to the KASAN test suite: ================================================================== BUG: KASAN: slab-use-after-free in kmem_cache_rcu_uaf+0x3ae/0x4d0 Read of size 1 at addr ffff888106224000 by task kunit_try_catch/224 CPU: 7 PID: 224 Comm: kunit_try_catch Tainted: G B N 6.10.0-00003-g065427d4b87f #430 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 Call Trace: dump_stack_lvl+0x53/0x70 print_report+0xce/0x670 [...] kasan_report+0xa5/0xe0 [...] kmem_cache_rcu_uaf+0x3ae/0x4d0 [...] kunit_try_run_case+0x1b3/0x490 [...] kunit_generic_run_threadfn_adapter+0x80/0xe0 kthread+0x2a5/0x370 [...] ret_from_fork+0x34/0x70 [...] ret_from_fork_asm+0x1a/0x30 Allocated by task 224: kasan_save_stack+0x33/0x60 kasan_save_track+0x14/0x30 __kasan_slab_alloc+0x6e/0x70 kmem_cache_alloc_noprof+0xef/0x2b0 kmem_cache_rcu_uaf+0x10d/0x4d0 kunit_try_run_case+0x1b3/0x490 kunit_generic_run_threadfn_adapter+0x80/0xe0 kthread+0x2a5/0x370 ret_from_fork+0x34/0x70 ret_from_fork_asm+0x1a/0x30 Freed by task 0: kasan_save_stack+0x33/0x60 kasan_save_track+0x14/0x30 kasan_save_free_info+0x3b/0x60 __kasan_slab_free+0x57/0x80 slab_free_after_rcu_debug+0xe3/0x220 rcu_core+0x676/0x15b0 handle_softirqs+0x22f/0x690 irq_exit_rcu+0x84/0xb0 sysvec_apic_timer_interrupt+0x6a/0x80 asm_sysvec_apic_timer_interrupt+0x1a/0x20 Last potentially related work creation: kasan_save_stack+0x33/0x60 __kasan_record_aux_stack+0x8e/0xa0 kmem_cache_free+0x10c/0x420 kmem_cache_rcu_uaf+0x16e/0x4d0 kunit_try_run_case+0x1b3/0x490 kunit_generic_run_threadfn_adapter+0x80/0xe0 kthread+0x2a5/0x370 ret_from_fork+0x34/0x70 ret_from_fork_asm+0x1a/0x30 The buggy address belongs to the object at ffff888106224000 which belongs to the cache test_cache of size 200 The buggy address is located 0 bytes inside of freed 200-byte region [ffff888106224000, ffff8881062240c8) The buggy address belongs to the physical page: page: refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x106224 head: order:1 mapcount:0 entire_mapcount:0 nr_pages_mapped:0 pincount:0 flags: 0x200000000000040(head|node=0|zone=2) page_type: 0xffffefff(slab) raw: 0200000000000040 ffff88810621c140 dead000000000122 0000000000000000 raw: 0000000000000000 00000000801f001f 00000001ffffefff 0000000000000000 head: 0200000000000040 ffff88810621c140 dead000000000122 0000000000000000 head: 0000000000000000 00000000801f001f 00000001ffffefff 0000000000000000 head: 0200000000000001 ffffea0004188901 ffffffffffffffff 0000000000000000 head: 0000000000000002 0000000000000000 00000000ffffffff 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff888106223f00: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc ffff888106223f80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc >ffff888106224000: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff888106224080: fb fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc ffff888106224100: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc ================================================================== ok 38 kmem_cache_rcu_uaf Signed-off-by: Jann Horn --- Changes in v7: - in patch 2/2: - clarify kconfig comment (Marco) - fix memory leak (vbabka and dsterba) - move rcu_barrier() call up into kmem_cache_destroy() to hopefully make the merge conflict with vbabka's https://lore.kernel.org/all/20240807-b4-slab-kfree_rcu-destroy-v2-1-ea79102f428c@suse.cz/ easier to deal with - Link to v6: https://lore.kernel.org/r/20240802-kasan-tsbrcu-v6-0-60d86ea78416@google.com Changes in v6: - in patch 1/2: - fix commit message (Andrey) - change comments (Andrey) - fix mempool handling of kfence objects (Andrey) - in patch 2/2: - fix is_kfence_address argument (syzbot and Marco) - refactor slab_free_hook() to create "still_accessible" variable - change kasan_slab_free() hook argument to "still_accessible" - add documentation to kasan_slab_free() hook - Link to v5: https://lore.kernel.org/r/20240730-kasan-tsbrcu-v5-0-48d3cbdfccc5@google.com Changes in v5: - rebase to latest origin/master (akpm), no other changes from v4 - Link to v4: https://lore.kernel.org/r/20240729-kasan-tsbrcu-v4-0-57ec85ef80c6@google.com Changes in v4: - note I kept vbabka's ack for the SLUB changes in patch 1/2 since the SLUB part didn't change, even though I refactored a bunch of the KASAN parts - in patch 1/2 (major rework): - fix commit message (Andrey) - add doc comments in header (Andrey) - remove "ip" argument from __kasan_slab_free() - rework the whole check_slab_free() thing and move code around (Andrey) - in patch 2/2: - kconfig description and dependency changes (Andrey) - remove useless linebreak (Andrey) - fix comment style (Andrey) - fix do_slab_free() invocation (kernel test robot) - Link to v3: https://lore.kernel.org/r/20240725-kasan-tsbrcu-v3-0-51c92f8f1101@google.com Changes in v3: - in patch 1/2, integrate akpm's fix for !CONFIG_KASAN build failure - in patch 2/2, as suggested by vbabka, use dynamically allocated rcu_head to avoid having to add slab metadata - in patch 2/2, add a warning in the kconfig help text that objects can be recycled immediately under memory pressure - Link to v2: https://lore.kernel.org/r/20240724-kasan-tsbrcu-v2-0-45f898064468@google.com Changes in v2: Patch 1/2 is new; it's some necessary prep work for the main patch to work, though the KASAN integration maybe is a bit ugly. Patch 2/2 is a rebased version of the old patch, with some changes to how the config is wired up, with poison/unpoison logic added as suggested by dvyukov@ back then, with cache destruction fixed using rcu_barrier() as pointed out by dvyukov@ and the test robot, and a test added as suggested by elver@. --- Jann Horn (2): kasan: catch invalid free before SLUB reinitializes the object slub: Introduce CONFIG_SLUB_RCU_DEBUG include/linux/kasan.h | 63 ++++++++++++++++++++++++++++++++++--- mm/Kconfig.debug | 32 +++++++++++++++++++ mm/kasan/common.c | 62 +++++++++++++++++++++--------------- mm/kasan/kasan_test.c | 46 +++++++++++++++++++++++++++ mm/slab_common.c | 12 +++++++ mm/slub.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++----- 6 files changed, 264 insertions(+), 38 deletions(-) --- base-commit: 94ede2a3e9135764736221c080ac7c0ad993dc2d change-id: 20240723-kasan-tsbrcu-b715a901f776