NetworkPkg/HttpDxe: Clear TlsChildHandle during cleanup

[edk2-devel] [PATCH] NetworkPkg/HttpDxe: Clear TlsChildHandle during cleanup

Posted by D Scott Phillips 3 years, 7 months ago

From: D Scott Phillips <d.scott.phillips@amperecomputing.com>

Leaving TlsChildHandle with the stale handle causes later use of https
with the http instance to incorrectly skip tls reconfiguration, use
the stale handle, and eventually call a garbage function pointer.

Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1917
Signed-off-by: D Scott Phillips <d.scott.phillips@amperecomputing.com>
---
 NetworkPkg/HttpDxe/HttpProto.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c
index 3c7c6ff9f0..afc7db5a72 100644
--- a/NetworkPkg/HttpDxe/HttpProto.c
+++ b/NetworkPkg/HttpDxe/HttpProto.c
@@ -873,6 +873,7 @@ HttpCleanProtocol (
     // Destroy the TLS instance.
     //
     HttpInstance->TlsSb->DestroyChild (HttpInstance->TlsSb, HttpInstance->TlsChildHandle);
+    HttpInstance->TlsChildHandle = NULL;
   }
 
   if (HttpInstance->Tcp4ChildHandle != NULL) {
-- 
2.26.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#65082): https://edk2.groups.io/g/devel/message/65082
Mute This Topic: https://groups.io/mt/76683729/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] NetworkPkg/HttpDxe: Clear TlsChildHandle during cleanup

Posted by Laszlo Ersek 3 years, 7 months ago

Hi Scott,

(+Rebecca)

On 09/05/20 03:15, D Scott Phillips wrote:
> From: D Scott Phillips <d.scott.phillips@amperecomputing.com>
> 
> Leaving TlsChildHandle with the stale handle causes later use of https
> with the http instance to incorrectly skip tls reconfiguration, use
> the stale handle, and eventually call a garbage function pointer.
> 
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1917
> Signed-off-by: D Scott Phillips <d.scott.phillips@amperecomputing.com>
> ---
>  NetworkPkg/HttpDxe/HttpProto.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c
> index 3c7c6ff9f0..afc7db5a72 100644
> --- a/NetworkPkg/HttpDxe/HttpProto.c
> +++ b/NetworkPkg/HttpDxe/HttpProto.c
> @@ -873,6 +873,7 @@ HttpCleanProtocol (
>      // Destroy the TLS instance.
>      //
>      HttpInstance->TlsSb->DestroyChild (HttpInstance->TlsSb, HttpInstance->TlsChildHandle);
> +    HttpInstance->TlsChildHandle = NULL;
>    }
>  
>    if (HttpInstance->Tcp4ChildHandle != NULL) {
> 

thanks a lot for tracking this down!

I've reopened BZ#1917, and linked your patch email in a new comment.

But, I'd also like to assign the BZ to you, if that's OK with you. Can
you please register in the TianoCore bugzilla instance for that?

Thanks!
Laszlo


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#65083): https://edk2.groups.io/g/devel/message/65083
Mute This Topic: https://groups.io/mt/76683729/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] NetworkPkg/HttpDxe: Clear TlsChildHandle during cleanup

Posted by D Scott Phillips 3 years, 7 months ago

On Monday, September 7, 2020 4:33 AM, Laszlo Ersek <lersek@redhat.com> wrote:

> Hi Scott,
>
> (+Rebecca)
>
> On 09/05/20 03:15, D Scott Phillips wrote:
>
> > From: D Scott Phillips d.scott.phillips@amperecomputing.com
> > Leaving TlsChildHandle with the stale handle causes later use of https
> > with the http instance to incorrectly skip tls reconfiguration, use
> > the stale handle, and eventually call a garbage function pointer.
> >
> > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1917
> > Signed-off-by: D Scott Phillips d.scott.phillips@amperecomputing.com
> >
> > ------------------------------------------------------------------------------------------------------------------------------
> >
> > NetworkPkg/HttpDxe/HttpProto.c | 1 +
> > 1 file changed, 1 insertion(+)
> > diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c
> > index 3c7c6ff9f0..afc7db5a72 100644
> > --- a/NetworkPkg/HttpDxe/HttpProto.c
> > +++ b/NetworkPkg/HttpDxe/HttpProto.c
> > @@ -873,6 +873,7 @@ HttpCleanProtocol (
> > // Destroy the TLS instance.
> > //
> > HttpInstance->TlsSb->DestroyChild (HttpInstance->TlsSb, HttpInstance->TlsChildHandle);
> >
> > -   HttpInstance->TlsChildHandle = NULL;
> >     }
> >
> >
> > if (HttpInstance->Tcp4ChildHandle != NULL) {
>
> thanks a lot for tracking this down!
>
> I've reopened BZ#1917, and linked your patch email in a new comment.
>
> But, I'd also like to assign the BZ to you, if that's OK with you. Can
> you please register in the TianoCore bugzilla instance for that?

Certainly, account created and assignment taken. Thanks Laszlo.

Scott


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#65132): https://edk2.groups.io/g/devel/message/65132
Mute This Topic: https://groups.io/mt/76683729/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] NetworkPkg/HttpDxe: Clear TlsChildHandle during cleanup

Posted by Maciej Rabeda 3 years, 7 months ago

Hi Scott,

Thanks for submitting the patch - I am about to approve the patch, 
however - a couple of small remarks to the commit message.
1. Please remove the "From:" line
2. Please add "Cc:" lines before "Signed-off-by". Cc people are added 
based on appropriate EDK2 package maintainer & reviewer list: 
https://github.com/tianocore/edk2/blob/master/Maintainers.txt
Example of a patch from NetworkPkg: 
https://github.com/tianocore/edk2/commit/0716b2390f005e84961cb98af28bd16cdcc5db42

Thanks,
Maciej

On 08-Sep-20 06:50, D Scott Phillips wrote:
> On Monday, September 7, 2020 4:33 AM, Laszlo Ersek <lersek@redhat.com> wrote:
>
>> Hi Scott,
>>
>> (+Rebecca)
>>
>> On 09/05/20 03:15, D Scott Phillips wrote:
>>
>>> *From: D Scott Phillips d.scott.phillips@amperecomputing.com*
>>> Leaving TlsChildHandle with the stale handle causes later use of https
>>> with the http instance to incorrectly skip tls reconfiguration, use
>>> the stale handle, and eventually call a garbage function pointer.
>>>
>>> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1917
>>> Signed-off-by: D Scott Phillips d.scott.phillips@amperecomputing.com
>>>
>>> ------------------------------------------------------------------------------------------------------------------------------
>>>
>>> NetworkPkg/HttpDxe/HttpProto.c | 1 +
>>> 1 file changed, 1 insertion(+)
>>> diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c
>>> index 3c7c6ff9f0..afc7db5a72 100644
>>> --- a/NetworkPkg/HttpDxe/HttpProto.c
>>> +++ b/NetworkPkg/HttpDxe/HttpProto.c
>>> @@ -873,6 +873,7 @@ HttpCleanProtocol (
>>> // Destroy the TLS instance.
>>> //
>>> HttpInstance->TlsSb->DestroyChild (HttpInstance->TlsSb, HttpInstance->TlsChildHandle);
>>>
>>> -   HttpInstance->TlsChildHandle = NULL;
>>>      }
>>>
>>>
>>> if (HttpInstance->Tcp4ChildHandle != NULL) {
>> thanks a lot for tracking this down!
>>
>> I've reopened BZ#1917, and linked your patch email in a new comment.
>>
>> But, I'd also like to assign the BZ to you, if that's OK with you. Can
>> you please register in the TianoCore bugzilla instance for that?
> Certainly, account created and assignment taken. Thanks Laszlo.
>
> Scott
>
>
> 
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#65276): https://edk2.groups.io/g/devel/message/65276
Mute This Topic: https://groups.io/mt/76683729/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-