Skip to contentSkip to conversation

Set return code on failure

PATCH Superseded Patrick Venture 3 participants 4 messages Jan 4, 2022 – Jan 5, 2022 Networking

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Set return code on failure

From: Peter Foley <[email protected]>

Match the other error handling in this function.

---
 net/tap.c | 1 +
 1 file changed, 1 insertion(+)
net/tap.c +1 -0
index f716be3e3f..c5cbeaa7a2 100644
@@ -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)) {
Signature · 1 line
2.34.1.448.ga2b2bfdf31-goog
author Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Patrick Venture

From: Peter Foley <[email protected]>

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

Quoted 3 lines
Quoted 21 lines
---
 net/tap.c | 1 +
 1 file changed, 1 insertion(+)
net/tap.c +1 -0
index f716be3e3f..c5cbeaa7a2 100644
@@ -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

Reviewed-by on v1 1/1
#3 lore raw

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

In reply to Patrick Venture

Cc'ing Daniel

Quoted 4 lines · Patrick Venture

From: Peter Foley <[email protected]>

Match the other error handling in this function.

Fixes e7b347d0bf6 ("net: detect errors from probing vnet hdr flag for TAP devices")
Quoted 17 lines
---
  net/tap.c | 1 +
  1 file changed, 1 insertion(+)
net/tap.c +1 -0
index f716be3e3f..c5cbeaa7a2 100644
@@ -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 lore raw
In reply to Patrick Venture
Quoted 11 lines · Patrick Venture
Quoted 4 lines · Patrick Venture

From: Peter Foley <[email protected]>

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

Quoted 26 lines
Quoted 4 lines
Quoted 20 lines
---
 net/tap.c | 1 +
 1 file changed, 1 insertion(+)
net/tap.c +1 -1
index f716be3e3f..c5cbeaa7a2 100644
@@ -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