summaryrefslogtreecommitdiffstats
path: root/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock
diff options
context:
space:
mode:
authorYao, Jiewen <jiewen.yao@intel.com>2015-09-02 06:29:06 +0000
committerjyao1 <jyao1@Edk2>2015-09-02 06:29:06 +0000
commit776566530b15a4241db00ac317659e5904ad453c (patch)
treeaea816ce7d9afe9146850e7ff5e86f0180c9dcfd /SecurityPkg/Tcg/MemoryOverwriteRequestControlLock
parent465be78e4d7c2ac2c21e5a673afa323d097a4a7b (diff)
downloadedk2-776566530b15a4241db00ac317659e5904ad453c.tar.gz
edk2-776566530b15a4241db00ac317659e5904ad453c.tar.bz2
edk2-776566530b15a4241db00ac317659e5904ad453c.zip
Add more strict check for MOR variable, besides MOR lock variable.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: "Yao, Jiewen" <jiewen.yao@intel.com> Reviewed-by: "Zhang, Chao B" <chao.b.zhang@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18383 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'SecurityPkg/Tcg/MemoryOverwriteRequestControlLock')
-rw-r--r--SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
index 7ca707915e..c6f3edc756 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
+++ b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
@@ -144,19 +144,20 @@ SetVariableCheckHandlerMor (
}
//
+ // Delete not OK
+ //
+ if ((DataSize != sizeof(UINT8)) || (Data == NULL) || (Attributes == 0)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ //
// check format
//
if (IsMorLockVariable(VariableName, VendorGuid)) {
//
- // Delete not OK
- //
- if ((DataSize == 0) || (Data == NULL) || (Attributes == 0)) {
- return EFI_INVALID_PARAMETER;
- }
- //
// set to any other value not OK
//
- if ((DataSize != sizeof(UINT8)) || ((*(UINT8 *)Data != 1) && (*(UINT8 *)Data != 0))) {
+ if ((*(UINT8 *)Data != 1) && (*(UINT8 *)Data != 0)) {
return EFI_INVALID_PARAMETER;
}
}