diff options
| author | Paul Moore <pmoore@redhat.com> | 2012-12-06 05:48:38 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-07 13:20:46 -0500 |
| commit | b3943aef7ecfcc47609136f46773e9a839c950b0 (patch) | |
| tree | 5318730c3c43595c671b8095a05bc1f56ea9c50d /drivers/net/tun.c | |
| parent | b6d048641a979d56730c28411df88d0f55184f24 (diff) | |
| download | linux-b3943aef7ecfcc47609136f46773e9a839c950b0.tar.bz2 | |
tun: correctly report an error in tun_flow_init()
On error, the error code from tun_flow_init() is lost inside
tun_set_iff(), this patch fixes this by assigning the tun_flow_init()
error code to the "err" variable which is returned by
the tun_flow_init() function on error.
Signed-off-by: Paul Moore <pmoore@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index a1b2389e6d7f..14a04543cd91 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1591,7 +1591,8 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) tun_net_init(dev); - if (tun_flow_init(tun)) + err = tun_flow_init(tun); + if (err < 0) goto err_free_dev; dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | |