* [net-next PATCH] tun: correctly report an error in tun_flow_init()
@ 2012-12-06 15:48 Paul Moore
2012-12-07 5:51 ` Jason Wang
0 siblings, 1 reply; 3+ messages in thread
From: Paul Moore @ 2012-12-06 15:48 UTC (permalink / raw)
To: netdev; +Cc: jasowang
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(-)
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 |
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [net-next PATCH] tun: correctly report an error in tun_flow_init()
2012-12-06 15:48 [net-next PATCH] tun: correctly report an error in tun_flow_init() Paul Moore
@ 2012-12-07 5:51 ` Jason Wang
2012-12-07 18:21 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Jason Wang @ 2012-12-07 5:51 UTC (permalink / raw)
To: Paul Moore; +Cc: netdev
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [net-next PATCH] tun: correctly report an error in tun_flow_init()
2012-12-07 5:51 ` Jason Wang
@ 2012-12-07 18:21 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2012-12-07 18:21 UTC (permalink / raw)
To: jasowang; +Cc: pmoore, netdev
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-07 18:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-06 15:48 [net-next PATCH] tun: correctly report an error in tun_flow_init() Paul Moore
2012-12-07 5:51 ` Jason Wang
2012-12-07 18:21 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).