From: Peter Foley <pefoley@google.com>

Match the other error handling in this function.

Signed-off-by: Peter Foley <pefoley@google.com>
---
 net/tap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/tap.c b/net/tap.c
index f716be3e3f..c5cbeaa7a2 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -900,6 +900,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
             if (i == 0) {
                 vnet_hdr = tap_probe_vnet_hdr(fd, errp);
                 if (vnet_hdr < 0) {
+                    ret = -1;
                     goto free_fail;
                 }
             } else if (vnet_hdr != tap_probe_vnet_hdr(fd, NULL)) {
-- 
2.34.1.448.ga2b2bfdf31-goog

On Tue, Jan 4, 2022 at 1:18 PM Patrick Venture <venture@google.com> wrote:

> From: Peter Foley <pefoley@google.com>
>
> Match the other error handling in this function.
>

Just noticed I didn't fix up the commit title here to match style.  Should
I do a PATCH RESEND or a new patch, or can you add the "net/tap: " to the
title before applying (should it be accepted).


>
> Signed-off-by: Peter Foley <pefoley@google.com>
>
Reviewed-by: Patrick Venture <venture@google.com>

> ---
>  net/tap.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/net/tap.c b/net/tap.c
> index f716be3e3f..c5cbeaa7a2 100644
> --- a/net/tap.c
> +++ b/net/tap.c
> @@ -900,6 +900,7 @@ int net_init_tap(const Netdev *netdev, const char
> *name,
>              if (i == 0) {
>                  vnet_hdr = tap_probe_vnet_hdr(fd, errp);
>                  if (vnet_hdr < 0) {
> +                    ret = -1;
>                      goto free_fail;
>                  }
>              } else if (vnet_hdr != tap_probe_vnet_hdr(fd, NULL)) {
> --
> 2.34.1.448.ga2b2bfdf31-goog
>
>

On Wed, Jan 5, 2022 at 5:32 AM Patrick Venture <venture@google.com> wrote:
>
>
>
> On Tue, Jan 4, 2022 at 1:18 PM Patrick Venture <venture@google.com> wrote:
>>
>> From: Peter Foley <pefoley@google.com>
>>
>> Match the other error handling in this function.
>
>
> Just noticed I didn't fix up the commit title here to match style.  Should I do a PATCH RESEND or a new patch, or can you add the "net/tap: " to the title before applying (should it be accepted).

Please resend.

Thanks

>
>>
>>
>> Signed-off-by: Peter Foley <pefoley@google.com>
>
> Reviewed-by: Patrick Venture <venture@google.com>
>>
>> ---
>>  net/tap.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/net/tap.c b/net/tap.c
>> index f716be3e3f..c5cbeaa7a2 100644
>> --- a/net/tap.c
>> +++ b/net/tap.c
>> @@ -900,6 +900,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
>>              if (i == 0) {
>>                  vnet_hdr = tap_probe_vnet_hdr(fd, errp);
>>                  if (vnet_hdr < 0) {
>> +                    ret = -1;
>>                      goto free_fail;
>>                  }
>>              } else if (vnet_hdr != tap_probe_vnet_hdr(fd, NULL)) {
>> --
>> 2.34.1.448.ga2b2bfdf31-goog
>>

Cc'ing Daniel

On 4/1/22 22:18, Patrick Venture wrote:
> From: Peter Foley <pefoley@google.com>
> 
> Match the other error handling in this function.
> 

Fixes: e7b347d0bf6 ("net: detect errors from probing vnet hdr flag for 
TAP devices")

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> Signed-off-by: Peter Foley <pefoley@google.com>
> ---
>   net/tap.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/net/tap.c b/net/tap.c
> index f716be3e3f..c5cbeaa7a2 100644
> --- a/net/tap.c
> +++ b/net/tap.c
> @@ -900,6 +900,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
>               if (i == 0) {
>                   vnet_hdr = tap_probe_vnet_hdr(fd, errp);
>                   if (vnet_hdr < 0) {
> +                    ret = -1;
>                       goto free_fail;
>                   }
>               } else if (vnet_hdr != tap_probe_vnet_hdr(fd, NULL)) {