From: AlexChen <alex.chen@huawei.com>
The 'kdgb' is allocating memory in get_kdbg(), but it is not freed
in both fill_header() and fill_context() failed branches, fix it.
Signed-off-by: AlexChen <alex.chen@huawei.com>
---
contrib/elf2dmp/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c
index 9a2dbc2902..ac746e49e0 100644
--- a/contrib/elf2dmp/main.c
+++ b/contrib/elf2dmp/main.c
@@ -568,12 +568,12 @@ int main(int argc, char *argv[])
if (fill_header(&header, &ps, &vs, KdDebuggerDataBlock, kdbg,
KdVersionBlock, qemu_elf.state_nr)) {
err = 1;
- goto out_pdb;
+ goto out_kdbg;
}
if (fill_context(kdbg, &vs, &qemu_elf)) {
err = 1;
- goto out_pdb;
+ goto out_kdbg;
}
if (write_dump(&ps, &header, argv[2])) {
--
2.19.1
Kindly ping. On 2020/8/26 18:15, AlexChen wrote: > From: AlexChen <alex.chen@huawei.com> > > The 'kdgb' is allocating memory in get_kdbg(), but it is not freed > in both fill_header() and fill_context() failed branches, fix it. > > Signed-off-by: AlexChen <alex.chen@huawei.com> > --- > contrib/elf2dmp/main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c > index 9a2dbc2902..ac746e49e0 100644 > --- a/contrib/elf2dmp/main.c > +++ b/contrib/elf2dmp/main.c > @@ -568,12 +568,12 @@ int main(int argc, char *argv[]) > if (fill_header(&header, &ps, &vs, KdDebuggerDataBlock, kdbg, > KdVersionBlock, qemu_elf.state_nr)) { > err = 1; > - goto out_pdb; > + goto out_kdbg; > } > > if (fill_context(kdbg, &vs, &qemu_elf)) { > err = 1; > - goto out_pdb; > + goto out_kdbg; > } > > if (write_dump(&ps, &header, argv[2])) { >
AlexChen <alex.chen@huawei.com> 于2020年8月26日周三 下午6:16写道: > > From: AlexChen <alex.chen@huawei.com> Reviewed-by: Li Qiang <liq3ea@gmail.com> > > The 'kdgb' is allocating memory in get_kdbg(), but it is not freed > in both fill_header() and fill_context() failed branches, fix it. > > Signed-off-by: AlexChen <alex.chen@huawei.com> > --- > contrib/elf2dmp/main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c > index 9a2dbc2902..ac746e49e0 100644 > --- a/contrib/elf2dmp/main.c > +++ b/contrib/elf2dmp/main.c > @@ -568,12 +568,12 @@ int main(int argc, char *argv[]) > if (fill_header(&header, &ps, &vs, KdDebuggerDataBlock, kdbg, > KdVersionBlock, qemu_elf.state_nr)) { > err = 1; > - goto out_pdb; > + goto out_kdbg; > } > > if (fill_context(kdbg, &vs, &qemu_elf)) { > err = 1; > - goto out_pdb; > + goto out_kdbg; > } > > if (write_dump(&ps, &header, argv[2])) { > -- > 2.19.1 > >
On Wed, 26 Aug 2020 18:15:53 +0800 AlexChen <alex.chen@huawei.com> wrote: > From: AlexChen <alex.chen@huawei.com> > > The 'kdgb' is allocating memory in get_kdbg(), but it is not freed > in both fill_header() and fill_context() failed branches, fix it. > > Signed-off-by: AlexChen <alex.chen@huawei.com> > --- > contrib/elf2dmp/main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c > index 9a2dbc2902..ac746e49e0 100644 > --- a/contrib/elf2dmp/main.c > +++ b/contrib/elf2dmp/main.c > @@ -568,12 +568,12 @@ int main(int argc, char *argv[]) > if (fill_header(&header, &ps, &vs, KdDebuggerDataBlock, kdbg, > KdVersionBlock, qemu_elf.state_nr)) { > err = 1; > - goto out_pdb; > + goto out_kdbg; > } > > if (fill_context(kdbg, &vs, &qemu_elf)) { > err = 1; > - goto out_pdb; > + goto out_kdbg; > } > > if (write_dump(&ps, &header, argv[2])) { Reviewed-by: Viktor Prutyanov <viktor.prutyanov@phystech.edu> -- Viktor Prutyanov
On 26/08/2020 12.15, AlexChen wrote: > From: AlexChen <alex.chen@huawei.com> > > The 'kdgb' is allocating memory in get_kdbg(), but it is not freed > in both fill_header() and fill_context() failed branches, fix it. > > Signed-off-by: AlexChen <alex.chen@huawei.com> > --- > contrib/elf2dmp/main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c > index 9a2dbc2902..ac746e49e0 100644 > --- a/contrib/elf2dmp/main.c > +++ b/contrib/elf2dmp/main.c > @@ -568,12 +568,12 @@ int main(int argc, char *argv[]) > if (fill_header(&header, &ps, &vs, KdDebuggerDataBlock, kdbg, > KdVersionBlock, qemu_elf.state_nr)) { > err = 1; > - goto out_pdb; > + goto out_kdbg; > } > > if (fill_context(kdbg, &vs, &qemu_elf)) { > err = 1; > - goto out_pdb; > + goto out_kdbg; > } > > if (write_dump(&ps, &header, argv[2])) { > I think this could go via qemu-trivial (now on CC:). Reviewed-by: Thomas Huth <thuth@redhat.com>
Le 11/09/2020 à 06:18, Thomas Huth a écrit : > On 26/08/2020 12.15, AlexChen wrote: >> From: AlexChen <alex.chen@huawei.com> >> >> The 'kdgb' is allocating memory in get_kdbg(), but it is not freed >> in both fill_header() and fill_context() failed branches, fix it. >> >> Signed-off-by: AlexChen <alex.chen@huawei.com> >> --- >> contrib/elf2dmp/main.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c >> index 9a2dbc2902..ac746e49e0 100644 >> --- a/contrib/elf2dmp/main.c >> +++ b/contrib/elf2dmp/main.c >> @@ -568,12 +568,12 @@ int main(int argc, char *argv[]) >> if (fill_header(&header, &ps, &vs, KdDebuggerDataBlock, kdbg, >> KdVersionBlock, qemu_elf.state_nr)) { >> err = 1; >> - goto out_pdb; >> + goto out_kdbg; >> } >> >> if (fill_context(kdbg, &vs, &qemu_elf)) { >> err = 1; >> - goto out_pdb; >> + goto out_kdbg; >> } >> >> if (write_dump(&ps, &header, argv[2])) { >> > > I think this could go via qemu-trivial (now on CC:). > > Reviewed-by: Thomas Huth <thuth@redhat.com> > > Applied to my trivial-patches branch. Thanks, Laurent
© 2016 - 2024 Red Hat, Inc.