Merge pull request FRRouting#14796 from donaldsharp/ospf_bsd_double_w…

…hammy_no_whammy lib: Prevent infinite loop in ospf
qlyoung · Nov 15, 2023 · 3a109ef · 3a109ef
2 parents 858cc75 + 1c0f3b6
commit 3a109ef
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/lib/sockopt.c b/lib/sockopt.c
@@ -23,9 +23,12 @@ void setsockopt_so_recvbuf(int sock, int size)
 {
 	int orig_req = size;
 
-	while (setsockopt(sock, SOL_SOCKET, SO_RCVBUF, &size, sizeof(size))
-	       == -1)
+	while (setsockopt(sock, SOL_SOCKET, SO_RCVBUF, &size, sizeof(size)) ==
+	       -1) {
+		if (size == 0)
+			break;
 		size /= 2;
+	}
 
 	if (size != orig_req)
 		flog_err(EC_LIB_SOCKET,
@@ -37,9 +40,12 @@ void setsockopt_so_sendbuf(const int sock, int size)
 {
 	int orig_req = size;
 
-	while (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size))
-	       == -1)
+	while (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size)) ==
+	       -1) {
+		if (size == 0)
+			break;
 		size /= 2;
+	}
 
 	if (size != orig_req)
 		flog_err(EC_LIB_SOCKET,