From: Jason Wang <jasowang@redhat.com>
To: Jerry Chu <hkchu@google.com>
Cc: Wei Yongjun <weiyj.lk@gmail.com>,
David Miller <davem@davemloft.net>,
mst@redhat.com, Eric Dumazet <edumazet@google.com>,
nhorman@tuxdriver.com, yongjun_wei@trendmicro.com.cn,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: Re: [PATCH] tuntap: fix error return code in tun_set_iff()
Date: Tue, 23 Apr 2013 14:19:59 +0800 [thread overview]
Message-ID: <5176280F.1060400@redhat.com> (raw)
In-Reply-To: <CAPshTCgApCEsrQ6uFfmyzvNvQNO8-MZ4zJaiMn3pPF+EV7+zJg@mail.gmail.com>
On 04/23/2013 01:37 PM, Jerry Chu wrote:
> On Fri, Apr 12, 2013 at 6:17 AM, Wei Yongjun <weiyj.lk@gmail.com> 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;
> I don't understand - yes it was a brainless bug to return err without
> setting it!
err was in fact set by tun_attach, so it was always zero here. The code
works by chance w/o this patch :)
> But won't the fix pretty much disable multi-q because only the the creation of
> the 1st queue will succeed? I thought the intent of "tuntap: fix ambigious
> multiqueue API" was to "Only allow TUNSETIFF to create queues.".
Yes this patch will break the creation of more than 1 queues.
>
> The code is very confusing. (Or am I the one who is confused? Sigh.)
-EBUSY is wrong here, we need return 0 for succeed here. The logic is,
if we have more than 1 queues attached, no need to re-initialize the net
device again. Will send patch to correct this.
Thanks.
>
> Jerry
>
>> }
>> else {
>> char *name;
>>
>> --
>> 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
next prev parent reply other threads:[~2013-04-23 6:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-12 13:17 [PATCH] tuntap: fix error return code in tun_set_iff() Wei Yongjun
2013-04-12 13:49 ` Eric Dumazet
2013-04-12 19:00 ` David Miller
2013-04-23 5:37 ` Jerry Chu
2013-04-23 6:19 ` Jason Wang [this message]
2013-04-23 6:59 ` Jerry Chu
2013-04-23 7:39 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5176280F.1060400@redhat.com \
--to=jasowang@redhat.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkchu@google.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=weiyj.lk@gmail.com \
--cc=yongjun_wei@trendmicro.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).