[Qemu-devel] [PATCH v2] file-posix: Don't leak fd in hdev_get_max_segments

Fam Zheng posted 1 patch 7 years, 1 month ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20170314161205.19415-1-famz@redhat.com
Test checkpatch passed
Test docker passed
block/file-posix.c | 3 +++
1 file changed, 3 insertions(+)
[Qemu-devel] [PATCH v2] file-posix: Don't leak fd in hdev_get_max_segments
Posted by Fam Zheng 7 years, 1 month ago
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 block/file-posix.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/block/file-posix.c b/block/file-posix.c
index c4c0663..d670be3 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -703,6 +703,9 @@ static int hdev_get_max_segments(const struct stat *st)
     }
 
 out:
+    if (fd != -1) {
+        close(fd);
+    }
     g_free(sysfspath);
     return ret;
 #else
-- 
2.9.3


Re: [Qemu-devel] [PATCH v2] file-posix: Don't leak fd in hdev_get_max_segments
Posted by Kevin Wolf 7 years, 1 month ago
Am 14.03.2017 um 17:12 hat Fam Zheng geschrieben:
> Signed-off-by: Fam Zheng <famz@redhat.com>

Thanks, applied to the block branch.

Kevin

Re: [Qemu-devel] [PATCH v2] file-posix: Don't leak fd in hdev_get_max_segments
Posted by Eric Blake 7 years, 1 month ago
On 03/14/2017 11:12 AM, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  block/file-posix.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/block/file-posix.c b/block/file-posix.c
> index c4c0663..d670be3 100644
> --- a/block/file-posix.c
> +++ b/block/file-posix.c
> @@ -703,6 +703,9 @@ static int hdev_get_max_segments(const struct stat *st)
>      }
>  
>  out:
> +    if (fd != -1) {
> +        close(fd);
> +    }

Mails crossed - I see I asked about this in reply to v1 after you
already sent v2 minutes earlier.

I still think it might be nice to mention a commit id that you are
fixing (one of my reply-to-self on your v1), but either way,

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Re: [Qemu-devel] [PATCH v2] file-posix: Don't leak fd in hdev_get_max_segments
Posted by Kevin Wolf 7 years, 1 month ago
Am 14.03.2017 um 17:20 hat Eric Blake geschrieben:
> On 03/14/2017 11:12 AM, Fam Zheng wrote:
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> >  block/file-posix.c | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/block/file-posix.c b/block/file-posix.c
> > index c4c0663..d670be3 100644
> > --- a/block/file-posix.c
> > +++ b/block/file-posix.c
> > @@ -703,6 +703,9 @@ static int hdev_get_max_segments(const struct stat *st)
> >      }
> >  
> >  out:
> > +    if (fd != -1) {
> > +        close(fd);
> > +    }
> 
> Mails crossed - I see I asked about this in reply to v1 after you
> already sent v2 minutes earlier.
> 
> I still think it might be nice to mention a commit id that you are
> fixing (one of my reply-to-self on your v1), but either way,
> 
> Reviewed-by: Eric Blake <eblake@redhat.com>

I added a sentence to the commit message: "This fixes a leaked fd
introduced in commit 9103f1ce." Sounds good?

Kevin
Re: [Qemu-devel] [PATCH v2] file-posix: Don't leak fd in hdev_get_max_segments
Posted by Eric Blake 7 years, 1 month ago
On 03/14/2017 11:28 AM, Kevin Wolf wrote:
> Am 14.03.2017 um 17:20 hat Eric Blake geschrieben:
>> On 03/14/2017 11:12 AM, Fam Zheng wrote:
>>> Signed-off-by: Fam Zheng <famz@redhat.com>
>>> ---
>>>  block/file-posix.c | 3 +++
>>>  1 file changed, 3 insertions(+)
>>>
>>> diff --git a/block/file-posix.c b/block/file-posix.c
>>> index c4c0663..d670be3 100644
>>> --- a/block/file-posix.c
>>> +++ b/block/file-posix.c
>>> @@ -703,6 +703,9 @@ static int hdev_get_max_segments(const struct stat *st)
>>>      }
>>>  
>>>  out:
>>> +    if (fd != -1) {
>>> +        close(fd);
>>> +    }
>>
>> Mails crossed - I see I asked about this in reply to v1 after you
>> already sent v2 minutes earlier.
>>
>> I still think it might be nice to mention a commit id that you are
>> fixing (one of my reply-to-self on your v1), but either way,
>>
>> Reviewed-by: Eric Blake <eblake@redhat.com>
> 
> I added a sentence to the commit message: "This fixes a leaked fd
> introduced in commit 9103f1ce." Sounds good?

Works for me!

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org