isdn/capi: prevent index overrun from command_2_index()
authorTilman Schmidt <tilman@imap.cc>
Sat, 11 Oct 2014 11:46:30 +0000 (13:46 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Oct 2014 19:05:34 +0000 (15:05 -0400)
The result of the function command_2_index() is used to index two
arrays mnames[] and cpars[] with max. index 0x4e but in its current
form that function can produce results up to 3*(0x9+0x9)+0x7f =
0xb5.
Fix by clamping all result values potentially overrunning the arrays
to zero which is already handled as an invalid value.

Re-spotted with Coverity.

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/isdn/capi/capiutil.c

index 4073d1684d07ef22a78dfd2ef966ad2d62055757..b501d76209f0240f11f5b04e28aa9512ec767f69 100644 (file)
@@ -207,6 +207,8 @@ static unsigned command_2_index(unsigned c, unsigned sc)
                c = 0x9 + (c & 0x0f);
        else if (c == 0x41)
                c = 0x9 + 0x1;
+       if (c > 0x18)
+               c = 0x00;
        return (sc & 3) * (0x9 + 0x9) + c;
 }