| Message ID | 55574e0e-01a9-3cad-34ab-251e340fb78e@virtuozzo.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [v3] ext4: missing !bh check in ext4_xattr_inode_write() | expand |
On Fri, Nov 09, 2018 at 08:49:48AM +0300, Vasily Averin wrote: > According to Ted Ts'o ext4_getblk() called in ext4_xattr_inode_write() > should not return bh = NULL > > The only time that bh could be NULL, then, would be in the case of > something really going wrong; a programming error elsewhere (perhaps a > wild pointer dereference) or I/O error causing on-disk file system > corruption (although that would be highly unlikely given that we had > *just* allocated the blocks and so the metadata blocks in question > probably would still be in the cache). > > Fixes e50e5129f384 ("ext4: xattr-in-inode support") > Cc: stable@kernel.org # 4.13 > > Signed-off-by: Vasily Averin <vvs@virtuozzo.com> Thanks, applied. - Ted
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 0b9688683526..7643d52c776c 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -1384,6 +1384,12 @@ static int ext4_xattr_inode_write(handle_t *handle, struct inode *ea_inode, bh = ext4_getblk(handle, ea_inode, block, 0); if (IS_ERR(bh)) return PTR_ERR(bh); + if (!bh) { + WARN_ON_ONCE(1); + EXT4_ERROR_INODE(ea_inode, + "ext4_getblk() return bh = NULL"); + return -EFSCORRUPTED; + } ret = ext4_journal_get_write_access(handle, bh); if (ret) goto out;
According to Ted Ts'o ext4_getblk() called in ext4_xattr_inode_write() should not return bh = NULL The only time that bh could be NULL, then, would be in the case of something really going wrong; a programming error elsewhere (perhaps a wild pointer dereference) or I/O error causing on-disk file system corruption (although that would be highly unlikely given that we had *just* allocated the blocks and so the metadata blocks in question probably would still be in the cache). Fixes e50e5129f384 ("ext4: xattr-in-inode support") Cc: stable@kernel.org # 4.13 Signed-off-by: Vasily Averin <vvs@virtuozzo.com> --- fs/ext4/xattr.c | 6 ++++++ 1 file changed, 6 insertions(+)