From 7b9ef6b3903537b08d8468c2d48098e066049e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 28 Jun 2025 13:47:26 +0200 Subject: [PATCH] [NDIS] NdisOpenFile: close file locally, as we don't need it later Remove now unused field FileHandle in NDIS_HANDLE_OBJECT structure. --- drivers/network/ndis/ndis/misc.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/network/ndis/ndis/misc.c b/drivers/network/ndis/ndis/misc.c index 3fe8109b30f..24ff47847ea 100644 --- a/drivers/network/ndis/ndis/misc.c +++ b/drivers/network/ndis/ndis/misc.c @@ -119,7 +119,6 @@ NdisInterlockedRemoveHeadList( typedef struct _NDIS_HANDLE_OBJECT { - HANDLE FileHandle; BOOLEAN Mapped; ULONG FileLength; PVOID MapBuffer; @@ -203,17 +202,8 @@ NdisCloseFile( FileHandleObject = NDIS_HANDLE_TO_POBJECT(FileHandle); - ASSERT ( FileHandleObject->FileHandle ); - - if ( FileHandleObject->Mapped ) - NdisUnmapFile ( FileHandle ); if ( FileHandleObject->MapBuffer ) ExFreePool ( FileHandleObject->MapBuffer ); - - ZwClose ( FileHandleObject->FileHandle ); - - memset ( FileHandleObject, 0, sizeof(NDIS_HANDLE_OBJECT) ); - ExFreePool ( FileHandleObject ); } @@ -349,6 +339,10 @@ NdisOpenFile( } cleanup: + if ( NtFileHandle != NULL ) + { + ZwClose( NtFileHandle ); + } if ( FullFileName.Buffer != NULL ) { ExFreePool ( FullFileName.Buffer ); @@ -366,7 +360,6 @@ cleanup: } else { - FileHandleObject->FileHandle = NtFileHandle; *FileHandle = NDIS_POBJECT_TO_HANDLE(FileHandleObject); *FileLength = NtFileLength; }