2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Dan Rosenberg <[email protected]> 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 <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Andi Kleen <[email protected]> Cc: Moritz Muehlenhoff <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- net/irda/af_irda.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) Index: linux-2.6.35.y/net/irda/af_irda.c =================================================================== --- linux-2.6.35.y.orig/net/irda/af_irda.c +++ linux-2.6.35.y/net/irda/af_irda.c @@ -2278,6 +2278,14 @@ static int __irda_getsockopt(struct sock 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 sock 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) { _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
