Skip to content

Fixes possible DoS if a file description has its status changed. #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fixes possible DoS if a file description has its status changed. #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions include/boost/asio/detail/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,6 +1372,14 @@
# endif // defined(_POSIX_VERSION)
#endif // !defined(BOOST_ASIO_HAS_MSG_NOSIGNAL)

#if !defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
# if defined (_POSIX_VERSION)
# if (_POSIX_VERSION >= 200112L)
# define BOOST_ASIO_HAS_MSG_DONTWAIT 1
# endif // _POSIX_VERSION >= 200112L
# endif // defined(_POSIX_VERSION)
#endif // !defined(BOOST_ASIO_HAS_MSG_DONTWAIT)

// Standard library support for std::to_address.
#if !defined(BOOST_ASIO_HAS_STD_TO_ADDRESS)
# if !defined(BOOST_ASIO_DISABLE_STD_TO_ADDRESS)
Expand Down
27 changes: 27 additions & 0 deletions include/boost/asio/detail/impl/socket_ops.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,9 @@ signed_size_type recv(socket_type s, buf* bufs, size_t count,
msghdr msg = msghdr();
msg.msg_iov = bufs;
msg.msg_iovlen = static_cast<int>(count);
#if defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
flags |= MSG_DONTWAIT;
#endif // defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
signed_size_type result = ::recvmsg(s, &msg, flags);
get_last_error(ec, result < 0);
return result;
Expand Down Expand Up @@ -873,6 +876,9 @@ signed_size_type recv1(socket_type s, void* data, size_t size,
boost::asio::error::clear(ec);
return bytes_transferred;
#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
#if defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
flags |= MSG_DONTWAIT;
#endif // defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
signed_size_type result = ::recv(s, static_cast<char*>(data), size, flags);
get_last_error(ec, result < 0);
return result;
Expand Down Expand Up @@ -1110,6 +1116,9 @@ signed_size_type recvfrom(socket_type s, buf* bufs, size_t count,
msg.msg_namelen = static_cast<int>(*addrlen);
msg.msg_iov = bufs;
msg.msg_iovlen = static_cast<int>(count);
#if defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
flags |= MSG_DONTWAIT;
#endif // defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
signed_size_type result = ::recvmsg(s, &msg, flags);
get_last_error(ec, result < 0);
*addrlen = msg.msg_namelen;
Expand All @@ -1122,6 +1131,9 @@ inline signed_size_type call_recvfrom(SockLenType msghdr::*, socket_type s,
void* data, size_t size, int flags, void* addr, std::size_t* addrlen)
{
SockLenType tmp_addrlen = addrlen ? (SockLenType)*addrlen : 0;
#if defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
flags |= MSG_DONTWAIT;
#endif // defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
signed_size_type result = ::recvfrom(s, static_cast<char*>(data), size,
flags, static_cast<socket_addr_type*>(addr), addrlen ? &tmp_addrlen : 0);
if (addrlen)
Expand Down Expand Up @@ -1328,6 +1340,9 @@ signed_size_type recvmsg(socket_type s, buf* bufs, size_t count,
msghdr msg = msghdr();
msg.msg_iov = bufs;
msg.msg_iovlen = static_cast<int>(count);
#if defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
flags |= MSG_DONTWAIT;
#endif // defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
signed_size_type result = ::recvmsg(s, &msg, in_flags);
get_last_error(ec, result < 0);
if (result >= 0)
Expand Down Expand Up @@ -1457,6 +1472,9 @@ signed_size_type send(socket_type s, const buf* bufs, size_t count,
#if defined(BOOST_ASIO_HAS_MSG_NOSIGNAL)
flags |= MSG_NOSIGNAL;
#endif // defined(BOOST_ASIO_HAS_MSG_NOSIGNAL)
#if defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
flags |= MSG_DONTWAIT;
#endif // defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
signed_size_type result = ::sendmsg(s, &msg, flags);
get_last_error(ec, result < 0);
return result;
Expand Down Expand Up @@ -1488,6 +1506,9 @@ signed_size_type send1(socket_type s, const void* data, size_t size,
#if defined(BOOST_ASIO_HAS_MSG_NOSIGNAL)
flags |= MSG_NOSIGNAL;
#endif // defined(BOOST_ASIO_HAS_MSG_NOSIGNAL)
#if defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
flags |= MSG_DONTWAIT;
#endif // defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
signed_size_type result = ::send(s,
static_cast<const char*>(data), size, flags);
get_last_error(ec, result < 0);
Expand Down Expand Up @@ -1687,6 +1708,9 @@ signed_size_type sendto(socket_type s, const buf* bufs,
#if defined(BOOST_ASIO_HAS_MSG_NOSIGNAL)
flags |= MSG_NOSIGNAL;
#endif // defined(BOOST_ASIO_HAS_MSG_NOSIGNAL)
#if defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
flags |= MSG_DONTWAIT;
#endif // defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
signed_size_type result = ::sendmsg(s, &msg, flags);
get_last_error(ec, result < 0);
return result;
Expand All @@ -1698,6 +1722,9 @@ inline signed_size_type call_sendto(SockLenType msghdr::*,
socket_type s, const void* data, size_t size, int flags,
const void* addr, std::size_t addrlen)
{
#if defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
flags |= MSG_DONTWAIT;
#endif // defined(BOOST_ASIO_HAS_MSG_DONTWAIT)
return ::sendto(s, static_cast<char*>(const_cast<void*>(data)), size, flags,
static_cast<const socket_addr_type*>(addr), (SockLenType)addrlen);
}
Expand Down