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

NULL check in UDPEndPoint Sockets SendMsgImpl #22432

Merged
merged 8 commits into from
Sep 12, 2022
Merged

NULL check in UDPEndPoint Sockets SendMsgImpl #22432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9cb6c1b
Add IsNull check to UDP Sockets SendMsgImpl prior to ptr dereference.
s-mcclain Sep 6, 2022
7b6c891
Update UDPEndPointImplSockets.cpp
s-mcclain Sep 7, 2022
bfe230f
Add null check to MinimalMdns Server when calling CloneData
s-mcclain Sep 7, 2022
b1036d6
Merge branch 'master' into sockets-sendmsgimpl-nullptr-check
andy31415 Sep 9, 2022
c26974c
Merge branch 'master' into sockets-sendmsgimpl-nullptr-check
andy31415 Sep 12, 2022
ce3677c
Restyle
andy31415 Sep 12, 2022
d1c9c35
Add namespace for PacketBufferHandle
andy31415 Sep 12, 2022
651b07f
Use std::move for tmp buffer to allow for && arguments
andy31415 Sep 12, 2022
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
3 changes: 3 additions & 0 deletions src/inet/UDPEndPointImplSockets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,9 @@ CHIP_ERROR UDPEndPointImplSockets::ListenImpl()

CHIP_ERROR UDPEndPointImplSockets::SendMsgImpl(const IPPacketInfo * aPktInfo, System::PacketBufferHandle && msg)
{
// Ensure packet buffer is not null
VerifyOrReturnError(!msg.IsNull(), CHIP_ERROR_INVALID_ARGUMENT);

// Make sure we have the appropriate type of socket based on the
// destination address.
ReturnErrorOnFailure(GetSocket(aPktInfo->DestAddress.Type()));
Expand Down
12 changes: 9 additions & 3 deletions src/lib/dnssd/minimal_mdns/Server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,14 +364,20 @@ CHIP_ERROR ServerBase::BroadcastImpl(chip::System::PacketBufferHandle && data, u
/// for sending via `CloneData`
///
/// TODO: this wastes one copy of the data and that could be optimized away
if (info->mAddressType == chip::Inet::IPAddressType::kIPv6)
chip::System::PacketBufferHandle tempBuf = data.CloneData();
if (tempBuf.IsNull())
{
err = udp->SendTo(mIpv6BroadcastAddress, port, data.CloneData(), udp->GetBoundInterface());
// Not enough memory available to clone pbuf
err = CHIP_ERROR_NO_MEMORY;
}
else if (info->mAddressType == chip::Inet::IPAddressType::kIPv6)
{
err = udp->SendTo(mIpv6BroadcastAddress, port, std::move(tempBuf), udp->GetBoundInterface());
}
#if INET_CONFIG_ENABLE_IPV4
else if (info->mAddressType == chip::Inet::IPAddressType::kIPv4)
{
err = udp->SendTo(mIpv4BroadcastAddress, port, data.CloneData(), udp->GetBoundInterface());
err = udp->SendTo(mIpv4BroadcastAddress, port, std::move(tempBuf), udp->GetBoundInterface());
}
#endif
else
Expand Down