Bug 237924 - Possible infinite loop in function empty_aux_buffer of sys/dev/atkbdc/atkbdc.c
Summary: Possible infinite loop in function empty_aux_buffer of sys/dev/atkbdc/atkbdc.c
Status: Open
Alias: None
Product: Base System
Classification: Unclassified
Component: kern (show other bugs)
Version: CURRENT
Hardware: Any Any
: --- Affects Some People
Assignee: freebsd-bugs (Nobody)
URL: https://github.com/freebsd/freebsd/co...
Keywords: needs-qa, patch
Depends on:
Blocks:
 
Reported: 2019-05-16 12:34 UTC by Young
Modified: 2019-05-25 04:51 UTC (History)
2 users (show)

See Also:
koobs: mfc-stable12?
koobs: mfc-stable11?


Attachments
Proposed patch (1.34 KB, application/mbox)
2019-05-16 12:34 UTC, Young
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Young 2019-05-16 12:34:43 UTC
Created attachment 204401 [details]
Proposed patch

There is a possible infinite loop vulnerability in function empty_aux_buffer of 
sys/dev/atkbdc/atkbdc.c

Some systems (Intel/IBM blades) do not have keyboard devices and will thus hang in the processure.

void
empty_aux_buffer(KBDC p, int wait)
{
    int t;
    int b;
    int f;
#if KBDIO_DEBUG >= 2
    int c1 = 0;
    int c2 = 0;
#endif
    int delta = 2;

    for (t = wait; t > 0; ) {
        if ((f = read_status(kbdcp(p))) & KBDS_ANY_BUFFER_FULL) {
            DELAY(KBDD_DELAYTIME);
            b = read_data(kbdcp(p));
            if ((f & KBDS_BUFFER_FULL) == KBDS_KBD_BUFFER_FULL) {
                addq(&kbdcp(p)->kbd, b);
#if KBDIO_DEBUG >= 2
                ++c1;
            } else {
                ++c2;
#endif
            }
            t = wait;
        } else {
            t -= delta;
        }
        DELAY(delta*1000);
    }
#if KBDIO_DEBUG >= 2
    if ((c1 > 0) || (c2 > 0))
        log(LOG_DEBUG, "kbdc: %d:%d char read (empty_aux_buffer)\n", c1, c2);
#endif

    emptyq(&kbdcp(p)->aux);
}

The attachment is the proposed patch that are copied from https://github.com/freebsd/freebsd/commit/3631541670c84a8731b46350daa30502edb0ca80
Comment 1 Kubilay Kocak freebsd_committer freebsd_triage 2019-05-16 12:47:06 UTC
Note to clarify:

Commit referenced in comment 0 is base r161969 by dwhite in empty_both_buffers()

Patch here is for adding the same fix to empty_aux_buffer()