From: Edward Adam Davis <eadavis@qq.com>
To: syzbot+57028366b9825d8e8ad0@syzkaller.appspotmail.com
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
syzkaller-bugs@googlegroups.com
Subject: [PATCH next] hfsplus: fix oob in hfsplus_bnode_read_key
Date: Sun, 4 Feb 2024 19:51:22 +0800 [thread overview]
Message-ID: <tencent_164AB8743976ED67863C2F375496E236B009@qq.com> (raw)
In-Reply-To: <000000000000c37a740610762e55@google.com>
In hfs_brec_insert(), if data has not been moved to "data_off + size", the size
should not be added when reading search_key from node->page.
Reported-and-tested-by: syzbot+57028366b9825d8e8ad0@syzkaller.appspotmail.com
Signed-off-by: Edward Adam Davis <eadavis@qq.com>
---
fs/hfsplus/brec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/hfsplus/brec.c b/fs/hfsplus/brec.c
index 1918544a7871..9e0e0c1f15a5 100644
--- a/fs/hfsplus/brec.c
+++ b/fs/hfsplus/brec.c
@@ -138,7 +138,8 @@ int hfs_brec_insert(struct hfs_find_data *fd, void *entry, int entry_len)
* at the start of the node and it is not the new node
*/
if (!rec && new_node != node) {
- hfs_bnode_read_key(node, fd->search_key, data_off + size);
+ hfs_bnode_read_key(node, fd->search_key, data_off +
+ (idx_rec_off == data_rec_off ? 0 : size));
hfs_brec_update_parent(fd);
}
--
2.43.0
next prev parent reply other threads:[~2024-02-04 11:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-03 8:40 [syzbot] [hfs?] KASAN: slab-out-of-bounds Write " syzbot
2024-02-04 11:04 ` Edward Adam Davis
2024-02-04 11:42 ` syzbot
2024-02-04 11:51 ` Edward Adam Davis [this message]
2024-02-06 12:05 ` [PATCH next] hfsplus: fix oob " Viacheslav Dubeyko
2024-02-07 6:23 ` Edward Adam Davis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_164AB8743976ED67863C2F375496E236B009@qq.com \
--to=eadavis@qq.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=syzbot+57028366b9825d8e8ad0@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®