Skip to content
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

Additional socket checks for socket inet implementations #35674

Merged
merged 7 commits into from
Sep 19, 2024
Merged

Additional socket checks for socket inet implementations #35674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4ce4e49
Additional socket checks for socket inet implementations
andreilitvin Sep 19, 2024
fdda391
Self-review update
andreilitvin Sep 19, 2024
c17e4f7
One more extra check to make clang-tidy happy
andreilitvin Sep 19, 2024
d76b473
Switch to nolint
andreilitvin Sep 19, 2024
2e22776
Avoid large code deltas
andreilitvin Sep 19, 2024
0255e13
Restyle
andreilitvin Sep 19, 2024
7bcbe62
Restyled by clang-format
restyled-commits Sep 19, 2024
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
2 changes: 2 additions & 0 deletions src/inet/TCPEndPointImplSockets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ CHIP_ERROR TCPEndPointImplSockets::BindImpl(IPAddressType addrType, const IPAddr

if (res == CHIP_NO_ERROR)
{
// NOLINTNEXTLINE(clang-analyzer-unix.StdCLibraryFunctions): GetSocket calls ensure mSocket is valid
if (bind(mSocket, &sa.any, sockaddrsize) != 0)
{
res = CHIP_ERROR_POSIX(errno);
Expand Down Expand Up @@ -248,6 +249,7 @@ CHIP_ERROR TCPEndPointImplSockets::ConnectImpl(const IPAddress & addr, uint16_t
return INET_ERROR_WRONG_ADDRESS_TYPE;
}

// NOLINTNEXTLINE(clang-analyzer-unix.StdCLibraryFunctions): GetSocket calls ensure mSocket is valid
int conRes = connect(mSocket, &sa.any, sockaddrsize);

if (conRes == -1 && errno != EINPROGRESS)
Expand Down
5 changes: 5 additions & 0 deletions src/inet/UDPEndPointImplSockets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ CHIP_ERROR IPv6Bind(int socket, const IPAddress & address, uint16_t port, Interf
sa.sin6_scope_id = static_cast<decltype(sa.sin6_scope_id)>(interfaceId);

CHIP_ERROR status = CHIP_NO_ERROR;

// NOLINTNEXTLINE(clang-analyzer-unix.StdCLibraryFunctions): Function called only with valid socket after GetSocket
if (bind(socket, reinterpret_cast<const sockaddr *>(&sa), static_cast<unsigned>(sizeof(sa))) != 0)
{
status = CHIP_ERROR_POSIX(errno);
Expand Down Expand Up @@ -139,6 +141,8 @@ CHIP_ERROR IPv4Bind(int socket, const IPAddress & address, uint16_t port)
sa.sin_addr = address.ToIPv4();

CHIP_ERROR status = CHIP_NO_ERROR;

// NOLINTNEXTLINE(clang-analyzer-unix.StdCLibraryFunctions): Function called only with valid socket after GetSocket
if (bind(socket, reinterpret_cast<const sockaddr *>(&sa), static_cast<unsigned>(sizeof(sa))) != 0)
{
status = CHIP_ERROR_POSIX(errno);
Expand Down Expand Up @@ -410,6 +414,7 @@ CHIP_ERROR UDPEndPointImplSockets::SendMsgImpl(const IPPacketInfo * aPktInfo, Sy
#endif // INET_CONFIG_UDP_SOCKET_PKTINFO

// Send IP packet.
// NOLINTNEXTLINE(clang-analyzer-unix.StdCLibraryFunctions): GetSocket calls ensure mSocket is valid
const ssize_t lenSent = sendmsg(mSocket, &msgHeader, 0);
if (lenSent == -1)
{
Expand Down
Loading