diff options
| author | fanwang2 <fan.wang@intel.com> | 2015-07-10 09:00:33 +0000 |
|---|---|---|
| committer | fanwang2 <fanwang2@Edk2> | 2015-07-10 09:00:33 +0000 |
| commit | 3fd7bd08f438130f9fcbcc1ab4392dea1a859c14 (patch) | |
| tree | 2ac1c1d8cf921d06b14b56582542ae8ae4807473 | |
| parent | 6b6fe3e9aa3d27070cf8e004a194a9c6f392ba5b (diff) | |
| download | edk2-platforms-3fd7bd08f438130f9fcbcc1ab4392dea1a859c14.tar.xz | |
NetworkPkg: Code logic optimization for DnsDxe and HttpDxe driver
Revise some errors which may lead NULL pointer be dereferenced:
* DnsDhcp.c: Paralist may be used without any initialized
* DnsHeader and RcvString may be null but be dereferenced
* HttpDriver.c: revise an if judgment
* HttpImpl.c: add a judgment to avoid null dereferenced
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: fanwang2 <fan.wang@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17923 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | NetworkPkg/DnsDxe/DnsDhcp.c | 2 | ||||
| -rw-r--r-- | NetworkPkg/DnsDxe/DnsImpl.c | 4 | ||||
| -rw-r--r-- | NetworkPkg/HttpDxe/HttpDriver.c | 2 | ||||
| -rw-r--r-- | NetworkPkg/HttpDxe/HttpImpl.c | 4 |
4 files changed, 10 insertions, 2 deletions
diff --git a/NetworkPkg/DnsDxe/DnsDhcp.c b/NetworkPkg/DnsDxe/DnsDhcp.c index 4607f7b633..1cc337f0cf 100644 --- a/NetworkPkg/DnsDxe/DnsDhcp.c +++ b/NetworkPkg/DnsDxe/DnsDhcp.c @@ -301,6 +301,8 @@ GetDns4ServerFromDhcp4 ( Data = NULL;
InterfaceInfo = NULL;
+ ZeroMem ((UINT8 *) ParaList, sizeof (ParaList));
+
ZeroMem (&MnpConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));
ZeroMem (&DnsServerInfor, sizeof (DNS4_SERVER_INFOR));
diff --git a/NetworkPkg/DnsDxe/DnsImpl.c b/NetworkPkg/DnsDxe/DnsImpl.c index c227093986..b196d181ca 100644 --- a/NetworkPkg/DnsDxe/DnsImpl.c +++ b/NetworkPkg/DnsDxe/DnsImpl.c @@ -1049,6 +1049,7 @@ IsValidDnsResponse ( continue;
} else {
TxString = NetbufGetByte (Packet, 0, NULL);
+ ASSERT (TxString != NULL);
DnsHeader = (DNS_HEADER *) TxString;
QueryName = (CHAR8 *) (TxString + sizeof (*DnsHeader));
QuerySection = (DNS_QUERY_SECTION *) (QueryName + AsciiStrLen (QueryName) + 1);
@@ -1426,7 +1427,8 @@ DnsOnPacketReceived ( ASSERT (Packet != NULL);
RcvString = NetbufGetByte (Packet, 0, NULL);
-
+ ASSERT (RcvString != NULL);
+
//
// Parse Dns Response
//
diff --git a/NetworkPkg/HttpDxe/HttpDriver.c b/NetworkPkg/HttpDxe/HttpDriver.c index b65607a4cb..43f42e29bf 100644 --- a/NetworkPkg/HttpDxe/HttpDriver.c +++ b/NetworkPkg/HttpDxe/HttpDriver.c @@ -79,7 +79,7 @@ HttpCleanService ( IN HTTP_SERVICE *HttpService
)
{
- if (HttpService != NULL) {
+ if (HttpService == NULL) {
return ;
}
diff --git a/NetworkPkg/HttpDxe/HttpImpl.c b/NetworkPkg/HttpDxe/HttpImpl.c index 4bd4ac884f..545fe42332 100644 --- a/NetworkPkg/HttpDxe/HttpImpl.c +++ b/NetworkPkg/HttpDxe/HttpImpl.c @@ -766,6 +766,10 @@ HttpResponseWorker ( HTTP_TOKEN_WRAP *ValueInItem;
UINTN HdrLen;
+ if (Wrap == NULL || Wrap->HttpInstance == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
HttpInstance = Wrap->HttpInstance;
Token = Wrap->HttpToken;
|