From nobody Tue Feb 10 09:58:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594628753; cv=none; d=zohomail.com; s=zohoarc; b=C4TZFS7jXJJ7RRleK9m01W7nJCD2knFUmSGk2uw0+8iirIIYjfIjoCitFF2fK3r9jhE2y5otIFLILnbki77KfKU9qKJjSVCKoyKQD1o/W/d8oH4ka+H2hq4Q8hg1Bqg4B7/pEluSjcqlO68AzciYmW3I1WuHV4X4z0Ndj3pHgow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594628753; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P/yD2zU1ff7FhDAxEU3pV5lfrMSjbvYcorTA8NlNopo=; b=Pa6wqghpJqML0byKzKDUhUM5wTLI4wQoTmIh4i1ADNZKGAYn9MtluSBPFkoRpkcM2eU6JPAmGGbwjn7zsgpiUAV/Wno8t1FZGtlONRwFDjjmOfmwMteIMlOlToRvawce9yFnfpP1rR74VweLtJiSkPQyEmK9Pr2nnGeMeR4Dors= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594628753347420.74173583702316; Mon, 13 Jul 2020 01:25:53 -0700 (PDT) Received: from localhost ([::1]:58568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jutma-0003j7-5P for importer@patchew.org; Mon, 13 Jul 2020 04:25:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jutle-00021c-8Q for qemu-devel@nongnu.org; Mon, 13 Jul 2020 04:24:54 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:58972 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jutlc-0006cl-GJ for qemu-devel@nongnu.org; Mon, 13 Jul 2020 04:24:53 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-350-5J4X8ZqrP9qjPNN5Ko4n-Q-1; Mon, 13 Jul 2020 04:24:50 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6BE24107ACCA for ; Mon, 13 Jul 2020 08:24:49 +0000 (UTC) Received: from localhost (unknown [10.36.110.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8030D27DE7C; Mon, 13 Jul 2020 08:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594628691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P/yD2zU1ff7FhDAxEU3pV5lfrMSjbvYcorTA8NlNopo=; b=XWMyKKAGBcMqs2Jy/EXaU5YZ07Z+mU94qYHuia9FaA7r8od1KrpHZdQCUvAixUNlvCGiBE cAlspSzisiryB7NeBRPov+E0EEtPAWK3vyh7Sfzi6Os67fPXJ77y/HIjbKUBX5cHuL49tW Jn3ojo0zQkY3dtqYOKfEfonqhLsHaY8= X-MC-Unique: 5J4X8ZqrP9qjPNN5Ko4n-Q-1 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PULL 2/8] chardev: don't abort on attempt to add duplicated chardev Date: Mon, 13 Jul 2020 12:24:18 +0400 Message-Id: <20200713082424.2947383-3-marcandre.lureau@redhat.com> In-Reply-To: <20200713082424.2947383-1-marcandre.lureau@redhat.com> References: <20200713082424.2947383-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/13 01:36:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Dr. David Alan Gilbert" , Markus Armbruster , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This is a regression from commit d2623129a7d ("qom: Drop parameter @errp of object_property_add() & friends"). (qemu) chardev-add id=3Dnull,backend=3Dnull (qemu) chardev-add id=3Dnull,backend=3Dnull Unexpected error in object_property_try_add() at /home/elmarco/src/qemu/qom= /object.c:1166: attempt to add duplicate property 'null' to object (type 'container') That case is currently not covered in the test suite, but will be with the queued patch "char: fix use-after-free with dup chardev & reconnect". Fixes: d2623129a7dec1d3041ad1221dda1ca49c667532 Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Markus Armbruster --- chardev/char.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/chardev/char.c b/chardev/char.c index e5b43cb4b87..a0626d04d50 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -996,7 +996,11 @@ static Chardev *chardev_new(const char *id, const char= *typename, } =20 if (id) { - object_property_add_child(get_chardevs_root(), id, obj); + object_property_try_add_child(get_chardevs_root(), id, obj, + &local_err); + if (local_err) { + goto end; + } object_unref(obj); } =20 --=20 2.27.0.221.ga08a83db2b