回复: [edk2-devel] [Patch edk2-stable202111] NetworkPkg: Fix invalid pointer for DNS response token on error

gaoliming posted 1 patch 1 week, 3 days ago
Failed in applying to current master (apply log)
1 file changed, 2 insertions(+)

回复: [edk2-devel] [Patch edk2-stable202111] NetworkPkg: Fix invalid pointer for DNS response token on error

Posted by gaoliming 1 week, 3 days ago
I suggest to merge this fix for the stable tag 202111. This fix is low risk.


 

Thanks

Liming

发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Wu, Jiaxin
发送时间: 2021年11月25日 9:37
收件人: Anbazhagan, Baraneedharan <anbazhagan@hp.com>; devel@edk2.groups.io
抄送: maciej.rabeda@linux.intel.com; Fu, Siyuan <siyuan.fu@intel.com>
主题: Re: [edk2-devel] NetworkPkg: Fix invalid pointer for DNS response
token on error

 

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

 

 

 

From: Anbazhagan, Baraneedharan <anbazhagan@hp.com
<mailto:anbazhagan@hp.com> > 
Sent: Thursday, November 25, 2021 9:28 AM
To: devel@edk2.groups.io <mailto:devel@edk2.groups.io> 
Cc: maciej.rabeda@linux.intel.com <mailto:maciej.rabeda@linux.intel.com> ;
Wu, Jiaxin <jiaxin.wu@intel.com <mailto:jiaxin.wu@intel.com> >; Fu, Siyuan
<siyuan.fu@intel.com <mailto:siyuan.fu@intel.com> >
Subject: RE: NetworkPkg: Fix invalid pointer for DNS response token on error

 

Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3719

 

Token->RspData.H2AData is de-allocated on error but it is not

set to NULL. HTTP module attempts to free again and cause assert.

 

Signed-off-by: Baraneedharan Anbazhagan anbazhagan@hp.com
<mailto:anbazhagan@hp.com> 

---

NetworkPkg/DnsDxe/DnsImpl.c | 2 ++

1 file changed, 2 insertions(+)

 

diff --git a/NetworkPkg/DnsDxe/DnsImpl.c b/NetworkPkg/DnsDxe/DnsImpl.c

index 2edcb280ac..78a56f2b56 100644

--- a/NetworkPkg/DnsDxe/DnsImpl.c

+++ b/NetworkPkg/DnsDxe/DnsImpl.c

@@ -1700,6 +1700,7 @@ ON_EXIT:

           }

 

           FreePool (Dns4TokenEntry->Token->RspData.H2AData);

+          Dns4TokenEntry->Token->RspData.H2AData = NULL;

         }

       }

     }

@@ -1731,6 +1732,7 @@ ON_EXIT:

           }

 

           FreePool (Dns6TokenEntry->Token->RspData.H2AData);

+          Dns6TokenEntry->Token->RspData.H2AData = NULL;

         }

       }

     }

-- 

2.33.0.windows.2

 





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84072): https://edk2.groups.io/g/devel/message/84072
Mute This Topic: https://groups.io/mt/87294818/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: 回复: [edk2-devel] [Patch edk2-stable202111] NetworkPkg: Fix invalid pointer for DNS response token on error

Posted by Leif Lindholm 1 week, 3 days ago
Agreed, but the commit message (and the BZ) should state which commit
introduced this issue.

/
    Leif

