MdeModulePkg: Fix service binding issue in TCP4 and Ip4 dxe.
v2: Handle error case in SockCreateChild and fix typo issue when we destroy the socket Sock and its associated protocol control block, we need to first close the parent protocol, then remove the protocol from childHandle and last to free any data structures that allocated in CreateChild. But currently, we free the socket data (Socket ConfigureState) before removing the protocol form the childhandle. So if the up layer want to send the tcp reset packet in it's driver binding stop function, it will failed. The IpInstance destroy state is redundant and may cause ip transmit failed if up layer want to send ip packet. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Zhang Lubo <lubo.zhang@intel.com> Cc: Wu Jiaxin <jiaxin.wu@intel.com> Cc: Ye Ting <ting.ye@intel.com> Cc: Fu Siyuan <siyuan.fu@intel.com> Reviewed-by: Ye Ting <ting.ye@intel.com> Reviewed-by: Fu Siyuan <siyuan.fu@intel.com> Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
Implementation of the Socket.
|
||||
|
||||
Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
which accompanies this distribution. The full text of the license may be found at
|
||||
@@ -717,16 +717,8 @@ SockDestroy (
|
||||
IN OUT SOCKET *Sock
|
||||
)
|
||||
{
|
||||
VOID *SockProtocol;
|
||||
EFI_GUID *ProtocolGuid;
|
||||
EFI_STATUS Status;
|
||||
|
||||
ASSERT (SockStream == Sock->Type);
|
||||
|
||||
if (Sock->DestroyCallback != NULL) {
|
||||
Sock->DestroyCallback (Sock, Sock->Context);
|
||||
}
|
||||
|
||||
//
|
||||
// Flush the completion token buffered
|
||||
// by sock and rcv, snd buffer
|
||||
@@ -762,44 +754,6 @@ SockDestroy (
|
||||
Sock->Parent = NULL;
|
||||
}
|
||||
|
||||
//
|
||||
// Set the protocol guid and driver binding handle
|
||||
// in the light of Sock->SockType
|
||||
//
|
||||
ProtocolGuid = &gEfiTcp4ProtocolGuid;
|
||||
|
||||
//
|
||||
// Retrieve the protocol installed on this sock
|
||||
//
|
||||
Status = gBS->OpenProtocol (
|
||||
Sock->SockHandle,
|
||||
ProtocolGuid,
|
||||
&SockProtocol,
|
||||
Sock->DriverBinding,
|
||||
Sock->SockHandle,
|
||||
EFI_OPEN_PROTOCOL_GET_PROTOCOL
|
||||
);
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
|
||||
DEBUG ((EFI_D_ERROR, "SockDestroy: Open protocol installed "
|
||||
"on socket failed with %r\n", Status));
|
||||
|
||||
goto FreeSock;
|
||||
}
|
||||
|
||||
//
|
||||
// Uninstall the protocol installed on this sock
|
||||
// in the light of Sock->SockType
|
||||
//
|
||||
gBS->UninstallMultipleProtocolInterfaces (
|
||||
Sock->SockHandle,
|
||||
ProtocolGuid,
|
||||
SockProtocol,
|
||||
NULL
|
||||
);
|
||||
|
||||
FreeSock:
|
||||
FreePool (Sock);
|
||||
return ;
|
||||
}
|
||||
|
@@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
Socket implementation header file.
|
||||
|
||||
Copyright (c) 2005 - 2006, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
which accompanies this distribution. The full text of the license may be found at
|
||||
@@ -16,6 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#define _SOCK_IMPL_H_
|
||||
|
||||
#include "Socket.h"
|
||||
#include "Tcp4Main.h"
|
||||
|
||||
/**
|
||||
Signal a event with the given status.
|
||||
|
@@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
Interface function of the Socket.
|
||||
|
||||
Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
which accompanies this distribution. The full text of the license may be found at
|
||||
@@ -144,7 +144,10 @@ SockDestroyChild (
|
||||
IN SOCKET *Sock
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
EFI_STATUS Status;
|
||||
TCP4_PROTO_DATA *ProtoData;
|
||||
TCP_CB *Tcb;
|
||||
VOID *SockProtocol;
|
||||
|
||||
ASSERT ((Sock != NULL) && (Sock->ProtoHandler != NULL));
|
||||
|
||||
@@ -154,6 +157,11 @@ SockDestroyChild (
|
||||
|
||||
Sock->InDestroy = TRUE;
|
||||
|
||||
ProtoData = (TCP4_PROTO_DATA *) Sock->ProtoReserved;
|
||||
Tcb = ProtoData->TcpPcb;
|
||||
|
||||
ASSERT (Tcb != NULL);
|
||||
|
||||
Status = EfiAcquireLockOrFail (&(Sock->Lock));
|
||||
if (EFI_ERROR (Status)) {
|
||||
|
||||
@@ -163,6 +171,49 @@ SockDestroyChild (
|
||||
return EFI_ACCESS_DENIED;
|
||||
}
|
||||
|
||||
//
|
||||
// Close the IP protocol.
|
||||
//
|
||||
gBS->CloseProtocol (
|
||||
Tcb->IpInfo->ChildHandle,
|
||||
&gEfiIp4ProtocolGuid,
|
||||
ProtoData->TcpService->IpIo->Image,
|
||||
Sock->SockHandle
|
||||
);
|
||||
|
||||
if (Sock->DestroyCallback != NULL) {
|
||||
Sock->DestroyCallback (Sock, Sock->Context);
|
||||
}
|
||||
|
||||
//
|
||||
// Retrieve the protocol installed on this sock
|
||||
//
|
||||
Status = gBS->OpenProtocol (
|
||||
Sock->SockHandle,
|
||||
&gEfiTcp4ProtocolGuid,
|
||||
&SockProtocol,
|
||||
Sock->DriverBinding,
|
||||
Sock->SockHandle,
|
||||
EFI_OPEN_PROTOCOL_GET_PROTOCOL
|
||||
);
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
|
||||
DEBUG ((EFI_D_ERROR, "SockDestroyChild: Open protocol installed "
|
||||
"on socket failed with %r\n", Status));
|
||||
}
|
||||
|
||||
//
|
||||
// Uninstall the protocol installed on this sock
|
||||
// in the light of Sock->SockType
|
||||
//
|
||||
gBS->UninstallMultipleProtocolInterfaces (
|
||||
Sock->SockHandle,
|
||||
&gEfiTcp4ProtocolGuid,
|
||||
SockProtocol,
|
||||
NULL
|
||||
);
|
||||
|
||||
//
|
||||
// force protocol layer to detach the PCB
|
||||
//
|
||||
@@ -209,6 +260,7 @@ SockCreateChild (
|
||||
)
|
||||
{
|
||||
SOCKET *Sock;
|
||||
VOID *SockProtocol;
|
||||
EFI_STATUS Status;
|
||||
|
||||
//
|
||||
@@ -229,8 +281,7 @@ SockCreateChild (
|
||||
DEBUG ((EFI_D_ERROR, "SockCreateChild: Get the lock to "
|
||||
"access socket failed with %r\n", Status));
|
||||
|
||||
SockDestroy (Sock);
|
||||
return NULL;
|
||||
goto ERROR;
|
||||
}
|
||||
//
|
||||
// inform the protocol layer to attach the socket
|
||||
@@ -243,11 +294,36 @@ SockCreateChild (
|
||||
DEBUG ((EFI_D_ERROR, "SockCreateChild: Protocol failed to"
|
||||
" attach a socket with %r\n", Status));
|
||||
|
||||
SockDestroy (Sock);
|
||||
Sock = NULL;
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
return Sock;
|
||||
|
||||
ERROR:
|
||||
|
||||
if (Sock->DestroyCallback != NULL) {
|
||||
Sock->DestroyCallback (Sock, Sock->Context);
|
||||
}
|
||||
|
||||
gBS->OpenProtocol (
|
||||
Sock->SockHandle,
|
||||
&gEfiTcp4ProtocolGuid,
|
||||
&SockProtocol,
|
||||
Sock->DriverBinding,
|
||||
Sock->SockHandle,
|
||||
EFI_OPEN_PROTOCOL_GET_PROTOCOL
|
||||
);
|
||||
//
|
||||
// Uninstall the protocol installed on this sock
|
||||
//
|
||||
gBS->UninstallMultipleProtocolInterfaces (
|
||||
Sock->SockHandle,
|
||||
&gEfiTcp4ProtocolGuid,
|
||||
SockProtocol,
|
||||
NULL
|
||||
);
|
||||
SockDestroy (Sock);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
Tcp request dispatcher implementation.
|
||||
|
||||
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
|
||||
Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
which accompanies this distribution. The full text of the license may be found at
|
||||
@@ -332,16 +332,6 @@ Tcp4DetachPcb (
|
||||
ASSERT (Tcb != NULL);
|
||||
|
||||
Tcp4FlushPcb (Tcb);
|
||||
|
||||
//
|
||||
// Close the IP protocol.
|
||||
//
|
||||
gBS->CloseProtocol (
|
||||
Tcb->IpInfo->ChildHandle,
|
||||
&gEfiIp4ProtocolGuid,
|
||||
ProtoData->TcpService->IpIo->Image,
|
||||
Sk->SockHandle
|
||||
);
|
||||
|
||||
IpIoRemoveIp (ProtoData->TcpService->IpIo, Tcb->IpInfo);
|
||||
|
||||
|
Reference in New Issue
Block a user