1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 5ce580f413b9..5550f56cb895 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1286,6 +1286,7 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,
         buflen += SKB_DATA_ALIGN(len + pad);
         rcu_read_unlock();
 
+        alloc_frag->offset = ALIGN((u64)alloc_frag->offset, SMP_CACHE_BYTES);
         if (unlikely(!skb_page_frag_refill(buflen, alloc_frag, GFP_KERNEL)))
                 return ERR_PTR(-ENOMEM);
 
@@ -2027,6 +2028,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 
                 if (!dev)
                         return -ENOMEM;
+                err = dev_get_valid_name(net, dev, name);
+                if (err < 0)
+                        goto err_free_dev;
 
                 dev_net_set(dev, net);
                 dev->rtnl_link_ops = &tun_link_ops;