From ea59c11d0ddeb9955b8fb137c5c5d972af13b3af Mon Sep 17 00:00:00 2001 From: Vladimir Stoilov Date: Fri, 28 Jun 2024 16:12:07 +0300 Subject: [PATCH] [windows_kext] Fix some clippy warnings --- windows_kext/wdk/src/allocator.rs | 4 ++-- windows_kext/wdk/src/filter_engine/callout_data.rs | 4 +--- windows_kext/wdk/src/filter_engine/ffi.rs | 4 +--- windows_kext/wdk/src/filter_engine/metadata.rs | 8 ++++---- windows_kext/wdk/src/filter_engine/mod.rs | 8 ++------ windows_kext/wdk/src/filter_engine/net_buffer.rs | 4 ++-- windows_kext/wdk/src/filter_engine/packet.rs | 4 ++-- windows_kext/wdk/src/irp_helpers.rs | 8 ++++---- 8 files changed, 18 insertions(+), 26 deletions(-) diff --git a/windows_kext/wdk/src/allocator.rs b/windows_kext/wdk/src/allocator.rs index e3f65fa8..f8767b8a 100644 --- a/windows_kext/wdk/src/allocator.rs +++ b/windows_kext/wdk/src/allocator.rs @@ -43,8 +43,8 @@ unsafe impl GlobalAlloc for WindowsAllocator { } unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 { - let pool = self.alloc(layout); - pool + + self.alloc(layout) } unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 { diff --git a/windows_kext/wdk/src/filter_engine/callout_data.rs b/windows_kext/wdk/src/filter_engine/callout_data.rs index 640baab3..bb861f84 100644 --- a/windows_kext/wdk/src/filter_engine/callout_data.rs +++ b/windows_kext/wdk/src/filter_engine/callout_data.rs @@ -37,9 +37,7 @@ impl ClassifyDefer { } ClassifyDefer::Reauthorization(_callout_id, packet_list) => { // There is no way to reset single filter. If another request for filter reset is trigger at the same time it will fail. - if let Err(err) = filter_engine.reset_all_filters() { - return Err(err); - } + filter_engine.reset_all_filters()?; return Ok(packet_list); } } diff --git a/windows_kext/wdk/src/filter_engine/ffi.rs b/windows_kext/wdk/src/filter_engine/ffi.rs index 766c1ef1..45103272 100644 --- a/windows_kext/wdk/src/filter_engine/ffi.rs +++ b/windows_kext/wdk/src/filter_engine/ffi.rs @@ -113,9 +113,7 @@ pub(crate) fn register_callout( check_ntstatus(status)?; - if let Err(err) = callout_add(filter_engine_handle, guid, layer, name, description) { - return Err(err); - } + callout_add(filter_engine_handle, guid, layer, name, description)?; return Ok(callout_id); } diff --git a/windows_kext/wdk/src/filter_engine/metadata.rs b/windows_kext/wdk/src/filter_engine/metadata.rs index 29419786..632830fa 100644 --- a/windows_kext/wdk/src/filter_engine/metadata.rs +++ b/windows_kext/wdk/src/filter_engine/metadata.rs @@ -154,10 +154,10 @@ impl FwpsIncomingMetadataValues { #[allow(dead_code)] #[repr(C)] enum FwpsDiscardModule0 { - FwpsDiscardModuleNetwork = 0, - FwpsDiscardModuleTransport = 1, - FwpsDiscardModuleGeneral = 2, - FwpsDiscardModuleMax = 3, + Network = 0, + Transport = 1, + General = 2, + Max = 3, } #[repr(C)] diff --git a/windows_kext/wdk/src/filter_engine/mod.rs b/windows_kext/wdk/src/filter_engine/mod.rs index 8ceb76b5..0405afba 100644 --- a/windows_kext/wdk/src/filter_engine/mod.rs +++ b/windows_kext/wdk/src/filter_engine/mod.rs @@ -107,9 +107,7 @@ impl FilterEngine { filter_engine.callouts = Some(boxed_callouts); } - if let Err(err) = filter_engine.commit() { - return Err(err); - } + filter_engine.commit()? } self.committed = true; info!("transaction committed"); @@ -147,9 +145,7 @@ impl FilterEngine { } } // Commit transaction. - if let Err(err) = filter_engine.commit() { - return Err(err); - } + filter_engine.commit()?; return Ok(()); } diff --git a/windows_kext/wdk/src/filter_engine/net_buffer.rs b/windows_kext/wdk/src/filter_engine/net_buffer.rs index f5274547..ff94ca80 100644 --- a/windows_kext/wdk/src/filter_engine/net_buffer.rs +++ b/windows_kext/wdk/src/filter_engine/net_buffer.rs @@ -85,7 +85,7 @@ impl NetBufferList { } // Allocate space in buffer, if buffer is too small. - let mut buffer = alloc::vec![0 as 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); @@ -209,7 +209,7 @@ impl Iterator for NetBufferListIter { } } -pub fn read_packet_partial<'a>(nbl: *mut NET_BUFFER_LIST, buffer: &'a mut [u8]) -> Result<(), ()> { +pub fn read_packet_partial(nbl: *mut NET_BUFFER_LIST, buffer: &mut [u8]) -> Result<(), ()> { unsafe { let Some(nbl) = nbl.as_ref() else { return Err(()); diff --git a/windows_kext/wdk/src/filter_engine/packet.rs b/windows_kext/wdk/src/filter_engine/packet.rs index fcaab347..afdcb021 100644 --- a/windows_kext/wdk/src/filter_engine/packet.rs +++ b/windows_kext/wdk/src/filter_engine/packet.rs @@ -105,9 +105,9 @@ impl Injector { } let mut remote_ip: [u8; 16] = [0; 16]; if ipv6 { - remote_ip[0..16].copy_from_slice(&remote_ip_slice); + remote_ip[0..16].copy_from_slice(remote_ip_slice); } else { - remote_ip[0..4].copy_from_slice(&remote_ip_slice); + remote_ip[0..4].copy_from_slice(remote_ip_slice); } TransportPacketList { diff --git a/windows_kext/wdk/src/irp_helpers.rs b/windows_kext/wdk/src/irp_helpers.rs index 52960d5e..821c3b13 100644 --- a/windows_kext/wdk/src/irp_helpers.rs +++ b/windows_kext/wdk/src/irp_helpers.rs @@ -67,7 +67,7 @@ impl ReadRequest<'_> { for i in 0..bytes_to_write { self.buffer[self.fill_index + i] = bytes[i]; } - self.fill_index = self.fill_index + bytes_to_write; + self.fill_index += bytes_to_write; bytes_to_write } @@ -94,7 +94,7 @@ impl WriteRequest<'_> { } pub fn get_buffer(&self) -> &[u8] { - &self.buffer + self.buffer } pub fn mark_all_as_read(&mut self) { @@ -155,7 +155,7 @@ impl DeviceControlRequest<'_> { } pub fn get_buffer(&self) -> &[u8] { - &self.buffer + self.buffer } pub fn write(&mut self, bytes: &[u8]) -> usize { let mut bytes_to_write: usize = bytes.len(); @@ -168,7 +168,7 @@ impl DeviceControlRequest<'_> { for i in 0..bytes_to_write { self.buffer[self.fill_index + i] = bytes[i]; } - self.fill_index = self.fill_index + bytes_to_write; + self.fill_index += bytes_to_write; bytes_to_write }