From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96846C433DB for ; Mon, 22 Mar 2021 13:03:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0ECA161606 for ; Mon, 22 Mar 2021 13:03:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0ECA161606 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=ionos.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOKDZ-0002Qc-Sn for qemu-devel@archiver.kernel.org; Mon, 22 Mar 2021 09:03:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOHrV-0005dl-QF for qemu-devel@nongnu.org; Mon, 22 Mar 2021 06:32:41 -0400 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:45746) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOHrS-0007hB-TJ for qemu-devel@nongnu.org; Mon, 22 Mar 2021 06:32:41 -0400 Received: by mail-ej1-x62a.google.com with SMTP id kt15so10859347ejb.12 for ; Mon, 22 Mar 2021 03:32:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=WJcAxKoLOyu7tVpNhfyDAr5e2Be97fRA4Y0qjbOKOP0=; b=UmQlQ3xtNw4Z8A91jgUkDZ1rvJKGXXMdI5P6t3qYSqq4KaTZUVNxFeDI4KWD3jGBVb XmdFIctZ8ZKG9d3dhnJyNyho+e37Owam5gusM3UOvxvBSlvCAkVIM+r2MVMW0OPJxMYN O+w4dcvhQg24VwDyLhOjSt/lnM3dUZQJxGes+1vf8MVq1ewxVPK//VunkcqNVGoO30Ih 8vg73EwOVY5ilLXSpMGe+lxs7TxUqoVn8sP36kFACa+ss1PXg9Ps2/05tCMaCPSNy8gf qs+ePBLEQKUMMNN0//Av3CqHIXVyN92+66zrD7DjDjXN19/9gRx5C4dvBRAOaFA/R05o LMyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=WJcAxKoLOyu7tVpNhfyDAr5e2Be97fRA4Y0qjbOKOP0=; b=fGdh0r2F9RQR0xCzZMSgqMSeo0hsX0cp9Ft+I3iDLZjyAm3fbBSyAkNbFh1wk38wd9 j4XyBZCaD5aLcaITT53Ibw90VB16P7HvBPqeVzrI/PT4LK4QUAliAMPpPhwD+A4v8wKX C71ACzKNhTz4UQMxy/9e7a7xKIC3AaaQHFDMjixCGEtCuEb+LMDMUtdEOnK2CwlFuqg5 j544BIcZTplToQVrF+icIkA6iniv9/3MzOwYoRh83gqwChF9Urxw3vDr/WmKB9DTe150 VIgHbMwyRdai69xUA2fXaSRFdb2yyLmjJc0wxjdzEbeyLjetp7RgCJWT5J0EbxXj3Fpt njsQ== X-Gm-Message-State: AOAM531xU2jX/yYCDVKidPMhG0KJwD+lLA/s271Hf/cKnitsW/MRnLbv hCrjyOpfx46whEz/GB1T33vryQ06ipxuGWC46ozWWA== X-Google-Smtp-Source: ABdhPJyy9wcASOFNBzNfIqnXG1Xcxb+23i2/dZP+LUgptpts31BFp7wPDqBPs1YY9fpryyJa6uuVURtCc0ovlui3prQ= X-Received: by 2002:a17:906:7d82:: with SMTP id v2mr18624834ejo.524.1616409155268; Mon, 22 Mar 2021 03:32:35 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Li Zhang Date: Mon, 22 Mar 2021 11:32:24 +0100 Message-ID: Subject: Re: [PATCH 4/5] chardev/char.c: Always pass id to chardev_new To: Lukas Straub Content-Type: multipart/alternative; boundary="00000000000083027505be1d9584" Received-SPF: permerror client-ip=2a00:1450:4864:20::62a; envelope-from=li.zhang@ionos.com; helo=mail-ej1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Mon, 22 Mar 2021 09:01:22 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , qemu-devel , Li Zhang , Paolo Bonzini , Marc-Andre Lureau Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --00000000000083027505be1d9584 Content-Type: text/plain; charset="UTF-8" Looks good to me. I have tested this series, it works well. Tested-by: Li Zhang Thanks Li On Mon, Mar 22, 2021 at 12:35 AM Lukas Straub wrote: > Always pass the id to chardev_new, since it is needed to register > the yank instance for the chardev. Also, after checking that > nothing calls chardev_new with id=NULL, assert() that id!=NULL. > > This fixes a crash when using chardev-change to change a chardev > to chardev-socket, which attempts to register a yank instance. > This in turn tries to dereference the NULL-pointer. > > Signed-off-by: Lukas Straub > --- > chardev/char.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/chardev/char.c b/chardev/char.c > index 1584865027..ad416c0714 100644 > --- a/chardev/char.c > +++ b/chardev/char.c > @@ -964,6 +964,7 @@ static Chardev *chardev_new(const char *id, const char > *typename, > bool be_opened = true; > > assert(g_str_has_prefix(typename, "chardev-")); > + assert(id); > > obj = object_new(typename); > chr = CHARDEV(obj); > @@ -1092,12 +1093,11 @@ ChardevReturn *qmp_chardev_change(const char *id, > ChardevBackend *backend, > return NULL; > } > > - chr_new = chardev_new(NULL, object_class_get_name(OBJECT_CLASS(cc)), > + chr_new = chardev_new(id, object_class_get_name(OBJECT_CLASS(cc)), > backend, chr->gcontext, errp); > if (!chr_new) { > return NULL; > } > - chr_new->label = g_strdup(id); > > if (chr->be_open && !chr_new->be_open) { > qemu_chr_be_event(chr, CHR_EVENT_CLOSED); > -- > 2.30.2 > > --00000000000083027505be1d9584 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Looks good to me. I have tested this series, it w= orks well.=C2=A0
Tested-by: Li Zhang <li.zhang@cloud.ionos.com>=C2=A0

