Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ubifs: Fix read out-of-bounds in ubifs_wbuf_write_nolock()

Function ubifs_wbuf_write_nolock() may access buf out of bounds in
following process:

ubifs_wbuf_write_nolock():
aligned_len = ALIGN(len, 8); // Assume len = 4089, aligned_len = 4096
if (aligned_len <= wbuf->avail) ... // Not satisfy
if (wbuf->used) {
ubifs_leb_write() // Fill some data in avail wbuf
len -= wbuf->avail; // len is still not 8-bytes aligned
aligned_len -= wbuf->avail;
}
n = aligned_len >> c->max_write_shift;
if (n) {
n <<= c->max_write_shift;
err = ubifs_leb_write(c, wbuf->lnum, buf + written,
wbuf->offs, n);
// n > len, read out of bounds less than 8(n-len) bytes
}

, which can be catched by KASAN:
=========================================================
BUG: KASAN: slab-out-of-bounds in ecc_sw_hamming_calculate+0x1dc/0x7d0
Read of size 4 at addr ffff888105594ff8 by task kworker/u8:4/128
Workqueue: writeback wb_workfn (flush-ubifs_0_0)
Call Trace:
kasan_report.cold+0x81/0x165
nand_write_page_swecc+0xa9/0x160
ubifs_leb_write+0xf2/0x1b0 [ubifs]
ubifs_wbuf_write_nolock+0x421/0x12c0 [ubifs]
write_head+0xdc/0x1c0 [ubifs]
ubifs_jnl_write_inode+0x627/0x960 [ubifs]
wb_workfn+0x8af/0xb80

Function ubifs_wbuf_write_nolock() accepts that parameter 'len' is not 8
bytes aligned, the 'len' represents the true length of buf (which is
allocated in 'ubifs_jnl_xxx', eg. ubifs_jnl_write_inode), so
ubifs_wbuf_write_nolock() must handle the length read from 'buf' carefully
to write leb safely.

Fetch a reproducer in [Link].

Fixes: 1e51764a3c2ac0 ("UBIFS: add new flash file system")
Link: https://bugzilla.kernel.org/show_bug.cgi?id=214785
Reported-by: Chengsong Ke <kechengsong@huawei.com>
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>

authored by

Zhihao Cheng and committed by
Richard Weinberger
4f2262a3 1b83ec05

+30 -4
+30 -4
fs/ubifs/io.c
··· 854 854 */ 855 855 n = aligned_len >> c->max_write_shift; 856 856 if (n) { 857 - n <<= c->max_write_shift; 857 + int m = n - 1; 858 + 858 859 dbg_io("write %d bytes to LEB %d:%d", n, wbuf->lnum, 859 860 wbuf->offs); 860 - err = ubifs_leb_write(c, wbuf->lnum, buf + written, 861 - wbuf->offs, n); 861 + 862 + if (m) { 863 + /* '(n-1)<<c->max_write_shift < len' is always true. */ 864 + m <<= c->max_write_shift; 865 + err = ubifs_leb_write(c, wbuf->lnum, buf + written, 866 + wbuf->offs, m); 867 + if (err) 868 + goto out; 869 + wbuf->offs += m; 870 + aligned_len -= m; 871 + len -= m; 872 + written += m; 873 + } 874 + 875 + /* 876 + * The non-written len of buf may be less than 'n' because 877 + * parameter 'len' is not 8 bytes aligned, so here we read 878 + * min(len, n) bytes from buf. 879 + */ 880 + n = 1 << c->max_write_shift; 881 + memcpy(wbuf->buf, buf + written, min(len, n)); 882 + if (n > len) { 883 + ubifs_assert(c, n - len < 8); 884 + ubifs_pad(c, wbuf->buf + len, n - len); 885 + } 886 + 887 + err = ubifs_leb_write(c, wbuf->lnum, wbuf->buf, wbuf->offs, n); 862 888 if (err) 863 889 goto out; 864 890 wbuf->offs += n; 865 891 aligned_len -= n; 866 - len -= n; 892 + len -= min(len, n); 867 893 written += n; 868 894 } 869 895