netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Wei Liu <wei.liu2@citrix.com>
To: <netdev@vger.kernel.org>, <xen-devel@lists.xen.org>
Cc: <ian.campbell@citrix.com>, <david.vrabel@citrix.com>,
	<konrad.wilk@oracle.com>, <annie.li@oracle.com>,
	<wdauchy@gmail.com>, Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH 7/7] xen-netback: don't disconnect frontend when seeing oversize packet
Date: Tue, 9 Apr 2013 12:07:35 +0100	[thread overview]
Message-ID: <1365505655-8021-8-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1365505655-8021-1-git-send-email-wei.liu2@citrix.com>

Some frontend drivers are sending packets > 64 KiB in length. This length
overflows the length field in the first slot making the following slots have
an invalid length ("Packet is bigger than frame").

Turn this error back into a non-fatal error by dropping the packet. To avoid
having the following slots having fatal errors, consume all slots in the
packet.

This does not reopen the security hole in XSA-39 as if the packet as an
invalid number of slots it will still hit fatal error case.

Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 drivers/net/xen-netback/netback.c |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 3490b2c..acd057b 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -986,10 +986,21 @@ static int netbk_count_requests(struct xenvif *vif,
 
 		memcpy(txp, RING_GET_REQUEST(&vif->tx, cons + slots),
 		       sizeof(*txp));
-		if (txp->size > first->size) {
-			netdev_err(vif->dev, "Packet is bigger than frame.\n");
-			netbk_fatal_tx_err(vif);
-			return -EIO;
+
+		/* If the guest submitted a frame >= 64 KiB then
+		 * first->size overflowed and following slots will
+		 * appear to be larger than the frame.
+		 *
+		 * This cannot be fatal error as there are buggy
+		 * frontends that do this.
+		 *
+		 * Consume all slots and drop the packet.
+		 */
+		if (!drop_err && txp->size > first->size) {
+			if (net_ratelimit())
+				netdev_dbg(vif->dev,
+					   "Packet is bigger than frame.\n");
+			drop_err = -EIO;
 		}
 
 		first->size -= txp->size;
-- 
1.7.10.4

  parent reply	other threads:[~2013-04-09 11:22 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-09 11:07 [PATCH V3 0/7] Bundle fixes for Xen netfront / netback Wei Liu
2013-04-09 11:07 ` [PATCH 1/7] xen-netfront: remove unused variable `extra' Wei Liu
2013-04-09 11:07 ` [PATCH 2/7] xen-netfront: frags -> slots in xennet_get_responses Wei Liu
2013-04-09 11:07 ` [PATCH 3/7] xen-netback: remove skb in xen_netbk_alloc_page Wei Liu
2013-04-09 11:07 ` [PATCH 4/7] xen-netfront: frags -> slots in log message Wei Liu
2013-04-09 13:35   ` Sergei Shtylyov
2013-04-09 13:47     ` Wei Liu
2013-04-12 14:40       ` Sergei Shtylyov
2013-04-12 14:58         ` Wei Liu
2013-04-09 11:07 ` [PATCH 5/7] xen-netfront: reduce gso_max_size to account for ethernet header Wei Liu
2013-04-11 20:04   ` Wei Liu
2013-04-12  8:18     ` Ian Campbell
2013-04-12  8:48       ` Wei Liu
2013-04-12  8:57         ` Ian Campbell
2013-04-12  9:34           ` Wei Liu
2013-04-12  9:43             ` Ian Campbell
2013-04-12 12:58               ` Eric Dumazet
2013-04-12 13:29                 ` Wei Liu
2013-04-12 13:36                   ` Ian Campbell
2013-04-12 16:17       ` Ben Hutchings
2013-04-09 11:07 ` [PATCH 6/7] xen-netback: coalesce slots and fix regressions Wei Liu
2013-04-09 12:13   ` [Xen-devel] " Jan Beulich
2013-04-09 12:48     ` Wei Liu
2013-04-09 13:13       ` Jan Beulich
2013-04-09 13:48         ` Wei Liu
2013-04-09 11:07 ` Wei Liu [this message]
2013-04-09 11:34   ` [PATCH 7/7] xen-netback: don't disconnect frontend when seeing oversize packet David Laight
2013-04-09 11:54     ` Wei Liu

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=1365505655-8021-8-git-send-email-wei.liu2@citrix.com \
    --to=wei.liu2@citrix.com \
    --cc=annie.li@oracle.com \
    --cc=david.vrabel@citrix.com \
    --cc=ian.campbell@citrix.com \
    --cc=konrad.wilk@oracle.com \
    --cc=netdev@vger.kernel.org \
    --cc=wdauchy@gmail.com \
    --cc=xen-devel@lists.xen.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).