b67d81feb6
- edk2-NetworkPkg-IScsiDxe-wrap-IScsiCHAP-source-files-to-8.patch [bz#1961100] - edk2-NetworkPkg-IScsiDxe-simplify-ISCSI_CHAP_AUTH_DATA.In.patch [bz#1961100] - edk2-NetworkPkg-IScsiDxe-clean-up-ISCSI_CHAP_AUTH_DATA.Ou.patch [bz#1961100] - edk2-NetworkPkg-IScsiDxe-clean-up-library-class-dependenc.patch [bz#1961100] - edk2-NetworkPkg-IScsiDxe-fix-potential-integer-overflow-i.patch [bz#1961100] - edk2-NetworkPkg-IScsiDxe-assert-that-IScsiBinToHex-always.patch [bz#1961100] - edk2-NetworkPkg-IScsiDxe-reformat-IScsiHexToBin-leading-c.patch [bz#1961100] - edk2-NetworkPkg-IScsiDxe-fix-IScsiHexToBin-hex-parsing.patch [bz#1961100] - edk2-NetworkPkg-IScsiDxe-fix-IScsiHexToBin-buffer-overflo.patch [bz#1961100] - edk2-NetworkPkg-IScsiDxe-check-IScsiHexToBin-return-value.patch [bz#1961100] - edk2-redhat-build-UefiShell.iso-with-xorriso-rather-than-.patch [bz#1971840] - Resolves: bz#1961100 (edk2: remote buffer overflow in IScsiHexToBin function in NetworkPkg/IScsiDxe [rhel-9.0]) - Resolves: bz#1971840 (Please replace genisoimage with xorriso)
103 lines
3.5 KiB
Diff
103 lines
3.5 KiB
Diff
From 26388852ad953a169f29b24277674c53f878ffe3 Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
Date: Tue, 8 Jun 2021 14:12:53 +0200
|
|
Subject: [PATCH 04/11] 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: 1: NetworkPkg/IScsiDxe: fix IScsiHexToBin() security and functionality bugs [RHEL-9, c9s]
|
|
RH-Commit: [4/10] c468615c009bfd43f68f93fd9c1dc0e5b8615563
|
|
RH-Bugzilla: 1961100
|
|
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>
|
|
Message-Id: <20210608121259.32451-5-lersek@redhat.com>
|
|
(cherry picked from commit e8f28b09e63dfdbb4169969a43c65f86c44b035a)
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
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
|
|
|