[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6647] net socket verify packet size (Dustin Kirkland)
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6647] net socket verify packet size (Dustin Kirkland) |
Date: |
Fri, 27 Feb 2009 19:54:01 +0000 |
Revision: 6647
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6647
Author: aliguori
Date: 2009-02-27 19:54:01 +0000 (Fri, 27 Feb 2009)
Log Message:
-----------
net socket verify packet size (Dustin Kirkland)
net socket oversized packet
This is a patch being carried by Ubuntu against kvm/qemu.
Verify packet size before performing memcpy().
Signed-off-by: Dustin Kirkland <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/net.c
Modified: trunk/net.c
===================================================================
--- trunk/net.c 2009-02-27 19:53:57 UTC (rev 6646)
+++ trunk/net.c 2009-02-27 19:54:01 UTC (rev 6647)
@@ -1093,8 +1093,8 @@
VLANClientState *vc;
int fd;
int state; /* 0 = getting length, 1 = getting data */
- int index;
- int packet_len;
+ unsigned int index;
+ unsigned int packet_len;
uint8_t buf[4096];
struct sockaddr_in dgram_dst; /* contains inet host and port destination
iff connectionless (SOCK_DGRAM) */
} NetSocketState;
@@ -1127,7 +1127,8 @@
static void net_socket_send(void *opaque)
{
NetSocketState *s = opaque;
- int l, size, err;
+ int size, err;
+ unsigned l;
uint8_t buf1[4096];
const uint8_t *buf;
@@ -1166,7 +1167,15 @@
l = s->packet_len - s->index;
if (l > size)
l = size;
- memcpy(s->buf + s->index, buf, l);
+ if (s->index + l <= sizeof(s->buf)) {
+ memcpy(s->buf + s->index, buf, l);
+ } else {
+ fprintf(stderr, "serious error: oversized packet received,"
+ "connection terminated.\n");
+ s->state = 0;
+ goto eoc;
+ }
+
s->index += l;
buf += l;
size -= l;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6647] net socket verify packet size (Dustin Kirkland),
Anthony Liguori <=