From 25de9199afa6136bac7537db629317ccb1e94665 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Sat, 11 Mar 2006 18:49:13 -0800 Subject: [PATCH] --- yaml --- r: 21001 b: refs/heads/master c: 8f22757ee84da64d4f662f1dd03dae95358a1efe h: refs/heads/master i: 20999: 677082a516b381b337ca919ef6444c822817c5aa v: v3 --- [refs] | 2 +- trunk/drivers/net/tun.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0a6b0f3e14bf..9668ffe20865 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 535744878e34d01a53f946f26dfbca37186f2cf8 +refs/heads/master: 8f22757ee84da64d4f662f1dd03dae95358a1efe diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c index 50b8c6754b1e..a1ed2d983740 100644 --- a/trunk/drivers/net/tun.c +++ b/trunk/drivers/net/tun.c @@ -249,8 +249,11 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv, if (align) skb_reserve(skb, align); - if (memcpy_fromiovec(skb_put(skb, len), iv, len)) + if (memcpy_fromiovec(skb_put(skb, len), iv, len)) { + tun->stats.rx_dropped++; + kfree_skb(skb); return -EFAULT; + } skb->dev = tun->dev; switch (tun->flags & TUN_TYPE_MASK) {