Skip to content

Commit 5079380

Browse files
Darrick J. Wongbrauner
authored andcommitted
fsdax: dax_unshare_iter needs to copy entire blocks
The code that copies data from srcmap to iomap in dax_unshare_iter is very very broken, which bfoster's recent fsx changes have exposed. If the pos and len passed to dax_file_unshare are not aligned to an fsblock boundary, the iter pos and length in the _iter function will reflect this unalignment. dax_iomap_direct_access always returns a pointer to the start of the kmapped fsdax page, even if its pos argument is in the middle of that page. This is catastrophic for data integrity when iter->pos is not aligned to a page, because daddr/saddr do not point to the same byte in the file as iter->pos. Hence we corrupt user data by copying it to the wrong place. If iter->pos + iomap_length() in the _iter function not aligned to a page, then we fail to copy a full block, and only partially populate the destination block. This is catastrophic for data confidentiality because we expose stale pmem contents. Fix both of these issues by aligning copy_pos/copy_len to a page boundary (remember, this is fsdax so 1 fsblock == 1 base page) so that we always copy full blocks. We're not done yet -- there's no call to invalidate_inode_pages2_range, so programs that have the file range mmap'd will continue accessing the old memory mapping after the file metadata updates have completed. Be careful with the return value -- if the unshare succeeds, we still need to return the number of bytes that the iomap iter thinks we're operating on. Cc: [email protected] Fixes: d984648 ("fsdax,xfs: port unshare to fsdax") Signed-off-by: Darrick J. Wong <[email protected]> Link: https://lore.kernel.org/r/172796813328.1131942.16777025316348797355.stgit@frogsfrogsfrogs Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent 9547227 commit 5079380

File tree

1 file changed

+27
-7
lines changed

1 file changed

+27
-7
lines changed

fs/dax.c

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,26 +1262,46 @@ static s64 dax_unshare_iter(struct iomap_iter *iter)
12621262
{
12631263
struct iomap *iomap = &iter->iomap;
12641264
const struct iomap *srcmap = iomap_iter_srcmap(iter);
1265-
loff_t pos = iter->pos;
1266-
loff_t length = iomap_length(iter);
1265+
loff_t copy_pos = iter->pos;
1266+
u64 copy_len = iomap_length(iter);
1267+
u32 mod;
12671268
int id = 0;
12681269
s64 ret = 0;
12691270
void *daddr = NULL, *saddr = NULL;
12701271

12711272
if (!iomap_want_unshare_iter(iter))
1272-
return length;
1273+
return iomap_length(iter);
1274+
1275+
/*
1276+
* Extend the file range to be aligned to fsblock/pagesize, because
1277+
* we need to copy entire blocks, not just the byte range specified.
1278+
* Invalidate the mapping because we're about to CoW.
1279+
*/
1280+
mod = offset_in_page(copy_pos);
1281+
if (mod) {
1282+
copy_len += mod;
1283+
copy_pos -= mod;
1284+
}
1285+
1286+
mod = offset_in_page(copy_pos + copy_len);
1287+
if (mod)
1288+
copy_len += PAGE_SIZE - mod;
1289+
1290+
invalidate_inode_pages2_range(iter->inode->i_mapping,
1291+
copy_pos >> PAGE_SHIFT,
1292+
(copy_pos + copy_len - 1) >> PAGE_SHIFT);
12731293

12741294
id = dax_read_lock();
1275-
ret = dax_iomap_direct_access(iomap, pos, length, &daddr, NULL);
1295+
ret = dax_iomap_direct_access(iomap, copy_pos, copy_len, &daddr, NULL);
12761296
if (ret < 0)
12771297
goto out_unlock;
12781298

1279-
ret = dax_iomap_direct_access(srcmap, pos, length, &saddr, NULL);
1299+
ret = dax_iomap_direct_access(srcmap, copy_pos, copy_len, &saddr, NULL);
12801300
if (ret < 0)
12811301
goto out_unlock;
12821302

1283-
if (copy_mc_to_kernel(daddr, saddr, length) == 0)
1284-
ret = length;
1303+
if (copy_mc_to_kernel(daddr, saddr, copy_len) == 0)
1304+
ret = iomap_length(iter);
12851305
else
12861306
ret = -EIO;
12871307

0 commit comments

Comments
 (0)