Skip to content

Commit 7fc3b7c

Browse files
committed
udf: Fix NULL ptr deref when converting from inline format
udf_expand_file_adinicb() calls directly ->writepage to write data expanded into a page. This however misses to setup inode for writeback properly and so we can crash on inode->i_wb dereference when submitting page for IO like: BUG: kernel NULL pointer dereference, address: 0000000000000158 #PF: supervisor read access in kernel mode ... <TASK> __folio_start_writeback+0x2ac/0x350 __block_write_full_page+0x37d/0x490 udf_expand_file_adinicb+0x255/0x400 [udf] udf_file_write_iter+0xbe/0x1b0 [udf] new_sync_write+0x125/0x1c0 vfs_write+0x28e/0x400 Fix the problem by marking the page dirty and going through the standard writeback path to write the page. Strictly speaking we would not even have to write the page but we want to catch e.g. ENOSPC errors early. Reported-by: butt3rflyh4ck <[email protected]> CC: [email protected] Fixes: 52ebea7 ("writeback: make backing_dev_info host cgroup-specific bdi_writebacks") Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Jan Kara <[email protected]>
1 parent dd81e1c commit 7fc3b7c

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

fs/udf/inode.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,6 @@ int udf_expand_file_adinicb(struct inode *inode)
258258
char *kaddr;
259259
struct udf_inode_info *iinfo = UDF_I(inode);
260260
int err;
261-
struct writeback_control udf_wbc = {
262-
.sync_mode = WB_SYNC_NONE,
263-
.nr_to_write = 1,
264-
};
265261

266262
WARN_ON_ONCE(!inode_is_locked(inode));
267263
if (!iinfo->i_lenAlloc) {
@@ -305,8 +301,10 @@ int udf_expand_file_adinicb(struct inode *inode)
305301
iinfo->i_alloc_type = ICBTAG_FLAG_AD_LONG;
306302
/* from now on we have normal address_space methods */
307303
inode->i_data.a_ops = &udf_aops;
304+
set_page_dirty(page);
305+
unlock_page(page);
308306
up_write(&iinfo->i_data_sem);
309-
err = inode->i_data.a_ops->writepage(page, &udf_wbc);
307+
err = filemap_fdatawrite(inode->i_mapping);
310308
if (err) {
311309
/* Restore everything back so that we don't lose data... */
312310
lock_page(page);

0 commit comments

Comments
 (0)