Thanks
Li

On Mon, Mar 22, 2021 at 12:35 AM Lukas St= raub <lukasstraub2@web.de>= wrote:
Always p= ass the id to chardev_new, since it is needed to register
the yank instance for the chardev. Also, after checking that
nothing calls chardev_new with id=3DNULL, assert() that id!=3DNULL.

This fixes a crash when using chardev-change to change a chardev
to chardev-socket, which attempts to register a yank instance.
This in turn tries to dereference the NULL-pointer.

Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
=C2=A0chardev/char.c | 4 ++--
=C2=A01 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chardev/char.c b/chardev/char.c
index 1584865027..ad416c0714 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -964,6 +964,7 @@ static Chardev *chardev_new(const char *id, const char = *typename,
=C2=A0 =C2=A0 =C2=A0bool be_opened =3D true;

=C2=A0 =C2=A0 =C2=A0assert(g_str_has_prefix(typename, "chardev-")= );
+=C2=A0 =C2=A0 assert(id);

=C2=A0 =C2=A0 =C2=A0obj =3D object_new(typename);
=C2=A0 =C2=A0 =C2=A0chr =3D CHARDEV(obj);
@@ -1092,12 +1093,11 @@ ChardevReturn *qmp_chardev_change(const char *id, C= hardevBackend *backend,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return NULL;
=C2=A0 =C2=A0 =C2=A0}

-=C2=A0 =C2=A0 chr_new =3D chardev_new(NULL, object_class_get_name(OBJECT_C= LASS(cc)),
+=C2=A0 =C2=A0 chr_new =3D chardev_new(id, object_class_get_name(OBJECT_CLA= SS(cc)),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0backend, chr->gcontext, errp);
=C2=A0 =C2=A0 =C2=A0if (!chr_new) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return NULL;
=C2=A0 =C2=A0 =C2=A0}
-=C2=A0 =C2=A0 chr_new->label =3D g_strdup(id);

=C2=A0 =C2=A0 =C2=A0if (chr->be_open && !chr_new->be_open) {<= br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0qemu_chr_be_event(chr, CHR_EVENT_CLOSED);=
--
2.30.2

--00000000000083027505be1d9584--