Merge pull request #1610 from tkatila/labeler-codeql

Fix last of codeql issues

Author: mythi

cmd/internal/labeler/labeler.go

@@ -16,6 +16,7 @@ package labeler
 
 import (
 	"fmt"
+	"math"
 	"os"
 	"os/signal"
 	"path"
@@ -205,12 +206,18 @@ func (l *labeler) getNumaNode(gpuName string) int {
 		return -1
 	}
 
-	numa, err := strconv.ParseInt(strings.TrimSpace(string(data)), 10, 64)
+	numa, err := strconv.ParseInt(strings.TrimSpace(string(data)), 10, 32)
 	if err != nil {
 		klog.Warning("Can't convert numa_node: ", err)
 		return -1
 	}
 
+	if numa > math.MaxInt16 {
+		klog.Warning("Too large numa: ", numa)
+
+		return -1
+	}
+
 	return int(numa)
 }
 
@@ -305,7 +312,9 @@ func (l *labeler) createLabels() error {
 			numaMapping[numaNode] = numaList
 		}
 
-		l.labels.addNumericLabel(labelNamespace+"memory.max", int64(memoryAmount))
+		if memoryAmount < math.MaxInt64 {
+			l.labels.addNumericLabel(labelNamespace+"memory.max", int64(memoryAmount))
+		}
 	}
 
 	gpuCount := len(gpuNumList)

cmd/internal/labeler/labeler_test.go

@@ -520,6 +520,48 @@ func getTestCases() []testcase {
 				"gpu.intel.com/tiles":         "27",
 			},
 		},
+		{
+			sysfsdirs: []string{
+				"card1/device/drm/card1",
+				"card1/gt/gt0",
+			},
+			sysfsfiles: map[string][]byte{
+				"card1/device/vendor":    []byte("0x8086"),
+				"card1/lmem_total_bytes": []byte("8000"),
+				"card1/device/numa_node": []byte("2147483648"), // max int32 + 1
+			},
+			name:           "too large numa node",
+			memoryOverride: 16000000000,
+			expectedRetval: nil,
+			expectedLabels: labelMap{
+				"gpu.intel.com/millicores":  "1000",
+				"gpu.intel.com/memory.max":  "8000",
+				"gpu.intel.com/gpu-numbers": "1",
+				"gpu.intel.com/cards":       "card1",
+				"gpu.intel.com/tiles":       "1",
+			},
+		},
+		{
+			sysfsdirs: []string{
+				"card1/device/drm/card1",
+				"card1/gt/gt0",
+			},
+			sysfsfiles: map[string][]byte{
+				"card1/device/vendor":    []byte("0x8086"),
+				"card1/lmem_total_bytes": []byte("8000"),
+				"card1/device/numa_node": []byte("32768"), // max int16 + 1
+			},
+			name:           "too large numa node",
+			memoryOverride: 16000000000,
+			expectedRetval: nil,
+			expectedLabels: labelMap{
+				"gpu.intel.com/millicores":  "1000",
+				"gpu.intel.com/memory.max":  "8000",
+				"gpu.intel.com/gpu-numbers": "1",
+				"gpu.intel.com/cards":       "card1",
+				"gpu.intel.com/tiles":       "1",
+			},
+		},
 	}
 }
 

pkg/fpga/dfl_linux.go

@@ -236,7 +236,7 @@ func (f *DflFME) GetPortsNum() int {
 	}
 
 	n, err := strconv.ParseUint(f.PortsNum, 10, 32)
-	if err != nil || n >= math.MaxInt {
+	if err != nil || n > math.MaxInt32 {
 		return -1
 	}
 

pkg/fpga/intel_fpga_linux.go

@@ -241,7 +241,7 @@ func (f *IntelFpgaFME) GetPortsNum() int {
 	}
 
 	n, err := strconv.ParseUint(f.PortsNum, 10, 32)
-	if err != nil || n >= math.MaxInt {
+	if err != nil || n > math.MaxInt32 {
 		return -1
 	}