diff -r c64216addd7f Modules/socketmodule.c --- a/Modules/socketmodule.c Mon Aug 22 11:55:57 2011 +1000 +++ b/Modules/socketmodule.c Mon Aug 22 15:08:19 2011 +1000 @@ -1745,7 +1745,7 @@ 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;