Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus-20190628' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Just two small fixes.
One from Paolo, fixing a silly mistake in BFQ. The other one is from
me, ensuring that we have ->file cleared in the io_uring request a bit
earlier. That avoids a use-before-free, if we encounter an error
before ->file is assigned"
* tag 'for-linus-20190628' of git://git.kernel.dk/linux-block:
block, bfq: fix operator in BFQQ_TOTALLY_SEEKY
io_uring: ensure req->file is cleared on allocation
+3
-4
+1
-1
block/bfq-iosched.c
+1
-1
block/bfq-iosched.c
···
240
240
* containing only random (seeky) I/O are prevented from being tagged
241
241
* as soft real-time.
242
242
*/
243
-
#define BFQQ_TOTALLY_SEEKY(bfqq) (bfqq->seek_history & -1)
243
+
#define BFQQ_TOTALLY_SEEKY(bfqq) (bfqq->seek_history == -1)
244
244
245
245
/* Min number of samples required to perform peak-rate update */
246
246
#define BFQ_RATE_MIN_SAMPLES 32
+2
-3
fs/io_uring.c
+2
-3
fs/io_uring.c
···
579
579
state->cur_req++;
580
580
}
581
581
582
+
req->file = NULL;
582
583
req->ctx = ctx;
583
584
req->flags = 0;
584
585
/* one is dropped after submission, the other at completion */
···
1802
1801
req->sequence = ctx->cached_sq_head - 1;
1803
1802
}
1804
1803
1805
-
if (!io_op_needs_file(s->sqe)) {
1806
-
req->file = NULL;
1804
+
if (!io_op_needs_file(s->sqe))
1807
1805
return 0;
1808
-
}
1809
1806
1810
1807
if (flags & IOSQE_FIXED_FILE) {
1811
1808
if (unlikely(!ctx->user_files ||