From patchwork Tue Nov 29 09:07:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 27122 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp225206wrr; Tue, 29 Nov 2022 01:20:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf5BBfiGy1kolw8RpLIGwpeh8fthTbl2mnP6LpzuUKOxKYOeOel95yb+GOGmODHqJ790djHG X-Received: by 2002:a17:90b:2688:b0:218:b9e1:ebef with SMTP id pl8-20020a17090b268800b00218b9e1ebefmr42540547pjb.65.1669713600038; Tue, 29 Nov 2022 01:20:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669713600; cv=none; d=google.com; s=arc-20160816; b=bCNRr8RsI3JbDE620njpSygxfi6zzjrCkeZeik7G1h59w9yoRUmWO8WWqp00xr2+/c gEmUT81trajfCppEv+VNaUBctBLBcHeIEgp/5FFKVvw6reqmjr5eHBveD6WCkwg2oQD+ XwZu7YGRaxSv/tjmQK9OgdHUGT/2ZA5cY1NK0Jb0WwKTD/ymfGlQQgvA/SK4hWtV6dwf P51+zcuef80n38BtenODL6ucLP4rhpl0TJuGMO0mvLRF6DwwXMDeV6KmdHbugaJXlKBi J4YJTvObfj8XZFcxd3PPnwhOM+IlCp9U5MJyaIORJRAyromqvOHqp68kiS37NhaJjMqb F/4A== 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=2d/6J559Y5Brs75TWkyq38uocVKinYN876XfltwZhYk=; b=b8d/VqVVO+YJ07UW13K1dLgKM6LtT5lECcaOBWlr170P45NSsBz2l5TLbkqw0TWIsn BCEYL3GaaYxJuMKpiQ6XdQzgd/pe5w5TybCsrmMKS+lEO7fAToMH+TQmCR2cdPX51Ymu 5MpY3xYBqCFqu4v5fMT9KHNt6t0YaGRBnJH33JSqcnTFnyM2hU55NI8RDg9TCQjA+jx7 hfD7HOXT78mXn1O3g4GNepYMYFN3xpwcw8T8M2kwPn5IlWCfNZz9K+3yKLaQE5i6vfaI m3kc5CQbbaZfIRGMQA0oOWHR9kC2k52EYBkGTn5Uurzh7XxmeD3XoI8NVrnxCEBkIFfO YJ9A== 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 na9-20020a17090b4c0900b00202b78e2adasi1364567pjb.102.2022.11.29.01.19.47; Tue, 29 Nov 2022 01:20:00 -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 S231228AbiK2JHg (ORCPT + 99 others); Tue, 29 Nov 2022 04:07:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229915AbiK2JHd (ORCPT ); Tue, 29 Nov 2022 04:07:33 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8114426ADC; Tue, 29 Nov 2022 01:07:30 -0800 (PST) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NLxKj5zsvz15MSg; Tue, 29 Nov 2022 17:06:49 +0800 (CST) Received: from kwepemm600020.china.huawei.com (7.193.23.147) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 29 Nov 2022 17:07:28 +0800 Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 29 Nov 2022 17:07:27 +0800 From: Peng Zhang To: , , CC: , , , , ZhangPeng , Subject: [PATCH v2] hfs: Fix OOB Write in hfs_asc2mac Date: Tue, 29 Nov 2022 09:07:06 +0000 Message-ID: <20221129090706.2336748-1-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm600020.china.huawei.com (7.193.23.147) 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750532583036524298?= X-GMAIL-MSGID: =?utf-8?q?1750821608119781863?= From: ZhangPeng Syzbot reported a OOB Write bug: loop0: detected capacity change from 0 to 64 ================================================================== BUG: KASAN: slab-out-of-bounds in hfs_asc2mac+0x467/0x9a0 fs/hfs/trans.c:133 Write of size 1 at addr ffff88801848314e by task syz-executor391/3632 Call Trace: __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x1b1/0x28e lib/dump_stack.c:106 print_address_description+0x74/0x340 mm/kasan/report.c:284 print_report+0x107/0x1f0 mm/kasan/report.c:395 kasan_report+0xcd/0x100 mm/kasan/report.c:495 hfs_asc2mac+0x467/0x9a0 fs/hfs/trans.c:133 hfs_cat_build_key+0x92/0x170 fs/hfs/catalog.c:28 hfs_lookup+0x1ab/0x2c0 fs/hfs/dir.c:31 lookup_open fs/namei.c:3391 [inline] open_last_lookups fs/namei.c:3481 [inline] path_openat+0x10e6/0x2df0 fs/namei.c:3710 do_filp_open+0x264/0x4f0 fs/namei.c:3740 If in->len is much larger than HFS_NAMELEN(31) which is the maximum length of an HFS filename, a OOB write could occur in hfs_asc2mac(). In that case, when the dst reaches the boundary, the srclen is still greater than 0, which causes a OOB write. Fix this by adding a check on dstlen in while() before writing to dst address. Fixes: 328b92278650 ("[PATCH] hfs: NLS support") Reported-by: syzbot+dc3b1cf9111ab5fe98e7@syzkaller.appspotmail.com Signed-off-by: ZhangPeng --- v2: - Change the location of the check for dstlen --- fs/hfs/trans.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/hfs/trans.c b/fs/hfs/trans.c index 39f5e343bf4d..fdb0edb8a607 100644 --- a/fs/hfs/trans.c +++ b/fs/hfs/trans.c @@ -109,7 +109,7 @@ void hfs_asc2mac(struct super_block *sb, struct hfs_name *out, const struct qstr if (nls_io) { wchar_t ch; - while (srclen > 0) { + while (srclen > 0 && dstlen > 0) { size = nls_io->char2uni(src, srclen, &ch); if (size < 0) { ch = '?';