From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH] Re-define PKT_PROT_LEN to be bigger. Date: Wed, 15 Dec 2010 09:48:12 +0000 Message-ID: <1292406492-20516-1-git-send-email-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: jeremy@goop.org, xen-devel@lists.xensource.com Cc: Paul Durrant List-Id: xen-devel@lists.xenproject.org Re-define PKT_PROT_LEN to be big enough to handle maximal IPv4 and TCP options and phrase the definition so that it's reasonably obvious that's what it's for. Signed-off-by: Paul Durrant --- drivers/xen/netback/netback.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/xen/netback/netback.c b/drivers/xen/netback/netback.c index c448675..368daa6 100644 --- a/drivers/xen/netback/netback.c +++ b/drivers/xen/netback/netback.c @@ -36,9 +36,11 @@ #include "common.h" -#include -#include #include +#include +#include + +#include #include #include @@ -125,10 +127,12 @@ static inline int netif_get_page_ext(struct page *pg, unsigned int *_group, unsi /* * This is the amount of packet we copy rather than map, so that the * guest can't fiddle with the contents of the headers while we do - * packet processing on them (netfilter, routing, etc). 72 is enough - * to cover TCP+IP headers including options. + * packet processing on them (netfilter, routing, etc). */ -#define PKT_PROT_LEN 72 +#define PKT_PROT_LEN (ETH_HLEN + \ + VLAN_HLEN + \ + sizeof(struct iphdr) + MAX_IPOPTLEN + \ + sizeof(struct tcphdr) + MAX_TCP_OPTION_SPACE) static inline pending_ring_idx_t pending_index(unsigned i) { -- 1.5.6.5