| Message ID | 1408695831-11844-1-git-send-email-zhang.zhanghailiang@huawei.com |
|---|---|
| State | New |
| Headers | show |
> -----Original Message----- > From: qemu-devel-bounces+arei.gonglei=huawei.com@nongnu.org > [mailto:qemu-devel-bounces+arei.gonglei=huawei.com@nongnu.org] On > Behalf Of zhanghailiang > Sent: Friday, August 22, 2014 4:24 PM > To: qemu-devel@nongnu.org > Cc: qemu-trivial@nongnu.org; riku.voipio@iki.fi; Luonengjun; Huangpeng > (Peter); Zhanghailiang > Subject: [Qemu-devel] [PATCH] linux-user: fix file descriptor leaks > > Handle variable "fd_orig" going out of scope leaks the handle. > > Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> > --- > linux-user/syscall.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index a50229d..11a48c2 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -5082,6 +5082,7 @@ static int open_self_cmdline(void *cpu_env, int fd) > > if (word_skipped) { > if (write(fd, cp_buf, nb_read) != nb_read) { > + close(fd_orig); > return -1; > } > } > -- > 1.7.12.4 > > Reviewed-by: Gonglei <arei.gonglei@huawei.com> Best regards, -Gonglei
Applied to -trivial, thank you! /mjt
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a50229d..11a48c2 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5082,6 +5082,7 @@ static int open_self_cmdline(void *cpu_env, int fd) if (word_skipped) { if (write(fd, cp_buf, nb_read) != nb_read) { + close(fd_orig); return -1; } }
Handle variable "fd_orig" going out of scope leaks the handle. Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> --- linux-user/syscall.c | 1 + 1 file changed, 1 insertion(+)