From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ab5Rq-0005T8-9M for qemu-devel@nongnu.org; Wed, 02 Mar 2016 07:00:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ab5Rn-00025K-Eo for qemu-devel@nongnu.org; Wed, 02 Mar 2016 07:00:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ab5Rn-00024u-7E for qemu-devel@nongnu.org; Wed, 02 Mar 2016 07:00:07 -0500 From: P J P Date: Wed, 2 Mar 2016 17:29:58 +0530 Message-Id: <1456919998-27680-1-git-send-email-ppandit@redhat.com> Subject: [Qemu-devel] [PATCH v3] net: check packet payload length List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Wang Cc: Markus Armbruster , Prasad J Pandit , Qemu Developers , Liu Ling From: Prasad J Pandit 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 Signed-off-by: Prasad J Pandit --- 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; -- 2.5.0