diff options
| author | Samuel Ortiz <samuel@sortiz.org> | 2010-10-11 01:17:56 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2010-12-12 21:25:24 +0100 |
| commit | e335f5515906bc78c194afb9f5b065ffa56e7045 (patch) | |
| tree | 69feafa9a2a5a5f681c732fe9499a22ed9bfda00 | |
| parent | 0056cb7298120af051f38eed414e3131088394eb (diff) | |
| download | linux-2.4-e335f5515906bc78c194afb9f5b065ffa56e7045.tar.gz | |
irda: Fix parameter extraction stack overflow
Cc: stable@kernel.org
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from 2.6 commit efc463eb508798da4243625b08c7396462cabf9f)
| -rw-r--r-- | net/irda/parameters.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/irda/parameters.c b/net/irda/parameters.c index 76cdf276b5bcd..d8fe634abeb48 100644 --- a/net/irda/parameters.c +++ b/net/irda/parameters.c @@ -297,6 +297,8 @@ static int irda_extract_string(void *self, __u8 *buf, int len, __u8 pi, p.pi = pi; /* In case handler needs to know */ p.pl = buf[1]; /* Extract lenght of value */ + if (p.pl > 32) + p.pl = 32; IRDA_DEBUG(2, "%s(), pi=%#x, pl=%d\n", __FUNCTION__, p.pi, p.pl); @@ -315,7 +317,7 @@ static int irda_extract_string(void *self, __u8 *buf, int len, __u8 pi, (__u8) str[1]); /* Null terminate string */ - str[p.pl+1] = '\0'; + str[p.pl] = '\0'; p.pv.c = str; /* Handler will need to take a copy */ |