diff options
| author | Dan Rosenberg <drosenberg@vsecurity.com> | 2011-03-20 15:32:06 +0000 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2011-04-28 08:20:51 -0700 |
| commit | 44b722fa1d1fdaecdf6fce55c26f90a98ea4b1d2 (patch) | |
| tree | ea4e0427e8baacc39d6b266976287b7e7c481e49 /net | |
| parent | f3373d71e3cbda31c253a8be1956de17ad089bb6 (diff) | |
irda: validate peer name and attribute lengths
commit d370af0ef7951188daeb15bae75db7ba57c67846 upstream.
Length fields provided by a peer for names and attributes may be longer
than the destination array sizes. Validate lengths to prevent stack
buffer overflows.
Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/irda/iriap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/irda/iriap.c b/net/irda/iriap.c index 5b743bdd89ba..36477538cea8 100644 --- a/net/irda/iriap.c +++ b/net/irda/iriap.c @@ -656,10 +656,16 @@ static void iriap_getvaluebyclass_indication(struct iriap_cb *self, n = 1; name_len = fp[n++]; + + IRDA_ASSERT(name_len < IAS_MAX_CLASSNAME + 1, return;); + memcpy(name, fp+n, name_len); n+=name_len; name[name_len] = '\0'; attr_len = fp[n++]; + + IRDA_ASSERT(attr_len < IAS_MAX_ATTRIBNAME + 1, return;); + memcpy(attr, fp+n, attr_len); n+=attr_len; attr[attr_len] = '\0'; |