DF-5324 / fix.diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 | --- a/sys/dev/misc/kbd/kbdsw.c +++ b/sys/dev/misc/kbd/kbdsw.c @@ -71,13 +71,37 @@ return (error); } +/* + * DF-5324: a console-side consumer can hold a keyboard_t pointer across a + * driver detach (e.g. ukbd unplug -> kbd_unregister() clears + * kbdsw[kb->kb_index] and the softc is freed). Validate kb_index and the + * kbdsw[] slot before every dispatch, mirroring the defensive pattern + * kbd_intr() already uses. The remaining window (softc freed and the slab + * reused between check and call) requires proper keyboard reference + * counting and is not closed by this change. + */ +static keyboard_switch_t * +kbdsw_check(keyboard_t *kbd) +{ + int i = kbd->kb_index; + + if (i < 0 || i >= KBD_MAXKEYBOARDS || kbdsw[i] == NULL) + return (NULL); + return (kbdsw[i]); +} + int kbd_term(keyboard_t *kbd) { int error; + keyboard_switch_t *sw; + KBD_ALWAYS_LOCK(kbd); - error = (*kbdsw[kbd->kb_index]->term)(kbd); + if ((sw = kbdsw_check(kbd)) != NULL) + error = (*sw->term)(kbd); + else + error = ENODEV; if (error) KBD_ALWAYS_UNLOCK(kbd); /* kbd structure is stale if error is 0 */ @@ -113,9 +137,13 @@ { int error; KBD_LOCK_DECLARE; + keyboard_switch_t *sw; KBD_LOCK(kbd); - error = (*kbdsw[kbd->kb_index]->test_if)(kbd); + if ((sw = kbdsw_check(kbd)) != NULL) + error = (*sw->test_if)(kbd); + else + error = ENODEV; KBD_UNLOCK(kbd); return (error); @@ -126,9 +154,13 @@ { int error; KBD_LOCK_DECLARE; + keyboard_switch_t *sw; KBD_LOCK(kbd); - error = (*kbdsw[kbd->kb_index]->enable)(kbd); + if ((sw = kbdsw_check(kbd)) != NULL) + error = (*sw->enable)(kbd); + else + error = ENODEV; KBD_UNLOCK(kbd); return (error); @@ -139,9 +171,13 @@ { int error; KBD_LOCK_DECLARE; + keyboard_switch_t *sw; KBD_LOCK(kbd); - error = (*kbdsw[kbd->kb_index]->disable)(kbd); + if ((sw = kbdsw_check(kbd)) != NULL) + error = (*sw->disable)(kbd); + else + error = ENODEV; KBD_UNLOCK(kbd); return (error); @@ -152,9 +188,13 @@ { int error; KBD_LOCK_DECLARE; + keyboard_switch_t *sw; KBD_LOCK(kbd); - error = (*kbdsw[kbd->kb_index]->read)(kbd, wait); + if ((sw = kbdsw_check(kbd)) != NULL) + error = (*sw->read)(kbd, wait); + else + error = ENODEV; KBD_UNLOCK(kbd); return (error); @@ -165,9 +205,13 @@ { int error; KBD_LOCK_DECLARE; + keyboard_switch_t *sw; KBD_LOCK(kbd); - error = (*kbdsw[kbd->kb_index]->check)(kbd); + if ((sw = kbdsw_check(kbd)) != NULL) + error = (*sw->check)(kbd); + else + error = ENODEV; KBD_UNLOCK(kbd); return (error); @@ -178,9 +222,13 @@ { int error; KBD_LOCK_DECLARE; + keyboard_switch_t *sw; KBD_LOCK(kbd); - error = (*kbdsw[kbd->kb_index]->read_char)(kbd, wait); + if ((sw = kbdsw_check(kbd)) != NULL) + error = (*sw->read_char)(kbd, wait); + else + error = NOKEY; KBD_UNLOCK(kbd); return (error); @@ -191,9 +239,13 @@ { int error; KBD_LOCK_DECLARE; + keyboard_switch_t *sw; KBD_LOCK(kbd); - error = (*kbdsw[kbd->kb_index]->check_char)(kbd); + if ((sw = kbdsw_check(kbd)) != NULL) + error = (*sw->check_char)(kbd); + else + error = ENODEV; KBD_UNLOCK(kbd); return (error); @@ -205,9 +257,14 @@ int error; KBD_LOCK_DECLARE; + keyboard_switch_t *sw; + if (kbd) { KBD_LOCK(kbd); - error = (*kbdsw[kbd->kb_index]->ioctl)(kbd, cmd, data); + if ((sw = kbdsw_check(kbd)) != NULL) + error = (*sw->ioctl)(kbd, cmd, data); + else + error = ENODEV; KBD_UNLOCK(kbd); } else { error = ENODEV; @@ -220,9 +277,13 @@ { int error; KBD_LOCK_DECLARE; + keyboard_switch_t *sw; KBD_LOCK(kbd); - error = (*kbdsw[kbd->kb_index]->lock)(kbd, xlock); + if ((sw = kbdsw_check(kbd)) != NULL) + error = (*sw->lock)(kbd, xlock); + else + error = ENODEV; KBD_UNLOCK(kbd); return (error); @@ -233,8 +294,11 @@ { KBD_LOCK_DECLARE; + keyboard_switch_t *sw; + KBD_LOCK(kbd); - (*kbdsw[kbd->kb_index]->clear_state)(kbd); + if ((sw = kbdsw_check(kbd)) != NULL) + (*sw->clear_state)(kbd); KBD_UNLOCK(kbd); } @@ -243,9 +307,13 @@ { int error; KBD_LOCK_DECLARE; + keyboard_switch_t *sw; KBD_LOCK(kbd); - error = (*kbdsw[kbd->kb_index]->get_state)(kbd, buf, len); + if ((sw = kbdsw_check(kbd)) != NULL) + error = (*sw->get_state)(kbd, buf, len); + else + error = ENODEV; KBD_UNLOCK(kbd); return (error); @@ -256,9 +324,13 @@ { int error; KBD_LOCK_DECLARE; + keyboard_switch_t *sw; KBD_LOCK(kbd); - error = (*kbdsw[kbd->kb_index]->set_state)(kbd, buf, len); + if ((sw = kbdsw_check(kbd)) != NULL) + error = (*sw->set_state)(kbd, buf, len); + else + error = ENODEV; KBD_UNLOCK(kbd); return (error); @@ -270,8 +342,13 @@ KBD_LOCK_DECLARE; u_char *retstr; + keyboard_switch_t *sw; + KBD_LOCK(kbd); - retstr = (*kbdsw[kbd->kb_index]->get_fkeystr)(kbd, fkey, len); + if ((sw = kbdsw_check(kbd)) != NULL) + retstr = (*sw->get_fkeystr)(kbd, fkey, len); + else + retstr = NULL; KBD_UNLOCK(kbd); return (retstr); @@ -285,9 +362,14 @@ { int error; + keyboard_switch_t *sw; + if (!on) KBD_UNPOLL(kbd); - error = (*kbdsw[kbd->kb_index]->poll)(kbd, on); + if ((sw = kbdsw_check(kbd)) != NULL) + error = (*sw->poll)(kbd, on); + else + error = ENODEV; if (on) KBD_POLL(kbd); @@ -299,7 +381,10 @@ { KBD_LOCK_DECLARE; + keyboard_switch_t *sw; + KBD_LOCK(kbd); - (*kbdsw[kbd->kb_index]->diag)(kbd, level); + if ((sw = kbdsw_check(kbd)) != NULL) + (*sw->diag)(kbd, level); KBD_UNLOCK(kbd); } |