diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2019-04-07 13:28:36 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2019-04-07 13:28:36 -1000 |
| commit | 429fba106e82e2792010a825b9dbeadd00bf9e9c (patch) | |
| tree | acaa2cefe9a35a7d25467957ea07f20eef63ecbc /fs | |
| parent | Merge tag 'for-linus-5.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | xsysace: Fix error handling in ace_setup (diff) | |
| download | linux-429fba106e82e2792010a825b9dbeadd00bf9e9c.tar.gz linux-429fba106e82e2792010a825b9dbeadd00bf9e9c.tar.bz2 linux-429fba106e82e2792010a825b9dbeadd00bf9e9c.zip | |
Merge tag 'for-linus-20190407' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
- Fixups for the pf/pcd queue handling (YueHaibing)
- Revert of the three direct issue changes as they have been proven to
cause an issue with dm-mpath (Bart)
- Plug rq_count reset fix (Dongli)
- io_uring double free in fileset registration error handling (me)
- Make null_blk handle bad numa node passed in (John)
- BFQ ifdef fix (Konstantin)
- Flush queue leak fix (Shenghui)
- Plug trace fix (Yufen)
* tag 'for-linus-20190407' of git://git.kernel.dk/linux-block:
xsysace: Fix error handling in ace_setup
null_blk: prevent crash from bad home_node value
block: Revert v5.0 blk_mq_request_issue_directly() changes
paride/pcd: Fix potential NULL pointer dereference and mem leak
blk-mq: do not reset plug->rq_count before the list is sorted
paride/pf: Fix potential NULL pointer dereference
io_uring: fix double free in case of fileset regitration failure
blk-mq: add trace block plug and unplug for multiple queues
block: use blk_free_flush_queue() to free hctx->fq in blk_mq_init_hctx
block/bfq: fix ifdef for CONFIG_BFQ_GROUP_IOSCHED=y
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index bbdbd56cf2ac..07d6ef195d05 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2215,6 +2215,7 @@ static int io_sqe_files_register(struct io_ring_ctx *ctx, void __user *arg, fput(ctx->user_files[i]); kfree(ctx->user_files); + ctx->user_files = NULL; ctx->nr_user_files = 0; return ret; } |