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=-7.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 37468C433DB for ; Mon, 22 Mar 2021 08:36:54 +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 9CF3561970 for ; Mon, 22 Mar 2021 08:36:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9CF3561970 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOG3Q-00011f-Hp for qemu-devel@archiver.kernel.org; Mon, 22 Mar 2021 04:36:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOFzx-0007xq-FG for qemu-devel@nongnu.org; Mon, 22 Mar 2021 04:33:17 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]:37600) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOFzu-0006OD-JE for qemu-devel@nongnu.org; Mon, 22 Mar 2021 04:33:16 -0400 Received: by mail-ed1-x529.google.com with SMTP id x21so18217086eds.4 for ; Mon, 22 Mar 2021 01:33:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=TuFbhq2XhRCZF5k4ejdf6JptcX/KbhUdNrfDfxa79Wo=; b=QeXftW8sKi8x/J0p2z4UBvspvU+5Vo6hkoy38b4tnhqU5qi9H/ttsGP+SSlIa0TOfN E+JTcNiZnU3/Ao2yzPe00e6Y55gty4wr/EpTEs9x2dpCOGo6riZ2pdJzs86cg8NXVtLx NeB++69xbxYzDIbcpOoVszpx8iR/xCiChjWuegyY9Zd2ZSHafFeCCOlWFCURB0l+gnqM K5QfBsbd8FhxIfzE1Tv6J+ITDTg9Lp+3JfwjtTXOTfIgN6rURMUgPcB+PnqXPreoaKFt Rd9YupXGzg6CeGXdYFVyzEH+I+C86qRGzEYEXOdh/t6eLxUB0iudB28jggPYy81N5NHq nuzw== 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=TuFbhq2XhRCZF5k4ejdf6JptcX/KbhUdNrfDfxa79Wo=; b=t2rqDV2CBLLzrUKDTgopp3Y1Y+1+FebQwdDFQvMyjMw3oftXvneNBktt6O/gcv1keL 4/Rwsf9yTuvl1YCeSibZG9RJgtNclTb36g/xKi1k/go3yx+ukOAawSJI91h3m9TAVo66 /ZHCy0mjZ148BFlWwrIjJ5hMvlaeGGJe9z2c6bKSHAAxcvu4Gx2NvI/KKG25JevqF2sR sJHd5safjZ8IUGAgeYB8sAQP+deKeM7Lp1cpOnJmORiuYatUIJ3VUYrquQWM0pc/07oA 4IPdLhrFfg3qL9siwiVG1lkx5VOccIGtPD2Cp4wIziDo65gu5F7pCpaXObkGYwLF/cMt syQw== X-Gm-Message-State: AOAM530Wyuk1Y6fWjkYxySnryybtp4nIYGPeTWCejrhEgw1slFBGwkY7 rvom+CBef6q5HpGVojO68NgCpNbLRzq2L/jotNo= X-Google-Smtp-Source: ABdhPJylja6RTPJP3Uhh0FtqPErLRb1cn6C+4DdpacpB8vOzq2xVq7UOJVcUKXbd41MEhNrO0G9b0IDW2l2rQ6XqN+o= X-Received: by 2002:aa7:dbd3:: with SMTP id v19mr24057276edt.314.1616401992908; Mon, 22 Mar 2021 01:33:12 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Mon, 22 Mar 2021 12:33:01 +0400 Message-ID: Subject: Re: [PATCH 4/5] chardev/char.c: Always pass id to chardev_new To: Lukas Straub Content-Type: multipart/alternative; boundary="0000000000009a01c405be1beaa2" Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=marcandre.lureau@gmail.com; helo=mail-ed1-x529.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, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 , Paolo Bonzini , Thomas Huth , Li Zhang , qemu-devel Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --0000000000009a01c405be1beaa2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Mar 22, 2021 at 3:31 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=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 > Reviewed-by: Marc-Andr=C3=A9 Lureau --- > 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 cha= r > *typename, > bool be_opened =3D true; > > assert(g_str_has_prefix(typename, "chardev-")); > + assert(id); > > obj =3D object_new(typename); > chr =3D CHARDEV(obj); > @@ -1092,12 +1093,11 @@ ChardevReturn *qmp_chardev_change(const char *id, > ChardevBackend *backend, > return NULL; > } > > - chr_new =3D chardev_new(NULL, object_class_get_name(OBJECT_CLASS(cc)= ), > + chr_new =3D chardev_new(id, object_class_get_name(OBJECT_CLASS(cc)), > backend, chr->gcontext, errp); > if (!chr_new) { > return NULL; > } > - chr_new->label =3D g_strdup(id); > > if (chr->be_open && !chr_new->be_open) { > qemu_chr_be_event(chr, CHR_EVENT_CLOSED); > -- > 2.30.2 > > --=20 Marc-Andr=C3=A9 Lureau --0000000000009a01c405be1beaa2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Mar 22, 2021 at 3:31 AM Lukas= Straub <lukasstraub2@web.de&= gt; wrote:
Alway= s 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=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>

Reviewed-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>=C2=A0
---
=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



--
Marc-Andr=C3=A9 Lureau
--0000000000009a01c405be1beaa2--