93 lines
3.8 KiB
Diff
93 lines
3.8 KiB
Diff
From cd26bdad5567460515fbfc91a4caabc8d740e8ed Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
Date: Tue, 27 Apr 2021 10:37:26 +0200
|
|
Subject: [PATCH 07/10] NetworkPkg/IScsiDxe: reformat IScsiHexToBin() leading
|
|
comment block
|
|
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: [7/10] 6c86ac71821db916b67df2a5ce188706f9b8d515
|
|
RH-Bugzilla: 1956676
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
|
We'll need further return values for IScsiHexToBin() in a subsequent
|
|
patch; make room for them in the leading comment block of the function.
|
|
While at it, rewrap the comment block to 80 characters width.
|
|
|
|
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: Maciej Rabeda <maciej.rabeda@linux.intel.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Upstream: https://bugzilla.tianocore.org/show_bug.cgi?id=3356, c#17...c#22
|
|
---
|
|
NetworkPkg/IScsiDxe/IScsiMisc.c | 16 ++++++++--------
|
|
NetworkPkg/IScsiDxe/IScsiMisc.h | 16 ++++++++--------
|
|
2 files changed, 16 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c
|
|
index 42988e15cb..014700e87a 100644
|
|
--- a/NetworkPkg/IScsiDxe/IScsiMisc.c
|
|
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.c
|
|
@@ -370,14 +370,14 @@ IScsiBinToHex (
|
|
/**
|
|
Convert the hexadecimal string into a binary encoded buffer.
|
|
|
|
- @param[in, out] BinBuffer The binary buffer.
|
|
- @param[in, out] BinLength Length of the binary buffer.
|
|
- @param[in] HexStr The hexadecimal string.
|
|
-
|
|
- @retval EFI_SUCCESS The hexadecimal string is converted into a binary
|
|
- encoded buffer.
|
|
- @retval EFI_BUFFER_TOO_SMALL The binary buffer is too small to hold the converted data.
|
|
-
|
|
+ @param[in, out] BinBuffer The binary buffer.
|
|
+ @param[in, out] BinLength Length of the binary buffer.
|
|
+ @param[in] HexStr The hexadecimal string.
|
|
+
|
|
+ @retval EFI_SUCCESS The hexadecimal string is converted into a
|
|
+ binary encoded buffer.
|
|
+ @retval EFI_BUFFER_TOO_SMALL The binary buffer is too small to hold the
|
|
+ converted data.
|
|
**/
|
|
EFI_STATUS
|
|
IScsiHexToBin (
|
|
diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.h b/NetworkPkg/IScsiDxe/IScsiMisc.h
|
|
index 231413993b..28cf408cd5 100644
|
|
--- a/NetworkPkg/IScsiDxe/IScsiMisc.h
|
|
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.h
|
|
@@ -165,14 +165,14 @@ IScsiBinToHex (
|
|
/**
|
|
Convert the hexadecimal string into a binary encoded buffer.
|
|
|
|
- @param[in, out] BinBuffer The binary buffer.
|
|
- @param[in, out] BinLength Length of the binary buffer.
|
|
- @param[in] HexStr The hexadecimal string.
|
|
-
|
|
- @retval EFI_SUCCESS The hexadecimal string is converted into a binary
|
|
- encoded buffer.
|
|
- @retval EFI_BUFFER_TOO_SMALL The binary buffer is too small to hold the converted data.
|
|
-
|
|
+ @param[in, out] BinBuffer The binary buffer.
|
|
+ @param[in, out] BinLength Length of the binary buffer.
|
|
+ @param[in] HexStr The hexadecimal string.
|
|
+
|
|
+ @retval EFI_SUCCESS The hexadecimal string is converted into a
|
|
+ binary encoded buffer.
|
|
+ @retval EFI_BUFFER_TOO_SMALL The binary buffer is too small to hold the
|
|
+ converted data.
|
|
**/
|
|
EFI_STATUS
|
|
IScsiHexToBin (
|
|
--
|
|
2.27.0
|
|
|