From nobody Sat Feb 7 05:49:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1769526604; cv=none; d=zohomail.com; s=zohoarc; b=Q825dywlSjFWpGwrGK+OboAM5wvnA1BVcBjujQM5Ck+NrMLow4sdq7evAr7YJYeERgRE8U+YTV6gQ5+YXtkt2iYHEsJ2g4qZqsMb0ukfMttSMhIgwYUBCkQqvUyWXTPUEsPa1VwD0DBlY6cuHZ85dczbK5G3nlVynjnbUEJyuDs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769526604; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xp7C8NY13Bji1YpuziNMnFlAQUXNfjVhh4AoYxC5Cyc=; b=lR3EYaSzXcblhVyhKE5B+kyO1NmMfSNMZcghbBF1xttqI0YXLiVlXW9aWEwdWVdQ+041ecaCHLdpLecdqzZYdihyPVJZx4AXItRwNiGW8U3l+GW9yjLJvZlEEsRNVi2QvT8V2gR5CJ9sH2CBfCZ+HGRzQxtDLBDQeJxN9XxKt/E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1769526604634142.88029725439605; Tue, 27 Jan 2026 07:10:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vkkh5-0006Ec-BO; Tue, 27 Jan 2026 10:09:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vkkh4-0006EC-BM for qemu-devel@nongnu.org; Tue, 27 Jan 2026 10:09:26 -0500 Received: from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vkkh2-0004Ww-Iw for qemu-devel@nongnu.org; Tue, 27 Jan 2026 10:09:26 -0500 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 58AAF337C2; Tue, 27 Jan 2026 15:09:21 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 7F8923EA61; Tue, 27 Jan 2026 15:09:19 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id S1v+Dx/VeGlFbAAAD6G6ig (envelope-from ); Tue, 27 Jan 2026 15:09:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1769526561; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=xp7C8NY13Bji1YpuziNMnFlAQUXNfjVhh4AoYxC5Cyc=; b=iyVp2qmUW+FkMFS6CvtTvAFrF5QxCgBV2QLthdVFxxQ1/9xfKhxd1Nb6E28gQ8nQswMsc6 SzxZzyjrJvhg8RMvLvO7X+yXwjDZBgQkmmiXvM7zGSbRHMSrzaCqbl+rPXN4M2Zuhle2V5 9J06llbIrSoB7AymYRiPV1nw0WykVwY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1769526561; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=xp7C8NY13Bji1YpuziNMnFlAQUXNfjVhh4AoYxC5Cyc=; b=I2W/0+s/oDpzQwf042IPeFZ97pujV8at6aDlRGMpQHqWYl+/I6UZN3slM0/kHQ2Vlqco1V dIP1BU94/Yu54QAg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1769526561; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=xp7C8NY13Bji1YpuziNMnFlAQUXNfjVhh4AoYxC5Cyc=; b=iyVp2qmUW+FkMFS6CvtTvAFrF5QxCgBV2QLthdVFxxQ1/9xfKhxd1Nb6E28gQ8nQswMsc6 SzxZzyjrJvhg8RMvLvO7X+yXwjDZBgQkmmiXvM7zGSbRHMSrzaCqbl+rPXN4M2Zuhle2V5 9J06llbIrSoB7AymYRiPV1nw0WykVwY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1769526561; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=xp7C8NY13Bji1YpuziNMnFlAQUXNfjVhh4AoYxC5Cyc=; b=I2W/0+s/oDpzQwf042IPeFZ97pujV8at6aDlRGMpQHqWYl+/I6UZN3slM0/kHQ2Vlqco1V dIP1BU94/Yu54QAg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: peterx@redhat.com, armbru@redhat.com, ppandit@redhat.com, Peter Maydell Subject: [PATCH v2] migration/options: Fix leaks in StrOrNull qdev accessors Date: Tue, 27 Jan 2026 12:09:16 -0300 Message-ID: <20260127150916.23329-1-farosas@suse.de> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_DN_SOME(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; URIBL_BLOCKED(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email,linaro.org:email]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; DBL_BLOCKED_OPENRESOLVER(0.00)[linaro.org:email, imap1.dmz-prg2.suse.org:helo] 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=2a07:de40:b251:101:10:150:64:1; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de 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, 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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1769526606590158500 Content-Type: text/plain; charset="utf-8" Fix a couple of leaks detected by Coverity. Both are currently harmless. - set_StrOrNull: the visitor should never fail unless there's a programming error and a property of different type has been passed in. Change it to only allocate memory after the visit call has returned successfully. - get_StrOrNull: the whole of the getter is unused, it's only purpose at the moment is to provide a complete implementation of the StrOrNull property. If it were used, it would always receive a non-NULL pointer because this property is part of s->parameters and always initialized by the setter. Assert non-NULL instead of allocating a new object. Fixes: CID 1643919 Fixes: CID 1643920 Reported-by: Peter Maydell Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- migration/options.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/migration/options.c b/migration/options.c index 1ffe85a2d8..93d11bba60 100644 --- a/migration/options.c +++ b/migration/options.c @@ -216,36 +216,36 @@ const size_t migration_properties_count =3D ARRAY_SIZ= E(migration_properties); static void get_StrOrNull(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - const Property *prop =3D opaque; - StrOrNull **ptr =3D object_field_prop_ptr(obj, prop); + StrOrNull **ptr =3D object_field_prop_ptr(obj, opaque); StrOrNull *str_or_null =3D *ptr; =20 - if (!str_or_null) { - str_or_null =3D g_new0(StrOrNull, 1); - str_or_null->type =3D QTYPE_QSTRING; - str_or_null->u.s =3D g_strdup(""); - } else { - /* the setter doesn't allow QNULL */ - assert(str_or_null->type !=3D QTYPE_QNULL); - } + /* + * The property should never be NULL because it's part of + * s->parameters and a default value is always set. It should also + * never be QNULL as the setter doesn't allow it. + */ + assert(str_or_null && str_or_null->type !=3D QTYPE_QNULL); visit_type_str(v, name, &str_or_null->u.s, errp); } =20 static void set_StrOrNull(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - const Property *prop =3D opaque; - StrOrNull **ptr =3D object_field_prop_ptr(obj, prop); - StrOrNull *str_or_null =3D g_new0(StrOrNull, 1); + StrOrNull **ptr =3D object_field_prop_ptr(obj, opaque); + StrOrNull *str_or_null; + char *str; + + if (!visit_type_str(v, name, &str, errp)) { + return; + } =20 /* * Only str to keep compatibility, QNULL was never used via * command line. */ + str_or_null =3D g_new0(StrOrNull, 1); str_or_null->type =3D QTYPE_QSTRING; - if (!visit_type_str(v, name, &str_or_null->u.s, errp)) { - return; - } + str_or_null->u.s =3D str; =20 qapi_free_StrOrNull(*ptr); *ptr =3D str_or_null; --=20 2.51.0