libnetwork/drivers/overlay: fix naked returns, output variables

thaJeztah · thaJeztah · commit 02b4c7cc52f3 · 2025-03-04T13:55:46.000+01:00
libnetwork/drivers/overlay/encryption.go:370:2: naked return in func `programSA` with 64 lines of code (nakedret)
        return
        ^

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/libnetwork/drivers/overlay/encryption.go b/libnetwork/drivers/overlay/encryption.go
@@ -304,7 +304,7 @@ func (d *driver) programInput(vni uint32, add bool) error {
 	return nil
 }
 
-func programSA(localIP, remoteIP net.IP, spi *spi, k *key, dir int, add bool) (fSA *netlink.XfrmState, rSA *netlink.XfrmState, err error) {
+func programSA(localIP, remoteIP net.IP, spi *spi, k *key, dir int, add bool) (fSA *netlink.XfrmState, rSA *netlink.XfrmState, lastErr error) {
 	var (
 		action      = "Removing"
 		xfrmProgram = ns.NlHandle().XfrmStateDel
@@ -330,6 +330,7 @@ func programSA(localIP, remoteIP net.IP, spi *spi, k *key, dir int, add bool) (f
 
 		exists, err := saExists(rSA)
 		if err != nil {
+			lastErr = err
 			exists = !add
 		}
 
@@ -356,6 +357,7 @@ func programSA(localIP, remoteIP net.IP, spi *spi, k *key, dir int, add bool) (f
 
 		exists, err := saExists(fSA)
 		if err != nil {
+			lastErr = err
 			exists = !add
 		}
 
@@ -367,7 +369,7 @@ func programSA(localIP, remoteIP net.IP, spi *spi, k *key, dir int, add bool) (f
 		}
 	}
 
-	return
+	return fSA, rSA, lastErr
 }
 
 // getMinimalIP returns the address in its shortest form

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ func (d *driver) programInput(vni uint32, add bool) error {`
`304`	`304`	`return nil`
`305`	`305`	`}`
`306`	`306`
`307`		`-func programSA(localIP, remoteIP net.IP, spi spi, k key, dir int, add bool) (fSA netlink.XfrmState, rSA netlink.XfrmState, err error) {`
	`307`	`+func programSA(localIP, remoteIP net.IP, spi spi, k key, dir int, add bool) (fSA netlink.XfrmState, rSA netlink.XfrmState, lastErr error) {`
`308`	`308`	`var (`
`309`	`309`	`action = "Removing"`
`310`	`310`	`xfrmProgram = ns.NlHandle().XfrmStateDel`
`@@ -330,6 +330,7 @@ func programSA(localIP, remoteIP net.IP, spi spi, k key, dir int, add bool) (f`
`330`	`330`
`331`	`331`	`exists, err := saExists(rSA)`
`332`	`332`	`if err != nil {`
	`333`	`+ lastErr = err`
`333`	`334`	`exists = !add`
`334`	`335`	`}`
`335`	`336`
`@@ -356,6 +357,7 @@ func programSA(localIP, remoteIP net.IP, spi spi, k key, dir int, add bool) (f`
`356`	`357`
`357`	`358`	`exists, err := saExists(fSA)`
`358`	`359`	`if err != nil {`
	`360`	`+ lastErr = err`
`359`	`361`	`exists = !add`
`360`	`362`	`}`
`361`	`363`
`@@ -367,7 +369,7 @@ func programSA(localIP, remoteIP net.IP, spi spi, k key, dir int, add bool) (f`
`367`	`369`	`}`
`368`	`370`	`}`
`369`	`371`
`370`		`- return`
	`372`	`+ return fSA, rSA, lastErr`
`371`	`373`	`}`
`372`	`374`
`373`	`375`	`// getMinimalIP returns the address in its shortest form`