kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xfs: update atime before I/O in xfs_file_dio_aio_read

Browse source 
After the call to __blkdev_direct_IO the final reference to the file
might have been dropped by aio_complete already, and the call to
file_accessed might cause a use after free.

Instead update the access time before the I/O, similar to how we
update the time stamps before writes.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-and-tested-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Christoph Hellwig 2016-10-03 09:47:34 +11:00 committed by Dave Chinner
parent 5694fe9aad
commit a447d7cd15
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/xfs/xfs_file.c
View file

@ -269,6 +269,8 @@ xfs_file_dio_aio_read(
return -EINVAL; return -EINVAL;
} }
file_accessed(iocb->ki_filp);
/* /*
* Locking is a bit tricky here. If we take an exclusive lock for direct * Locking is a bit tricky here. If we take an exclusive lock for direct
* IO, we effectively serialise all new concurrent read IO to this file * IO, we effectively serialise all new concurrent read IO to this file
@ -323,7 +325,6 @@ xfs_file_dio_aio_read(
} }
xfs_rw_iunlock(ip, XFS_IOLOCK_SHARED); xfs_rw_iunlock(ip, XFS_IOLOCK_SHARED);
file_accessed(iocb->ki_filp);
return ret; return ret;
} }