This is a note to let you know that I've just added the patch titled
udf: Fix races with i_size changes during readpage
to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
udf-fix-races-with-i_size-changes-during-readpage.patch
and it can be found in the queue-4.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 9795e0e8ac0d6a3ee092f1b555b284b57feef99e Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@xxxxxxx>
Date: Tue, 13 Jun 2017 15:54:58 +0200
Subject: udf: Fix races with i_size changes during readpage
From: Jan Kara <jack@xxxxxxx>
commit 9795e0e8ac0d6a3ee092f1b555b284b57feef99e upstream.
__udf_adinicb_readpage() uses i_size several times. When truncate
changes i_size while the function is running, it can observe several
different values and thus e.g. expose uninitialized parts of page to
userspace. Also use i_size_read() in the function since it does not hold
inode_lock. Since i_size is guaranteed to be small, this cannot really
cause any issues even on 32-bit archs but let's be careful.
Fixes: 9c2fc0de1a6e638fe58c354a463f544f42a90a09
Signed-off-by: Jan Kara <jack@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/udf/file.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -43,10 +43,15 @@ static void __udf_adinicb_readpage(struc
struct inode *inode = page->mapping->host;
char *kaddr;
struct udf_inode_info *iinfo = UDF_I(inode);
+ loff_t isize = i_size_read(inode);
+ /*
+ * We have to be careful here as truncate can change i_size under us.
+ * So just sample it once and use the same value everywhere.
+ */
kaddr = kmap_atomic(page);
- memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, inode->i_size);
- memset(kaddr + inode->i_size, 0, PAGE_SIZE - inode->i_size);
+ memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, isize);
+ memset(kaddr + isize, 0, PAGE_SIZE - isize);
flush_dcache_page(page);
SetPageUptodate(page);
kunmap_atomic(kaddr);
Patches currently in stable-queue which might be from jack@xxxxxxx are
queue-4.12/f2fs-don-t-clear-sgid-when-inheriting-acls.patch
queue-4.12/ext2-don-t-clear-sgid-when-inheriting-acls.patch
queue-4.12/scsi-avoid-that-scsi_exit_rq-triggers-a-use-after-free.patch
queue-4.12/hfsplus-don-t-clear-sgid-when-inheriting-acls.patch
queue-4.12/btrfs-don-t-clear-sgid-when-inheriting-acls.patch
queue-4.12/xfs-don-t-clear-sgid-when-inheriting-acls.patch
queue-4.12/udf-fix-races-with-i_size-changes-during-readpage.patch
queue-4.12/udf-fix-deadlock-between-writeback-and-udf_setsize.patch