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

IPv4: Make header fields go out of scope when no longer usable.

Browse Source 
There was a comment indicating where this happened, but then
there was a use of one of them after this point. Fix that,
and add { } around their use to prevent this from happening again.
This commit is contained in:
Augustin Cavalier
2024-01-26 14:32:59 -05:00
parent 6738595a67
commit 17aa6d0125
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp
+5 -3
View File
@@ -1707,6 +1707,8 @@ ipv4_receive_data(net_buffer* buffer)
{ {
TRACE("ipv4_receive_data(%p [%" B_PRIu32 " bytes])", buffer, buffer->size); TRACE("ipv4_receive_data(%p [%" B_PRIu32 " bytes])", buffer, buffer->size);
uint16 headerLength = 0;
{
NetBufferHeaderReader<ipv4_header> bufferHeader(buffer); NetBufferHeaderReader<ipv4_header> bufferHeader(buffer);
if (bufferHeader.Status() != B_OK) if (bufferHeader.Status() != B_OK)
return bufferHeader.Status(); return bufferHeader.Status();
@@ -1718,7 +1720,7 @@ ipv4_receive_data(net_buffer* buffer)
return B_BAD_TYPE; return B_BAD_TYPE;
uint16 packetLength = header.TotalLength(); uint16 packetLength = header.TotalLength();
uint16 headerLength = header.HeaderLength(); headerLength = header.HeaderLength();
if (packetLength > buffer->size if (packetLength > buffer->size
|| headerLength < sizeof(ipv4_header)) || headerLength < sizeof(ipv4_header))
return B_BAD_DATA; return B_BAD_DATA;
@@ -1810,13 +1812,13 @@ ipv4_receive_data(net_buffer* buffer)
// Since the buffer might have been changed (reassembled fragment) // Since the buffer might have been changed (reassembled fragment)
// we must no longer access bufferHeader or header anymore after // we must no longer access bufferHeader or header anymore after
// this point // this point
}
bool rawDelivered = raw_receive_data(buffer); bool rawDelivered = raw_receive_data(buffer);
// Preserve the ipv4 header for ICMP processing // Preserve the ipv4 header for ICMP processing
gBufferModule->store_header(buffer); gBufferModule->store_header(buffer);
gBufferModule->remove_header(buffer, headerLength);
bufferHeader.Remove(headerLength);
// the header is of variable size and may include IP options // the header is of variable size and may include IP options
// (TODO: that we ignore for now) // (TODO: that we ignore for now)