Commit 75a5be7c authored by Eric Biggers's avatar Eric Biggers Committed by Kelsey Skunberg

fs/minix: check return value of sb_getblk()

BugLink: https://bugs.launchpad.net/bugs/1892822

commit da27e0a0 upstream.

Patch series "fs/minix: fix syzbot bugs and set s_maxbytes".

This series fixes all syzbot bugs in the minix filesystem:

	KASAN: null-ptr-deref Write in get_block
	KASAN: use-after-free Write in get_block
	KASAN: use-after-free Read in get_block
	WARNING in inc_nlink
	KMSAN: uninit-value in get_block
	WARNING in drop_nlink

It also fixes the minix filesystem to set s_maxbytes correctly, so that
userspace sees the correct behavior when exceeding the max file size.

This patch (of 6):

sb_getblk() can fail, so check its return value.

This fixes a NULL pointer dereference.

Originally from Qiujun Huang.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Reported-by: syzbot+4a88b2b9dc280f47baf4@syzkaller.appspotmail.com
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Qiujun Huang <anenbupt@gmail.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: <stable@vger.kernel.org>
Link: http://lkml.kernel.org/r/20200628060846.682158-1-ebiggers@kernel.org
Link: http://lkml.kernel.org/r/20200628060846.682158-2-ebiggers@kernel.orgSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarIan May <ian.may@canonical.com>
Signed-off-by: default avatarKelsey Skunberg <kelsey.skunberg@canonical.com>
parent 45565f56
...@@ -74,6 +74,7 @@ static int alloc_branch(struct inode *inode, ...@@ -74,6 +74,7 @@ static int alloc_branch(struct inode *inode,
int n = 0; int n = 0;
int i; int i;
int parent = minix_new_block(inode); int parent = minix_new_block(inode);
int err = -ENOSPC;
branch[0].key = cpu_to_block(parent); branch[0].key = cpu_to_block(parent);
if (parent) for (n = 1; n < num; n++) { if (parent) for (n = 1; n < num; n++) {
...@@ -84,6 +85,11 @@ static int alloc_branch(struct inode *inode, ...@@ -84,6 +85,11 @@ static int alloc_branch(struct inode *inode,
break; break;
branch[n].key = cpu_to_block(nr); branch[n].key = cpu_to_block(nr);
bh = sb_getblk(inode->i_sb, parent); bh = sb_getblk(inode->i_sb, parent);
if (!bh) {
minix_free_block(inode, nr);
err = -ENOMEM;
break;
}
lock_buffer(bh); lock_buffer(bh);
memset(bh->b_data, 0, bh->b_size); memset(bh->b_data, 0, bh->b_size);
branch[n].bh = bh; branch[n].bh = bh;
...@@ -102,7 +108,7 @@ static int alloc_branch(struct inode *inode, ...@@ -102,7 +108,7 @@ static int alloc_branch(struct inode *inode,
bforget(branch[i].bh); bforget(branch[i].bh);
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
minix_free_block(inode, block_to_cpu(branch[i].key)); minix_free_block(inode, block_to_cpu(branch[i].key));
return -ENOSPC; return err;
} }
static inline int splice_branch(struct inode *inode, static inline int splice_branch(struct inode *inode,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment