github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 13:37:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

floppy: use a statically allocated error counter

Browse Source 
commit f71f01394f upstream.

Interrupt handler bad_flp_intr() may cause a UAF on the recently freed
request just to increment the error count.  There's no point keeping
that one in the request anyway, and since the interrupt handler uses a
static pointer to the error which cannot be kept in sync with the
pending request, better make it use a static error counter that's reset
for each new request.  This reset now happens when entering
redo_fd_request() for a new request via set_next_request().

One initial concern about a single error counter was that errors on one
floppy drive could be reported on another one, but this problem is not
real given that the driver uses a single drive at a time, as that
PC-compatible controllers also have this limitation by using shared
signals.  As such the error count is always for the "current" drive.

Reported-by: Minh Yuan <yuanmingbuaa@gmail.com>
Suggested-by: Linus Torvalds <torvalds@linuxfoundation.org>
Tested-by: Denis Efremov <efremov@linux.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Denis Efremov <efremov@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Willy Tarreau 2022-05-08 11:37:07 +02:00 committed by Greg Kroah-Hartman
parent 3c48558be5
commit 911b362678
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/block/floppy.c
View File

@ -509,8 +509,8 @@ static unsigned long fdc_busy;
static DECLARE_WAIT_QUEUE_HEAD(fdc_wait); static DECLARE_WAIT_QUEUE_HEAD(fdc_wait);
static DECLARE_WAIT_QUEUE_HEAD(command_done); static DECLARE_WAIT_QUEUE_HEAD(command_done);
/* Errors during formatting are counted here. */ /* errors encountered on the current (or last) request */
static int format_errors; static int floppy_errors;
/* Format request descriptor. */ /* Format request descriptor. */
static struct format_descr format_req; static struct format_descr format_req;
@ -530,7 +530,6 @@ static struct format_descr format_req;
static char *floppy_track_buffer; static char *floppy_track_buffer;
static int max_buffer_sectors; static int max_buffer_sectors;
static int *errors;
typedef void (*done_f)(int); typedef void (*done_f)(int);
static const struct cont_t { static const struct cont_t {
void (*interrupt)(void); void (*interrupt)(void);
@ -1455,7 +1454,7 @@ static int interpret_errors(void)
if (drive_params[current_drive].flags & FTD_MSG) if (drive_params[current_drive].flags & FTD_MSG)
DPRINT("Over/Underrun - retrying\n"); DPRINT("Over/Underrun - retrying\n");
bad = 0; bad = 0;
} else if (*errors >= drive_params[current_drive].max_errors.reporting) { } else if (floppy_errors >= drive_params[current_drive].max_errors.reporting) {
print_errors(); print_errors();
} }
if (reply_buffer[ST2] & ST2_WC || reply_buffer[ST2] & ST2_BC) if (reply_buffer[ST2] & ST2_WC || reply_buffer[ST2] & ST2_BC)
@ -2095,7 +2094,7 @@ static void bad_flp_intr(void)
if (!next_valid_format(current_drive)) if (!next_valid_format(current_drive))
return; return;
} }
err_count = ++(*errors); err_count = ++floppy_errors;
INFBOUND(write_errors[current_drive].badness, err_count); INFBOUND(write_errors[current_drive].badness, err_count);
if (err_count > drive_params[current_drive].max_errors.abort) if (err_count > drive_params[current_drive].max_errors.abort)
cont->done(0); cont->done(0);
@ -2240,9 +2239,8 @@ static int do_format(int drive, struct format_descr *tmp_format_req)
return -EINVAL; return -EINVAL;
} }
format_req = *tmp_format_req; format_req = *tmp_format_req;
format_errors = 0;
cont = &format_cont; cont = &format_cont;
errors = &format_errors; floppy_errors = 0;
ret = wait_til_done(redo_format, true); ret = wait_til_done(redo_format, true);
if (ret == -EINTR) if (ret == -EINTR)
return -EINTR; return -EINTR;
@ -2721,7 +2719,7 @@ static int make_raw_rw_request(void)
*/ */
if (!direct || if (!direct ||
(indirect * 2 > direct * 3 && (indirect * 2 > direct * 3 &&
*errors < drive_params[current_drive].max_errors.read_track && floppy_errors < drive_params[current_drive].max_errors.read_track &&
((!probing || ((!probing ||
(drive_params[current_drive].read_track & (1 << drive_state[current_drive].probed_format)))))) { (drive_params[current_drive].read_track & (1 << drive_state[current_drive].probed_format)))))) {
max_size = blk_rq_sectors(current_req); max_size = blk_rq_sectors(current_req);
@ -2846,10 +2844,11 @@ static int set_next_request(void)
current_req = list_first_entry_or_null(&floppy_reqs, struct request, current_req = list_first_entry_or_null(&floppy_reqs, struct request,
queuelist); queuelist);
if (current_req) { if (current_req) {
current_req->error_count = 0; floppy_errors = 0;
list_del_init(&current_req->queuelist); list_del_init(&current_req->queuelist);
return 1;
} }
return current_req != NULL; return 0;
} }
/* Starts or continues processing request. Will automatically unlock the /* Starts or continues processing request. Will automatically unlock the
@ -2908,7 +2907,6 @@ static void redo_fd_request(void)
_floppy = floppy_type + drive_params[current_drive].autodetect[drive_state[current_drive].probed_format]; _floppy = floppy_type + drive_params[current_drive].autodetect[drive_state[current_drive].probed_format];
} else } else
probing = 0; probing = 0;
errors = &(current_req->error_count);
tmp = make_raw_rw_request(); tmp = make_raw_rw_request();
if (tmp < 2) { if (tmp < 2) {
request_done(tmp); request_done(tmp);