* [PATCH] isdn/capi: avoid index overrun from command_2_index()
@ 2014-07-20 13:49 Tilman Schmidt
2014-07-21 5:25 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Tilman Schmidt @ 2014-07-20 13:49 UTC (permalink / raw)
To: netdev; +Cc: David Miller, Dan Carpenter, Karsten Keil, isdn4linux
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.
Legal values for the function's first argument (c) according to the
CAPI 2.0 standard are 0x00..0x08, 0x41, 0x80, 0x82..0x88, and 0xff.
This patch modifies command_2_index() in such a way that the result
is unchanged for legal values of c, and guaranteed to be less or
equal to 0x4e for any argument values.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
---
drivers/isdn/capi/capiutil.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index 6e797e5..b666d8b 100644
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -201,15 +201,10 @@ static unsigned char *cpars[] =
#define structTRcpyovl(x, y, l) memmove(y, x, l)
/*-------------------------------------------------------*/
-static unsigned command_2_index(unsigned c, unsigned sc)
+static unsigned command_2_index(u8 c, u8 sc)
{
- if (c & 0x80)
+ if (c & 0xf0)
c = 0x9 + (c & 0x0f);
- else if (c <= 0x0f);
- else if (c == 0x41)
- c = 0x9 + 0x1;
- else if (c == 0xff)
- c = 0x00;
return (sc & 3) * (0x9 + 0x9) + c;
}
--
1.9.2.459.g68773ac
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] isdn/capi: avoid index overrun from command_2_index()
2014-07-20 13:49 [PATCH] isdn/capi: avoid index overrun from command_2_index() Tilman Schmidt
@ 2014-07-21 5:25 ` David Miller
2014-07-21 7:42 ` Tilman Schmidt
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2014-07-21 5:25 UTC (permalink / raw)
To: tilman; +Cc: netdev, dan.carpenter, isdn, isdn4linux
From: Tilman Schmidt <tilman@imap.cc>
Date: Sun, 20 Jul 2014 15:49:12 +0200 (CEST)
> 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.
> Legal values for the function's first argument (c) according to the
> CAPI 2.0 standard are 0x00..0x08, 0x41, 0x80, 0x82..0x88, and 0xff.
> This patch modifies command_2_index() in such a way that the result
> is unchanged for legal values of c, and guaranteed to be less or
> equal to 0x4e for any argument values.
>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Command value validation should occur at the callers, signalling
errors if invalid values are seen, and command_2_index() should
BUG_ON() such invalid values.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] isdn/capi: avoid index overrun from command_2_index()
2014-07-21 5:25 ` David Miller
@ 2014-07-21 7:42 ` Tilman Schmidt
0 siblings, 0 replies; 3+ messages in thread
From: Tilman Schmidt @ 2014-07-21 7:42 UTC (permalink / raw)
To: David Miller; +Cc: netdev, dan.carpenter, isdn, isdn4linux
On Mon, Jul 21, 2014, at 07:25, David Miller wrote:
> Command value validation should occur at the callers, signalling
> errors if invalid values are seen, and command_2_index() should
> BUG_ON() such invalid values.
Ok, that's a bigger operation then. I don't have time for that right
now. Any takers?
--
Tilman Schmidt
tilman@imap.cc
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-07-21 7:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-20 13:49 [PATCH] isdn/capi: avoid index overrun from command_2_index() Tilman Schmidt
2014-07-21 5:25 ` David Miller
2014-07-21 7:42 ` Tilman Schmidt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).