[PATCH v2] net/tap: Set return code on failure

Patrick Venture posted 1 patch 2 years, 2 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220105164500.3381822-1-venture@google.com
Maintainers: Jason Wang <jasowang@redhat.com>
net/tap.c | 1 +
1 file changed, 1 insertion(+)
[PATCH v2] net/tap: Set return code on failure
Posted by Patrick Venture 2 years, 2 months ago
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: Patrick Venture <venture@google.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Peter Foley <pefoley@google.com>
---
v2: Fixed commit titlewq and updated description.
---
 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


Re: [PATCH v2] net/tap: Set return code on failure
Posted by Jason Wang 2 years, 2 months ago
在 2022/1/6 上午12:45, Patrick Venture 写道:
> 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: Patrick Venture <venture@google.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Signed-off-by: Peter Foley <pefoley@google.com>
> ---
> v2: Fixed commit titlewq and updated description.
> ---


Applied.

Thanks


>   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)) {