From: "Wu, Hao A" <hao.a.wu@intel.com>
To: devel@edk2.groups.io
Cc: Hao A Wu <hao.a.wu@intel.com>, Star Zeng <star.zeng@intel.com>,
Liming Gao <liming.gao@intel.com>,
Jian J Wang <jian.j.wang@intel.com>
Subject: [PATCH v2] MdeModulePkg/Variable/RuntimeDxe: Not copy SMM pointers in comm buffer
Date: Wed, 7 Aug 2019 08:17:49 +0800 [thread overview]
Message-ID: <20190807001749.28220-1-hao.a.wu@intel.com> (raw)
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2002
This commit will update the logic in function SmmVariableGetStatistics()
so that the pointer fields ('Next' and 'Name') in structure
VARIABLE_INFO_ENTRY will not be copied into the SMM communication buffer.
Doing so will prevent SMM pointers address from being leaked into non-SMM
environment.
Please note that newly introduced internal function CopyVarInfoEntry()
will not use CopyMem() to copy the whole VARIABLE_INFO_ENTRY structure and
then zero out the 'Next' and 'Name' fields. This is for preventing race
conditions where the pointers value might still be read.
Cc: Star Zeng <star.zeng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
V2 patch updates the type of parameter 'DstInfoEntry' from 'in' to 'out'
for the newly added function CopyVarInfoEntry().
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c | 33 ++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
index ec463d063e..9b59387e58 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
@@ -312,6 +312,35 @@ GetFvbCountAndBuffer (
/**
+ Copy only the meaningful fields of the variable statistics information from
+ source buffer to the destination buffer. Other fields are filled with zero.
+
+ @param[out] DstInfoEntry A pointer to the buffer of destination variable
+ information entry.
+ @param[in] SrcInfoEntry A pointer to the buffer of source variable
+ information entry.
+
+**/
+static
+VOID
+CopyVarInfoEntry (
+ OUT VARIABLE_INFO_ENTRY *DstInfoEntry,
+ IN VARIABLE_INFO_ENTRY *SrcInfoEntry
+ )
+{
+ DstInfoEntry->Next = NULL;
+ DstInfoEntry->Name = NULL;
+
+ CopyGuid (&DstInfoEntry->VendorGuid, &SrcInfoEntry->VendorGuid);
+ DstInfoEntry->Attributes = SrcInfoEntry->Attributes;
+ DstInfoEntry->ReadCount = SrcInfoEntry->ReadCount;
+ DstInfoEntry->WriteCount = SrcInfoEntry->WriteCount;
+ DstInfoEntry->DeleteCount = SrcInfoEntry->DeleteCount;
+ DstInfoEntry->CacheCount = SrcInfoEntry->CacheCount;
+ DstInfoEntry->Volatile = SrcInfoEntry->Volatile;
+}
+
+/**
Get the variable statistics information from the information buffer pointed by gVariableInfo.
Caution: This function may be invoked at SMM runtime.
@@ -373,7 +402,7 @@ SmmVariableGetStatistics (
*InfoSize = StatisticsInfoSize;
return EFI_BUFFER_TOO_SMALL;
}
- CopyMem (InfoEntry, VariableInfo, sizeof (VARIABLE_INFO_ENTRY));
+ CopyVarInfoEntry (InfoEntry, VariableInfo);
CopyMem (InfoName, VariableInfo->Name, NameSize);
*InfoSize = StatisticsInfoSize;
return EFI_SUCCESS;
@@ -413,7 +442,7 @@ SmmVariableGetStatistics (
return EFI_BUFFER_TOO_SMALL;
}
- CopyMem (InfoEntry, VariableInfo, sizeof (VARIABLE_INFO_ENTRY));
+ CopyVarInfoEntry (InfoEntry, VariableInfo);
CopyMem (InfoName, VariableInfo->Name, NameSize);
*InfoSize = StatisticsInfoSize;
--
2.12.0.windows.1
next reply other threads:[~2019-08-07 0:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-07 0:17 Wu, Hao A [this message]
2019-08-07 3:21 ` [edk2-devel] [PATCH v2] MdeModulePkg/Variable/RuntimeDxe: Not copy SMM pointers in comm buffer Wang, Jian J
2019-08-07 3:43 ` Yao, Jiewen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190807001749.28220-1-hao.a.wu@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox