From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.web12.3512.1581582855551139134 for ; Thu, 13 Feb 2020 00:34:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TYhjNDaL; spf=pass (domain: gmail.com, ip: 209.85.215.181, mailfrom: newexplorerj@gmail.com) Received: by mail-pg1-f181.google.com with SMTP id b9so2560453pgk.12 for ; Thu, 13 Feb 2020 00:34:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=TFDcLTxpEB5lmsXiNfy5WoTJ8dRUp3ROpkEjuDPnHaU=; b=TYhjNDaLEAnT+ZBplp/TI56o/c0Xfnp6Xa5bQKZGE1Q0wDJVo9A5nMML573BHk69Oc 0RrVk4/ckucwSwiv4GuSuEmnC6y+KP6GlVMMhuYq3VV7RSLnVuPrKj+IaW1z0Swel/Dj R9UA0TRoZNFhCg4SVA7rkJxfU4S/q1YTvxS+4t6TnnhZ+0ak+Mz5Mw3XqXr5+L2rPpqF +Wi7qP0nAfavacevzcImv+WUnLE8falPgnAbpgnIZ8UP2DyV/Iv+XskASybpjA55x7Lo gIvSnU3HUvYinrfWwyA2Y8dvhLpawGtF6fGl+sbhbhtyRZIByNQ3jc/2YjSCSdASuRmq Wvtw== 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; bh=TFDcLTxpEB5lmsXiNfy5WoTJ8dRUp3ROpkEjuDPnHaU=; b=qh5fYoDyXtTkdaXBvpA8dsRkE+/40Uod1f466lMVcdKTOm6h3IA1Uf7hqpQHDqtdYA SfKu0QUT5tY3zwLbRu0+vTLmIz6I24XJypP+IvuPUTvzz/C3ZM4GNLZl4g3vVrc1m/+l 0H7z319qi96n4RNwK+yXCZ+MvJck8LKafVFLbo0DishFtQLA554uWZSXfZDGJ8fuf0R2 rEVPDaz6Ml0E3abKklDO+XrpDm5FATBcN1bt09+f+CDH8JqgkTjACkT5eXNRntyrFeDV rdGfLmUJaX1BB2TIAdxaRcopjZp1EqIzvnF8KQJBYyKoGKpymP36/YgH0AeWndmU0zCV wVQg== X-Gm-Message-State: APjAAAUE6oCWcSEQExwaY6rPqg6RwqaPYKfMtgwL5NQvcnbMK/RExMlt +yaio6+sONHsDjF5XEcGiBTytF/ZIIx+sA== X-Google-Smtp-Source: APXvYqyxmyFqaQ6RS28c/NUPtVDvdMLQlRv1yULeg1ZmL/zIJZFVR31nPUpvjbF1LO9J5WPJG9T7eg== X-Received: by 2002:a62:d15a:: with SMTP id t26mr12729641pfl.187.1581582854652; Thu, 13 Feb 2020 00:34:14 -0800 (PST) Return-Path: Received: from localhost.localdomain ([45.135.186.76]) by smtp.gmail.com with ESMTPSA id n2sm2019886pfq.50.2020.02.13.00.34.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 00:34:13 -0800 (PST) From: newexplorerj@gmail.com To: devel@edk2.groups.io Cc: GuoMinJ Subject: [PATCH 1/3] FmpDevicePkg/FmpDxe: Issues reported by ECC in EDK2. Date: Thu, 13 Feb 2020 16:33:46 +0800 Message-Id: <16ebd7982dcfc25c46bf933384bfcdb5f711e9a2.1581494371.git.newexplorerj@gmail.com> X-Mailer: git-send-email 2.17.1 https://bugzilla.tianocore.org/show_bug.cgi?id=2515 Change the FmpDevicePkg to match the ECC check rule Signed-off-by: GuoMinJ --- FmpDevicePkg/FmpDxe/Dependency.c | 4 ++-- FmpDevicePkg/FmpDxe/Dependency.h | 2 +- FmpDevicePkg/FmpDxe/FmpDxe.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FmpDevicePkg/FmpDxe/Dependency.c b/FmpDevicePkg/FmpDxe/Dependency.c index b63a36b989..8f97c42916 100644 --- a/FmpDevicePkg/FmpDxe/Dependency.c +++ b/FmpDevicePkg/FmpDxe/Dependency.c @@ -163,8 +163,8 @@ Push ( /** Pop an element from the stack. - @param[in] Value Element to pop. - @param[in] Type Type of element. + @param[out] Element Element to pop. + @param[in] Type Type of element. @retval EFI_SUCCESS The value was popped onto the stack. @retval EFI_ACCESS_DENIED The pop operation underflowed the stack. diff --git a/FmpDevicePkg/FmpDxe/Dependency.h b/FmpDevicePkg/FmpDxe/Dependency.h index a2aaaceeae..badd2542d6 100644 --- a/FmpDevicePkg/FmpDxe/Dependency.h +++ b/FmpDevicePkg/FmpDxe/Dependency.h @@ -56,7 +56,7 @@ EvaluateImageDependencies ( IN CONST EFI_GUID ImageTypeId, IN CONST UINT32 Version, IN CONST EFI_FIRMWARE_IMAGE_DEP *Dependencies, - IN CONST UINT32 DependenciesSize, + IN CONST UINT32 DepexSize, OUT BOOLEAN *IsSatisfied ); diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.c b/FmpDevicePkg/FmpDxe/FmpDxe.c index aa92331966..5b523291e4 100644 --- a/FmpDevicePkg/FmpDxe/FmpDxe.c +++ b/FmpDevicePkg/FmpDxe/FmpDxe.c @@ -413,7 +413,7 @@ PopulateDescriptor ( } if (!EFI_ERROR (Status) && Image != NULL) { IsDepexValid = ValidateImageDepex ((EFI_FIRMWARE_IMAGE_DEP *) Image, ImageSize, &DepexSize); - if (IsDepexValid == TRUE) { + if (IsDepexValid) { Private->Descriptor.Dependencies = AllocatePool (DepexSize); if (Private->Descriptor.Dependencies != NULL) { CopyMem (Private->Descriptor.Dependencies->Dependencies, Image, DepexSize); -- 2.17.1