101 lines
3.4 KiB
Diff
101 lines
3.4 KiB
Diff
|
From fc21f1820452cf17a777f141b8ae9112a9ca3b84 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
Date: Tue, 27 Apr 2021 09:49:16 +0200
|
||
|
|
Subject: [PATCH 04/10] NetworkPkg/IScsiDxe: clean up library class
|
||
|
|
dependencies
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
RH-MergeRequest: 3: NetworkPkg/IScsiDxe: fix IScsiHexToBin() security and functionality bugs [rhel-8.4.0.z]
|
||
|
|
RH-Commit: [4/10] 981f8efd1155dbe653c846b013c90780c32f3f59
|
||
|
|
RH-Bugzilla: 1956676
|
||
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
|
||
|
|
Sort the library class dependencies in the #include directives and in the
|
||
|
|
INF file. Remove the DpcLib class from the #include directives -- it is
|
||
|
|
not listed in the INF file, and IScsiDxe doesn't call either DpcLib API
|
||
|
|
(QueueDpc(), DispatchDpc()). No functional changes.
|
||
|
|
|
||
|
|
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
|
||
|
|
Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
|
||
|
|
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
Cc: Siyuan Fu <siyuan.fu@intel.com>
|
||
|
|
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3356
|
||
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
|
||
|
|
Upstream: https://bugzilla.tianocore.org/show_bug.cgi?id=3356, c#17...c#22
|
||
|
|
---
|
||
|
|
NetworkPkg/IScsiDxe/IScsiDxe.inf | 6 +++---
|
||
|
|
NetworkPkg/IScsiDxe/IScsiImpl.h | 17 ++++++++---------
|
||
|
|
2 files changed, 11 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/NetworkPkg/IScsiDxe/IScsiDxe.inf b/NetworkPkg/IScsiDxe/IScsiDxe.inf
|
||
|
|
index 0ffb340ce0..543c408302 100644
|
||
|
|
--- a/NetworkPkg/IScsiDxe/IScsiDxe.inf
|
||
|
|
+++ b/NetworkPkg/IScsiDxe/IScsiDxe.inf
|
||
|
|
@@ -65,6 +65,7 @@
|
||
|
|
NetworkPkg/NetworkPkg.dec
|
||
|
|
|
||
|
|
[LibraryClasses]
|
||
|
|
+ BaseCryptLib
|
||
|
|
BaseLib
|
||
|
|
BaseMemoryLib
|
||
|
|
DebugLib
|
||
|
|
@@ -72,14 +73,13 @@
|
||
|
|
HiiLib
|
||
|
|
MemoryAllocationLib
|
||
|
|
NetLib
|
||
|
|
- TcpIoLib
|
||
|
|
PrintLib
|
||
|
|
+ TcpIoLib
|
||
|
|
UefiBootServicesTableLib
|
||
|
|
UefiDriverEntryPoint
|
||
|
|
+ UefiHiiServicesLib
|
||
|
|
UefiLib
|
||
|
|
UefiRuntimeServicesTableLib
|
||
|
|
- UefiHiiServicesLib
|
||
|
|
- BaseCryptLib
|
||
|
|
|
||
|
|
[Protocols]
|
||
|
|
gEfiAcpiTableProtocolGuid ## SOMETIMES_CONSUMES ## SystemTable
|
||
|
|
diff --git a/NetworkPkg/IScsiDxe/IScsiImpl.h b/NetworkPkg/IScsiDxe/IScsiImpl.h
|
||
|
|
index 387ab9765e..d895c7feb9 100644
|
||
|
|
--- a/NetworkPkg/IScsiDxe/IScsiImpl.h
|
||
|
|
+++ b/NetworkPkg/IScsiDxe/IScsiImpl.h
|
||
|
|
@@ -35,21 +35,20 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
|
||
|
|
#include <Protocol/AdapterInformation.h>
|
||
|
|
#include <Protocol/NetworkInterfaceIdentifier.h>
|
||
|
|
|
||
|
|
-#include <Library/HiiLib.h>
|
||
|
|
-#include <Library/UefiHiiServicesLib.h>
|
||
|
|
-#include <Library/DevicePathLib.h>
|
||
|
|
-#include <Library/DebugLib.h>
|
||
|
|
+#include <Library/BaseCryptLib.h>
|
||
|
|
#include <Library/BaseLib.h>
|
||
|
|
#include <Library/BaseMemoryLib.h>
|
||
|
|
+#include <Library/DebugLib.h>
|
||
|
|
+#include <Library/DevicePathLib.h>
|
||
|
|
+#include <Library/HiiLib.h>
|
||
|
|
#include <Library/MemoryAllocationLib.h>
|
||
|
|
+#include <Library/NetLib.h>
|
||
|
|
#include <Library/PrintLib.h>
|
||
|
|
+#include <Library/TcpIoLib.h>
|
||
|
|
#include <Library/UefiBootServicesTableLib.h>
|
||
|
|
-#include <Library/UefiRuntimeServicesTableLib.h>
|
||
|
|
+#include <Library/UefiHiiServicesLib.h>
|
||
|
|
#include <Library/UefiLib.h>
|
||
|
|
-#include <Library/DpcLib.h>
|
||
|
|
-#include <Library/NetLib.h>
|
||
|
|
-#include <Library/TcpIoLib.h>
|
||
|
|
-#include <Library/BaseCryptLib.h>
|
||
|
|
+#include <Library/UefiRuntimeServicesTableLib.h>
|
||
|
|
|
||
|
|
#include <Guid/MdeModuleHii.h>
|
||
|
|
#include <Guid/EventGroup.h>
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|