* [Qemu-trivial] [PATCH] piix: fix resource leak reported by Coverity @ 2015-09-14 10:40 ` zhanghailiang 0 siblings, 0 replies; 6+ messages in thread From: zhanghailiang @ 2015-09-14 10:40 UTC (permalink / raw) To: qemu-trivial; +Cc: zhanghailiang, qemu-devel, mst config_fd should be closed before return, or there will be a resource leak error. Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> --- hw/pci-host/piix.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 1fb71c8..7b2fbf9 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -764,6 +764,7 @@ static int host_pci_config_read(int pos, int len, uint32_t val) /* Access real host bridge. */ int rc = snprintf(path, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", 0, 0, 0, 0, "config"); + int ret = 0; if (rc >= size || rc < 0) { return -ENODEV; @@ -775,16 +776,18 @@ static int host_pci_config_read(int pos, int len, uint32_t val) } if (lseek(config_fd, pos, SEEK_SET) != pos) { - return -errno; + ret = -errno; + goto out; } do { rc = read(config_fd, (uint8_t *)&val, len); } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); if (rc != len) { - return -errno; + ret = -errno; } - - return 0; +out: + close(config_fd); + return ret; } static int igd_pt_i440fx_initfn(struct PCIDevice *pci_dev) -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH] piix: fix resource leak reported by Coverity @ 2015-09-14 10:40 ` zhanghailiang 0 siblings, 0 replies; 6+ messages in thread From: zhanghailiang @ 2015-09-14 10:40 UTC (permalink / raw) To: qemu-trivial; +Cc: zhanghailiang, qemu-devel, mst config_fd should be closed before return, or there will be a resource leak error. Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> --- hw/pci-host/piix.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 1fb71c8..7b2fbf9 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -764,6 +764,7 @@ static int host_pci_config_read(int pos, int len, uint32_t val) /* Access real host bridge. */ int rc = snprintf(path, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", 0, 0, 0, 0, "config"); + int ret = 0; if (rc >= size || rc < 0) { return -ENODEV; @@ -775,16 +776,18 @@ static int host_pci_config_read(int pos, int len, uint32_t val) } if (lseek(config_fd, pos, SEEK_SET) != pos) { - return -errno; + ret = -errno; + goto out; } do { rc = read(config_fd, (uint8_t *)&val, len); } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); if (rc != len) { - return -errno; + ret = -errno; } - - return 0; +out: + close(config_fd); + return ret; } static int igd_pt_i440fx_initfn(struct PCIDevice *pci_dev) -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-trivial] [Qemu-devel] [PATCH] piix: fix resource leak reported by Coverity 2015-09-14 10:40 ` [Qemu-devel] " zhanghailiang @ 2015-10-16 12:01 ` Stefan Hajnoczi -1 siblings, 0 replies; 6+ messages in thread From: Stefan Hajnoczi @ 2015-10-16 12:01 UTC (permalink / raw) To: zhanghailiang; +Cc: qemu-trivial, qemu-devel, mst On Mon, Sep 14, 2015 at 06:40:10PM +0800, zhanghailiang wrote: > config_fd should be closed before return, or there will > be a resource leak error. > > Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> > --- > hw/pci-host/piix.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] piix: fix resource leak reported by Coverity @ 2015-10-16 12:01 ` Stefan Hajnoczi 0 siblings, 0 replies; 6+ messages in thread From: Stefan Hajnoczi @ 2015-10-16 12:01 UTC (permalink / raw) To: zhanghailiang; +Cc: qemu-trivial, qemu-devel, mst On Mon, Sep 14, 2015 at 06:40:10PM +0800, zhanghailiang wrote: > config_fd should be closed before return, or there will > be a resource leak error. > > Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> > --- > hw/pci-host/piix.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-trivial] [PATCH] piix: fix resource leak reported by Coverity 2015-09-14 10:40 ` [Qemu-devel] " zhanghailiang @ 2015-10-29 7:40 ` Michael Tokarev -1 siblings, 0 replies; 6+ messages in thread From: Michael Tokarev @ 2015-10-29 7:40 UTC (permalink / raw) To: zhanghailiang, qemu-trivial; +Cc: qemu-devel, mst [-- Attachment #1: Type: text/plain, Size: 1418 bytes --] 14.09.2015 13:40, zhanghailiang wrote: > config_fd should be closed before return, or there will > be a resource leak error. > > Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> > --- > hw/pci-host/piix.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c > index 1fb71c8..7b2fbf9 100644 > --- a/hw/pci-host/piix.c > +++ b/hw/pci-host/piix.c > @@ -764,6 +764,7 @@ static int host_pci_config_read(int pos, int len, uint32_t val) > /* Access real host bridge. */ > int rc = snprintf(path, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", > 0, 0, 0, 0, "config"); > + int ret = 0; > > if (rc >= size || rc < 0) { > return -ENODEV; > @@ -775,16 +776,18 @@ static int host_pci_config_read(int pos, int len, uint32_t val) > } > > if (lseek(config_fd, pos, SEEK_SET) != pos) { > - return -errno; > + ret = -errno; > + goto out; > } > do { > rc = read(config_fd, (uint8_t *)&val, len); > } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); > if (rc != len) { > - return -errno; > + ret = -errno; > } > - > - return 0; > +out: > + close(config_fd); > + return ret; > } > > static int igd_pt_i440fx_initfn(struct PCIDevice *pci_dev) How about the attached (untested)? Thanks, /mjt [-- Attachment #2: piix-fix-resource-leak.diff --] [-- Type: text/x-patch, Size: 1114 bytes --] diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 7b2fbf9..42f847d 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -764,7 +764,6 @@ static int host_pci_config_read(int pos, int len, uint32_t val) /* Access real host bridge. */ int rc = snprintf(path, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", 0, 0, 0, 0, "config"); - int ret = 0; if (rc >= size || rc < 0) { return -ENODEV; @@ -774,20 +773,15 @@ static int host_pci_config_read(int pos, int len, uint32_t val) if (config_fd < 0) { return -ENODEV; } - - if (lseek(config_fd, pos, SEEK_SET) != pos) { - ret = -errno; - goto out; - } do { - rc = read(config_fd, (uint8_t *)&val, len); + rc = pread(config_fd, (uint8_t *)&val, len, pos); } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); + close(config_fd); if (rc != len) { - ret = -errno; + return -errno; } -out: - close(config_fd); - return ret; + + return 0; } static int igd_pt_i440fx_initfn(struct PCIDevice *pci_dev) ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] piix: fix resource leak reported by Coverity @ 2015-10-29 7:40 ` Michael Tokarev 0 siblings, 0 replies; 6+ messages in thread From: Michael Tokarev @ 2015-10-29 7:40 UTC (permalink / raw) To: zhanghailiang, qemu-trivial; +Cc: qemu-devel, mst [-- Attachment #1: Type: text/plain, Size: 1418 bytes --] 14.09.2015 13:40, zhanghailiang wrote: > config_fd should be closed before return, or there will > be a resource leak error. > > Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> > --- > hw/pci-host/piix.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c > index 1fb71c8..7b2fbf9 100644 > --- a/hw/pci-host/piix.c > +++ b/hw/pci-host/piix.c > @@ -764,6 +764,7 @@ static int host_pci_config_read(int pos, int len, uint32_t val) > /* Access real host bridge. */ > int rc = snprintf(path, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", > 0, 0, 0, 0, "config"); > + int ret = 0; > > if (rc >= size || rc < 0) { > return -ENODEV; > @@ -775,16 +776,18 @@ static int host_pci_config_read(int pos, int len, uint32_t val) > } > > if (lseek(config_fd, pos, SEEK_SET) != pos) { > - return -errno; > + ret = -errno; > + goto out; > } > do { > rc = read(config_fd, (uint8_t *)&val, len); > } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); > if (rc != len) { > - return -errno; > + ret = -errno; > } > - > - return 0; > +out: > + close(config_fd); > + return ret; > } > > static int igd_pt_i440fx_initfn(struct PCIDevice *pci_dev) How about the attached (untested)? Thanks, /mjt [-- Attachment #2: piix-fix-resource-leak.diff --] [-- Type: text/x-patch, Size: 1114 bytes --] diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 7b2fbf9..42f847d 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -764,7 +764,6 @@ static int host_pci_config_read(int pos, int len, uint32_t val) /* Access real host bridge. */ int rc = snprintf(path, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", 0, 0, 0, 0, "config"); - int ret = 0; if (rc >= size || rc < 0) { return -ENODEV; @@ -774,20 +773,15 @@ static int host_pci_config_read(int pos, int len, uint32_t val) if (config_fd < 0) { return -ENODEV; } - - if (lseek(config_fd, pos, SEEK_SET) != pos) { - ret = -errno; - goto out; - } do { - rc = read(config_fd, (uint8_t *)&val, len); + rc = pread(config_fd, (uint8_t *)&val, len, pos); } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); + close(config_fd); if (rc != len) { - ret = -errno; + return -errno; } -out: - close(config_fd); - return ret; + + return 0; } static int igd_pt_i440fx_initfn(struct PCIDevice *pci_dev) ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-10-29 7:40 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-09-14 10:40 [Qemu-trivial] [PATCH] piix: fix resource leak reported by Coverity zhanghailiang 2015-09-14 10:40 ` [Qemu-devel] " zhanghailiang 2015-10-16 12:01 ` [Qemu-trivial] " Stefan Hajnoczi 2015-10-16 12:01 ` Stefan Hajnoczi 2015-10-29 7:40 ` [Qemu-trivial] " Michael Tokarev 2015-10-29 7:40 ` [Qemu-devel] " Michael Tokarev
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.