|
 |
40b356 |
From 6d126da8f958c57413a4505d98cb4a3ff48cbbfe Mon Sep 17 00:00:00 2001
|
|
|
40b356 |
From: "wexu@redhat.com" <wexu@redhat.com>
|
|
|
40b356 |
Date: Wed, 21 Dec 2016 06:04:24 +0100
|
|
|
40b356 |
Subject: [PATCH] net: check packet payload length
|
|
|
40b356 |
|
|
|
40b356 |
RH-Author: wexu@redhat.com
|
|
|
40b356 |
Message-id: <1482300264-29708-2-git-send-email-wexu@redhat.com>
|
|
|
40b356 |
Patchwork-id: 73088
|
|
|
40b356 |
O-Subject: [RHEL-7.4/7.3.z qemu-kvm Patch v2] net: check packet payload length
|
|
|
40b356 |
Bugzilla: 1398217
|
|
|
40b356 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
40b356 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
40b356 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
40b356 |
|
|
|
40b356 |
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
40b356 |
|
|
|
40b356 |
While computing IP checksum, 'net_checksum_calculate' reads
|
|
|
40b356 |
payload length from the packet. It could exceed the given 'data'
|
|
|
40b356 |
buffer size. Add a check to avoid it.
|
|
|
40b356 |
|
|
|
40b356 |
This patch is to fix CVE-2016-2857.
|
|
|
40b356 |
https://access.redhat.com/security/cve/CVE-2016-2857
|
|
|
40b356 |
|
|
|
40b356 |
Reported-by: Liu Ling <liuling-it@360.cn>
|
|
|
40b356 |
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
40b356 |
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
|
40b356 |
(cherry picked from commit 362786f14a753d8a5256ef97d7c10ed576d6572b)
|
|
|
40b356 |
Signed-off-by: Wei Xu <wexu@redhat.com>
|
|
|
40b356 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
40b356 |
---
|
|
|
40b356 |
net/checksum.c | 10 ++++++++--
|
|
|
40b356 |
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
40b356 |
|
|
|
40b356 |
diff --git a/net/checksum.c b/net/checksum.c
|
|
|
40b356 |
index 14c0855..0942437 100644
|
|
|
40b356 |
--- a/net/checksum.c
|
|
|
40b356 |
+++ b/net/checksum.c
|
|
|
40b356 |
@@ -59,6 +59,11 @@ void net_checksum_calculate(uint8_t *data, int length)
|
|
|
40b356 |
int hlen, plen, proto, csum_offset;
|
|
|
40b356 |
uint16_t csum;
|
|
|
40b356 |
|
|
|
40b356 |
+ /* Ensure data has complete L2 & L3 headers. */
|
|
|
40b356 |
+ if (length < 14 + 20) {
|
|
|
40b356 |
+ return;
|
|
|
40b356 |
+ }
|
|
|
40b356 |
+
|
|
|
40b356 |
if ((data[14] & 0xf0) != 0x40)
|
|
|
40b356 |
return; /* not IPv4 */
|
|
|
40b356 |
hlen = (data[14] & 0x0f) * 4;
|
|
|
40b356 |
@@ -76,8 +81,9 @@ void net_checksum_calculate(uint8_t *data, int length)
|
|
|
40b356 |
return;
|
|
|
40b356 |
}
|
|
|
40b356 |
|
|
|
40b356 |
- if (plen < csum_offset+2)
|
|
|
40b356 |
- return;
|
|
|
40b356 |
+ if (plen < csum_offset + 2 || 14 + hlen + plen > length) {
|
|
|
40b356 |
+ return;
|
|
|
40b356 |
+ }
|
|
|
40b356 |
|
|
|
40b356 |
data[14+hlen+csum_offset] = 0;
|
|
|
40b356 |
data[14+hlen+csum_offset+1] = 0;
|
|
|
40b356 |
--
|
|
|
40b356 |
1.8.3.1
|
|
|
40b356 |
|