From patchwork Mon Jun 1 12:08:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 49325 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0E6E1218FC for ; Mon, 1 Jun 2015 12:09:23 +0000 (UTC) Received: by labc7 with SMTP id c7sf4610383lab.1 for ; Mon, 01 Jun 2015 05:09:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=u355FQVpvRLX3e7NefuxggQZKyqjGsno/2Ke99OzTHY=; b=PX949eGQ2VieX2SMck7fySpDXKFkz3PQkH12OTFAQpPpaK/DXYg2KiJL9FE52fIVYJ Sb6gn/QkYwk8ZmkNa/MBPJU/jGXBD1q1mlnW04B0mj3Hv5TzWcIS/a2TxklqcJsGGIy9 GHniotAzDE1HrWfHcvZgFGULPtX+oGkEiOheinGd2CBR6ogA5WO6BZf9u3vY9Vfyc4TY PeKT5bQw6YdV2SlHMwCXa5hcNK8ZT53Pl5UPfDa3ul6S8AcaNz352R6SU2hwPJp6KUYk RCKIdYYvd/z6lOnti9mJgpySVGKGP3mudhFlGw5YGmvHFBWoBeXg7TotfT/OavPx84T3 o+NQ== X-Gm-Message-State: ALoCoQm69d9Rg1NVbHaApReI63Z4MRDIzYmpjA5tPzbinWAt97YEDRY+hkxNuwHr2WqEkTbze/Sj X-Received: by 10.152.87.140 with SMTP id ay12mr11118928lab.1.1433160561942; Mon, 01 Jun 2015 05:09:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.9.7 with SMTP id v7ls76933laa.75.gmail; Mon, 01 Jun 2015 05:09:21 -0700 (PDT) X-Received: by 10.152.43.110 with SMTP id v14mr20552629lal.4.1433160561770; Mon, 01 Jun 2015 05:09:21 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id eq8si12162837lac.38.2015.06.01.05.09.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jun 2015 05:09:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by laei3 with SMTP id i3so11927189lae.3 for ; Mon, 01 Jun 2015 05:09:21 -0700 (PDT) X-Received: by 10.112.131.98 with SMTP id ol2mr4700171lbb.56.1433160561655; Mon, 01 Jun 2015 05:09:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2266397lbb; Mon, 1 Jun 2015 05:09:20 -0700 (PDT) X-Received: by 10.107.167.73 with SMTP id q70mr26217845ioe.82.1433160560208; Mon, 01 Jun 2015 05:09:20 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id oa5si8302887icb.70.2015.06.01.05.09.19 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 01 Jun 2015 05:09:20 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YzOWl-00063O-5N; Mon, 01 Jun 2015 12:09:11 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YzOWj-00063F-9X for edk2-devel@lists.sourceforge.net; Mon, 01 Jun 2015 12:09:09 +0000 Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.192.178 as permitted sender) client-ip=209.85.192.178; envelope-from=heyi.guo@linaro.org; helo=mail-pd0-f178.google.com; Received: from mail-pd0-f178.google.com ([209.85.192.178]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1YzOWf-0000Sr-8n for edk2-devel@lists.sourceforge.net; Mon, 01 Jun 2015 12:09:09 +0000 Received: by pdbnf5 with SMTP id nf5so45203927pdb.2 for ; Mon, 01 Jun 2015 05:08:59 -0700 (PDT) X-Received: by 10.70.109.131 with SMTP id hs3mr40086802pdb.40.1433160539622; Mon, 01 Jun 2015 05:08:59 -0700 (PDT) Received: from localhost.localdomain ([180.150.157.4]) by mx.google.com with ESMTPSA id nb10sm14345131pdb.76.2015.06.01.05.08.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Jun 2015 05:08:58 -0700 (PDT) From: Heyi Guo To: lersek@redhat.com Date: Mon, 1 Jun 2015 20:08:15 +0800 Message-Id: <1433160495-10385-4-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433160495-10385-1-git-send-email-heyi.guo@linaro.org> References: <1433160495-10385-1-git-send-email-heyi.guo@linaro.org> X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1YzOWf-0000Sr-8n Cc: edk2-devel@lists.sourceforge.net, ilias.biris@linaro.org Subject: [edk2] [PATCH 3/3] OvmfPkg: PlatformDxe: Add ConfigHdrMatch check in RouteConfig X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: heyi.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Add HiiIsConfigHdrMatch check in RouteConfig, or the test case in UEFI SCT will fail for Configuration with invalid GUID, because it expects the return value to be NOT FOUND but actually INVALID PARAMETER returned. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Heyi Guo --- OvmfPkg/PlatformDxe/Platform.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c index 35fabf8..48a24fd 100644 --- a/OvmfPkg/PlatformDxe/Platform.c +++ b/OvmfPkg/PlatformDxe/Platform.c @@ -340,6 +340,11 @@ RouteConfig ( DEBUG ((EFI_D_VERBOSE, "%a: Configuration=\"%s\"\n", __FUNCTION__, Configuration)); + if (!HiiIsConfigHdrMatch (Configuration, &gOvmfPlatformConfigGuid, NULL)) { + *Progress = Configuration; + return EFI_NOT_FOUND; + } + // // the "read" step in RMW //