2 files changed, 2 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index e7346082d7..e40e40b51d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -898,6 +898,7 @@ Nathan Srebro
 RajGopal Srinivasan
 Quentin Stafford-Fraser
 Frank Stajano
+Joel Stanley
 Oliver Steele
 Greg Stein
 Chris Stern
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 5878ebb0d3..9372feaa6e 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1749,7 +1749,7 @@ cmsg_min_space(struct msghdr *msg, struct cmsghdr *cmsgh, size_t space)
     static const size_t cmsg_len_end = (offsetof(struct cmsghdr, cmsg_len) +
                                         sizeof(cmsgh->cmsg_len));
 
-    if (cmsgh == NULL || msg->msg_control == NULL || msg->msg_controllen < 0)
+    if (cmsgh == NULL || msg->msg_control == NULL)
         return 0;
     if (space < cmsg_len_end)
         space = cmsg_len_end;