Skip to content

Commit 7b9ef6b

Browse files
committed
[NDIS] NdisOpenFile: close file locally, as we don't need it later
Remove now unused field FileHandle in NDIS_HANDLE_OBJECT structure.
1 parent e2904d3 commit 7b9ef6b

File tree

1 file changed

+4
-11
lines changed
  • drivers/network/ndis/ndis

1 file changed

+4
-11
lines changed

drivers/network/ndis/ndis/misc.c

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ NdisInterlockedRemoveHeadList(
119119

120120
typedef struct _NDIS_HANDLE_OBJECT
121121
{
122-
HANDLE FileHandle;
123122
BOOLEAN Mapped;
124123
ULONG FileLength;
125124
PVOID MapBuffer;
@@ -203,17 +202,8 @@ NdisCloseFile(
203202

204203
FileHandleObject = NDIS_HANDLE_TO_POBJECT(FileHandle);
205204

206-
ASSERT ( FileHandleObject->FileHandle );
207-
208-
if ( FileHandleObject->Mapped )
209-
NdisUnmapFile ( FileHandle );
210205
if ( FileHandleObject->MapBuffer )
211206
ExFreePool ( FileHandleObject->MapBuffer );
212-
213-
ZwClose ( FileHandleObject->FileHandle );
214-
215-
memset ( FileHandleObject, 0, sizeof(NDIS_HANDLE_OBJECT) );
216-
217207
ExFreePool ( FileHandleObject );
218208
}
219209

@@ -349,6 +339,10 @@ NdisOpenFile(
349339
}
350340

351341
cleanup:
342+
if ( NtFileHandle != NULL )
343+
{
344+
ZwClose( NtFileHandle );
345+
}
352346
if ( FullFileName.Buffer != NULL )
353347
{
354348
ExFreePool ( FullFileName.Buffer );
@@ -366,7 +360,6 @@ NdisOpenFile(
366360
}
367361
else
368362
{
369-
FileHandleObject->FileHandle = NtFileHandle;
370363
*FileHandle = NDIS_POBJECT_TO_HANDLE(FileHandleObject);
371364
*FileLength = NtFileLength;
372365
}

0 commit comments

Comments
 (0)