[PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared when reset

[PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared when reset

[Abner Chang]

BZ #2909,
https://bugzilla.tianocore.org/show_bug.cgi?id=2909

When Http->Configure() is invoked with HttpConfigData set to
NULL to reset the EFI HTTP instance, TLS child instance is
destroyed but HttpInstance->TlsChildHandle is not set to
NULL. After reconfiguring HTTP through Http->Configure()
and sending the HTTP request to HTTPS URL, TLS child
instance is not recreated because
HttpInstance->TlsChildHandle is not NULL.

Signed-off-by: Abner Chang <abner.chang@hpe.com>

Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Nickle Wang <nickle.wang@hpe.com>
---
 NetworkPkg/HttpDxe/HttpProto.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c
index 3c7c6ff9f0c..afc7db5a726 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.21.0.windows.1

Re: [PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared when reset

[Wu, Jiaxin]

Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>

Thanks,
Jiaxin

> -----Original Message-----
> From: Abner Chang <abner.chang@hpe.com>
> Sent: Monday, September 28, 2020 2:30 PM
> To: devel@edk2.groups.io
> Cc: abner.chang@hpe.com; Maciej Rabeda <maciej.rabeda@linux.intel.com>;
> Wu, Jiaxin <jiaxin.wu@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>; Nickle
> Wang <nickle.wang@hpe.com>
> Subject: [PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared when
> reset
> 
> BZ #2909,
> https://bugzilla.tianocore.org/show_bug.cgi?id=2909
> 
> When Http->Configure() is invoked with HttpConfigData set to
> NULL to reset the EFI HTTP instance, TLS child instance is
> destroyed but HttpInstance->TlsChildHandle is not set to
> NULL. After reconfiguring HTTP through Http->Configure()
> and sending the HTTP request to HTTPS URL, TLS child
> instance is not recreated because
> HttpInstance->TlsChildHandle is not NULL.
> 
> Signed-off-by: Abner Chang <abner.chang@hpe.com>
> 
> Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> Cc: Fu Siyuan <siyuan.fu@intel.com>
> Cc: Nickle Wang <nickle.wang@hpe.com>
> ---
>  NetworkPkg/HttpDxe/HttpProto.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/NetworkPkg/HttpDxe/HttpProto.c
> b/NetworkPkg/HttpDxe/HttpProto.c
> index 3c7c6ff9f0c..afc7db5a726 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.21.0.windows.1

Re: [PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared when reset

[Maciej Rabeda]

Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>

On 28-Sep-20 08:29, Abner Chang wrote:
> BZ #2909,
> https://bugzilla.tianocore.org/show_bug.cgi?id=2909
>
> When Http->Configure() is invoked with HttpConfigData set to
> NULL to reset the EFI HTTP instance, TLS child instance is
> destroyed but HttpInstance->TlsChildHandle is not set to
> NULL. After reconfiguring HTTP through Http->Configure()
> and sending the HTTP request to HTTPS URL, TLS child
> instance is not recreated because
> HttpInstance->TlsChildHandle is not NULL.
>
> Signed-off-by: Abner Chang <abner.chang@hpe.com>
>
> Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> Cc: Fu Siyuan <siyuan.fu@intel.com>
> Cc: Nickle Wang <nickle.wang@hpe.com>
> ---
>   NetworkPkg/HttpDxe/HttpProto.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c
> index 3c7c6ff9f0c..afc7db5a726 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) {

Re: [PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared when reset

[Abner Chang]

Hi Maciej,
Could you please help to merge this patch? Thanks!
Abner

> -----Original Message-----
> From: Rabeda, Maciej [mailto:maciej.rabeda@linux.intel.com]
> Sent: Tuesday, September 29, 2020 9:47 PM
> To: Chang, Abner (HPS SW/FW Technologist) <abner.chang@hpe.com>;
> devel@edk2.groups.io
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>; Fu Siyuan <siyuan.fu@intel.com>;
> Wang, Nickle (HPS SW) <nickle.wang@hpe.com>
> Subject: Re: [PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared
> when reset
> 
> Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
> 
> On 28-Sep-20 08:29, Abner Chang wrote:
> > BZ #2909,
> > INVALID URI REMOVED
> > e.org_show-5Fbug.cgi-3Fid-
> 3D2909&d=DwICaQ&c=C5b8zRQO1miGmBeVZ2LFWg&r=_
> >
> SN6FZBN4Vgi4Ulkskz6qU3NYRO03nHp9P7Z5q59A3E&m=gVilLut38Vw51w0YX
> bkL2XI7A
> > ieZI7M-
> u7_bYls4zQo&s=eavHqEkeSVmQnn5EYDmq9TnEyjp8MS3_hdpPDgG9hSY&e=
> >
> > When Http->Configure() is invoked with HttpConfigData set to NULL to
> > reset the EFI HTTP instance, TLS child instance is destroyed but
> > HttpInstance->TlsChildHandle is not set to NULL. After reconfiguring
> > HTTP through Http->Configure() and sending the HTTP request to HTTPS
> > URL, TLS child instance is not recreated because
> > HttpInstance->TlsChildHandle is not NULL.
> >
> > Signed-off-by: Abner Chang <abner.chang@hpe.com>
> >
> > Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
> > Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> > Cc: Fu Siyuan <siyuan.fu@intel.com>
> > Cc: Nickle Wang <nickle.wang@hpe.com>
> > ---
> >   NetworkPkg/HttpDxe/HttpProto.c | 1 +
> >   1 file changed, 1 insertion(+)
> >
> > diff --git a/NetworkPkg/HttpDxe/HttpProto.c
> > b/NetworkPkg/HttpDxe/HttpProto.c index 3c7c6ff9f0c..afc7db5a726
> 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) {

Re: [edk2-devel] [PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared when reset

[Maciej Rabeda]

Hi Abner,

Waiting for review on a different patch on NetworkPkg, else CI likely 
fires in my face when I try to integrate yours.

https://edk2.groups.io/g/devel/message/65833

Thanks,
Maciej

On 08-Oct-20 15:50, Abner Chang wrote:
> Hi Maciej,
> Could you please help to merge this patch? Thanks!
> Abner
>
>> -----Original Message-----
>> From: Rabeda, Maciej [mailto:maciej.rabeda@linux.intel.com]
>> Sent: Tuesday, September 29, 2020 9:47 PM
>> To: Chang, Abner (HPS SW/FW Technologist) <abner.chang@hpe.com>;
>> devel@edk2.groups.io
>> Cc: Wu Jiaxin <jiaxin.wu@intel.com>; Fu Siyuan <siyuan.fu@intel.com>;
>> Wang, Nickle (HPS SW) <nickle.wang@hpe.com>
>> Subject: Re: [PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared
>> when reset
>>
>> Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
>>
>> On 28-Sep-20 08:29, Abner Chang wrote:
>>> BZ #2909,
>>> INVALID URI REMOVED
>>> e.org_show-5Fbug.cgi-3Fid-
>> 3D2909&d=DwICaQ&c=C5b8zRQO1miGmBeVZ2LFWg&r=_
>> SN6FZBN4Vgi4Ulkskz6qU3NYRO03nHp9P7Z5q59A3E&m=gVilLut38Vw51w0YX
>> bkL2XI7A
>>> ieZI7M-
>> u7_bYls4zQo&s=eavHqEkeSVmQnn5EYDmq9TnEyjp8MS3_hdpPDgG9hSY&e=
>>> When Http->Configure() is invoked with HttpConfigData set to NULL to
>>> reset the EFI HTTP instance, TLS child instance is destroyed but
>>> HttpInstance->TlsChildHandle is not set to NULL. After reconfiguring
>>> HTTP through Http->Configure() and sending the HTTP request to HTTPS
>>> URL, TLS child instance is not recreated because
>>> HttpInstance->TlsChildHandle is not NULL.
>>>
>>> Signed-off-by: Abner Chang <abner.chang@hpe.com>
>>>
>>> Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
>>> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
>>> Cc: Fu Siyuan <siyuan.fu@intel.com>
>>> Cc: Nickle Wang <nickle.wang@hpe.com>
>>> ---
>>>    NetworkPkg/HttpDxe/HttpProto.c | 1 +
>>>    1 file changed, 1 insertion(+)
>>>
>>> diff --git a/NetworkPkg/HttpDxe/HttpProto.c
>>> b/NetworkPkg/HttpDxe/HttpProto.c index 3c7c6ff9f0c..afc7db5a726
>> 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) {
>
>
> 
>
>

Re: [edk2-devel] [PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared when reset

[Maciej Rabeda]

Merged:
https://github.com/tianocore/edk2/commit/5df413119ec80cb462bf9c888ef5574f8ce8ae2e
https://github.com/tianocore/edk2/pull/995

On 08-Oct-20 18:17, Maciej Rabeda wrote:
> Hi Abner,
>
> Waiting for review on a different patch on NetworkPkg, else CI likely 
> fires in my face when I try to integrate yours.
>
> https://edk2.groups.io/g/devel/message/65833
>
> Thanks,
> Maciej
>
> On 08-Oct-20 15:50, Abner Chang wrote:
>> Hi Maciej,
>> Could you please help to merge this patch? Thanks!
>> Abner
>>
>>> -----Original Message-----
>>> From: Rabeda, Maciej [mailto:maciej.rabeda@linux.intel.com]
>>> Sent: Tuesday, September 29, 2020 9:47 PM
>>> To: Chang, Abner (HPS SW/FW Technologist) <abner.chang@hpe.com>;
>>> devel@edk2.groups.io
>>> Cc: Wu Jiaxin <jiaxin.wu@intel.com>; Fu Siyuan <siyuan.fu@intel.com>;
>>> Wang, Nickle (HPS SW) <nickle.wang@hpe.com>
>>> Subject: Re: [PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared
>>> when reset
>>>
>>> Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
>>>
>>> On 28-Sep-20 08:29, Abner Chang wrote:
>>>> BZ #2909,
>>>> INVALID URI REMOVED
>>>> e.org_show-5Fbug.cgi-3Fid-
>>> 3D2909&d=DwICaQ&c=C5b8zRQO1miGmBeVZ2LFWg&r=_
>>> SN6FZBN4Vgi4Ulkskz6qU3NYRO03nHp9P7Z5q59A3E&m=gVilLut38Vw51w0YX
>>> bkL2XI7A
>>>> ieZI7M-
>>> u7_bYls4zQo&s=eavHqEkeSVmQnn5EYDmq9TnEyjp8MS3_hdpPDgG9hSY&e=
>>>> When Http->Configure() is invoked with HttpConfigData set to NULL to
>>>> reset the EFI HTTP instance, TLS child instance is destroyed but
>>>> HttpInstance->TlsChildHandle is not set to NULL. After reconfiguring
>>>> HTTP through Http->Configure() and sending the HTTP request to HTTPS
>>>> URL, TLS child instance is not recreated because
>>>> HttpInstance->TlsChildHandle is not NULL.
>>>>
>>>> Signed-off-by: Abner Chang <abner.chang@hpe.com>
>>>>
>>>> Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
>>>> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
>>>> Cc: Fu Siyuan <siyuan.fu@intel.com>
>>>> Cc: Nickle Wang <nickle.wang@hpe.com>
>>>> ---
>>>>    NetworkPkg/HttpDxe/HttpProto.c | 1 +
>>>>    1 file changed, 1 insertion(+)
>>>>
>>>> diff --git a/NetworkPkg/HttpDxe/HttpProto.c
>>>> b/NetworkPkg/HttpDxe/HttpProto.c index 3c7c6ff9f0c..afc7db5a726
>>> 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) {
>>
>>
>>
>>
>>
>
>
>
> 
>
>

Re: [edk2-devel] [PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared when reset

[Abner Chang]

[-- Attachment #1: Type: text/plain, Size: 3146 bytes --]

Thanks Maciej.
Abner

Get Outlook for Android<https://aka.ms/ghei36>

________________________________
From: Rabeda, Maciej <maciej.rabeda@linux.intel.com>
Sent: Friday, October 9, 2020, 5:39 PM
To: devel@edk2.groups.io; Chang, Abner (HPS SW/FW Technologist)
Cc: Wu Jiaxin; Fu Siyuan; Wang, Nickle (HPS SW)
Subject: Re: [edk2-devel] [PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared when reset

Merged:
https://github.com/tianocore/edk2/commit/5df413119ec80cb462bf9c888ef5574f8ce8ae2e
https://github.com/tianocore/edk2/pull/995

On 08-Oct-20 18:17, Maciej Rabeda wrote:
> Hi Abner,
>
> Waiting for review on a different patch on NetworkPkg, else CI likely
> fires in my face when I try to integrate yours.
>
> https://edk2.groups.io/g/devel/message/65833
>
> Thanks,
> Maciej
>
> On 08-Oct-20 15:50, Abner Chang wrote:
>> Hi Maciej,
>> Could you please help to merge this patch? Thanks!
>> Abner
>>
>>> -----Original Message-----
>>> From: Rabeda, Maciej [mailto:maciej.rabeda@linux.intel.com]
>>> Sent: Tuesday, September 29, 2020 9:47 PM
>>> To: Chang, Abner (HPS SW/FW Technologist) <abner.chang@hpe.com>;
>>> devel@edk2.groups.io
>>> Cc: Wu Jiaxin <jiaxin.wu@intel.com>; Fu Siyuan <siyuan.fu@intel.com>;
>>> Wang, Nickle (HPS SW) <nickle.wang@hpe.com>
>>> Subject: Re: [PATCH] NetworkPkg/HttpDxe: TlsChildHandle is not cleared
>>> when reset
>>>
>>> Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
>>>
>>> On 28-Sep-20 08:29, Abner Chang wrote:
>>>> BZ #2909,
>>>> INVALID URI REMOVED
>>>> e.org_show-5Fbug.cgi-3Fid-
>>> 3D2909&d=DwICaQ&c=C5b8zRQO1miGmBeVZ2LFWg&r=_
>>> SN6FZBN4Vgi4Ulkskz6qU3NYRO03nHp9P7Z5q59A3E&m=gVilLut38Vw51w0YX
>>> bkL2XI7A
>>>> ieZI7M-
>>> u7_bYls4zQo&s=eavHqEkeSVmQnn5EYDmq9TnEyjp8MS3_hdpPDgG9hSY&e=
>>>> When Http->Configure() is invoked with HttpConfigData set to NULL to
>>>> reset the EFI HTTP instance, TLS child instance is destroyed but
>>>> HttpInstance->TlsChildHandle is not set to NULL. After reconfiguring
>>>> HTTP through Http->Configure() and sending the HTTP request to HTTPS
>>>> URL, TLS child instance is not recreated because
>>>> HttpInstance->TlsChildHandle is not NULL.
>>>>
>>>> Signed-off-by: Abner Chang <abner.chang@hpe.com>
>>>>
>>>> Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
>>>> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
>>>> Cc: Fu Siyuan <siyuan.fu@intel.com>
>>>> Cc: Nickle Wang <nickle.wang@hpe.com>
>>>> ---
>>>>    NetworkPkg/HttpDxe/HttpProto.c | 1 +
>>>>    1 file changed, 1 insertion(+)
>>>>
>>>> diff --git a/NetworkPkg/HttpDxe/HttpProto.c
>>>> b/NetworkPkg/HttpDxe/HttpProto.c index 3c7c6ff9f0c..afc7db5a726
>>> 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) {
>>
>>
>>
>>
>>
>
>
>
> 
>
>



[-- Attachment #2: Type: text/html, Size: 5782 bytes --]