From 376173f679a53cdcf9f02a3913b1c20d68e5f4c8 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sun, 3 Aug 2008 18:02:10 +0000
Subject: [PATCH]  - Fail if we can't allocate memory  - Fix a memory leak  -
 Also resize the buffer on STATUS_BUFFER_OVERFLOW

svn path=/branches/aicom-network-fixes/; revision=35076
---
 drivers/network/tcpip/datalink/lan.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/network/tcpip/datalink/lan.c b/drivers/network/tcpip/datalink/lan.c
index 90865b9e863..2021cc43e82 100644
--- a/drivers/network/tcpip/datalink/lan.c
+++ b/drivers/network/tcpip/datalink/lan.c
@@ -839,6 +839,8 @@ static NTSTATUS FindDeviceDescForAdapter( PUNICODE_STRING Name,
         ExAllocatePool(NonPagedPool, sizeof(KEY_BASIC_INFORMATION));
     ULONG KbioLength = sizeof(KEY_BASIC_INFORMATION), ResultLength;
 
+    if( !Kbio ) return STATUS_INSUFFICIENT_RESOURCES;
+
     RtlInitUnicodeString
         (&EnumKeyName, CCS_ROOT L"\\Control\\Class\\" TCPIP_GUID);
 
@@ -847,6 +849,7 @@ static NTSTATUS FindDeviceDescForAdapter( PUNICODE_STRING Name,
     if( !NT_SUCCESS(Status) ) {
         TI_DbgPrint(DEBUG_DATALINK,("Couldn't open Enum key %wZ: %x\n",
                                     &EnumKeyName, Status));
+        ExFreePool( Kbio );
         return Status;
     }
 
@@ -854,7 +857,7 @@ static NTSTATUS FindDeviceDescForAdapter( PUNICODE_STRING Name,
         Status = ZwEnumerateKey( EnumKey, i, KeyBasicInformation,
                                  Kbio, KbioLength, &ResultLength );
 
-        if( Status == STATUS_BUFFER_TOO_SMALL ) {
+        if( Status == STATUS_BUFFER_TOO_SMALL || Status == STATUS_BUFFER_OVERFLOW ) {
             ExFreePool( Kbio );
             KbioLength = ResultLength;
             Kbio = ExAllocatePool( NonPagedPool, KbioLength );
@@ -864,6 +867,7 @@ static NTSTATUS FindDeviceDescForAdapter( PUNICODE_STRING Name,
 
             if( !NT_SUCCESS(Status) ) {
                 TI_DbgPrint(DEBUG_DATALINK,("Couldn't enum key child %d\n", i));
+                ExFreePool( Kbio );
                 return Status;
             }
         }
@@ -877,6 +881,7 @@ static NTSTATUS FindDeviceDescForAdapter( PUNICODE_STRING Name,
                 ( &EnumKeyName, &TargetKeyName, Name, DeviceDesc );
             if( NT_SUCCESS(Status) ) {
                 NtClose( EnumKey );
+                ExFreePool( Kbio );
                 return Status;
             } else Status = STATUS_SUCCESS;
         }
@@ -885,6 +890,7 @@ static NTSTATUS FindDeviceDescForAdapter( PUNICODE_STRING Name,
     RtlInitUnicodeString( DeviceDesc, L"" );
     AppendUnicodeString( DeviceDesc, &TargetKeyName, FALSE );
     NtClose( EnumKey );
+    ExFreePool( Kbio );
     return STATUS_UNSUCCESSFUL;
 }