Not so theoretical race in atkbd_command
Hi!
There's quite real race in atkbd_command:
static int atkbd_command(struct atkbd *atkbd, unsigned char *param, int command)
{
int timeout = 500000; /* 500 msec */
int send = (command >> 12) & 0xf;
int receive = (command >> 8) & 0xf;
int i;
atkbd->cmdcnt = receive;[user presses key here]
atkbd_interrupt eats user keypress, thinking its reply. Boom. To exploit:
while true; do setleds +num; setleds -num; done
then try typing.
Pavel
Signature · 1 line
934a471f20d6580d5aad759bf0d97ddc
Hi!
Quoted 11 lines
There's quite real race in
atkbd_command:static int
atkbd_command(struct atkbd *atkbd, unsigned char *param, int command){ int timeout = 500000; /* 500 msec */ int send = (command >> 12) & 0xf; int receive = (command >> 8) & 0xf; int i; atkbd->cmdcnt = receive;
Quoted 8 lines
[user presses key here]
atkbd_interrupteats user keypress, thinking its reply. Boom. To exploit:while true; do setleds +num; setleds -num; done
then try typing.
Petr suggested following follow-up patch. I'm not quite sure it is effective. I still get lost keys with
while true; do setleds +num; setleds -num; done
Pavel
drivers/input/keyboard/atkbd.c renamed from linux/drivers/input/keyboard/atkbd.c +7 -7
@@ -244,7 +244,7 @@ goto out; } -if (atkbd->cmdcnt) { +if (atkbd->cmdcnt &&atomic_read (&atkbd->ack) ==1 ) { atkbd->cmdbuf[--atkbd->cmdcnt] = code; goto out; }
@@ -366,10 +366,12 @@* replacement anyway, and they only make a mess in the protocol. */ -static int atkbd_sendbyte (struct atkbd *atkbd,unsigned char byte) +static int atkbd_sendbyte (struct atkbd *atkbd,unsigned char byte,int cmdcnt) {int timeout =20000 ;/* 200 msec */ -atomic_set (&atkbd->ack,0 );mb (); +atomic_set (&atkbd->ack,0 ); +mb ();/* First clear ACK, then write how many reply bytes we want... though maybe it would want real spinlock */ + atkbd->cmdcnt = cmdcnt;#ifdef ATKBD_DEBUG printk (KERN_DEBUG "atkbd.c: Sent: %02x\n" , byte);
@@ -397,8 +399,6 @@int receive = (command >>8 ) &0xf ;int i; - atkbd->cmdcnt = receive; -if (command ==ATKBD_CMD_RESET_BAT ) timeout =2000000 ;/* 2 sec */
@@ -407,11 +407,11 @@ atkbd->cmdbuf[(receive -1 ) - i] = param[i];if (command &0xff ) -if (atkbd_sendbyte (atkbd, command &0xff )) +if (atkbd_sendbyte (atkbd, command &0xff , send ?0 : receive))return (atkbd->cmdcnt =0 ) -1 ;for (i =0 ; i < send; i++) -if (atkbd_sendbyte (atkbd, param[i])) +if (atkbd_sendbyte (atkbd, param[i], (i != send -1 ) ?0 : receive))return (atkbd->cmdcnt =0 ) -1 ;while (atkbd->cmdcnt && timeout--) {
Signature · 1 line
934a471f20d6580d5aad759bf0d97ddc