Message ID | 20221214103707.3893954-1-chenxiaosong2@huawei.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp109136wrn; Wed, 14 Dec 2022 01:34:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf4vGtJ0dJJ3Wh9U7zXYv/Ky/rxSc6Soh17oWBdTOdNvzaTcgxqW/UQ9lMYQRKAOv309Moh9 X-Received: by 2002:aa7:cb53:0:b0:470:44eb:9e58 with SMTP id w19-20020aa7cb53000000b0047044eb9e58mr4571710edt.30.1671010469852; Wed, 14 Dec 2022 01:34:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671010469; cv=none; d=google.com; s=arc-20160816; b=dIt6Dc2aqizurEXU1GC1ZXKoNoJBSx4FK91m48TnSzLcBYfOwPVpGS187COa2SboHB vXgkzQNYb3/tXbghKmlb3awbvB0fJX61Q0UMo/dHslG552cFW+BwWCElWna7RPaIWB8y Fr1Vrpj2+sDyPxFva8QieloVvNrA0JRFNf60s5q1UIbRu9gHHX0dKGfXX8bd5rYv9QtS RLg/DcqdfbqhkYhdxISYiy0xPN6cyZ3KvQMQOqnm21HOynEPWmvtNx9XPJt6vFwIr5BC OcrXem2BetAIg0pBStnFvFfG1mxGxjijQTQRL3AotqKNyfR+lNXuczWSgkGl5tdVRRMg u9lA== 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; bh=mcxrn0jQantrnOpG6G/Hanep/KYSYvW8ivdP36+UVLA=; b=H2RxO2EPz48vtAqBvRY39HyWZFoY+q25/GldFOsX6gTG+R7V7csyDT1WvaOC9KpA5p +P8EUuIIaBskoInco9kMjhalWHReN6/LZzfxPHu0/W9jns1GzRW0q1bNcZBi8o8jp5EK GXns2LzfuHDtHm2JmRPkwGsYf50RYWvLO8E92gpfI+CT49B4/p2W1Vvf6hnalc9jL2uC L135F9HnVBMlVcp8qD1nzYzbapR1pEDgLOFwVyMFDeUhy3Hcqb2wWd6x5bJiF3zdHbrj 5paePaoA07pVMh/Nmga0nZjznyEe8nN04Mae3NzbQbKpgSdFSBmpRfDMX7iqGecvdTjt Z2sw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z21-20020a05640235d500b0046ffcd4df07si5990427edc.569.2022.12.14.01.34.06; Wed, 14 Dec 2022 01:34:29 -0800 (PST) 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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237725AbiLNJdS (ORCPT <rfc822;jeantsuru.cumc.mandola@gmail.com> + 99 others); Wed, 14 Dec 2022 04:33:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237866AbiLNJdG (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 14 Dec 2022 04:33:06 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E6AC13EA1; Wed, 14 Dec 2022 01:33:02 -0800 (PST) Received: from kwepemm600015.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NX96p4LFDzJpKv; Wed, 14 Dec 2022 17:29:22 +0800 (CST) Received: from huawei.com (10.175.101.6) by kwepemm600015.china.huawei.com (7.193.23.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 14 Dec 2022 17:32:59 +0800 From: ChenXiaoSong <chenxiaosong2@huawei.com> To: <roman.gushchin@linux.dev>, <axboe@kernel.dk>, <bvanassche@acm.org>, <tytso@mit.edu>, <akpm@linux-foundation.org> CC: <linux-fsdevel@vger.kernel.org>, <linux-kernel@vger.kernel.org> Subject: [PATCH] hfsplus: fix uninit-value in hfsplus_delete_cat() Date: Wed, 14 Dec 2022 18:37:07 +0800 Message-ID: <20221214103707.3893954-1-chenxiaosong2@huawei.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600015.china.huawei.com (7.193.23.52) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752181474300205253?= X-GMAIL-MSGID: =?utf-8?q?1752181474300205253?= |
Series |
hfsplus: fix uninit-value in hfsplus_delete_cat()
|
|
Commit Message
ChenXiaoSong
Dec. 14, 2022, 10:37 a.m. UTC
Syzkaller reported BUG as follows:
=====================================================
BUG: KMSAN: uninit-value in hfsplus_subfolders_dec
fs/hfsplus/catalog.c:248 [inline]
BUG: KMSAN: uninit-value in hfsplus_delete_cat+0x1207/0x14d0
fs/hfsplus/catalog.c:419
hfsplus_subfolders_dec fs/hfsplus/catalog.c:248 [inline]
hfsplus_delete_cat+0x1207/0x14d0 fs/hfsplus/catalog.c:419
hfsplus_rmdir+0x141/0x3d0 fs/hfsplus/dir.c:425
hfsplus_rename+0x102/0x2e0 fs/hfsplus/dir.c:545
vfs_rename+0x1e4c/0x2800 fs/namei.c:4779
do_renameat2+0x173d/0x1dc0 fs/namei.c:4930
__do_sys_renameat2 fs/namei.c:4963 [inline]
__se_sys_renameat2 fs/namei.c:4960 [inline]
__ia32_sys_renameat2+0x14b/0x1f0 fs/namei.c:4960
do_syscall_32_irqs_on arch/x86/entry/common.c:112 [inline]
__do_fast_syscall_32+0xa2/0x100 arch/x86/entry/common.c:178
do_fast_syscall_32+0x33/0x70 arch/x86/entry/common.c:203
do_SYSENTER_32+0x1b/0x20 arch/x86/entry/common.c:246
entry_SYSENTER_compat_after_hwframe+0x70/0x82
Uninit was stored to memory at:
hfsplus_subfolders_inc fs/hfsplus/catalog.c:232 [inline]
hfsplus_create_cat+0x19e3/0x19f0 fs/hfsplus/catalog.c:314
hfsplus_mknod+0x1fd/0x560 fs/hfsplus/dir.c:494
hfsplus_mkdir+0x54/0x60 fs/hfsplus/dir.c:529
vfs_mkdir+0x62a/0x870 fs/namei.c:4036
do_mkdirat+0x466/0x7b0 fs/namei.c:4061
__do_sys_mkdirat fs/namei.c:4076 [inline]
__se_sys_mkdirat fs/namei.c:4074 [inline]
__ia32_sys_mkdirat+0xc4/0x120 fs/namei.c:4074
do_syscall_32_irqs_on arch/x86/entry/common.c:112 [inline]
__do_fast_syscall_32+0xa2/0x100 arch/x86/entry/common.c:178
do_fast_syscall_32+0x33/0x70 arch/x86/entry/common.c:203
do_SYSENTER_32+0x1b/0x20 arch/x86/entry/common.c:246
entry_SYSENTER_compat_after_hwframe+0x70/0x82
Uninit was created at:
__alloc_pages+0x9f1/0xe80 mm/page_alloc.c:5581
alloc_pages+0xaae/0xd80 mm/mempolicy.c:2285
alloc_slab_page mm/slub.c:1794 [inline]
allocate_slab+0x1b5/0x1010 mm/slub.c:1939
new_slab mm/slub.c:1992 [inline]
___slab_alloc+0x10c3/0x2d60 mm/slub.c:3180
__slab_alloc mm/slub.c:3279 [inline]
slab_alloc_node mm/slub.c:3364 [inline]
slab_alloc mm/slub.c:3406 [inline]
__kmem_cache_alloc_lru mm/slub.c:3413 [inline]
kmem_cache_alloc_lru+0x6f3/0xb30 mm/slub.c:3429
alloc_inode_sb include/linux/fs.h:3125 [inline]
hfsplus_alloc_inode+0x56/0xc0 fs/hfsplus/super.c:627
alloc_inode+0x83/0x440 fs/inode.c:259
iget_locked+0x2a1/0xe20 fs/inode.c:1286
hfsplus_iget+0x5f/0xb60 fs/hfsplus/super.c:64
hfsplus_btree_open+0x13b/0x1cf0 fs/hfsplus/btree.c:150
hfsplus_fill_super+0x12b0/0x2a80 fs/hfsplus/super.c:473
mount_bdev+0x508/0x840 fs/super.c:1401
hfsplus_mount+0x49/0x60 fs/hfsplus/super.c:641
legacy_get_tree+0x10c/0x280 fs/fs_context.c:610
vfs_get_tree+0xa1/0x500 fs/super.c:1531
do_new_mount+0x694/0x1580 fs/namespace.c:3040
path_mount+0x71a/0x1eb0 fs/namespace.c:3370
do_mount fs/namespace.c:3383 [inline]
__do_sys_mount fs/namespace.c:3591 [inline]
__se_sys_mount+0x734/0x840 fs/namespace.c:3568
__ia32_sys_mount+0xdf/0x140 fs/namespace.c:3568
do_syscall_32_irqs_on arch/x86/entry/common.c:112 [inline]
__do_fast_syscall_32+0xa2/0x100 arch/x86/entry/common.c:178
do_fast_syscall_32+0x33/0x70 arch/x86/entry/common.c:203
do_SYSENTER_32+0x1b/0x20 arch/x86/entry/common.c:246
entry_SYSENTER_compat_after_hwframe+0x70/0x82
=====================================================
Fix this by initializing 'subfolders' of 'struct hfsplus_inode_info'
in hfsplus_iget().
Link: https://syzkaller.appspot.com/bug?id=981f82f21b973f2f5663dfea581ff8cee1ddfef2
Signed-off-by: ChenXiaoSong <chenxiaosong2@huawei.com>
---
fs/hfsplus/super.c | 1 +
1 file changed, 1 insertion(+)
Comments
> On Dec 14, 2022, at 2:37 AM, ChenXiaoSong <chenxiaosong2@huawei.com> wrote: > > Syzkaller reported BUG as follows: > > ===================================================== > BUG: KMSAN: uninit-value in hfsplus_subfolders_dec > fs/hfsplus/catalog.c:248 [inline] > BUG: KMSAN: uninit-value in hfsplus_delete_cat+0x1207/0x14d0 > fs/hfsplus/catalog.c:419 > hfsplus_subfolders_dec fs/hfsplus/catalog.c:248 [inline] > hfsplus_delete_cat+0x1207/0x14d0 fs/hfsplus/catalog.c:419 > hfsplus_rmdir+0x141/0x3d0 fs/hfsplus/dir.c:425 > hfsplus_rename+0x102/0x2e0 fs/hfsplus/dir.c:545 > vfs_rename+0x1e4c/0x2800 fs/namei.c:4779 > do_renameat2+0x173d/0x1dc0 fs/namei.c:4930 > __do_sys_renameat2 fs/namei.c:4963 [inline] > __se_sys_renameat2 fs/namei.c:4960 [inline] > __ia32_sys_renameat2+0x14b/0x1f0 fs/namei.c:4960 > do_syscall_32_irqs_on arch/x86/entry/common.c:112 [inline] > __do_fast_syscall_32+0xa2/0x100 arch/x86/entry/common.c:178 > do_fast_syscall_32+0x33/0x70 arch/x86/entry/common.c:203 > do_SYSENTER_32+0x1b/0x20 arch/x86/entry/common.c:246 > entry_SYSENTER_compat_after_hwframe+0x70/0x82 > > Uninit was stored to memory at: > hfsplus_subfolders_inc fs/hfsplus/catalog.c:232 [inline] > hfsplus_create_cat+0x19e3/0x19f0 fs/hfsplus/catalog.c:314 > hfsplus_mknod+0x1fd/0x560 fs/hfsplus/dir.c:494 > hfsplus_mkdir+0x54/0x60 fs/hfsplus/dir.c:529 > vfs_mkdir+0x62a/0x870 fs/namei.c:4036 > do_mkdirat+0x466/0x7b0 fs/namei.c:4061 > __do_sys_mkdirat fs/namei.c:4076 [inline] > __se_sys_mkdirat fs/namei.c:4074 [inline] > __ia32_sys_mkdirat+0xc4/0x120 fs/namei.c:4074 > do_syscall_32_irqs_on arch/x86/entry/common.c:112 [inline] > __do_fast_syscall_32+0xa2/0x100 arch/x86/entry/common.c:178 > do_fast_syscall_32+0x33/0x70 arch/x86/entry/common.c:203 > do_SYSENTER_32+0x1b/0x20 arch/x86/entry/common.c:246 > entry_SYSENTER_compat_after_hwframe+0x70/0x82 > > Uninit was created at: > __alloc_pages+0x9f1/0xe80 mm/page_alloc.c:5581 > alloc_pages+0xaae/0xd80 mm/mempolicy.c:2285 > alloc_slab_page mm/slub.c:1794 [inline] > allocate_slab+0x1b5/0x1010 mm/slub.c:1939 > new_slab mm/slub.c:1992 [inline] > ___slab_alloc+0x10c3/0x2d60 mm/slub.c:3180 > __slab_alloc mm/slub.c:3279 [inline] > slab_alloc_node mm/slub.c:3364 [inline] > slab_alloc mm/slub.c:3406 [inline] > __kmem_cache_alloc_lru mm/slub.c:3413 [inline] > kmem_cache_alloc_lru+0x6f3/0xb30 mm/slub.c:3429 > alloc_inode_sb include/linux/fs.h:3125 [inline] > hfsplus_alloc_inode+0x56/0xc0 fs/hfsplus/super.c:627 > alloc_inode+0x83/0x440 fs/inode.c:259 > iget_locked+0x2a1/0xe20 fs/inode.c:1286 > hfsplus_iget+0x5f/0xb60 fs/hfsplus/super.c:64 > hfsplus_btree_open+0x13b/0x1cf0 fs/hfsplus/btree.c:150 > hfsplus_fill_super+0x12b0/0x2a80 fs/hfsplus/super.c:473 > mount_bdev+0x508/0x840 fs/super.c:1401 > hfsplus_mount+0x49/0x60 fs/hfsplus/super.c:641 > legacy_get_tree+0x10c/0x280 fs/fs_context.c:610 > vfs_get_tree+0xa1/0x500 fs/super.c:1531 > do_new_mount+0x694/0x1580 fs/namespace.c:3040 > path_mount+0x71a/0x1eb0 fs/namespace.c:3370 > do_mount fs/namespace.c:3383 [inline] > __do_sys_mount fs/namespace.c:3591 [inline] > __se_sys_mount+0x734/0x840 fs/namespace.c:3568 > __ia32_sys_mount+0xdf/0x140 fs/namespace.c:3568 > do_syscall_32_irqs_on arch/x86/entry/common.c:112 [inline] > __do_fast_syscall_32+0xa2/0x100 arch/x86/entry/common.c:178 > do_fast_syscall_32+0x33/0x70 arch/x86/entry/common.c:203 > do_SYSENTER_32+0x1b/0x20 arch/x86/entry/common.c:246 > entry_SYSENTER_compat_after_hwframe+0x70/0x82 > ===================================================== > > Fix this by initializing 'subfolders' of 'struct hfsplus_inode_info' > in hfsplus_iget(). > > Link: https://syzkaller.appspot.com/bug?id=981f82f21b973f2f5663dfea581ff8cee1ddfef2 > Signed-off-by: ChenXiaoSong <chenxiaosong2@huawei.com> > --- > fs/hfsplus/super.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c > index 122ed89ebf9f..612c07857667 100644 > --- a/fs/hfsplus/super.c > +++ b/fs/hfsplus/super.c > @@ -72,6 +72,7 @@ struct inode *hfsplus_iget(struct super_block *sb, unsigned long ino) > mutex_init(&HFSPLUS_I(inode)->extents_lock); > HFSPLUS_I(inode)->flags = 0; > HFSPLUS_I(inode)->extent_state = 0; > + HFSPLUS_I(inode)->subfolders = 0; > HFSPLUS_I(inode)->rsrc_inode = NULL; > atomic_set(&HFSPLUS_I(inode)->opencnt, 0); > Looks good. Thanks for the fix. Reviewed-by: Viacheslav Dubeyko <slava@dubeyko.com> But we have more fields in struct hfsplus_inode_info: struct hfsplus_inode_info { atomic_t opencnt; /* * Extent allocation information, protected by extents_lock. */ u32 first_blocks; u32 clump_blocks; u32 alloc_blocks; u32 cached_start; u32 cached_blocks; hfsplus_extent_rec first_extents; hfsplus_extent_rec cached_extents; unsigned int extent_state; struct mutex extents_lock; /* * Immutable data. */ struct inode *rsrc_inode; __be32 create_date; /* * Protected by sbi->vh_mutex. */ u32 linkid; /* * Accessed using atomic bitops. */ unsigned long flags; /* * Protected by i_mutex. */ sector_t fs_blocks; u8 userflags; /* BSD user file flags */ u32 subfolders; /* Subfolder count (HFSX only) */ struct list_head open_dir_list; spinlock_t open_dir_lock; loff_t phys_size; struct inode vfs_inode; }; I believe we need to set initialized more fields in hfsplus_iget() method. Could you add the initialization of other missed fields? Thanks, Slava. > -- > 2.31.1 >
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index 122ed89ebf9f..612c07857667 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c @@ -72,6 +72,7 @@ struct inode *hfsplus_iget(struct super_block *sb, unsigned long ino) mutex_init(&HFSPLUS_I(inode)->extents_lock); HFSPLUS_I(inode)->flags = 0; HFSPLUS_I(inode)->extent_state = 0; + HFSPLUS_I(inode)->subfolders = 0; HFSPLUS_I(inode)->rsrc_inode = NULL; atomic_set(&HFSPLUS_I(inode)->opencnt, 0);