From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1W3X-0000RZ-IQ for qemu-devel@nongnu.org; Thu, 29 Mar 2018 07:49:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1W3S-0001Wi-FK for qemu-devel@nongnu.org; Thu, 29 Mar 2018 07:49:23 -0400 References: <152231456507.69730.15601462044394150786.stgit@bahia.lan> <152231460685.69730.14860451936216690693.stgit@bahia.lan> <20180329112721.6c7ee3f3@redhat.com> <20180329113941.6eebc57f@bahia.lan> <20180329123131.45d4a76c.cohuck@redhat.com> From: Thomas Huth Message-ID: <30257c4e-f1d9-7652-80dc-bc43eb0cf16d@redhat.com> Date: Thu, 29 Mar 2018 13:49:07 +0200 MIME-Version: 1.0 In-Reply-To: <20180329123131.45d4a76c.cohuck@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [qemu-s390x] [PATCH 2/3] hw/s390x: fix memory leak in s390_init_ipl_dev() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck , Greg Kurz Cc: Eduardo Habkost , David Hildenbrand , qemu-stable@nongnu.org, Peter Crosthwaite , Alexander Graf , qemu-devel@nongnu.org, qemu-s390x@nongnu.org, Paolo Bonzini , Igor Mammedov , Richard Henderson On 29.03.2018 12:31, Cornelia Huck wrote: > On Thu, 29 Mar 2018 11:39:41 +0200 > Greg Kurz wrote: > >> On Thu, 29 Mar 2018 11:27:21 +0200 >> Igor Mammedov wrote: >> >>> On Thu, 29 Mar 2018 11:10:06 +0200 >>> Greg Kurz wrote: >>> >>>> The string returned by object_property_get_str() is dynamically allocated. >>>> >>>> Fixes: 3c4e9baacf4d9 >>>> Signed-off-by: Greg Kurz >>>> --- >>>> hw/s390x/s390-virtio-ccw.c | 5 ++++- >>>> 1 file changed, 4 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c >>>> index 864145a7c6f3..435f7c99e77c 100644 >>>> --- a/hw/s390x/s390-virtio-ccw.c >>>> +++ b/hw/s390x/s390-virtio-ccw.c >>>> @@ -246,6 +246,7 @@ static void s390_init_ipl_dev(const char *kernel_filename, >>>> { >>>> Object *new = object_new(TYPE_S390_IPL); >>>> DeviceState *dev = DEVICE(new); >>>> + char *netboot_fw_prop; >>>> >>>> if (kernel_filename) { >>>> qdev_prop_set_string(dev, "kernel", kernel_filename); >>>> @@ -256,9 +257,11 @@ static void s390_init_ipl_dev(const char *kernel_filename, >>>> qdev_prop_set_string(dev, "cmdline", kernel_cmdline); >>>> qdev_prop_set_string(dev, "firmware", firmware); >>>> qdev_prop_set_bit(dev, "enforce_bios", enforce_bios); >>>> - if (!strlen(object_property_get_str(new, "netboot_fw", &error_abort))) { >>>> + netboot_fw_prop = object_property_get_str(new, "netboot_fw", &error_abort); >>>> + if (!strlen(netboot_fw_prop)) { >>> probably not really issue here but, >>> is strlen really safe in case netboot_fw_prop == NULL? >>> >> >> You're right, object_property_get_str() can theoretically return NULL and >> strlen() would crash... Not sure how this would happen though. Anyway, the >> current code doesn't check if object_property_get_str() returns NULL so >> if this needs to be fixed as well, let's do it in a followup patch. > > I don't think so - if the attribute exists, we'll always get != NULL if > I read the code correctly. Right, the property is always there, so this should never be NULL. Thomas