|
 |
12bdf0 |
From 172b2928c24c0ab955127afcdc9e3a52b3913ba5 Mon Sep 17 00:00:00 2001
|
|
|
12bdf0 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
12bdf0 |
Date: Tue, 8 Jun 2021 14:12:56 +0200
|
|
|
12bdf0 |
Subject: [PATCH 07/10] NetworkPkg/IScsiDxe: reformat IScsiHexToBin() leading
|
|
|
12bdf0 |
comment block
|
|
|
12bdf0 |
MIME-Version: 1.0
|
|
|
12bdf0 |
Content-Type: text/plain; charset=UTF-8
|
|
|
12bdf0 |
Content-Transfer-Encoding: 8bit
|
|
|
12bdf0 |
|
|
|
12bdf0 |
RH-Author: Laszlo Ersek <lersek@redhat.com>
|
|
|
12bdf0 |
RH-MergeRequest: 5: NetworkPkg/IScsiDxe: fix IScsiHexToBin() security and functionality bugs [rhel-8.5.0, post-rebase]
|
|
|
12bdf0 |
RH-Commit: [7/10] 4f867fa4ad8f7305961b83224107c1452a7d44ed
|
|
|
12bdf0 |
RH-Bugzilla: 1956408
|
|
|
12bdf0 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
12bdf0 |
|
|
|
12bdf0 |
We'll need further return values for IScsiHexToBin() in a subsequent
|
|
|
12bdf0 |
patch; make room for them in the leading comment block of the function.
|
|
|
12bdf0 |
While at it, rewrap the comment block to 80 characters width.
|
|
|
12bdf0 |
|
|
|
12bdf0 |
No functional changes.
|
|
|
12bdf0 |
|
|
|
12bdf0 |
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
|
|
|
12bdf0 |
Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
|
|
|
12bdf0 |
Cc: Philippe Mathieu-Daud <philmd@redhat.com>
|
|
|
12bdf0 |
Cc: Siyuan Fu <siyuan.fu@intel.com>
|
|
|
12bdf0 |
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3356
|
|
|
12bdf0 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
12bdf0 |
Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
|
|
|
12bdf0 |
Reviewed-by: Philippe Mathieu-Daud <philmd@redhat.com>
|
|
|
12bdf0 |
Message-Id: <20210608121259.32451-8-lersek@redhat.com>
|
|
|
12bdf0 |
(cherry picked from commit dc469f137110fe79704b8b92c552972c739bb915)
|
|
|
12bdf0 |
---
|
|
|
12bdf0 |
NetworkPkg/IScsiDxe/IScsiMisc.c | 16 ++++++++--------
|
|
|
12bdf0 |
NetworkPkg/IScsiDxe/IScsiMisc.h | 16 ++++++++--------
|
|
|
12bdf0 |
2 files changed, 16 insertions(+), 16 deletions(-)
|
|
|
12bdf0 |
|
|
|
12bdf0 |
diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c
|
|
|
12bdf0 |
index 42988e15cb..014700e87a 100644
|
|
|
12bdf0 |
--- a/NetworkPkg/IScsiDxe/IScsiMisc.c
|
|
|
12bdf0 |
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.c
|
|
|
12bdf0 |
@@ -370,14 +370,14 @@ IScsiBinToHex (
|
|
|
12bdf0 |
/**
|
|
|
12bdf0 |
Convert the hexadecimal string into a binary encoded buffer.
|
|
|
12bdf0 |
|
|
|
12bdf0 |
- @param[in, out] BinBuffer The binary buffer.
|
|
|
12bdf0 |
- @param[in, out] BinLength Length of the binary buffer.
|
|
|
12bdf0 |
- @param[in] HexStr The hexadecimal string.
|
|
|
12bdf0 |
-
|
|
|
12bdf0 |
- @retval EFI_SUCCESS The hexadecimal string is converted into a binary
|
|
|
12bdf0 |
- encoded buffer.
|
|
|
12bdf0 |
- @retval EFI_BUFFER_TOO_SMALL The binary buffer is too small to hold the converted data.
|
|
|
12bdf0 |
-
|
|
|
12bdf0 |
+ @param[in, out] BinBuffer The binary buffer.
|
|
|
12bdf0 |
+ @param[in, out] BinLength Length of the binary buffer.
|
|
|
12bdf0 |
+ @param[in] HexStr The hexadecimal string.
|
|
|
12bdf0 |
+
|
|
|
12bdf0 |
+ @retval EFI_SUCCESS The hexadecimal string is converted into a
|
|
|
12bdf0 |
+ binary encoded buffer.
|
|
|
12bdf0 |
+ @retval EFI_BUFFER_TOO_SMALL The binary buffer is too small to hold the
|
|
|
12bdf0 |
+ converted data.
|
|
|
12bdf0 |
**/
|
|
|
12bdf0 |
EFI_STATUS
|
|
|
12bdf0 |
IScsiHexToBin (
|
|
|
12bdf0 |
diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.h b/NetworkPkg/IScsiDxe/IScsiMisc.h
|
|
|
12bdf0 |
index 231413993b..28cf408cd5 100644
|
|
|
12bdf0 |
--- a/NetworkPkg/IScsiDxe/IScsiMisc.h
|
|
|
12bdf0 |
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.h
|
|
|
12bdf0 |
@@ -165,14 +165,14 @@ IScsiBinToHex (
|
|
|
12bdf0 |
/**
|
|
|
12bdf0 |
Convert the hexadecimal string into a binary encoded buffer.
|
|
|
12bdf0 |
|
|
|
12bdf0 |
- @param[in, out] BinBuffer The binary buffer.
|
|
|
12bdf0 |
- @param[in, out] BinLength Length of the binary buffer.
|
|
|
12bdf0 |
- @param[in] HexStr The hexadecimal string.
|
|
|
12bdf0 |
-
|
|
|
12bdf0 |
- @retval EFI_SUCCESS The hexadecimal string is converted into a binary
|
|
|
12bdf0 |
- encoded buffer.
|
|
|
12bdf0 |
- @retval EFI_BUFFER_TOO_SMALL The binary buffer is too small to hold the converted data.
|
|
|
12bdf0 |
-
|
|
|
12bdf0 |
+ @param[in, out] BinBuffer The binary buffer.
|
|
|
12bdf0 |
+ @param[in, out] BinLength Length of the binary buffer.
|
|
|
12bdf0 |
+ @param[in] HexStr The hexadecimal string.
|
|
|
12bdf0 |
+
|
|
|
12bdf0 |
+ @retval EFI_SUCCESS The hexadecimal string is converted into a
|
|
|
12bdf0 |
+ binary encoded buffer.
|
|
|
12bdf0 |
+ @retval EFI_BUFFER_TOO_SMALL The binary buffer is too small to hold the
|
|
|
12bdf0 |
+ converted data.
|
|
|
12bdf0 |
**/
|
|
|
12bdf0 |
EFI_STATUS
|
|
|
12bdf0 |
IScsiHexToBin (
|
|
|
12bdf0 |
--
|
|
|
12bdf0 |
2.27.0
|
|
|
12bdf0 |
|