From patchwork Thu Jun 30 09:54:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 102731 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 32338B6F53 for ; Thu, 30 Jun 2011 19:55:12 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QcDxa-0007Lv-2G; Thu, 30 Jun 2011 09:54:58 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QcDxY-0007La-3q for kernel-team@lists.ubuntu.com; Thu, 30 Jun 2011 09:54:56 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QcDxX-0000M1-Ru for ; Thu, 30 Jun 2011 09:54:56 +0000 Received: from [83.141.95.158] (helo=[10.155.4.147]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QcDxX-0006II-MN for kernel-team@lists.ubuntu.com; Thu, 30 Jun 2011 09:54:55 +0000 Message-ID: <4E0C47EE.8010504@canonical.com> Date: Thu, 30 Jun 2011 10:54:54 +0100 From: Paolo Pisati User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110424 Thunderbird/3.1.10 MIME-Version: 1.0 To: "kernel-team@lists.ubuntu.com" Subject: [lucid/fsl-imx51][PATCH] CVE-2010-3859 X-Enigmail-Version: 1.1.2 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Attached is the missing patch to close 3859 on lucid/fsl-imx51: this patch has been derived from the original one (commit upstream 8acfe468b0384e834a303f08ebc4953d72fb690a) since part of the security issue was introduced after .31 (exactly the missing partial-issue was introduced with 01db403cf99f739f86903314a489fb420e0e254f) and since fsl-imx51 is based off .31 we didn't had the "entire issue" but just a part of it. With this patch fsl-imx51 becomes identical to the other branch as far as CVE-2010-3859 is concerned . -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJODEfuAAoJEMupOQaAohtUAPwIAKtbgTc3YVFdLw5BXynBT34h DCTAaZBcnklGx5PmkkMDc8WKBWgKkZNF9N+t+wTAyeN4+Rm+qPxaalaHYdnAb+1v B4tMLdYVtJ1CmIgVPdofSeVhzFrRHHPs07Z7/QU4pimvOkc1Rj9VnUWCJrVgycky oUe6wFJU9wNW22uVlP5knS8NDRAN0mL1gk8V5N5EW4r4TampUvXtymkv78aOY4sI Rveehnpgp6sXE9POxGcGgu1pyWnzxnWmmfJsCs9UnkTFzSEcGHi/C63mqWpSz5c4 4sqd+sX1s+Vt5nGUkZPuQ2cm+jNEmAK7C9ZANwlc8bekk/UXITJlJVmQxy3mJhY= =C1rr -----END PGP SIGNATURE----- From 0e25c0af4ecb7f47d0a4b2e5802d3aa22dc201ab Mon Sep 17 00:00:00 2001 From: Paolo Pisati Date: Wed, 29 Jun 2011 11:53:00 +0100 Subject: [PATCH] [PATCH] net: Limit socket I/O iovec total length to INT_MAX. BugLink: http://bugs.launchpad.net/bugs/708839 commit 8acfe468b0384e834a303f08ebc4953d72fb690a upstream. This helps protect us from overflow issues down in the individual protocol sendmsg/recvmsg handlers. Once we hit INT_MAX we truncate out the rest of the iovec by setting the iov_len members to zero. This works because: 1) For SOCK_STREAM and SOCK_SEQPACKET sockets, partial writes are allowed and the application will just continue with another write to send the rest of the data. 2) For datagram oriented sockets, where there must be a one-to-one correspondance between write() calls and packets on the wire, INT_MAX is going to be far larger than the packet size limit the protocol is going to check for and signal with -EMSGSIZE. Based upon a patch by Linus Torvalds. Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman Signed-off-by: Stefan Bader Signed-off-by: Brad Figg Signed-off-by: Paolo Pisati --- net/compat.c | 10 ++++++---- net/core/iovec.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/net/compat.c b/net/compat.c index 8d73905..2a2659b 100644 --- a/net/compat.c +++ b/net/compat.c @@ -40,10 +40,12 @@ static inline int iov_from_user_compat_to_kern(struct iovec *kiov, compat_size_t len; if (get_user(len, &uiov32->iov_len) || - get_user(buf, &uiov32->iov_base)) { - tot_len = -EFAULT; - break; - } + get_user(buf, &uiov32->iov_base)) + return -EFAULT; + + if (len > INT_MAX - tot_len) + len = INT_MAX - tot_len; + tot_len += len; kiov->iov_base = compat_ptr(buf); kiov->iov_len = (__kernel_size_t) len; diff --git a/net/core/iovec.c b/net/core/iovec.c index 16ad45d..b6a4780 100644 --- a/net/core/iovec.c +++ b/net/core/iovec.c @@ -60,14 +60,13 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, err = 0; for (ct = 0; ct < m->msg_iovlen; ct++) { - err += iov[ct].iov_len; - /* - * Goal is not to verify user data, but to prevent returning - * negative value, which is interpreted as errno. - * Overflow is still possible, but it is harmless. - */ - if (err < 0) - return -EMSGSIZE; + size_t len = iov[ct].iov_len; + + if (len > INT_MAX - err) { + len = INT_MAX - err; + iov[ct].iov_len = len; + } + err += len; } return err; -- 1.7.4.1