From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45935)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1abNfK-0007RD-7n
	for qemu-devel@nongnu.org; Thu, 03 Mar 2016 02:27:24 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1abNfG-0004u6-V8
	for qemu-devel@nongnu.org; Thu, 03 Mar 2016 02:27:18 -0500
Received: from mx1.redhat.com ([209.132.183.28]:50255)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1abNfG-0004u2-P5
	for qemu-devel@nongnu.org; Thu, 03 Mar 2016 02:27:14 -0500
References: <1456919998-27680-1-git-send-email-ppandit@redhat.com>
From: Jason Wang <jasowang@redhat.com>
Message-ID: <56D7E741.30603@redhat.com>
Date: Thu, 3 Mar 2016 15:26:57 +0800
MIME-Version: 1.0
In-Reply-To: <1456919998-27680-1-git-send-email-ppandit@redhat.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v3] net: check packet payload length
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: P J P <ppandit@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>, Prasad J Pandit <pjp@fedoraproject.org>, Qemu Developers <qemu-devel@nongnu.org>, Liu Ling <liuling-it@360.cn>



On 03/02/2016 07:59 PM, P J P wrote:
> From: Prasad J Pandit <pjp@fedoraproject.org>
>
> While computing IP checksum, 'net_checksum_calculate' reads
> payload length from the packet. It could exceed the given 'data'
> buffer size. Add a check to avoid it.
>
> Reported-by: Liu Ling <liuling-it@360.cn>
> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
> ---
>  net/checksum.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
>
> Update as per review:
>   -> https://lists.gnu.org/archive/html/qemu-devel/2016-02/msg06121.html
>
> diff --git a/net/checksum.c b/net/checksum.c
> index 14c0855..0942437 100644
> --- a/net/checksum.c
> +++ b/net/checksum.c
> @@ -59,6 +59,11 @@ void net_checksum_calculate(uint8_t *data, int length)
>      int hlen, plen, proto, csum_offset;
>      uint16_t csum;
>  
> +    /* Ensure data has complete L2 & L3 headers. */
> +    if (length < 14 + 20) {
> +        return;
> +    }
> +
>      if ((data[14] & 0xf0) != 0x40)
>  	return; /* not IPv4 */
>      hlen  = (data[14] & 0x0f) * 4;
> @@ -76,8 +81,9 @@ void net_checksum_calculate(uint8_t *data, int length)
>  	return;
>      }
>  
> -    if (plen < csum_offset+2)
> -	return;
> +    if (plen < csum_offset + 2 || 14 + hlen + plen > length) {
> +        return;
> +    }
>  
>      data[14+hlen+csum_offset]   = 0;
>      data[14+hlen+csum_offset+1] = 0;

Applied to -net.

Thanks