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 5/7] xen-netfront: reduce gso_max_size to account for ethernet header
Date: Tue, 9 Apr 2013 12:07:33 +0100 [thread overview]
Message-ID: <1365505655-8021-6-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1365505655-8021-1-git-send-email-wei.liu2@citrix.com>
The maximum packet including ethernet header that can be handled by netfront /
netback wire format is 65535. Reduce gso_max_size accordingly.
Drop skb and print warning when skb->len > 65535. This can 1) save the effort
to send malformed packet to netback, 2) help spotting misconfiguration of
netfront in the future.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
drivers/net/xen-netfront.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 1bb2e20..42ef4a8 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -547,6 +547,16 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
unsigned int len = skb_headlen(skb);
unsigned long flags;
+ /* If skb->len is too big for wire format, drop skb and alert
+ * user about misconfiguration.
+ */
+ if (unlikely(skb->len > (typeof(tx->size))(~0))) {
+ net_alert_ratelimited(
+ "xennet: skb->len = %u, too big for wire format\n",
+ skb->len);
+ goto drop;
+ }
+
slots = DIV_ROUND_UP(offset + len, PAGE_SIZE) +
xennet_count_skb_frag_slots(skb);
if (unlikely(slots > MAX_SKB_FRAGS + 1)) {
@@ -1058,7 +1068,7 @@ err:
static int xennet_change_mtu(struct net_device *dev, int mtu)
{
- int max = xennet_can_sg(dev) ? 65535 - ETH_HLEN : ETH_DATA_LEN;
+ int max = xennet_can_sg(dev) ? 65535 - VLAN_ETH_HLEN : ETH_DATA_LEN;
if (mtu > max)
return -EINVAL;
@@ -1362,6 +1372,8 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
SET_ETHTOOL_OPS(netdev, &xennet_ethtool_ops);
SET_NETDEV_DEV(netdev, &dev->dev);
+ netif_set_gso_max_size(netdev, 65535 - VLAN_ETH_HLEN);
+
np->netdev = netdev;
netif_carrier_off(netdev);
--
1.7.10.4
next prev 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 ` Wei Liu [this message]
2013-04-11 20:04 ` [PATCH 5/7] xen-netfront: reduce gso_max_size to account for ethernet header 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 ` [PATCH 7/7] xen-netback: don't disconnect frontend when seeing oversize packet Wei Liu
2013-04-09 11:34 ` 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-6-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).