From b1237f9a64ac230896f23ae03ca4531208f08a9a Mon Sep 17 00:00:00 2001
From: Zhao Congqi <zhaocongqi_yewu@cmss.chinamobile.com>
Date: Fri, 24 May 2024 13:24:40 +0800
Subject: [PATCH] fix crypto/rand: argument to Int is <= 0 (#4077)

Signed-off-by: zcq98 <zhaocongqi_yewu@cmss.chinamobile.com>
---
 pkg/util/net.go      |  2 +-
 pkg/util/net_test.go | 45 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/pkg/util/net.go b/pkg/util/net.go
index 2c570b9447c..482977475ba 100644
--- a/pkg/util/net.go
+++ b/pkg/util/net.go
@@ -200,7 +200,7 @@ func genRandomIP(cidr string, isIPv6 bool) string {
 	if isIPv6 {
 		hostBits = 128 - netMask
 	}
-	add, err := rand.Int(rand.Reader, big.NewInt(1<<(uint(hostBits)-1)))
+	add, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), uint(hostBits)-1))
 	if err != nil {
 		LogFatalAndExit(err, "failed to generate random ip")
 	}
diff --git a/pkg/util/net_test.go b/pkg/util/net_test.go
index bccc995aac0..9848ac66838 100644
--- a/pkg/util/net_test.go
+++ b/pkg/util/net_test.go
@@ -446,6 +446,51 @@ func TestGenerateRandomV4IP(t *testing.T) {
 	}
 }
 
+func TestGenerateRandomV6IP(t *testing.T) {
+	tests := []struct {
+		name     string
+		cidr     string
+		wantErr  bool
+		wantIPv6 bool
+	}{
+		{
+			name:     "valid IPv6 CIDR",
+			cidr:     "2001:db8::/64",
+			wantErr:  false,
+			wantIPv6: true,
+		},
+		{
+			name:     "invalid CIDR format",
+			cidr:     "2001:db8::1",
+			wantErr:  true,
+			wantIPv6: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ip := GenerateRandomV6IP(tt.cidr)
+			if tt.wantErr {
+				if ip != "" {
+					t.Errorf("GenerateRandomV6IP(%s) = %s; want empty string", tt.cidr, ip)
+				}
+				return
+			}
+
+			parsedIP, _, err := net.ParseCIDR(ip)
+			if err != nil {
+				t.Errorf("GenerateRandomV6IP(%s) returned invalid IP: %v", tt.cidr, err)
+				return
+			}
+
+			isIPv6 := parsedIP.To4() == nil
+			if isIPv6 != tt.wantIPv6 {
+				t.Errorf("GenerateRandomV6IP(%s) returned %v; want IPv6: %v", tt.cidr, parsedIP, tt.wantIPv6)
+			}
+		})
+	}
+}
+
 func TestIPToString(t *testing.T) {
 	tests := []struct {
 		name string