diff mbox

[v2] qga/commands-posix: Fix resource leak

Message ID 1426326735-11448-1-git-send-email-zhaoshenglong@huawei.com
State New
Headers show

Commit Message

Shannon Zhao March 14, 2015, 9:52 a.m. UTC
It's detected by coverity. Close the dirfd.

Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
    v1->v2: close after use [Stefan Weil]
---
 qga/commands-posix.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Stefan Weil March 14, 2015, 9:56 a.m. UTC | #1
Am 14.03.2015 um 10:52 schrieb Shannon Zhao:
> It's detected by coverity. Close the dirfd.
>
> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> ---
>      v1->v2: close after use [Stefan Weil]
> ---
>   qga/commands-posix.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
> index d5bb5cb..ba8de62 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -2283,6 +2283,7 @@ GuestMemoryBlockInfo *qmp_guest_get_memory_block_info(Error **errp)
>   
>       buf = g_malloc0(20);
>       ga_read_sysfs_file(dirfd, "block_size_bytes", buf, 20, &local_err);
> +    close(dirfd);
>       if (local_err) {
>           g_free(buf);
>           error_propagate(errp, local_err);

Thanks.

Reviewed-by: Stefan Weil <sw@weilnetz.de>
Zhanghailiang March 16, 2015, 1:27 a.m. UTC | #2
On 2015/3/14 17:52, Shannon Zhao wrote:
> It's detected by coverity. Close the dirfd.
>

Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com>

> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> ---
>      v1->v2: close after use [Stefan Weil]
> ---
>   qga/commands-posix.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
> index d5bb5cb..ba8de62 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -2283,6 +2283,7 @@ GuestMemoryBlockInfo *qmp_guest_get_memory_block_info(Error **errp)
>
>       buf = g_malloc0(20);
>       ga_read_sysfs_file(dirfd, "block_size_bytes", buf, 20, &local_err);
> +    close(dirfd);
>       if (local_err) {
>           g_free(buf);
>           error_propagate(errp, local_err);
>
Shannon Zhao March 16, 2015, 4:17 a.m. UTC | #3
On 2015/3/14 17:56, Stefan Weil wrote:
> Am 14.03.2015 um 10:52 schrieb Shannon Zhao:
>> It's detected by coverity. Close the dirfd.
>>
>> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
>> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
>> ---
>>      v1->v2: close after use [Stefan Weil]
>> ---
>>   qga/commands-posix.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
>> index d5bb5cb..ba8de62 100644
>> --- a/qga/commands-posix.c
>> +++ b/qga/commands-posix.c
>> @@ -2283,6 +2283,7 @@ GuestMemoryBlockInfo *qmp_guest_get_memory_block_info(Error **errp)
>>         buf = g_malloc0(20);
>>       ga_read_sysfs_file(dirfd, "block_size_bytes", buf, 20, &local_err);
>> +    close(dirfd);
>>       if (local_err) {
>>           g_free(buf);
>>           error_propagate(errp, local_err);
> 
> Thanks.
> 
> Reviewed-by: Stefan Weil <sw@weilnetz.de>
> 
Hi Stefan,

Thanks for your review.

Shannon
Shannon Zhao March 16, 2015, 4:18 a.m. UTC | #4
On 2015/3/16 9:27, zhanghailiang wrote:
> On 2015/3/14 17:52, Shannon Zhao wrote:
>> It's detected by coverity. Close the dirfd.
>>
> 
> Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
> 

Hi zhanghailiang,

Thanks for your review.

Shannon

>> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
>> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
>> ---
>>      v1->v2: close after use [Stefan Weil]
>> ---
>>   qga/commands-posix.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
>> index d5bb5cb..ba8de62 100644
>> --- a/qga/commands-posix.c
>> +++ b/qga/commands-posix.c
>> @@ -2283,6 +2283,7 @@ GuestMemoryBlockInfo *qmp_guest_get_memory_block_info(Error **errp)
>>
>>       buf = g_malloc0(20);
>>       ga_read_sysfs_file(dirfd, "block_size_bytes", buf, 20, &local_err);
>> +    close(dirfd);
>>       if (local_err) {
>>           g_free(buf);
>>           error_propagate(errp, local_err);
>>
> 
> 
> 
> .
>
Michael Tokarev March 19, 2015, 8:40 a.m. UTC | #5
Applied to -trivial, thanks!

/mjt, who don't really expect another thanks! to his thanks!.. ;)
diff mbox

Patch

diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index d5bb5cb..ba8de62 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -2283,6 +2283,7 @@  GuestMemoryBlockInfo *qmp_guest_get_memory_block_info(Error **errp)
 
     buf = g_malloc0(20);
     ga_read_sysfs_file(dirfd, "block_size_bytes", buf, 20, &local_err);
+    close(dirfd);
     if (local_err) {
         g_free(buf);
         error_propagate(errp, local_err);