From patchwork Fri Apr 21 21:09:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 97932 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp507923qgf; Fri, 21 Apr 2017 14:10:33 -0700 (PDT) X-Received: by 10.98.208.193 with SMTP id p184mr14049935pfg.80.1492809033247; Fri, 21 Apr 2017 14:10:33 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id k6si11296200pla.11.2017.04.21.14.10.32; Fri, 21 Apr 2017 14:10:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A88FE77BF4; Fri, 21 Apr 2017 21:10:30 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-it0-f47.google.com (mail-it0-f47.google.com [209.85.214.47]) by mail.openembedded.org (Postfix) with ESMTP id D59BE77BB4 for ; Fri, 21 Apr 2017 21:09:58 +0000 (UTC) Received: by mail-it0-f47.google.com with SMTP id a140so768605ita.0 for ; Fri, 21 Apr 2017 14:10:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2qy4Go8EhJSTBgjjaPsNVx4pq7wnIGaDP5qBgupKPmM=; b=HF7WcLuN8SO0ZRhtmOcUbWwLnjxNb/VDXYu2wrpYDgN1Hihe8gPoliVdpXjV41HpSG 9fY1mkRlCE1nvPQxfyye26vdbDerg9UYc8cCaxer7l9GFAjbe8OiwhHhYb9icG8zsWIV 1zJMBl/ohT/Y/8rp8IeG13HqKusBLmPla3EMoScHrppBDuoL2D9yXnvj345Ppvck7xI6 6MvfJc9e0nEuJxft9BcJYb3CFRVvGjdl0oxhdF3OG/ja1C/44uHCsi64mei8xPm8oYBh BbmwsQtZ8qz9mzLRXDtFNPwUp156/EFET+/bTZuPSkoXBymNoCjWHev+AvyVXxNQXQNy G66Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2qy4Go8EhJSTBgjjaPsNVx4pq7wnIGaDP5qBgupKPmM=; b=e5EaWCHw2kgWZuedqm6lPzlomvN3f4JSoj9hx4yu8gK4Xpd7vBZzNQwKjMzV/YLHjI RQXRRnqE/qO6ZUAG1T7+dItf/Wx+5hS1kATh6z1LGGTmh60UxynjgEYpz91E9KvKsMG4 VpJpAaSXP44AJXcyIdIb2dDBC72a5R+4Xp9jq0z0lWura24r/DZojVZPv+esxLyRDi28 DsesUc6V+R98qdhzcJA8QFPPOYBRUwd746PI/tzbqT2HkuZxCxOvdHtA/RZZ7dfY/0ax jpg+Lj5xjosvBdk2EfajHTPiveZwEMDyyHlZet22M1fakiwgGM90yjXYquYjoYEo8Dsm GOTg== X-Gm-Message-State: AN3rC/6O2xXw3QkDPvTjH2Q7yc7fMaOSLwHsb7/kJRbSgVokyT6VBKVN lOCdSbAEf/yfXw== X-Received: by 10.99.153.9 with SMTP id d9mr14104394pge.214.1492808999871; Fri, 21 Apr 2017 14:09:59 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id o10sm17709954pgc.18.2017.04.21.14.09.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Apr 2017 14:09:58 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Fri, 21 Apr 2017 14:09:48 -0700 Message-Id: <20170421210948.2656-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170421210948.2656-1-raj.khem@gmail.com> References: <20170421210948.2656-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 2/2] ovmf: Fix build with gcc7 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org backport a patch which fixing warnings with gcc7 Signed-off-by: Khem Raj --- ...g-UefiHiiLib-Fix-incorrect-comparison-exp.patch | 45 ++++++++++++++++++++++ meta/recipes-core/ovmf/ovmf_git.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch -- 2.12.2 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch b/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch new file mode 100644 index 00000000000..0529a27b168 --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch @@ -0,0 +1,45 @@ +From 73692710d50da1f421b0e6ddff784ca3135389b3 Mon Sep 17 00:00:00 2001 +From: Dandan Bi +Date: Sat, 1 Apr 2017 10:31:14 +0800 +Subject: [PATCH] MdeModulePkg/UefiHiiLib:Fix incorrect comparison expression + +Fix the incorrect comparison between pointer and constant zero character. + +https://bugzilla.tianocore.org/show_bug.cgi?id=416 + +V2: The pointer StringPtr points to a string returned +by ExtractConfig/ExportConfig, if it is NULL, function +InternalHiiIfrValueAction will return FALSE. So in +current usage model, the StringPtr can not be NULL before +using it, so we can add ASSERT here. + +Cc: Eric Dong +Cc: Liming Gao +Contributed-under: TianoCore Contribution Agreement 1.0 +Signed-off-by: Dandan Bi +Reviewed-by: Eric Dong +--- +Upstream-Status: Backport + + MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c +index 8579501..46ca7bc 100644 +--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c ++++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c +@@ -2180,8 +2180,9 @@ InternalHiiIfrValueAction ( + } + + StringPtr = ConfigAltResp; +- +- while (StringPtr != L'\0') { ++ ASSERT (StringPtr != NULL); ++ ++ while (*StringPtr != L'\0') { + // + // 1. Find GUID=...&NAME=...&PATH=... + // +-- +1.9.1 + diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 73fdfc6239e..9d988e9d414 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/tianocore/edk2.git;branch=master \ file://0002-ovmf-update-path-to-native-BaseTools.patch \ file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ file://VfrCompile-increase-path-length-limit.patch \ + file://0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch \ " SRC_URI_append_class-target = " \