Re: [PATCH] tuntap: fix error return code in tun_set_iff()

[David Miller <davem@davemloft.net>]

From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 12 Apr 2013 06:49:20 -0700

> On Fri, 2013-04-12 at 21:17 +0800, Wei Yongjun wrote:
>> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>> 
>> Fix to return a negative error code from the error handling
>> case instead of 0, as returned elsewhere in this function.
>> 
>> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>> ---
>>  drivers/net/tun.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/drivers/net/tun.c b/drivers/net/tun.c
>> index b7c457a..729ed53 100644
>> --- a/drivers/net/tun.c
>> +++ b/drivers/net/tun.c
>> @@ -1594,7 +1594,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
>>  
>>  		if (tun->flags & TUN_TAP_MQ &&
>>  		    (tun->numqueues + tun->numdisabled > 1))
>> -			return err;
>> +			return -EBUSY;
>>  	}
>>  	else {
>>  		char *name;
> 
> Bug added in linux-3.8 , commit 4008e97f866db665 
> ("tuntap: fix ambigious multiqueue API")
> 
> Acked-by: Eric Dumazet <edumazet@google.com>

Applied and queued up for -stable, thanks.