fix unchecked errors in cmds/exp/netbootxyz & pkg/boot

RiSKeD · RiSKeD · commit 78ab231c576b · 2022-10-25T10:53:49.000+02:00
replace kexec cmd

Signed-off-by: Fabian Wienand &lt;fabian.wienand@9elements.com&gt;
diff --git a/cmds/exp/netbootxyz/netbootxyz.go b/cmds/exp/netbootxyz/netbootxyz.go
@@ -11,7 +11,6 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"os/exec"
 	"strings"
 	"time"
 
@@ -174,12 +173,15 @@ func (o OSEndpoint) Load() error {
 			fmt.Printf("With Kernel at %s\n", tmpPath+"vmlinuz")
 			fmt.Printf("With Initrd at %s\n", tmpPath+"initrd")
 			fmt.Printf("Commandline: %s\n", o.Commandline)
+
 			// Load Kernel and initrd
 			err = kexec.FileLoad(vmlinuz, initrd, o.Commandline)
+			if err != nil {
+				return err
+			}
+
 			// Load KExec kernel and initrd - init cmdline
-			cmd := exec.Command("kexec", "-e")
-			err = cmd.Run()
-			return err
+			return kexec.Reboot()
 		}
 		return err
 	}
diff --git a/pkg/boot/fit/vfit.go b/pkg/boot/fit/vfit.go
@@ -104,6 +104,10 @@ func (s RSASignature) Verify(b []byte, ring openpgp.KeyRing) (*bytes.Reader, err
 	}
 
 	hashed, err := vfile.CalculateHash(bytes.NewReader(b), s.hash.New())
+	if err != nil {
+		return r, err
+	}
+
 	for _, key := range keys {
 		if err = rsa.VerifyPKCS1v15(key, s.hash, hashed, s.value); err == nil {
 			return r, nil
diff --git a/pkg/boot/uefi/uefi.go b/pkg/boot/uefi/uefi.go
@@ -73,7 +73,12 @@ func checkFVAndGetEntryPoint(name string) (uintptr, error) {
 	if err != nil {
 		return 0, err
 	}
+
 	secEntry, err := findSecurityCorePEEntry(dat)
+	if err != nil {
+		return 0, err
+	}
+
 	f, err := os.Open(name)
 	if err != nil {
 		return 0, err
