Skip to content

Commit 93be0ee

Browse files
vvidicgregkh
authored andcommitted
ocfs2: mount fails with buffer overflow in strlen
commit b15fa92 upstream. Starting with kernel 5.11 built with CONFIG_FORTIFY_SOURCE mouting an ocfs2 filesystem with either o2cb or pcmk cluster stack fails with the trace below. Problem seems to be that strings for cluster stack and cluster name are not guaranteed to be null terminated in the disk representation, while strlcpy assumes that the source string is always null terminated. This causes a read outside of the source string triggering the buffer overflow detection. detected buffer overflow in strlen ------------[ cut here ]------------ kernel BUG at lib/string.c:1149! invalid opcode: 0000 [#1] SMP PTI CPU: 1 PID: 910 Comm: mount.ocfs2 Not tainted 5.14.0-1-amd64 #1 Debian 5.14.6-2 RIP: 0010:fortify_panic+0xf/0x11 ... Call Trace: ocfs2_initialize_super.isra.0.cold+0xc/0x18 [ocfs2] ocfs2_fill_super+0x359/0x19b0 [ocfs2] mount_bdev+0x185/0x1b0 legacy_get_tree+0x27/0x40 vfs_get_tree+0x25/0xb0 path_mount+0x454/0xa20 __x64_sys_mount+0x103/0x140 do_syscall_64+0x3b/0xc0 entry_SYSCALL_64_after_hwframe+0x44/0xae Link: https://lkml.kernel.org/r/20210929180654.32460-1-vvidic@valentin-vidic.from.hr Signed-off-by: Valentin Vidic <vvidic@valentin-vidic.from.hr> Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com> Cc: Mark Fasheh <mark@fasheh.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Junxiao Bi <junxiao.bi@oracle.com> Cc: Changwei Ge <gechangwei@live.cn> Cc: Gang He <ghe@suse.com> Cc: Jun Piao <piaojun@huawei.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f1b9856 commit 93be0ee

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

fs/ocfs2/super.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2171,11 +2171,17 @@ static int ocfs2_initialize_super(struct super_block *sb,
21712171
}
21722172

21732173
if (ocfs2_clusterinfo_valid(osb)) {
2174+
/*
2175+
* ci_stack and ci_cluster in ocfs2_cluster_info may not be null
2176+
* terminated, so make sure no overflow happens here by using
2177+
* memcpy. Destination strings will always be null terminated
2178+
* because osb is allocated using kzalloc.
2179+
*/
21742180
osb->osb_stackflags =
21752181
OCFS2_RAW_SB(di)->s_cluster_info.ci_stackflags;
2176-
strlcpy(osb->osb_cluster_stack,
2182+
memcpy(osb->osb_cluster_stack,
21772183
OCFS2_RAW_SB(di)->s_cluster_info.ci_stack,
2178-
OCFS2_STACK_LABEL_LEN + 1);
2184+
OCFS2_STACK_LABEL_LEN);
21792185
if (strlen(osb->osb_cluster_stack) != OCFS2_STACK_LABEL_LEN) {
21802186
mlog(ML_ERROR,
21812187
"couldn't mount because of an invalid "
@@ -2184,9 +2190,9 @@ static int ocfs2_initialize_super(struct super_block *sb,
21842190
status = -EINVAL;
21852191
goto bail;
21862192
}
2187-
strlcpy(osb->osb_cluster_name,
2193+
memcpy(osb->osb_cluster_name,
21882194
OCFS2_RAW_SB(di)->s_cluster_info.ci_cluster,
2189-
OCFS2_CLUSTER_NAME_LEN + 1);
2195+
OCFS2_CLUSTER_NAME_LEN);
21902196
} else {
21912197
/* The empty string is identical with classic tools that
21922198
* don't know about s_cluster_info. */

0 commit comments

Comments
 (0)