diff options
| author | Dan Rosenberg <drosenberg@vsecurity.com> | 2010-12-22 13:58:27 +0000 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2011-04-28 08:21:01 -0700 |
| commit | eca877d1ae4a597ff1f213396662690143d01f88 (patch) | |
| tree | 276f93746e0fffbc387fa83ba969b29bcfdb79cf /net/irda | |
| parent | 58c373ba73707261ace8a2227a7ec99d58e9fd94 (diff) | |
irda: prevent integer underflow in IRLMP_ENUMDEVICES
commit fdac1e0697356ac212259f2147aa60c72e334861 upstream.
If the user-provided len is less than the expected offset, the
IRLMP_ENUMDEVICES getsockopt will do a copy_to_user() with a very large
size value. While this isn't be a security issue on x86 because it will
get caught by the access_ok() check, it may leak large amounts of kernel
heap on other architectures. In any event, this patch fixes it.
Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/af_irda.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index fd55b5135de..83ef96eda75 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -2278,6 +2278,14 @@ static int __irda_getsockopt(struct socket *sock, int level, int optname, switch (optname) { case IRLMP_ENUMDEVICES: + + /* Offset to first device entry */ + offset = sizeof(struct irda_device_list) - + sizeof(struct irda_device_info); + + if (len < offset) + return -EINVAL; + /* Ask lmp for the current discovery log */ discoveries = irlmp_get_discoveries(&list.len, self->mask.word, self->nslots); @@ -2287,15 +2295,9 @@ static int __irda_getsockopt(struct socket *sock, int level, int optname, err = 0; /* Write total list length back to client */ - if (copy_to_user(optval, &list, - sizeof(struct irda_device_list) - - sizeof(struct irda_device_info))) + if (copy_to_user(optval, &list, offset)) err = -EFAULT; - /* Offset to first device entry */ - offset = sizeof(struct irda_device_list) - - sizeof(struct irda_device_info); - /* Copy the list itself - watch for overflow */ if(list.len > 2048) { |