diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-17 12:01:19 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-17 12:01:19 +1100 |
| commit | 23dd64011285010ac291f7dddf6e287bdb43a0ad (patch) | |
| tree | 0e4f4569d38d82f4dceb4150d5ad940e0fd5f24f /drivers/net/tun.c | |
| parent | 516450179454de9e689e0a53ed8f34b896e8651c (diff) | |
| parent | 485ff09990416c75ae9593ddc71619939ab9dd51 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 50b8c6754b1..a1ed2d98374 100644 --- a/drivers/net/tun.c +++ b/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) { |