From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHjo5-0005Pa-GL for qemu-devel@nongnu.org; Mon, 27 Jun 2016 23:35:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHjo4-0004aE-5i for qemu-devel@nongnu.org; Mon, 27 Jun 2016 23:35:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56949) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHjo3-0004a9-W2 for qemu-devel@nongnu.org; Mon, 27 Jun 2016 23:35:24 -0400 From: Jason Wang Date: Tue, 28 Jun 2016 11:35:07 +0800 Message-Id: <1467084910-14643-3-git-send-email-jasowang@redhat.com> In-Reply-To: <1467084910-14643-1-git-send-email-jasowang@redhat.com> References: <1467084910-14643-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PULL 2/5] net: mipsnet: check transmit buffer size before sending List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: Prasad J Pandit , Jason Wang From: Prasad J Pandit When processing MIPSnet I/O port write operation, it uses a transmit buffer tx_buffer[MAX_ETH_FRAME_SIZE=1514]. Two indices 's->tx_written' and 's->tx_count' are used to control data written to this buffer. If the two were to be equal before writing, it'd lead to an OOB write access beyond tx_buffer. Add check to avoid it. Reported-by: Li Qiang Signed-off-by: Prasad J Pandit Signed-off-by: Jason Wang --- hw/net/mipsnet.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c index cf8b823..5115adc 100644 --- a/hw/net/mipsnet.c +++ b/hw/net/mipsnet.c @@ -183,10 +183,12 @@ static void mipsnet_ioport_write(void *opaque, hwaddr addr, break; case MIPSNET_TX_DATA_BUFFER: s->tx_buffer[s->tx_written++] = val; - if (s->tx_written == s->tx_count) { + if ((s->tx_written >= MAX_ETH_FRAME_SIZE) + || (s->tx_written == s->tx_count)) { /* Send buffer. */ - trace_mipsnet_send(s->tx_count); - qemu_send_packet(qemu_get_queue(s->nic), s->tx_buffer, s->tx_count); + trace_mipsnet_send(s->tx_written); + qemu_send_packet(qemu_get_queue(s->nic), + s->tx_buffer, s->tx_written); s->tx_count = s->tx_written = 0; s->intctl |= MIPSNET_INTCTL_TXDONE; s->busy = 1; -- 2.7.4