| Message ID | 20121206154838.6073.17102.stgit@localhost |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thursday, December 06, 2012 10:48:38 AM Paul Moore wrote: > 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> Thanks Paul. > --- > drivers/net/tun.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/tun.c b/drivers/net/tun.c > index a1b2389..14a0454 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 | > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jason Wang <jasowang@redhat.com> Date: Fri, 07 Dec 2012 13:51:47 +0800 > On Thursday, December 06, 2012 10:48:38 AM Paul Moore wrote: >> 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index a1b2389..14a0454 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 |
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> --- drivers/net/tun.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html