[pull] main from u-root:main

.circleci/images/kernel-amd64/config_linux.txt

@@ -114,6 +114,7 @@ CONFIG_NET_SCH_CODEL=y
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_U32=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_GACT=y
 

.circleci/images/kernel-arm/config_linux.txt

@@ -123,6 +123,7 @@ CONFIG_NET_SCH_CODEL=y
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_U32=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_GACT=y
 

.circleci/images/kernel-arm64/config_linux.txt

@@ -117,6 +117,7 @@ CONFIG_NET_SCH_CODEL=y
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_U32=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_GACT=y
 

.github/workflows/golangci-lint.yml

@@ -19,10 +19,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.24'
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.64.5
-          args: --out-format=line-number --timeout=5m
+          version: v2.1.2
+          args: --timeout=5m

.golangci.yml

@@ -1,37 +1,46 @@
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
-    - revive
+    - errorlint
     - ineffassign
+    - revive
     - staticcheck
-    - stylecheck
-    - errorlint
-
-linters-settings:
-  staticcheck:
-    checks: ["all", "-SA1019"]
-  stylecheck:
-    checks: ["all", "-ST1003"]
-  errorlint:
-    errorf: true
-    asserts: false
-    comparison: false
-
-issues:
-  exclude-dirs:
-    - pkg/uroot/test
-  exclude-rules:
-    - linters: [revive]
-      text: "don't use underscores"
-    - linters: [revive]
-      text: "don't use ALL_CAPS"
-    - linters: [revive]
-      text: "stutter"
-    - linters: [revive]
-      text: "unexported-return"
-    - linters: [revive]
-      text: "unused-parameter"
-    - linters: [revive]
-      text: "superfluous-else"
-    - linters: [revive]
-      text: "empty-block"
+  settings:
+    errorlint:
+      errorf: true
+      asserts: false
+      comparison: false
+    staticcheck:
+      checks:
+        - all
+        - -SA1019
+        - -ST1003
+        - -QF*
+  exclusions:
+    presets:
+      - comments
+    rules:
+      - linters:
+          - revive
+        text: don't use underscores
+      - linters:
+          - revive
+        text: don't use ALL_CAPS
+      - linters:
+          - revive
+        text: stutter
+      - linters:
+          - revive
+        text: unexported-return
+      - linters:
+          - revive
+        text: unused-parameter
+      - linters:
+          - revive
+        text: superfluous-else
+      - linters:
+          - revive
+        text: empty-block
+    paths:
+      - pkg/uroot/test

.vmtest.yaml

@@ -6,7 +6,7 @@ amd64:
       qemu: "/zqemu"
 
   VMTEST_KERNEL:
-    container: "ghcr.io/u-root/u-root/test-kernel-amd64@sha256:0b4f399fd61f2f5e060c86216150ec12439851101921337add61402c185e8007"
+    container: "ghcr.io/u-root/u-root/test-kernel-amd64@sha256:f27fc07be718df785b2ce4a21a6eece6daf0532f7c971cec279d84806b0f04c3"
     template: "{{.bzImage}}"
     files:
       bzImage: "/bzImage"
@@ -31,7 +31,7 @@ arm:
       qemu: "/zqemu"
 
   VMTEST_KERNEL:
-    container: "ghcr.io/u-root/u-root/test-kernel-arm@sha256:0429fa0ab8dbc4d1913f1c2b8ccc45fa8000897c801ed90b90c14a15e1f32020"
+    container: "ghcr.io/u-root/u-root/test-kernel-arm@sha256:9877321ee56df88e1cd9a19a3431d0952f27a997a5c182f66007ebc8b94df4e8"
     template: "{{.zImage}}"
     files:
       zImage: "/zImage"
@@ -44,7 +44,7 @@ arm64:
       qemu: "/zqemu"
 
   VMTEST_KERNEL:
