Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp2150278rwl; Thu, 30 Mar 2023 06:44:15 -0700 (PDT) X-Google-Smtp-Source: AKy350alUiOxaKWK/deTlRQfpgGClwgmt8TJqoResaNFI5mHEUA2lQmTmNweTAsCZNjLDy8bg6uG X-Received: by 2002:a17:907:10cc:b0:932:2874:cc5 with SMTP id rv12-20020a17090710cc00b0093228740cc5mr22477526ejb.16.1680183855226; Thu, 30 Mar 2023 06:44:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680183855; cv=none; d=google.com; s=arc-20160816; b=wWMplhOoaY2Jl2t1AU3z86UwJT0j2IMaZZOyIIwGXR86RzzYk3pvLcrq+6i9UmXlbe UZlVXU7Oblnm+T9jD4DBqTk43mqyhi7XdoSP6Vzq3YOUblQ7RlNPLxDCdaPsAoUxIOKB SloTf7vNLA0U2/UPJGISUu8z2gsbfv/YXgOrgR7GB4Dy9vPuozeD/7WLTK/A5JLnAgiW tbx2OaZT2O1jRPZ6cOPHl0VVkxtiPOganxrvAObI5Rq+Pp8OqTN405m7X0Cu5ztL/zxf nmhoqdUkksUP4iIwQVY4OF5BXmf39CHKb7pIOp4kCm+Bt58sXU/b1CqTt8Lwer62IEPd OYyQ== 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=Ciy/j7+gGpGGitemo6zgFmtrTpHLEWhuusaBGl9ec5Q=; b=ikLOVt76ZFEkhhp+zOF7LI0eCG2WZIbg+H87ZdLkEvwnZyZRPmfuuq58d54SBVkn5s ra16iBy+q7wd4RjUaXzExOzCq72wwH33xeKJlSiOauWk/Rjit+U/8nm1xXAsAj5eGXJx U0j9qAK6MEgAOXs8DEEIo4rnkx+kGcdXLt5LLHUHJtG5ItsCFdyQ1gHvjNcwlS6UJPls ilQnXm0FousKTaRAjjsbgo5AnKqm5wh3qR3wC2VNGQkIab5mJOiRmXw1Ud+LwnGPivgJ sv2cL+G8GAJHYNUGF1+a6Guk5CfNECtIbvWj1d/gYEb2I/EKDDakpQmA00Zgyrh8ByyV 2+KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=T+UONiVl; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 27-20020a170906005b00b008cf961a7be1si38417557ejg.830.2023.03.30.06.43.46; Thu, 30 Mar 2023 06:44:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-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=@linaro.org header.s=google header.b=T+UONiVl; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232119AbjC3NnO (ORCPT + 99 others); Thu, 30 Mar 2023 09:43:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231536AbjC3NnN (ORCPT ); Thu, 30 Mar 2023 09:43:13 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1050A9EEF for ; Thu, 30 Mar 2023 06:42:42 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id h11so17599097lfu.8 for ; Thu, 30 Mar 2023 06:42:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680183758; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Ciy/j7+gGpGGitemo6zgFmtrTpHLEWhuusaBGl9ec5Q=; b=T+UONiVles7QSlLTBwZEbV0faj7CrqST29KkE+UlBDfk7bionukH/9OM0YOq9zjxoa T+Op4cMRQRAqxVBYeLCLucVKivl+yDUkckhKbad/XGjaoZJLVLYn25+4lBGVHD97Zhto 2I6REBckOisb962zv73UkrhIsjjZvSC8UGOmAYgIx/Ba54siHP8uHtIZfRHkN3t9/G4E oAzUcgWff8/tg2JjxRk941gyU3OI7PNtro/T/zZqQdLVXy8ysbTwDEGgkKh2juv5FzYL Hdxu+8QoUr5c6njEEhXx/9d+rGA7XDmmzA8yzbfApVBzGrx724SSQCQLZuezrYRCRAI4 17sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680183758; 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=Ciy/j7+gGpGGitemo6zgFmtrTpHLEWhuusaBGl9ec5Q=; b=Unz1L1EcxCDOBlV29xlLK3pCg5E12OtJCRqFMZopWOb4Apgvt9ocVj+RAN7dyJfnjv vKilakA1e+w8C5Z4BmzCJBCWXAG9OdRoVaSzQPRX/aVjV5w11YkThUbcwo6xhxYYwX8R MX0EYewqn0GoI4QZxfNqxcQLTqynRWAqPW8MbZMvZAqP2Kr8yZ7UgHN5UO6U9RV2/enS rP1+uAemY80ooU+vZbr25MpJmkNzW15YHDoq0rCZBdy2DJV2b0pgqj5aD/0nrItNqMay J05fx3fhNs5uoYdmrfbgs5vXfL2jdguOLUd/G9ExiUnAbBCrzgyzrmhRuDQLlXBfu/yh ud7g== X-Gm-Message-State: AAQBX9cKIqLvTHeXoN1wu7gbDCFmnYI4vZr8T77bOWcOf6C83X56mbJV 6NJq3FrnUFynEWFVPhH2UaJjTA== X-Received: by 2002:a19:7003:0:b0:4dd:af76:d3c with SMTP id h3-20020a197003000000b004ddaf760d3cmr7640686lfc.48.1680183757940; Thu, 30 Mar 2023 06:42:37 -0700 (PDT) Received: from ta1.c.googlers.com.com (61.215.228.35.bc.googleusercontent.com. [35.228.215.61]) by smtp.gmail.com with ESMTPSA id m10-20020ac2428a000000b004b6f00832cesm5848001lfh.166.2023.03.30.06.42.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 06:42:37 -0700 (PDT) From: Tudor Ambarus To: gregkh@linuxfoundation.org, stable@vger.kernel.org Cc: tytso@mit.edu, adilger.kernel@dilger.ca, boyu.mt@taobao.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, leejones@google.com, yebin10@huawei.com, syzbot+4faa160fa96bfba639f8@syzkaller.appspotmail.com, jun.nie@linaro.org, stable@kernel.org, Tudor Ambarus Subject: [PATCH v2][for-stable 5.10, 5.4, 4.19, 4.14] ext4: fix kernel BUG in 'ext4_write_inline_data_end()' Date: Thu, 30 Mar 2023 13:42:33 +0000 Message-Id: <20230330134233.3407390-1-tudor.ambarus@linaro.org> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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-ext4@vger.kernel.org From: Ye Bin [ Upstream commit 5c099c4fdc438014d5893629e70a8ba934433ee8 ] Syzbot report follow issue: ------------[ cut here ]------------ kernel BUG at fs/ext4/inline.c:227! invalid opcode: 0000 [#1] PREEMPT SMP KASAN CPU: 1 PID: 3629 Comm: syz-executor212 Not tainted 6.1.0-rc5-syzkaller-00018-g59d0d52c30d4 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022 RIP: 0010:ext4_write_inline_data+0x344/0x3e0 fs/ext4/inline.c:227 RSP: 0018:ffffc90003b3f368 EFLAGS: 00010293 RAX: 0000000000000000 RBX: ffff8880704e16c0 RCX: 0000000000000000 RDX: ffff888021763a80 RSI: ffffffff821e31a4 RDI: 0000000000000006 RBP: 000000000006818e R08: 0000000000000006 R09: 0000000000068199 R10: 0000000000000079 R11: 0000000000000000 R12: 000000000000000b R13: 0000000000068199 R14: ffffc90003b3f408 R15: ffff8880704e1c82 FS: 000055555723e3c0(0000) GS:ffff8880b9b00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fffe8ac9080 CR3: 0000000079f81000 CR4: 0000000000350ee0 Call Trace: ext4_write_inline_data_end+0x2a3/0x12f0 fs/ext4/inline.c:768 ext4_write_end+0x242/0xdd0 fs/ext4/inode.c:1313 ext4_da_write_end+0x3ed/0xa30 fs/ext4/inode.c:3063 generic_perform_write+0x316/0x570 mm/filemap.c:3764 ext4_buffered_write_iter+0x15b/0x460 fs/ext4/file.c:285 ext4_file_write_iter+0x8bc/0x16e0 fs/ext4/file.c:700 call_write_iter include/linux/fs.h:2191 [inline] do_iter_readv_writev+0x20b/0x3b0 fs/read_write.c:735 do_iter_write+0x182/0x700 fs/read_write.c:861 vfs_iter_write+0x74/0xa0 fs/read_write.c:902 iter_file_splice_write+0x745/0xc90 fs/splice.c:686 do_splice_from fs/splice.c:764 [inline] direct_splice_actor+0x114/0x180 fs/splice.c:931 splice_direct_to_actor+0x335/0x8a0 fs/splice.c:886 do_splice_direct+0x1ab/0x280 fs/splice.c:974 do_sendfile+0xb19/0x1270 fs/read_write.c:1255 __do_sys_sendfile64 fs/read_write.c:1323 [inline] __se_sys_sendfile64 fs/read_write.c:1309 [inline] __x64_sys_sendfile64+0x1d0/0x210 fs/read_write.c:1309 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd ---[ end trace 0000000000000000 ]--- Above issue may happens as follows: ext4_da_write_begin ext4_da_write_inline_data_begin ext4_da_convert_inline_data_to_extent ext4_clear_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA); ext4_da_write_end ext4_run_li_request ext4_mb_prefetch ext4_read_block_bitmap_nowait ext4_validate_block_bitmap ext4_mark_group_bitmap_corrupted(sb, block_group, EXT4_GROUP_INFO_BBITMAP_CORRUPT) percpu_counter_sub(&sbi->s_freeclusters_counter,grp->bb_free); -> sbi->s_freeclusters_counter become zero ext4_da_write_begin if (ext4_nonda_switch(inode->i_sb)) -> As freeclusters_counter is zero will return true *fsdata = (void *)FALL_BACK_TO_NONDELALLOC; ext4_write_begin ext4_da_write_end if (write_mode == FALL_BACK_TO_NONDELALLOC) ext4_write_end if (inline_data) ext4_write_inline_data_end ext4_write_inline_data BUG_ON(pos + len > EXT4_I(inode)->i_inline_size); -> As inode is already convert to extent, so 'pos + len' > inline_size -> then trigger BUG. To solve this issue, instead of checking ext4_has_inline_data() which is only cleared after data has been written back, check the EXT4_STATE_MAY_INLINE_DATA flag in ext4_write_end(). Fixes: f19d5870cbf7 ("ext4: add normal write support for inline data") Reported-by: syzbot+4faa160fa96bfba639f8@syzkaller.appspotmail.com Reported-by: Jun Nie Signed-off-by: Ye Bin Link: https://lore.kernel.org/r/20221206144134.1919987-1-yebin@huaweicloud.com Signed-off-by: Theodore Ts'o Cc: stable@kernel.org [ta: Fix conflict in if expression and use the local variable inline_data as it is initialized with ext4_has_inline_data(inode) anyway.] Signed-off-by: Tudor Ambarus --- v2: update description on how the conflict was fixed fs/ext4/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 6ba185b46ba3..9bd5f8b0511b 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1303,7 +1303,8 @@ static int ext4_write_end(struct file *file, bool verity = ext4_verity_in_progress(inode); trace_ext4_write_end(inode, pos, len, copied); - if (inline_data) { + if (inline_data && + ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) { ret = ext4_write_inline_data_end(inode, pos, len, copied, page); if (ret < 0) { -- 2.40.0.348.gf938b09366-goog