On Thu, Nov 25, 2021 at 09:52:58 +0800, gaoliming wrote:
> I suggest to merge this fix for the stable tag 202111. This fix is low risk.
> 
> 
>  
> 
> Thanks
> 
> Liming
> 
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Wu, Jiaxin
> 发送时间: 2021年11月25日 9:37
> 收件人: Anbazhagan, Baraneedharan <anbazhagan@hp.com>; devel@edk2.groups.io
> 抄送: maciej.rabeda@linux.intel.com; Fu, Siyuan <siyuan.fu@intel.com>
> 主题: Re: [edk2-devel] NetworkPkg: Fix invalid pointer for DNS response
> token on error
> 
>  
> 
> Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com <mailto:jiaxin.wu@intel.com> >
> 
>  
> 
>  
> 
>  
> 
> From: Anbazhagan, Baraneedharan <anbazhagan@hp.com
> <mailto:anbazhagan@hp.com> > 
> Sent: Thursday, November 25, 2021 9:28 AM
> To: devel@edk2.groups.io <mailto:devel@edk2.groups.io> 
> Cc: maciej.rabeda@linux.intel.com <mailto:maciej.rabeda@linux.intel.com> ;
> Wu, Jiaxin <jiaxin.wu@intel.com <mailto:jiaxin.wu@intel.com> >; Fu, Siyuan
> <siyuan.fu@intel.com <mailto:siyuan.fu@intel.com> >
> Subject: RE: NetworkPkg: Fix invalid pointer for DNS response token on error
> 
>  
> 
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3719
> 
>  
> 
> Token->RspData.H2AData is de-allocated on error but it is not
> 
> set to NULL. HTTP module attempts to free again and cause assert.
> 
>  
> 
> Signed-off-by: Baraneedharan Anbazhagan anbazhagan@hp.com
> <mailto:anbazhagan@hp.com> 
> 
> ---
> 
> NetworkPkg/DnsDxe/DnsImpl.c | 2 ++
> 
> 1 file changed, 2 insertions(+)
> 
>  
> 
> diff --git a/NetworkPkg/DnsDxe/DnsImpl.c b/NetworkPkg/DnsDxe/DnsImpl.c
> 
> index 2edcb280ac..78a56f2b56 100644
> 
> --- a/NetworkPkg/DnsDxe/DnsImpl.c
> 
> +++ b/NetworkPkg/DnsDxe/DnsImpl.c
> 
> @@ -1700,6 +1700,7 @@ ON_EXIT:
> 
>            }
> 
>  
> 
>            FreePool (Dns4TokenEntry->Token->RspData.H2AData);
> 
> +          Dns4TokenEntry->Token->RspData.H2AData = NULL;
> 
>          }
> 
>        }
> 
>      }
> 
> @@ -1731,6 +1732,7 @@ ON_EXIT:
> 
>            }
> 
>  
> 
>            FreePool (Dns6TokenEntry->Token->RspData.H2AData);
> 
> +          Dns6TokenEntry->Token->RspData.H2AData = NULL;
> 
>          }
> 
>        }
> 
>      }
> 
> -- 
> 
> 2.33.0.windows.2
> 
>  
> 
> 
> 
> 
> 
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84083): https://edk2.groups.io/g/devel/message/84083
Mute This Topic: https://groups.io/mt/87294818/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


回复: 回复: [edk2-devel] [Patch edk2-stable202111] NetworkPkg: Fix invalid pointer for DNS response token on error

Posted by gaoliming 1 week, 2 days ago
Leif:
  Yes. Both commit message and BZ are updated. 
  https://github.com/tianocore/edk2/pull/2222 is created to merge this patch. 

Thanks
Liming
> -----邮件原件-----
> 发件人: Leif Lindholm <leif@nuviainc.com>
> 发送时间: 2021年11月25日 18:55
> 收件人: devel@edk2.groups.io; gaoliming@byosoft.com.cn
> 抄送: jiaxin.wu@intel.com; 'Anbazhagan, Baraneedharan'
> <anbazhagan@hp.com>; maciej.rabeda@linux.intel.com; 'Fu, Siyuan'
> <siyuan.fu@intel.com>; 'Andrew Fish' <afish@apple.com>; 'Michael D Kinney'
> <michael.d.kinney@intel.com>
> 主题: Re: 回复: [edk2-devel] [Patch edk2-stable202111] NetworkPkg: Fix
> invalid pointer for DNS response token on error
> 
> Agreed, but the commit message (and the BZ) should state which commit
> introduced this issue.
> 
> /
>     Leif
> 
> On Thu, Nov 25, 2021 at 09:52:58 +0800, gaoliming wrote:
> > I suggest to merge this fix for the stable tag 202111. This fix is low risk.
> >
> >
> >
> >
> > Thanks
> >
> > Liming
> >
> > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Wu, Jiaxin
> > 发送时间: 2021年11月25日 9:37
> > 收件人: Anbazhagan, Baraneedharan <anbazhagan@hp.com>;
> devel@edk2.groups.io
> > 抄送: maciej.rabeda@linux.intel.com; Fu, Siyuan <siyuan.fu@intel.com>
> > 主题: Re: [edk2-devel] NetworkPkg: Fix invalid pointer for DNS response
> > token on error
> >
> >
> >
> > Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com
> <mailto:jiaxin.wu@intel.com> >
> >
> >
> >
> >
> >
> >
> >
> > From: Anbazhagan, Baraneedharan <anbazhagan@hp.com
> > <mailto:anbazhagan@hp.com> >
> > Sent: Thursday, November 25, 2021 9:28 AM
> > To: devel@edk2.groups.io <mailto:devel@edk2.groups.io>
> > Cc: maciej.rabeda@linux.intel.com
> <mailto:maciej.rabeda@linux.intel.com> ;
> > Wu, Jiaxin <jiaxin.wu@intel.com <mailto:jiaxin.wu@intel.com> >; Fu, Siyuan
> > <siyuan.fu@intel.com <mailto:siyuan.fu@intel.com> >
> > Subject: RE: NetworkPkg: Fix invalid pointer for DNS response token on
> error
> >
> >
> >
> > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3719
> >
> >
> >
> > Token->RspData.H2AData is de-allocated on error but it is not
> >
> > set to NULL. HTTP module attempts to free again and cause assert.
> >
> >
> >
> > Signed-off-by: Baraneedharan Anbazhagan anbazhagan@hp.com
> > <mailto:anbazhagan@hp.com>
> >
> > ---
> >
> > NetworkPkg/DnsDxe/DnsImpl.c | 2 ++
> >
> > 1 file changed, 2 insertions(+)
> >
> >
> >
> > diff --git a/NetworkPkg/DnsDxe/DnsImpl.c
> b/NetworkPkg/DnsDxe/DnsImpl.c
> >
> > index 2edcb280ac..78a56f2b56 100644
> >
> > --- a/NetworkPkg/DnsDxe/DnsImpl.c
> >
> > +++ b/NetworkPkg/DnsDxe/DnsImpl.c
> >
> > @@ -1700,6 +1700,7 @@ ON_EXIT:
> >
> >            }
> >
> >
> >
> >            FreePool (Dns4TokenEntry->Token->RspData.H2AData);
> >
> > +          Dns4TokenEntry->Token->RspData.H2AData = NULL;
> >
> >          }
> >
> >        }
> >
> >      }
> >
> > @@ -1731,6 +1732,7 @@ ON_EXIT:
> >
> >            }
> >
> >
> >
> >            FreePool (Dns6TokenEntry->Token->RspData.H2AData);
> >
> > +          Dns6TokenEntry->Token->RspData.H2AData = NULL;
> >
> >          }
> >
> >        }
> >
> >      }
> >
> > --
> >
> > 2.33.0.windows.2
> >
> >
> >
> >
> >
> >
> >
> > 
> >
> >






