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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5130EC4332F for ; Sat, 17 Dec 2022 15:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229952AbiLQPd6 (ORCPT ); Sat, 17 Dec 2022 10:33:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230380AbiLQPcb (ORCPT ); Sat, 17 Dec 2022 10:32:31 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6239E1AF12; Sat, 17 Dec 2022 07:29:01 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C4A6960C13; Sat, 17 Dec 2022 15:29:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B88CBC43392; Sat, 17 Dec 2022 15:28:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671290940; bh=huscLZkbXLDXuPiTqXbzABWrfX3kei9rZ84GI/UNxbE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P/kQP1QHVYpF8qeYQqwn1C9Rb9WssdMhmy4R8HBxlkaXzX6aB0iJeouMNPrY6MUuV a3fljkCiF0mLdYoxdqm/g/3As184oHizMpW8EgA0dKfESfYXdECthttHZqcGSRhqB8 ZYsOrzRKYsYQ9zohobsbN45Dl5+gIfpJSqpAyDvhYLsMfasfaxH903UjpZdyAeztTG FRdLQUDMc9CE0OosiVayKkFua+Pk/EcSB5r4i1Lzxy4J0ueuqW9Z15q3GVpbmltkYV Kgv5S3nZXWE69Vo44uM01wyniM2WH3mfAqKrR9UTaAsYzi/guzkkxK9crLGkZDENbq 4t9LPKBsA7aZg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: ZhangPeng , syzbot+e836ff7133ac02be825f@syzkaller.appspotmail.com, Damien Le Moal , Ira Weiny , Jeff Layton , Kefeng Wang , Matthew Wilcox , Nanyong Sun , Viacheslav Dubeyko , Andrew Morton , Sasha Levin , hannes@cmpxchg.org, linux-fsdevel@vger.kernel.org Subject: [PATCH AUTOSEL 6.0 16/16] hfs: fix OOB Read in __hfs_brec_find Date: Sat, 17 Dec 2022 10:28:19 -0500 Message-Id: <20221217152821.98618-16-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221217152821.98618-1-sashal@kernel.org> References: <20221217152821.98618-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: ZhangPeng [ Upstream commit 8d824e69d9f3fa3121b2dda25053bae71e2460d2 ] Syzbot reported a OOB read bug: ================================================================== BUG: KASAN: slab-out-of-bounds in hfs_strcmp+0x117/0x190 fs/hfs/string.c:84 Read of size 1 at addr ffff88807eb62c4e by task kworker/u4:1/11 CPU: 1 PID: 11 Comm: kworker/u4:1 Not tainted 6.1.0-rc6-syzkaller-00308-g644e9524388a #0 Workqueue: writeback wb_workfn (flush-7:0) 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_strcmp+0x117/0x190 fs/hfs/string.c:84 __hfs_brec_find+0x213/0x5c0 fs/hfs/bfind.c:75 hfs_brec_find+0x276/0x520 fs/hfs/bfind.c:138 hfs_write_inode+0x34c/0xb40 fs/hfs/inode.c:462 write_inode fs/fs-writeback.c:1440 [inline] If the input inode of hfs_write_inode() is incorrect: struct inode struct hfs_inode_info struct hfs_cat_key struct hfs_name u8 len # len is greater than HFS_NAMELEN(31) which is the maximum length of an HFS filename OOB read occurred: hfs_write_inode() hfs_brec_find() __hfs_brec_find() hfs_cat_keycmp() hfs_strcmp() # OOB read occurred due to len is too large Fix this by adding a Check on len in hfs_write_inode() before calling hfs_brec_find(). Link: https://lkml.kernel.org/r/20221130065959.2168236-1-zhangpeng362@huawei.com Signed-off-by: ZhangPeng Reported-by: Cc: Damien Le Moal Cc: Ira Weiny Cc: Jeff Layton Cc: Kefeng Wang Cc: Matthew Wilcox Cc: Nanyong Sun Cc: Viacheslav Dubeyko Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- fs/hfs/inode.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c index c4526f16355d..a0746be3c1de 100644 --- a/fs/hfs/inode.c +++ b/fs/hfs/inode.c @@ -458,6 +458,8 @@ int hfs_write_inode(struct inode *inode, struct writeback_control *wbc) /* panic? */ return -EIO; + if (HFS_I(main_inode)->cat_key.CName.len > HFS_NAMELEN) + return -EIO; fd.search_key->cat = HFS_I(main_inode)->cat_key; if (hfs_brec_find(&fd)) /* panic? */ -- 2.35.1