CID 97194: Check return from setsockopt()

bk: 5116e44caNx0PukU22ljnnOYLtB4ZA

diff --git a/ChangeLog b/ChangeLog
index 933ff44ba8d26bb367ead311be8f2660fbd747cb..17e6bccd20c563180bc426234f4313e19afe35ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* CID 97194: Check return from setsockopt().
 * CID 739473,739532: Out-of-bounds access/illegal address computation.
 * CID 739558: Double close.
 * CID 739559: Double close.

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index c304c1ec9de4145e59ebb807451c4dff64f019c2..f1b17dd1ac1cb9a553298b817d4e9b26d49c6d2d 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -3807,8 +3807,13 @@ findlocalinterface(
         */
        if (bcast) {
                on = 1;
-               setsockopt(s, SOL_SOCKET, SO_BROADCAST,
-                          (char *)&on, sizeof(on));
+               if (SOCKET_ERROR == setsockopt(s, SOL_SOCKET,
+                                               SO_BROADCAST,
+                                               (char *)&on,
+                                               sizeof(on))) {
+                       closesocket(s);
+                       return NULL;
+               }
        }
 
        rtn = connect(s, &addr->sa, SOCKLEN(addr));