From patchwork Thu Nov 3 14:17:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shigeru Yoshida X-Patchwork-Id: 14918 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp562817wru; Thu, 3 Nov 2022 07:20:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM46H7zG/kfETAMcKwpHm6FHY54D1Jmr+Q2nFFL+9rzskkm0IXzudK+W9OlEgArwkaelHkvF X-Received: by 2002:a17:902:ef51:b0:180:7922:ce40 with SMTP id e17-20020a170902ef5100b001807922ce40mr30401133plx.8.1667485231733; Thu, 03 Nov 2022 07:20:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667485231; cv=none; d=google.com; s=arc-20160816; b=NormwSFQSSpta62vQyWnu/7Ip0ypVkwFmnri9KhP/phqJNX/Xyqqiyybfz9e7DesU/ EwunVNV3Ke6jwVxn0/VNNc8GXseKx+xgrhiCVKJNWYaPCBOr6IcAK/UOplcWAAYVIvK9 Dr7zwUMlwu7a6CZJrSo7ssLQay82LM9ej6ociKk5DD/QXDKyXOND3r/cFq40Es5Y/5Zl t+tN/wPnFZembB5V7SNI1YY7iLFY7n1BTfoBHuRCBX7zJNU2t1qjxLXxWc9GRgNQ6fmm N4z1tVgjJ+PCu7WpEfiNhawXGLsDhS5G6Qahc/o6rs9Mtjp1YxNtSSTY14lK72rrP4p8 a0fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=7sFhbFjsyed+EphiRBlueeREBkJAs1QiqobCz6ZZTfY=; b=xF6/GtSKZpQ7lBwZSFLJaLKCHI3rJIM25cjvsQhbCL+xXBoRpFR7+L7g5uqzlb2mBQ n+49X6cnP3iWDzFXrPSVuAlepJtPLVnrBi35MRjDfC/dxbvQ9648S6FObCB0oMTBbBxB AOd+3ImGu7HnVgsZN1XZ4K/THW5yK0eRA/Y7j2GMr+SBTydX9QklbRbxR6aOcwBfn/v3 8OUhfUs9tteCZRcUsTlFAJj+rm6uGOw9/ZDqS2BiV1ldZgNEuoUBvIhalW5IWAr9eNWe 0o+LnGVQ56Othq7BTIOWCfCiFhOSqOJR4Nwl12bbcps3sJC/sEqWSD9y6zN3DVO/++cG 5yTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=K+WxXayI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m11-20020a63580b000000b004388f47a0b1si1204380pgb.572.2022.11.03.07.20.18; Thu, 03 Nov 2022 07:20:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=K+WxXayI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230258AbiKCOTn (ORCPT + 99 others); Thu, 3 Nov 2022 10:19:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231698AbiKCOT0 (ORCPT ); Thu, 3 Nov 2022 10:19:26 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F0EC1147E for ; Thu, 3 Nov 2022 07:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667485089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=7sFhbFjsyed+EphiRBlueeREBkJAs1QiqobCz6ZZTfY=; b=K+WxXayITKcz2e4xpEGpZZr1+QLKsNauZ4S7CS+kiOfMxUimslN9BX8wZ/PfRG/rU2kbk2 QeBwQ0fCY0TxqT7banXultIFaFovdEsEC1Fey0kaRaA7ztxlFXkUhALoQpoKJ3EGCPAzdJ R+TH1gIjGBrqND75cK9FoS9HvIGcesg= Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-481-iBCjSSgROhW3KwNrbE5SVA-1; Thu, 03 Nov 2022 10:18:08 -0400 X-MC-Unique: iBCjSSgROhW3KwNrbE5SVA-1 Received: by mail-pj1-f72.google.com with SMTP id n9-20020a17090a2bc900b0021010dca313so842663pje.7 for ; Thu, 03 Nov 2022 07:18:08 -0700 (PDT) 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=7sFhbFjsyed+EphiRBlueeREBkJAs1QiqobCz6ZZTfY=; b=cpRpnZkj7cEldqpjnO3HPhq1dZUxtgWVGFg81AbHf6/EOVtrC7Y2LL8UdrwTykZm3X ZLSFrLsZ2gHi8PRo1+r6UO/RogwqHuVHVyLEWdf69t4CKV5+VHNUjJH9QnniIY6HeU0l Z0dPHFinsrcAIpVFftuBTTbqAoZpJlOjKQYhFD2gHzjiqVaSUD7Zpgit+bbahRu/MCYK wUiSBy/0snpgF6YuwWzdejWclRLaKcjO2kiVYdPM+o5cvNs1MFHNJYFxsNA0nwScwRvx OCrKgcGexZlnvlxEw6P60Ih0AwKsAh0Hb1oCVN3lC6piDX1aSL3cIaMohi3w3Agn3JUB W+ug== X-Gm-Message-State: ACrzQf27eAaCpTwVXLgEryvt5JaUMHziteJH2e6OnkUXJw7eE9UsR13G oEcNa4NZJPZKPMtGMyL0mEAHXzrVzcp8QuklyKEumEc+O8D3n1TdG9zFQYmUNnZqY3xffMU+1oi dI+ad3tdxU+SfQ3gs45vwQYgv X-Received: by 2002:a17:903:2411:b0:184:7159:dce6 with SMTP id e17-20020a170903241100b001847159dce6mr30858918plo.101.1667485086965; Thu, 03 Nov 2022 07:18:06 -0700 (PDT) X-Received: by 2002:a17:903:2411:b0:184:7159:dce6 with SMTP id e17-20020a170903241100b001847159dce6mr30858903plo.101.1667485086707; Thu, 03 Nov 2022 07:18:06 -0700 (PDT) Received: from ryzen.. ([240d:1a:c0d:9f00:fc9c:8ee9:e32c:2d9]) by smtp.gmail.com with ESMTPSA id gf7-20020a17090ac7c700b00214247989dfsm39222pjb.13.2022.11.03.07.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 07:18:06 -0700 (PDT) From: Shigeru Yoshida To: konishi.ryusuke@gmail.com Cc: linux-nilfs@vger.kernel.org, linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com, Shigeru Yoshida , syzbot+f816fa82f8783f7a02bb@syzkaller.appspotmail.com Subject: [PATCH] nilfs: Avoid use-after-free caused by nilfs->ns_writer Date: Thu, 3 Nov 2022 23:17:59 +0900 Message-Id: <20221103141759.1836312-1-syoshida@redhat.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748484994757831100?= X-GMAIL-MSGID: =?utf-8?q?1748484994757831100?= syzbot reported use-after-free in nilfs_segctor_sync() [1]. The use-after-free occurs with nilfs->ns_writer. The scenario for the issue is as follows: Task1 Task2 ---------------------------------------------------------------------- nilfs_construct_segment nilfs_segctor_sync init_wait init_waitqueue_entry add_wait_queue schedule nilfs_detach_log_writer nilfs_segctor_destroy kfree finish_wait _raw_spin_lock_irqsave __raw_spin_lock_irqsave do_raw_spin_lock debug_spin_lock_before <-- use-after-free While Task1 is sleeping, nilfs->ns_writer is freed by Task2. After Task1 waked up, Task1 accesses nilfs->ns_writer which is already freed. This patch fixes the issue by taking nilfs->ns_segctor_sem in nilfs_construct_segment() so that nilfs->ns_segctor_sem cannot be freed while nilfs_segctor_sync() is sleeping. Link: https://syzkaller.appspot.com/bug?id=79a4c002e960419ca173d55e863bd09e8112df8b [1] Reported-by: syzbot+f816fa82f8783f7a02bb@syzkaller.appspotmail.com Signed-off-by: Shigeru Yoshida --- fs/nilfs2/segment.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index b4cebad21b48..d4f10d82664d 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -2239,16 +2239,24 @@ static void nilfs_segctor_wakeup(struct nilfs_sc_info *sci, int err) int nilfs_construct_segment(struct super_block *sb) { struct the_nilfs *nilfs = sb->s_fs_info; - struct nilfs_sc_info *sci = nilfs->ns_writer; + struct nilfs_sc_info *sci; struct nilfs_transaction_info *ti; + int ret; - if (!sci) + down_write(&nilfs->ns_segctor_sem); + sci = nilfs->ns_writer; + if (!sci) { + up_write(&nilfs->ns_segctor_sem); return -EROFS; + } /* A call inside transactions causes a deadlock. */ BUG_ON((ti = current->journal_info) && ti->ti_magic == NILFS_TI_MAGIC); - return nilfs_segctor_sync(sci); + ret = nilfs_segctor_sync(sci); + up_write(&nilfs->ns_segctor_sem); + + return ret; } /**