qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org, qemu-devel@nongnu.org
Cc: Jason Wang <jasowang@redhat.com>,
	Prasad J Pandit <pjp@fedoraproject.org>
Subject: [Qemu-devel] [PULL V2 03/17] net: cadence_gem: check packet size in gem_recieve
Date: Thu,  4 Feb 2016 16:31:32 +0800	[thread overview]
Message-ID: <1454574706-5681-4-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1454574706-5681-1-git-send-email-jasowang@redhat.com>

From: Prasad J Pandit <pjp@fedoraproject.org>

While receiving packets in 'gem_receive' routine, if Frame Check
Sequence(FCS) is enabled, it copies the packet into a local
buffer without checking its size. Add check to validate packet
length against the buffer size to avoid buffer overflow.

Reported-by: Ling Liu <liuling-it@360.cn>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/cadence_gem.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index f9e4091..e513d9d 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -678,6 +678,10 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)
     } else {
         unsigned crc_val;
 
+        if (size > sizeof(rxbuf) - sizeof(crc_val)) {
+            size = sizeof(rxbuf) - sizeof(crc_val);
+        }
+        bytes_to_copy = size;
         /* The application wants the FCS field, which QEMU does not provide.
          * We must try and calculate one.
          */
-- 
2.5.0

  parent reply	other threads:[~2016-02-04  8:32 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-04  8:31 [Qemu-devel] [PULL V2 00/17] Net patches Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 01/17] net/slirp: Tell the users when they are using deprecated options Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 02/17] qemu-doc: Do not promote deprecated -smb and -redir options Jason Wang
2016-02-04  8:31 ` Jason Wang [this message]
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 04/17] cadence_gem: fix buffer overflow Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 05/17] slirp: goto bad in udp_input if sosendto fails Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 06/17] slirp: Generalizing and neutralizing ARP code Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 07/17] slirp: Adding address family switch for produced frames Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 08/17] slirp: Make Socket structure IPv6 compatible Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 09/17] slirp: Factorizing address translation Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 10/17] slirp: Factorizing and cleaning solookup() Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 11/17] slirp: Add sockaddr_equal, make solookup family-agnostic Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 12/17] slirp: Make udp_attach IPv6 compatible Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 13/17] slirp: Adding family argument to tcp_fconnect() Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 14/17] e1000: eliminate infinite loops on out-of-bounds transfer start Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 15/17] net: netmap: use nm_open() to open netmap ports Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 16/17] net: always walk through filters in reverse if traffic is egress Jason Wang
2016-02-04  8:31 ` [Qemu-devel] [PULL V2 17/17] net/filter: Fix the output information for command 'info network' Jason Wang
2016-02-04 16:15 ` [Qemu-devel] [PULL V2 00/17] Net patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1454574706-5681-4-git-send-email-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=pjp@fedoraproject.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).