tun: reserves space for network in skb

The tun driver allocates skb's to hold data from user and then passes
the data into the network stack as received data. Most network devices
allocate the receive skb with routines like dev_alloc_skb() that reserves
additional space for use by network protocol stack but tun does not.

Because of the lack of padding, when the packet is passed through bridge
netfilter a new skb has to be allocated.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit a504b86e718a425ea4a34e2f95b5cf0545ddfd8d)

BugLink: http://launchpad.net/bugs/905219

Signed-off-by: Chris J Arges <chris.j.arges@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index fb50e5a542f..2f2a19054ec 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -607,7 +607,7 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun,
 {
         struct tun_pi pi = { 0, cpu_to_be16(ETH_P_IP) };
         struct sk_buff *skb;
-        size_t len = count, align = 0;
+        size_t len = count, align = NET_SKB_PAD;
         struct virtio_net_hdr gso = { 0 };
         int offset = 0;
 
@@ -637,7 +637,7 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun,
         }
 
         if ((tun->flags & TUN_TYPE_MASK) == TUN_TAP_DEV) {
-                align = NET_IP_ALIGN;
+                align += NET_IP_ALIGN;
                 if (unlikely(len < ETH_HLEN ||
                              (gso.hdr_len && gso.hdr_len < ETH_HLEN)))
                         return -EINVAL;