From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 10A791A1E3A for ; Mon, 24 Oct 2016 04:52:15 -0700 (PDT) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7E90F7F7DA; Mon, 24 Oct 2016 11:52:14 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-107.phx2.redhat.com [10.3.116.107]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9OBqC2t003065; Mon, 24 Oct 2016 07:52:13 -0400 To: Ard Biesheuvel References: <20161021212737.15974-1-lersek@redhat.com> <20161021212737.15974-19-lersek@redhat.com> Cc: edk2-devel-01 , Leif Lindholm , Michael Zimmermann From: Laszlo Ersek Message-ID: <6573540a-4d39-0334-2b27-dee06034438e@redhat.com> Date: Mon, 24 Oct 2016 13:52:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 24 Oct 2016 11:52:14 +0000 (UTC) Subject: Re: [PATCH 18/19] ArmPkg/DefaultExceptionHandlerLib: replace AsciiStrCat() with AsciiStrCatS() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2016 11:52:15 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 10/24/16 09:57, Ard Biesheuvel wrote: > On 21 October 2016 at 22:27, Laszlo Ersek wrote: >> AsciiStrCat() is deprecated / disabled under the >> DISABLE_NEW_DEPRECATED_INTERFACES feature test macro. >> >> The caller of CpsrString() is required to pass in "ReturnStr" with 32 >> CHAR8 elements. (DefaultExceptionHandler() complies with this.) "Str" is >> used to build "ReturnStr" gradually. Just before calling AsciiStrCat(), >> "Str" points to the then-terminating NUL character in "ReturnStr". >> >> The difference (Str - ReturnStr) gives the number of non-NUL characters >> we've written thus far, hence (32 - (Str - ReturnStr)) yields the number >> of remaining bytes in ReturnStr, including the ultimately terminating NUL >> character. >> >> Cc: Ard Biesheuvel >> Cc: Leif Lindholm >> Cc: Michael Zimmermann >> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=164 >> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=165 >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Laszlo Ersek >> --- >> >> Notes: >> - build-tested only >> >> - Michael (CC'd) had posted a patch earlier for this: >> , >> but I only noticed that now that he pointed it out, in >> . >> I'll leave it to the ArmPkg maintainers to choose one; I don't feel >> strongly either way. >> >> ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c >> index aece26355e2e..4b2ee9a9acf7 100644 >> --- a/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c >> +++ b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c >> @@ -116,7 +116,10 @@ CpsrString ( >> break; >> } >> >> - AsciiStrCat (Str, ModeStr); >> + // >> + // See the interface contract in the leading comment block. >> + // >> + AsciiStrCatS (Str, 32 - (Str - ReturnStr), ModeStr); >> return; > > Could you please use a symbolic constant for this '32', and replace it > in the declaration of CpsrStr[] as well? > > With that > > Reviewed-by: Ard Biesheuvel > > Oh, and if the bogus 'return' happens to get lost along the way as > well, I would not mind. > Okay, will do. :)