public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Hao Wu <hao.a.wu@intel.com>
To: edk2-devel@lists.01.org
Cc: Hao Wu <hao.a.wu@intel.com>, Steven Shi <steven.shi@intel.com>,
	Michael Kinney <michael.d.kinney@intel.com>,
	Liming Gao <liming.gao@intel.com>
Subject: [PATCH v2 2/6] MdeModulePkg/PrintLib: Fix possible negative value left shift
Date: Thu, 21 Sep 2017 14:46:13 +0800	[thread overview]
Message-ID: <20170921064617.2628-3-hao.a.wu@intel.com> (raw)
In-Reply-To: <20170921064617.2628-1-hao.a.wu@intel.com>

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=702

Within function InternalPrintLibSPrintMarker(), possible left shift of a
negative value is found in:
"(*(ArgumentString + 1) << 8)"

which involves undefined behavior.

Since '*(ArgumentString + 1)' is of type CONST CHAR8 (signed), it will be
promoted to type int (signed) during the left shift operation. If
'*(ArgumentString + 1)' is a negative value, the behavior will be
undefined.

According to the C11 spec, Section 6.5.7:
> 4 The result of E1 << E2 is E1 left-shifted E2 bit positions; vacated
>   bits are filled with zeros. If E1 has an unsigned type, the value
>   of the result is E1 * 2^E2 , reduced modulo one more than the
>   maximum value representable in the result type. If E1 has a signed
>   type and nonnegative value, and E1 * 2^E2 is representable in the
>   result type, then that is the resulting value; otherwise, the
>   behavior is undefined.

This commit explicitly cast '*(ArgumentString + 1)' with UINT8 to resolve
this issue.

Cc: Steven Shi <steven.shi@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
 MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
index b58db8e011..56534e56c3 100644
--- a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
+++ b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
@@ -2108,7 +2108,7 @@ InternalPrintLibSPrintMarker (
     // Copy the string into the output buffer performing the required type conversions
     //
     while (Index < Count) {
-      ArgumentCharacter = ((*ArgumentString & 0xff) | (*(ArgumentString + 1) << 8)) & ArgumentMask;
+      ArgumentCharacter = ((*ArgumentString & 0xff) | (((UINT8)*(ArgumentString + 1)) << 8)) & ArgumentMask;
 
       LengthToReturn += (1 * BytesPerOutputCharacter);
       if ((Flags & COUNT_ONLY_NO_PRINT) == 0 && Buffer != NULL) {
-- 
2.12.0.windows.1



  parent reply	other threads:[~2017-09-21  6:43 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-21  6:46 [PATCH v2 0/6] Resolve undefined behaviours in left shift OPs Hao Wu
2017-09-21  6:46 ` [PATCH v2 1/6] MdePkg/PrintLib: Fix possible negative value left shift Hao Wu
2017-09-28  3:58   ` Gao, Liming
2017-09-21  6:46 ` Hao Wu [this message]
2017-09-28  3:58   ` [PATCH v2 2/6] MdeModulePkg/PrintLib: " Gao, Liming
2017-09-21  6:46 ` [PATCH v2 3/6] MdeModulePkg/Tpl: Fix " Hao Wu
2017-09-25  6:21   ` Zeng, Star
2017-09-21  6:46 ` [PATCH v2 4/6] MdeModulePkg/DxeNetLib: " Hao Wu
2017-09-25  6:21   ` Zeng, Star
2017-09-21  6:46 ` [PATCH v2 5/6] MdeModulePkg/Crc32: Fix possible out of range " Hao Wu
2017-09-28  3:54   ` Gao, Liming
2017-09-28  3:55     ` Wu, Hao A
2017-09-21  6:46 ` [PATCH v2 6/6] MdeModulePkg/AtaAtapiPassThru: " Hao Wu
2017-09-25  6:24   ` Zeng, Star
2017-09-28  3:56     ` Gao, Liming
2017-09-28  5:13       ` Zeng, Star

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170921064617.2628-3-hao.a.wu@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox