Merge pull request #44 from enowars/havoc-fix

Havoc error fix
enowars · Jul 14, 2023 · f148c29 · f148c29
2 parents 3c6fc32 + 4c52728
commit f148c29
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/checker/src/internal/handler/handler.go b/checker/src/internal/handler/handler.go
@@ -948,11 +948,16 @@ func (h *Handler) randomGmm(ctx context.Context, message *enochecker.TaskMessage
 		ueConn.Close()
 	}()
 
-	_, _ = io.Recv(ueConn)
+	_, err = io.Recv(ueConn)
+	if err != nil {
+		return err
+	}
 
 	for i := 0; i < mrand.Intn(3); i++ {
+		macbuf := make([]byte, 8)
+		_, err := crand.Read(macbuf)
 		gmm := nas.GmmHeader{Security: mrand.Intn(1) == 1,
-			Mac:         [8]byte(h.getRandomBytes(8)),
+			Mac:         [8]byte(macbuf),
 			MessageType: nas.NasMsgType(mrand.Intn(30)),
 			Message:     h.getRandomBytes((252))}
 
@@ -962,6 +967,14 @@ func (h *Handler) randomGmm(ctx context.Context, message *enochecker.TaskMessage
 		if err != nil {
 			break
 		}
+
+		macbuf = make([]byte, 8)
+		_, err = crand.Read(macbuf)
+		gmm = nas.GmmHeader{Security: mrand.Intn(1) == 1,
+			Mac:         [8]byte(macbuf),
+			MessageType: nas.NasMsgType(mrand.Intn(30)),
+			Message:     h.getRandomBytes((252))}
+
 		err = io.SendGmm(ueConn, gmm)
 		if err != nil {
 			break