Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53d872e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs 

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix a use after free in xfs_end_io_direct_write
parents 1d2ef590 2d2422ae

fs/xfs/xfs_aops.c

+2 −1
Original line number Diff line number Diff line
@@ -1300,6 +1300,7 @@ xfs_end_io_direct_write( 
	bool			is_async)

{

	struct xfs_ioend	*ioend = iocb->private;

	struct inode		*inode = ioend->io_inode;



	/*

	 * blockdev_direct_IO can return an error even after the I/O
@@ -1331,7 +1332,7 @@ xfs_end_io_direct_write( 
	}



	/* XXX: probably should move into the real I/O completion handler */

	inode_dio_done(ioend->io_inode);

	inode_dio_done(inode);

}



STATIC ssize_t