-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84093): https://edk2.groups.io/g/devel/message/84093
Mute This Topic: https://groups.io/mt/87315952/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [Patch edk2-stable202111] NetworkPkg: Fix invalid pointer for DNS response token on error

Posted by Michael D Kinney 1 week, 3 days ago
Hi Liming,

I agree it is both low risk and prevents an ASSERT() condition that should never be triggered.

I approve for edk2-stable202111

Mike

From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming
Sent: Wednesday, November 24, 2021 5:53 PM
To: devel@edk2.groups.io; Wu, Jiaxin <jiaxin.wu@intel.com>; Anbazhagan, Baraneedharan <anbazhagan@hp.com>
Cc: maciej.rabeda@linux.intel.com; Fu, Siyuan <siyuan.fu@intel.com>; leif@nuviainc.com; 'Andrew Fish' <afish@apple.com>; Kinney, Michael D <michael.d.kinney@intel.com>
Subject: 回复: [edk2-devel] [Patch edk2-stable202111] NetworkPkg: Fix invalid pointer for DNS response token on error

I suggest to merge this fix for the stable tag 202111. This fix is low risk.

Thanks
Liming
发件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> 代表 Wu, Jiaxin
发送时间: 2021年11月25日 9:37
收件人: Anbazhagan, Baraneedharan <anbazhagan@hp.com<mailto:anbazhagan@hp.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io>
抄送: maciej.rabeda@linux.intel.com<mailto:maciej.rabeda@linux.intel.com>; Fu, Siyuan <siyuan.fu@intel.com<mailto:siyuan.fu@intel.com>>
主题: Re: [edk2-devel] NetworkPkg: Fix invalid pointer for DNS response token on error

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



From: Anbazhagan, Baraneedharan <anbazhagan@hp.com<mailto:anbazhagan@hp.com>>
Sent: Thursday, November 25, 2021 9:28 AM
To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>
Cc: maciej.rabeda@linux.intel.com<mailto:maciej.rabeda@linux.intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com<mailto:jiaxin.wu@intel.com>>; Fu, Siyuan <siyuan.fu@intel.com<mailto:siyuan.fu@intel.com>>
Subject: RE: NetworkPkg: Fix invalid pointer for DNS response token on error

Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3719

Token->RspData.H2AData is de-allocated on error but it is not
set to NULL. HTTP module attempts to free again and cause assert.

Signed-off-by: Baraneedharan Anbazhagan anbazhagan@hp.com<mailto:anbazhagan@hp.com>
---
NetworkPkg/DnsDxe/DnsImpl.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/NetworkPkg/DnsDxe/DnsImpl.c b/NetworkPkg/DnsDxe/DnsImpl.c
index 2edcb280ac..78a56f2b56 100644
--- a/NetworkPkg/DnsDxe/DnsImpl.c
+++ b/NetworkPkg/DnsDxe/DnsImpl.c
@@ -1700,6 +1700,7 @@ ON_EXIT:
           }

           FreePool (Dns4TokenEntry->Token->RspData.H2AData);
+          Dns4TokenEntry->Token->RspData.H2AData = NULL;
         }
       }
     }
@@ -1731,6 +1732,7 @@ ON_EXIT:
           }

           FreePool (Dns6TokenEntry->Token->RspData.H2AData);
+          Dns6TokenEntry->Token->RspData.H2AData = NULL;
         }
       }
     }
--
2.33.0.windows.2




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84075): https://edk2.groups.io/g/devel/message/84075
Mute This Topic: https://groups.io/mt/87295090/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-