Skip to content

Commit

Permalink
block: Don't allow an atomic write be truncated in blkdev_write_iter()
Browse files Browse the repository at this point in the history
[ Upstream commit 2cbd51f ]

A write which goes past the end of the bdev in blkdev_write_iter() will
be truncated. Truncating cannot tolerated for an atomic write, so error
that condition.

Fixes: caf336f ("block: Add fops atomic write support")
Signed-off-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20241127092318.632790-1-john.g.garry@oracle.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
johnpgarry authored and gregkh committed Dec 5, 2024
1 parent 1b9ab6b commit d545734
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion block/fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,7 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
struct file *file = iocb->ki_filp;
struct inode *bd_inode = bdev_file_inode(file);
struct block_device *bdev = I_BDEV(bd_inode);
bool atomic = iocb->ki_flags & IOCB_ATOMIC;
loff_t size = bdev_nr_bytes(bdev);
size_t shorted = 0;
ssize_t ret;
Expand All @@ -696,14 +697,16 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
if ((iocb->ki_flags & (IOCB_NOWAIT | IOCB_DIRECT)) == IOCB_NOWAIT)
return -EOPNOTSUPP;

if (iocb->ki_flags & IOCB_ATOMIC) {
if (atomic) {
ret = generic_atomic_write_valid(iocb, from);
if (ret)
return ret;
}

size -= iocb->ki_pos;
if (iov_iter_count(from) > size) {
if (atomic)
return -EINVAL;
shorted = iov_iter_count(from) - size;
iov_iter_truncate(from, size);
}
Expand Down

0 comments on commit d545734

Please sign in to comment.