github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[kext] Fix wrong buffer copy call

Browse Source
This commit is contained in:
Vladimir Stoilov
2025-06-09 20:25:47 +03:00
parent 10f2ef426e
commit 934480da0b
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
windows_kext/wdk/src/filter_engine/net_buffer.rs
View File

@@ -87,15 +87,20 @@ impl NetBufferList {
// Allocate space in buffer, if buffer is too small. // Allocate space in buffer, if buffer is too small.
let mut buffer = alloc::vec![0_u8; data_length as usize]; let mut buffer = alloc::vec![0_u8; data_length as usize];
let ptr = NdisGetDataBuffer(nb, data_length, buffer.as_mut_ptr(), 1, 0); let buffer_ptr = buffer.as_mut_ptr();
if !ptr.is_null() { // Two options returns a pointer to the raw packet buffer,
// or copies the data to the supplied buffer
// and returns a pointer to the supplied buffer.
let ptr = NdisGetDataBuffer(nb, data_length, buffer_ptr, 1, 0);
if ptr.is_null() {
return Err("failed to copy packet buffer".to_string());
}
// If the pointers differ the data is not in the correct place.
if ptr != buffer_ptr {
buffer.copy_from_slice(core::slice::from_raw_parts(ptr, data_length as usize)); buffer.copy_from_slice(core::slice::from_raw_parts(ptr, data_length as usize));
} else {
let ptr = NdisGetDataBuffer(nb, data_length, buffer.as_mut_ptr(), 1, 0);
if ptr.is_null() {
return Err("failed to copy packet buffer".to_string());
}
} }
let new_nbl = net_allocator.wrap_packet_in_nbl(&buffer)?; let new_nbl = net_allocator.wrap_packet_in_nbl(&buffer)?;