-    container: "ghcr.io/u-root/u-root/test-kernel-arm64@sha256:e48f32266071edaec44445da98375fe512b1532640e256f9f7138633e0000866"
+    container: "ghcr.io/u-root/u-root/test-kernel-arm64@sha256:9e861fbab497a182c8397a34d371d6924ac65e8a3f044343d87f3cdfaa8ae4a4"
     template: "{{.Image}}"
     files:
       Image: "/Image"

cmds/core/echo/echo.go

@@ -49,7 +49,7 @@ func escapeString(s string) (string, error) {
 	}
 
 	s = strings.Split(s, "\\c")[0]
-	s = strings.Replace(s, "\\0", "\\", -1)
+	s = strings.ReplaceAll(s, "\\0", "\\")
 
 	// Quote the string and scan it through %q to interpret backslash escapes
 	s = fmt.Sprintf("\"%s\"", s)

cmds/core/ip/route_linux.go

@@ -89,7 +89,7 @@ func (cmd *cmd) routeAdddefault() error {
 	}
 	switch nh {
 	case "via":
-		fmt.Fprintf(cmd.Out, "Add default route %v via %v", nhval, l.Attrs().Name)
+		fmt.Fprintf(cmd.Out, "Add default route %v via %v\n", nhval, l.Attrs().Name)
 		r := &netlink.Route{LinkIndex: l.Attrs().Index, Gw: nhval}
 		if err := cmd.handle.RouteAdd(r); err != nil {
 			return fmt.Errorf("error adding default route to %v: %w", l.Attrs().Name, err)

cmds/core/kexec/kexec_linux.go

@@ -174,8 +174,17 @@ func run(args []string) error {
 		return fmt.Errorf("usage: kexec [fs] kernelname OR kexec -e")
 	}
 
-	if err := universalpayload.Load(opts.kernelpath, linux.Debug); err != nil {
+	if err, warningMsg := universalpayload.Load(opts.kernelpath, linux.Debug); err != nil {
 		log.Printf("Failed to load universalpayload (%v), try legacy kernel..", err)
+	} else {
+		// universalpayload package suppresses warning message, we print messages here.
+		if warningMsg != nil {
+			log.Printf("Warning messages from universalpayload:\n%v\n", warningMsg)
+		}
+
+		if err := universalpayload.Exec(); err != nil {
+			log.Printf("Failed to execute universalpayload (%v), try legacy kernel..", err)
+		}
 	}
 
 	if opts.cmdline != "" && opts.reuseCmdline {

cmds/core/netcat/connect.go

@@ -195,7 +195,7 @@ func (c *cmd) establishConnection(network, address string) (net.Conn, error) {
 	} else {
 		// TLS Support
 		if c.config.SSLConfig.Enabled || c.config.SSLConfig.VerifyTrust {
-			tlsConfig, err := c.config.SSLConfig.GenerateTLSConfiguration()
+			tlsConfig, err := c.config.SSLConfig.GenerateTLSConfiguration(false)
 			if err != nil {
 				return nil, err
 			}

cmds/core/netcat/listen.go

@@ -77,16 +77,19 @@ func (c *cmd) setupListener(network, address string) (net.Listener, error) {
 	}
 
 	switch c.config.ProtocolOptions.SocketType {
-	case netcat.SOCKET_TYPE_TCP, netcat.SOCKET_TYPE_UNIX:
-		if c.config.SSLConfig.Enabled || c.config.SSLConfig.VerifyTrust {
-			tlsConfig, err := c.config.SSLConfig.GenerateTLSConfiguration()
+	case netcat.SOCKET_TYPE_TCP:
+		if c.config.SSLConfig.Enabled {
+			tlsConfig, err := c.config.SSLConfig.GenerateTLSConfiguration(true)
 			if err != nil {
 				return nil, fmt.Errorf("failed generating TLS configuration: %w", err)
 			}
 
 			return tls.Listen(network, address, tlsConfig)
 
 		}
+		fallthrough
+
+	case netcat.SOCKET_TYPE_UNIX:
 		return net.Listen(network, address)
 
 	case netcat.SOCKET_TYPE_UDP, netcat.SOCKET_TYPE_UDP_UNIX: