| Message ID | d2b35b6077ffe9072f2b5924b02a75751ffc6031.1495508197.git.maozy.fnst@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On 05/23/2017 01:04 AM, Mao Zhongyi wrote: > pci_rocker_init() leaks a World when the name more than 9 chars, > then return a negative value directly, doesn't make a correct > cleanup. So add a new goto label to fix it. > > Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com> > Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/net/rocker/rocker.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c > index d01ba9d..6d44f37 100644 > --- a/hw/net/rocker/rocker.c > +++ b/hw/net/rocker/rocker.c > @@ -1357,7 +1357,8 @@ static int pci_rocker_init(PCIDevice *dev) > fprintf(stderr, > "rocker: name too long; please shorten to at most %d chars\n", > MAX_ROCKER_NAME_LEN); > - return -EINVAL; > + err = -EINVAL; > + goto err_name_too_long; > } > > if (memcmp(&r->fp_start_macaddr, &zero, sizeof(zero)) == 0) { > @@ -1416,6 +1417,7 @@ static int pci_rocker_init(PCIDevice *dev) > > return 0; > > +err_name_too_long: > err_duplicate: > rocker_msix_uninit(r); > err_msix_init: >
diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index d01ba9d..6d44f37 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -1357,7 +1357,8 @@ static int pci_rocker_init(PCIDevice *dev) fprintf(stderr, "rocker: name too long; please shorten to at most %d chars\n", MAX_ROCKER_NAME_LEN); - return -EINVAL; + err = -EINVAL; + goto err_name_too_long; } if (memcmp(&r->fp_start_macaddr, &zero, sizeof(zero)) == 0) { @@ -1416,6 +1417,7 @@ static int pci_rocker_init(PCIDevice *dev) return 0; +err_name_too_long: err_duplicate: rocker_msix_uninit(r); err_msix_init: