Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2556566pxj; Mon, 10 May 2021 05:52:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfqpe+7MsU7bW+2hV3GnSkOyB24Le+/JoaZCF1sD69mhN7Kd/xygE+NDYJwqebL6osCRDG X-Received: by 2002:a05:6e02:5ac:: with SMTP id k12mr22567090ils.173.1620651157594; Mon, 10 May 2021 05:52:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620651157; cv=none; d=google.com; s=arc-20160816; b=cedpAk0fwmIQ5X3WGO1FzWZRPzyNubIdoFN+C7KS/klIoylfXAguO65VC/RGLOE3YA zQX/RM9WZeyr8SN2Rn387mXT6QWImBbEXfHI8OatFbhA0XeJ7tjfm10i/++lstcjUUdL Lull8fXInne9xcH/sHnMGUxZnjmTP5ExdsPLWIftgcXgmI9KpycjTNmqkcGcJ2PWQMas Xpqovt7BonAH9e+1HkG/UyXTAlgxGjwhNZJkN9Pqr47PrUX6dzcomlVpJcFzAFAKMqIw KDS+TuN2e4SVnU9ywKINqgJXJptgfS47jZWEbsblo6PJetZ851eRAWNT8T/+LawNtIB4 7cTA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+g7HcRoROjhwOPy0sWamM9OY/scoqaXTKAJ7KVigSQ8=; b=Ym0WylnKcKyiD3jvvHzTwGE9HuvwpoLatQtnIueKg4mlKzLr7+b5ZsZ0DibybK3DNX fV4jI3/GDqLOUgKxKPBmNWiHqOUFxxL8K08tBQ5S9s+4xemlr1e7UO3xTGiZSo+iMeQs 137W2m89oAjpkbsm9+MGOjdsDwnZlRzJBHNGvxE6UF0QlWGPAPdmwPEFPTsLXDkYufU7 bofuQ1s5oDNXPV2wuDBstRWYIwPFz1SxPlz26BMBJOd3Neab47todvpUuMxMPbj0NeLi zPBasbobY3NQnU149Te+Yhgtj3S70U9Cr7oQZlNGcHhoMw3D9BRYGRAbELwgjnC+IA9y w6Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Pib1nO5s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k6si13176022jaq.122.2021.05.10.05.52.24; Mon, 10 May 2021 05:52:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Pib1nO5s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348822AbhEJMra (ORCPT + 99 others); Mon, 10 May 2021 08:47:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:53450 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232523AbhEJLLy (ORCPT ); Mon, 10 May 2021 07:11:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DA8C16162A; Mon, 10 May 2021 11:09:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644961; bh=dLe0Am5ISS6BlIIr8EpXzSimkCnuebfRxTunvVj6FIw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pib1nO5sLR59EXnQzm78cQQiVbbPO7L6nWi1xedbEnQKWBdEPvmMzKG3lwAk+hMtH 7UkY2khNrZQrMXJXlqGXVlT54/nqbqg7wDcvjMGm1Fp1GpBReVtWl4UVGHNOFGk7ER 15PiOKnhh4GVZF6cFG8SFgmyq8QWGQbMn1GcAzJ8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim , butt3rflyh4ck Subject: [PATCH 5.12 293/384] f2fs: fix to avoid out-of-bounds memory access Date: Mon, 10 May 2021 12:21:22 +0200 Message-Id: <20210510102024.475813911@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Yu commit b862676e371715456c9dade7990c8004996d0d9e upstream. butt3rflyh4ck reported a bug found by syzkaller fuzzer with custom modifications in 5.12.0-rc3+ [1]: dump_stack+0xfa/0x151 lib/dump_stack.c:120 print_address_description.constprop.0.cold+0x82/0x32c mm/kasan/report.c:232 __kasan_report mm/kasan/report.c:399 [inline] kasan_report.cold+0x7c/0xd8 mm/kasan/report.c:416 f2fs_test_bit fs/f2fs/f2fs.h:2572 [inline] current_nat_addr fs/f2fs/node.h:213 [inline] get_next_nat_page fs/f2fs/node.c:123 [inline] __flush_nat_entry_set fs/f2fs/node.c:2888 [inline] f2fs_flush_nat_entries+0x258e/0x2960 fs/f2fs/node.c:2991 f2fs_write_checkpoint+0x1372/0x6a70 fs/f2fs/checkpoint.c:1640 f2fs_issue_checkpoint+0x149/0x410 fs/f2fs/checkpoint.c:1807 f2fs_sync_fs+0x20f/0x420 fs/f2fs/super.c:1454 __sync_filesystem fs/sync.c:39 [inline] sync_filesystem fs/sync.c:67 [inline] sync_filesystem+0x1b5/0x260 fs/sync.c:48 generic_shutdown_super+0x70/0x370 fs/super.c:448 kill_block_super+0x97/0xf0 fs/super.c:1394 The root cause is, if nat entry in checkpoint journal area is corrupted, e.g. nid of journalled nat entry exceeds max nid value, during checkpoint, once it tries to flush nat journal to NAT area, get_next_nat_page() may access out-of-bounds memory on nat_bitmap due to it uses wrong nid value as bitmap offset. [1] https://lore.kernel.org/lkml/CAFcO6XOMWdr8pObek6eN6-fs58KG9doRFadgJj-FnF-1x43s2g@mail.gmail.com/T/#u Reported-and-tested-by: butt3rflyh4ck Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Greg Kroah-Hartman --- fs/f2fs/node.c | 3 +++ 1 file changed, 3 insertions(+) --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -2785,6 +2785,9 @@ static void remove_nats_in_journal(struc struct f2fs_nat_entry raw_ne; nid_t nid = le32_to_cpu(nid_in_journal(journal, i)); + if (f2fs_check_nid_range(sbi, nid)) + continue; + raw_ne = nat_in_journal(journal, i); ne = __lookup_nat_cache(nm_i, nid);