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