i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network/ipv4: Fix NULL dereference in multicast-send.

Browse Source 
Fixes the KDL in #18585.
While at it, add a missing NULL check and fix a leak.
This commit is contained in:
Augustin Cavalier
2023-09-20 16:39:28 -04:00
parent 39fa47a536
commit 2903a69d4a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp
+8 -2
View File
@@ -1550,10 +1550,13 @@ ipv4_send_routed_data(net_protocol* _protocol, struct net_route* route,
} }
if ((buffer->flags & MSG_MCAST) != 0 if ((buffer->flags & MSG_MCAST) != 0
&& protocol->multicast_loopback) { && (protocol != NULL && protocol->multicast_loopback)) {
// copy an IP multicast packet to the input queue of the loopback // copy an IP multicast packet to the input queue of the loopback
// interface // interface
net_buffer *loopbackBuffer = gBufferModule->duplicate(buffer); net_buffer *loopbackBuffer = gBufferModule->duplicate(buffer);
if (loopbackBuffer == NULL)
return B_NO_MEMORY;
status_t status = B_ERROR;
// get the IPv4 loopback address // get the IPv4 loopback address
struct sockaddr loopbackAddress; struct sockaddr loopbackAddress;
@@ -1568,8 +1571,11 @@ ipv4_send_routed_data(net_protocol* _protocol, struct net_route* route,
sDatalinkModule->put_interface_address( sDatalinkModule->put_interface_address(
loopbackBuffer->interface_address); loopbackBuffer->interface_address);
loopbackBuffer->interface_address = address; loopbackBuffer->interface_address = address;
ipv4_receive_data(loopbackBuffer); status = ipv4_receive_data(loopbackBuffer);
} }
if (status != B_OK)
gBufferModule->free(loopbackBuffer);
} }
TRACE_SK(protocol, " SendRoutedData(): header chksum: %" B_PRIu32 TRACE_SK(protocol, " SendRoutedData(): header chksum: %" B_PRIu32