Merge pull request #14801 from FRRouting/mergify/bp/stable/9.1/pr-14796

lib: Prevent infinite loop in ospf (backport #14796)
marcosfsch · Nov 15, 2023 · 612f1f5 · 612f1f5
2 parents b3bf380 + 77fe290
commit 612f1f5
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/lib/sockopt.c b/lib/sockopt.c
@@ -24,9 +24,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,
@@ -38,9 +41,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,