The patch titled AIO: fix cleanup in io_submit_one(...) has been added to the -mm tree. Its filename is aio-fix-cleanup-in-io_submit_one.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: AIO: fix cleanup in io_submit_one(...) From: "Yan Zheng" <yanzheng@xxxxxxxx> When IOCB_FLAG_RESFD flag is set and iocb->aio_resfd is incorrect, statement 'goto out_put_req' is executed. At label 'out_put_req', aio_put_req(..) is called, which requires 'req->ki_filp' set. Signed-off-by: Yan Zheng<yanzheng@xxxxxxxx> Cc: Zach Brown <zach.brown@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- diff -puN fs/aio.c~aio-fix-cleanup-in-io_submit_one fs/aio.c --- a/fs/aio.c~aio-fix-cleanup-in-io_submit_one +++ a/fs/aio.c @@ -1562,6 +1562,7 @@ int fastcall io_submit_one(struct kioctx fput(file); return -EAGAIN; } + req->ki_filp = file; if (iocb->aio_flags & IOCB_FLAG_RESFD) { /* * If the IOCB_FLAG_RESFD flag of aio_flags is set, get an @@ -1576,7 +1577,6 @@ int fastcall io_submit_one(struct kioctx } } - req->ki_filp = file; ret = put_user(req->ki_key, &user_iocb->aio_key); if (unlikely(ret)) { dprintk("EFAULT: aio_key\n"); _ Patches currently in -mm which might be from yanzheng@xxxxxxxx are fix-vm_can_nonlinear-check-in-sys_remap_file_pages.patch fix-page-release-issue-in-filemap_fault.patch aio-fix-cleanup-in-io_submit_one.patch anon-inodes-use-open-coded-atomic_inc-for-the-shared-inode.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html