File ovmf.9de306701312f986c9638cb819d3f1f848d55cab.p... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File ovmf.9de306701312f986c9638cb819d3f1f848d55cab.patch of Package xen (Revision 26642095b7b72faa1f8d7f66d7dc8880)

Currently displaying revision 26642095b7b72faa1f8d7f66d7dc8880 , Show latest

From: Laszlo Ersek <lersek@redhat.com>
Date: Fri, 2 Mar 2018 17:11:52 +0100
Subject: 9de306701312f986c9638cb819d3f1f848d55cab

BaseTools/GenVtf: silence false "stringop-overflow" warning with memcpy()

gcc-8 (which is part of Fedora 28) enables the new warning
"-Wstringop-overflow" in "-Wall". This warning is documented in detail at
<https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html>; the
introduction says

> Warn for calls to string manipulation functions such as memcpy and
> strcpy that are determined to overflow the destination buffer.

It breaks the BaseTools build with:

> GenVtf.c: In function 'ConvertVersionInfo':
> GenVtf.c:132:7: error: 'strncpy' specified bound depends on the length
> of the source argument [-Werror=stringop-overflow=]
>        strncpy (TemStr + 4 - Length, Str, Length);
>        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> GenVtf.c:130:14: note: length computed here
>      Length = strlen(Str);
>               ^~~~~~~~~~~

It is a false positive because, while the bound equals the length of the
source argument, the destination pointer is moved back towards the
beginning of the destination buffer by the same amount (and this amount is
range-checked first, so we can't precede the start of the dest buffer).

Replace both strncpy() calls with memcpy().

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Cole Robinson <crobinso@redhat.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Reported-by: Cole Robinson <crobinso@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
---
 BaseTools/Source/C/GenVtf/GenVtf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/BaseTools/Source/C/GenVtf/GenVtf.c
+++ b/BaseTools/Source/C/GenVtf/GenVtf.c
@@ -120,27 +120,27 @@ Returns:
   Minor = 0;
 
   if (strstr (Str, ".") != NULL) {
     sscanf (
       Str,
       "%02x.%02x",
       &Major,
       &Minor
       );
   } else {
     Length = strlen(Str);
     if (Length < 4) {
-      strncpy (TemStr + 4 - Length, Str, Length);
+      memcpy (TemStr + 4 - Length, Str, Length);
     } else {
-      strncpy (TemStr, Str + Length - 4, 4);
+      memcpy (TemStr, Str + Length - 4, 4);
     }
   
     sscanf (
       TemStr,
       "%02x%02x",
       &Major,
       &Minor
       );
   }
 
   *MajorVer = (UINT8) Major;
   *MinorVer = (UINT8) Minor;

Places

File ovmf.9de306701312f986c9638cb819d3f1f848d55cab.patch of Package xen (Revision 26642095b7b72faa1f8d7f66d7dc8880)

Places