From nobody Fri Nov 14 19:45:24 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1761084300; cv=none; d=zohomail.com; s=zohoarc; b=QYVs3ShU61H+N/J7cFGkn9Y2y949XrjiuIfTo0iYUqzsdn4NiltamznPHh6hJY+3rdSLAzPnRVj8S3UM6mfjeP62GHOE1q0kt23AUV8igLEHhn40dg8V+P0KaknLao/x7cz8105kwCJRGVaYwsCdPDDEyCdS+NYnjJMwo/+VToU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761084300; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=v2vPYC2fE8GpivztwCqYqJ3Uox9D4sCeEMiTNLY9Snk=; b=B0cDMfY4E1tVkwJigqHC+yyW2yxriaqiibFNuiMxc2Vp5roOHDSVAAz4zgpf+K/GXAD2lAkNkCka6XwEpfrVdRXMuPpjCe+Ff67qn2k925MLIME2tacP6wfSfw+iUrDCPQnMAN7+bDrbQPzEyLn1/NqSxDmnEM5JuRWBFc6AQwY= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761084300054929.3834385423938; Tue, 21 Oct 2025 15:05:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBKSs-0003pe-5z; Tue, 21 Oct 2025 18:04:22 -0400 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 1vBKSp-0003p9-Lu for qemu-devel@nongnu.org; Tue, 21 Oct 2025 18:04:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vBKSn-0001KM-Mf for qemu-devel@nongnu.org; Tue, 21 Oct 2025 18:04:19 -0400 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-631-DL-xZkPwOCOnlbJCK9WS8A-1; Tue, 21 Oct 2025 18:04:14 -0400 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-85dd8633b1bso100525185a.1 for ; Tue, 21 Oct 2025 15:04:13 -0700 (PDT) Received: from x1.com ([142.188.210.50]) by smtp.gmail.com with ESMTPSA id af79cd13be357-891cd098edasm849197285a.19.2025.10.21.15.04.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 15:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761084256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v2vPYC2fE8GpivztwCqYqJ3Uox9D4sCeEMiTNLY9Snk=; b=ib6469JCkQYQZajTbWHMGtpdVHNYelmXE8nd/R5EUUK6RqYk4txZC0Qw3Erdl6q9S2B2gN WYAQt8j6Q/N8Qp3L3llfpy4OHlwMQSC/o18uYV+hLN+JZ4AyewfYKYVpaar64wR0AKO4iA T0KcmPt8uGKeS1VdNlp8bou8qQMNp50= X-MC-Unique: DL-xZkPwOCOnlbJCK9WS8A-1 X-Mimecast-MFC-AGG-ID: DL-xZkPwOCOnlbJCK9WS8A_1761084253 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761084253; x=1761689053; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v2vPYC2fE8GpivztwCqYqJ3Uox9D4sCeEMiTNLY9Snk=; b=GjQchjdS85qE734gkTmshVW2CMyrlBi+euWFANFKqXldHMd2Kx7K+vsvI+FobFVhHg 0TanroofER6W8hcijSRpjpAdfFkKo3IKj+TE7UVyttV19AZAKfEjb4FSZcbtc+RpwJ4J owY3I+pINyDB11mx7kYY+ScA+UrvSHirpKAtPlKAs/lujettwjXJP8LCCqNE6ywmiMHA jH89SQpzQYHMqeWnDYHEuXZRkaGWpdHkeI4aNMmJqdoN+ZyitulwxEngmdDOO4OneVWW d2+GoWI5Bdpqo0MgHqPu/5XobvsfUNSPf94LpqS5aVYZGz1Rg3pNO5SBypO6vnRPAI5H sKBw== X-Gm-Message-State: AOJu0Yz6dz4OCaMM8pnpcrZlBFYMoaXvLr/EVOlqD7gwPur/Xjjys53o KoTuuQeHnZwwRAuR6z/B8b4KKEGIj5d7h2kFZdqdGvX40Hh8W0keVTj6suTLbROMne7kgfCaZz0 CNFRxMzWgRX/2KlVi62QFqUvUEDx4ir4Q+DyBVG9pN3nUDWP0Fmz6UnWNG69yVYYMFF+GKi4Oqa +ZMeGB2l7D1M63MVvpCPHYnF4A1H4gbzfZYIg5vw== X-Gm-Gg: ASbGncvznhjzuZmhEPTRIXsHp5kEwcsPDxB7CqjvIIfkAzlOjWoGErjQ76ILWoYT12t b1BWpUVFFbaAK1nrCQXkzDSCan3eTl8z2RQ/FFy0F/VbRNGIfLNwWvsfBsBQYlhA8YfTDe4cyFY KPw0Upv6O4S7/Id8OIQHnm2fp1FwxkdpbbKYiOm3M4qwtecb4yadNuT1myEYvUxBPcjQgGi1sFv caXzgXuUAT0FLoX+WCJzO0FP3BSNr5+3B1xyxMlvt8KgrwcYVD/Eo6yblaWklAv5fr0YW8quFh7 wV6Cdl/sTn05I9vg01fqk3fJ3pdx54jRnwn1ro71JNskRW2WanbA2jS54aKYZAo1 X-Received: by 2002:a05:620a:2699:b0:850:78b7:f878 with SMTP id af79cd13be357-899d6d64c4cmr179025985a.0.1761084252873; Tue, 21 Oct 2025 15:04:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwW2abgfFamvG8IFlZPryfrETn5zm5g84CSPTTR46WLq9o2TwWJL0u4/N8VxkTr3tntqSYkw== X-Received: by 2002:a05:620a:2699:b0:850:78b7:f878 with SMTP id af79cd13be357-899d6d64c4cmr179020685a.0.1761084252313; Tue, 21 Oct 2025 15:04:12 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Maydell , Arun Menon , Juraj Marcin , peterx@redhat.com, Fabiano Rosas Subject: [PATCH v2 1/4] migration: Fix error leak in postcopy_ram_listen_thread() Date: Tue, 21 Oct 2025 18:04:04 -0400 Message-ID: <20251021220407.2662288-2-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251021220407.2662288-1-peterx@redhat.com> References: <20251021220407.2662288-1-peterx@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 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 @redhat.com) X-ZM-MESSAGEID: 1761084303739154100 Content-Type: text/plain; charset="utf-8" As reported and analyzed by Peter: https://lore.kernel.org/r/CAFEAcA9otBWtR7rPQ0Y9aBm+7ZWJzd4VWpXrAmGr8XspPn+z= pw@mail.gmail.com Fix it by freeing the error. When at it, always reset the local_err pointer in both paths. Cc: Arun Menon Resolves: Coverity CID 1641390 Fixes: 94272d9b45 ("migration: Capture error in postcopy_ram_listen_thread(= )") Signed-off-by: Peter Xu Reviewed-by: Fabiano Rosas --- migration/savevm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index aafa40d779..232cae090b 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2136,17 +2136,18 @@ static void *postcopy_ram_listen_thread(void *opaqu= e) if (postcopy_state_get() =3D=3D POSTCOPY_INCOMING_RUNNING && !migrate_postcopy_ram() && migrate_dirty_bitmaps()) { - error_report("%s: loadvm failed during postcopy: %d. All state= s " + error_report("%s: loadvm failed during postcopy: %d: %s. All s= tates " "are migrated except dirty bitmaps. Some dirty " "bitmaps may be lost, and present migrated dirty " "bitmaps are correctly migrated and valid.", - __func__, load_res); + __func__, load_res, error_get_pretty(local_err)); + g_clear_pointer(&local_err, error_free); load_res =3D 0; /* prevent further exit() */ } else { error_prepend(&local_err, "loadvm failed during postcopy: %d: ", load_res); migrate_set_error(migr, local_err); - error_report_err(local_err); + g_clear_pointer(&local_err, error_report_err); migrate_set_state(&mis->state, MIGRATION_STATUS_POSTCOPY_ACTIV= E, MIGRATION_STATUS_FAILED); } --=20 2.50.1 From nobody Fri Nov 14 19:45:24 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1761084318; cv=none; d=zohomail.com; s=zohoarc; b=Q8DtT2xDg8qbQcfxXjQCK1mGbdxAg46E96xTGVkdsUrDtItH3OI9BrnPtOu9E4k8dw3GzMRyaaXN4JQZ5mp7tJ9WRijSUfi6OsvZUxJXOs00M2x4yJ9HSjuP3d5OZtZ7SmmuL3XRhuIrUnDtGpdmOZHlFOcDblvnFV3Mwdnu3/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761084318; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=69ecGEZJFtzy4xFcHboVNxa4L/XTe4GWvnXGonXsjRQ=; b=kDGZKsUMFLCJRLd2l/6nMNKv8B2s1YhVp5vaFPQSsmvU+wvaI5trPnx0y6S5OSWcy5rG7FFRVmGmWb4fEQ3ItG8+2A8AACNXDI2ouwiVqKg0vInvYp+CvkXWl3L/2ParMJLNY0Qab9aTvWVltDFtz5vdG92ZZWmcDBnkT6/sJ5Q= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761084318020387.65064869119396; Tue, 21 Oct 2025 15:05:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBKSt-0003qQ-Am; Tue, 21 Oct 2025 18:04:23 -0400 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 1vBKSq-0003pP-N4 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 18:04:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vBKSo-0001KX-KL for qemu-devel@nongnu.org; Tue, 21 Oct 2025 18:04:20 -0400 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-454-DnwFUZ-PM7-CpajaNSL8Pg-1; Tue, 21 Oct 2025 18:04:15 -0400 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-890f1090e81so1076214785a.0 for ; Tue, 21 Oct 2025 15:04:15 -0700 (PDT) Received: from x1.com ([142.188.210.50]) by smtp.gmail.com with ESMTPSA id af79cd13be357-891cd098edasm849197285a.19.2025.10.21.15.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 15:04:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761084257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=69ecGEZJFtzy4xFcHboVNxa4L/XTe4GWvnXGonXsjRQ=; b=h3dtjJxWCcnM74vbZDgGvzYwVYVaWkfbfldjWFx5Rb4aTvV2rom/t8lx5JUBeuahwI+MzD CziFbNeABPS/zp8C5XFjQ9zSH29L/uBUQWVEIsSdGDW2PZP3pBPpDrPUpDtcEWMKqyMA4P 64eX2pd7yjXz0CqNKHhnieRji+KSp+A= X-MC-Unique: DnwFUZ-PM7-CpajaNSL8Pg-1 X-Mimecast-MFC-AGG-ID: DnwFUZ-PM7-CpajaNSL8Pg_1761084255 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761084254; x=1761689054; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=69ecGEZJFtzy4xFcHboVNxa4L/XTe4GWvnXGonXsjRQ=; b=R+U22jbtK4+FjZYQUTmrocoBmCmMnA8bsstAk9gnY+Ww1APQaJPZewSZkUsAbSlnG6 e1wKYhyV0wHHm3Wr7Ijv+TWRX2quOcVy1vAc0hXhh3hSfuh5X+/giVMfyGY5FqNzqOZZ lO7PFDJXMq+bnw8f1i9C9roWhHWpkx5hF8YT/G5zg0q82nWxx361J631qFU70vDA8xnP h+vAdYyw7/QnmpjMbn9KMbZs8vaQgqjtD2paIC02IoGeP+YR4tgKvkqpIQwL7JNesyrf xCE7EWfMZPultAEnPEIEAiA/x9fyNFmxCQytDZB2n8g6aeWa4NBVYZN+KOeydY0nBkSg qcQg== X-Gm-Message-State: AOJu0Yyzbk8/zcFC/t/oB5fMJQZTn7+SdPrkYZ7Af+ZYFotCly7JN6xF 305oGDJ7tgXL6Y3d7hopq86ayqHA0DRPsWT/7BdXcg7iOqwSxja06ie3moiyEe/vQbZBGeV37rF EPYMNIm7ltlTWKOjhNlbpktWqWv89uFTni+TLopUwgUX3lO2sIMFWfMXmilTSeCGXCTDxIRuCtd rgbG6OF0VbvHV7mDhmQR0oxwDjOFhKsUIuFvPKCA== X-Gm-Gg: ASbGnctWptPgIEa9+y/UtkWUakG8K1lg0vZ/Vy4LZ7XX2Dm6dotn2Fs6UrdhWdMOsd+ dGmfSbyLfN3NBLIwLlzO9EplNyLGxZHAP4Uf+Td2ztYTdEIIWkGGEgvq+RbNWr8YeV2eZvZEiUT PBirfUzFRtj9jjInR0zX3a2GK8lZHKv+rQyB1o2lMMNQBBjRpQWLAdHEXWR9L3umarXwTumN6GA 4346xhdR60CRyy/lyezQS1QpikRja3InBC/fhNOCfMC9oBJJmOkSS5AHkZEUOCJoKI9wTvME1Ea l1FnlqvdN2ABz7X3T/EzZgbSygsn9LSAga4xqAPJJH0kFI+MM3vB+biA4nO5IEuY X-Received: by 2002:a05:620a:40d4:b0:85f:ffc2:b620 with SMTP id af79cd13be357-8907050ddc9mr2126325585a.68.1761084254567; Tue, 21 Oct 2025 15:04:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF5p+VOka/UWLiWV4fFRIWebSck8Qb4jv/hSJ6id/oHKBXOBWYc+4s/vhHhg9c2yIEklK/4GA== X-Received: by 2002:a05:620a:40d4:b0:85f:ffc2:b620 with SMTP id af79cd13be357-8907050ddc9mr2126319285a.68.1761084253921; Tue, 21 Oct 2025 15:04:13 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Maydell , Arun Menon , Juraj Marcin , peterx@redhat.com, Fabiano Rosas Subject: [PATCH v2 2/4] migration/cpr: Fix coverity report in cpr_exec_persist_state() Date: Tue, 21 Oct 2025 18:04:05 -0400 Message-ID: <20251021220407.2662288-3-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251021220407.2662288-1-peterx@redhat.com> References: <20251021220407.2662288-1-peterx@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 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 @redhat.com) X-ZM-MESSAGEID: 1761084319933154100 Content-Type: text/plain; charset="utf-8" Per reported and analyzed by Peter: https://lore.kernel.org/r/CAFEAcA_mUQ2NeoguR5efrhw7XYGofnriWEA=3D+Dg+Ocvyam= 1wAw@mail.gmail.com mfd leak is a false positive, try to use a coverity annotation (which I didn't find manual myself, but still give it a shot). Fix the other one by capture error if setenv() failed. When at it, pass the error to the top (cpr_state_save()). Along the way, changing all retval to bool when errp is around. Resolves: Coverity CID 1641391 Resolves: Coverity CID 1641392 Fixes: efc6587313 ("migration: cpr-exec save and load") Signed-off-by: Peter Xu Reviewed-by: Fabiano Rosas --- include/migration/cpr.h | 4 ++-- migration/cpr-exec.c | 10 ++++++++-- migration/cpr.c | 15 +++++++++------ migration/migration.c | 2 +- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/include/migration/cpr.h b/include/migration/cpr.h index a412d6663c..027cb98073 100644 --- a/include/migration/cpr.h +++ b/include/migration/cpr.h @@ -41,7 +41,7 @@ MigMode cpr_get_incoming_mode(void); void cpr_set_incoming_mode(MigMode mode); bool cpr_is_incoming(void); =20 -int cpr_state_save(MigrationChannel *channel, Error **errp); +bool cpr_state_save(MigrationChannel *channel, Error **errp); int cpr_state_load(MigrationChannel *channel, Error **errp); void cpr_state_close(void); struct QIOChannel *cpr_state_ioc(void); @@ -56,7 +56,7 @@ QEMUFile *cpr_transfer_input(MigrationChannel *channel, E= rror **errp); void cpr_exec_init(void); QEMUFile *cpr_exec_output(Error **errp); QEMUFile *cpr_exec_input(Error **errp); -void cpr_exec_persist_state(QEMUFile *f); +bool cpr_exec_persist_state(QEMUFile *f, Error **errp); bool cpr_exec_has_state(void); void cpr_exec_unpersist_state(void); void cpr_exec_unpreserve_fds(void); diff --git a/migration/cpr-exec.c b/migration/cpr-exec.c index d57714bc5d..087ca94c87 100644 --- a/migration/cpr-exec.c +++ b/migration/cpr-exec.c @@ -40,16 +40,22 @@ static QEMUFile *qemu_file_new_fd_output(int fd, const = char *name) return qemu_file_new_output(ioc); } =20 -void cpr_exec_persist_state(QEMUFile *f) +bool cpr_exec_persist_state(QEMUFile *f, Error **errp) { QIOChannelFile *fioc =3D QIO_CHANNEL_FILE(qemu_file_get_ioc(f)); + /* coverity[leaked_storage] - mfd intentionally kept open across exec(= ) */ int mfd =3D dup(fioc->fd); char val[16]; =20 /* Remember mfd in environment for post-exec load */ qemu_clear_cloexec(mfd); snprintf(val, sizeof(val), "%d", mfd); - g_setenv(CPR_EXEC_STATE_NAME, val, 1); + if (!g_setenv(CPR_EXEC_STATE_NAME, val, 1)) { + error_setg(errp, "Setting env %s =3D %s failed", CPR_EXEC_STATE_NA= ME, val); + return false; + } + + return true; } =20 static int cpr_exec_find_state(void) diff --git a/migration/cpr.c b/migration/cpr.c index 22dbac7c72..adee2a919a 100644 --- a/migration/cpr.c +++ b/migration/cpr.c @@ -176,7 +176,7 @@ bool cpr_is_incoming(void) return incoming_mode !=3D MIG_MODE_NONE; } =20 -int cpr_state_save(MigrationChannel *channel, Error **errp) +bool cpr_state_save(MigrationChannel *channel, Error **errp) { int ret; QEMUFile *f; @@ -190,10 +190,10 @@ int cpr_state_save(MigrationChannel *channel, Error *= *errp) } else if (mode =3D=3D MIG_MODE_CPR_EXEC) { f =3D cpr_exec_output(errp); } else { - return 0; + return true; } if (!f) { - return -1; + return false; } =20 qemu_put_be32(f, QEMU_CPR_FILE_MAGIC); @@ -202,11 +202,14 @@ int cpr_state_save(MigrationChannel *channel, Error *= *errp) ret =3D vmstate_save_state(f, &vmstate_cpr_state, &cpr_state, 0, errp); if (ret) { qemu_fclose(f); - return ret; + return false; } =20 if (migrate_mode() =3D=3D MIG_MODE_CPR_EXEC) { - cpr_exec_persist_state(f); + if (!cpr_exec_persist_state(f, errp)) { + qemu_fclose(f); + return false; + } } =20 /* @@ -217,7 +220,7 @@ int cpr_state_save(MigrationChannel *channel, Error **e= rrp) qio_channel_shutdown(qemu_file_get_ioc(f), QIO_CHANNEL_SHUTDOWN_WRITE, NULL); cpr_state_file =3D f; - return 0; + return true; } =20 int cpr_state_load(MigrationChannel *channel, Error **errp) diff --git a/migration/migration.c b/migration/migration.c index a63b46bbef..c8a5712993 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2301,7 +2301,7 @@ void qmp_migrate(const char *uri, bool has_channels, return; } =20 - if (cpr_state_save(cpr_channel, &local_err)) { + if (!cpr_state_save(cpr_channel, &local_err)) { goto out; } =20 --=20 2.50.1 From nobody Fri Nov 14 19:45:24 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1761084299; cv=none; d=zohomail.com; s=zohoarc; b=UGi0/ibC4WpqU4bmzpazWfmJ0+fF/A1l0vwvthwz5AoxoQjUBlmg7CqfQ02CnfI4Ag51hLqqbShjjH5dgbq/p9Op3NXU8W0YklYt2tIaUdzmW6RvUzglS9Xobc8SQQHJw6M9ilQk0gaeE17isqEsTzqvkJcYPLBBPpRoIklxZhg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761084299; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kjie+EYy7hcnSGU2LzbAjxCFfmcoQEk64RorSJjWBpg=; b=igFY6Uec73t1Yg5k9HJTSbRqsusq/6qPpMsH534b0BOmv3r6ScGUqGz77kirsNj/HQz/hSwju9GgfP7Ruy48IebhbJZY19RUgIwfS+n4IJkCsDlQaEfFBQI6xfVJN3khGhcSsx/2hE6atr2uHp5Vv+USwZ2lMjPjpk1tuxho+Fo= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176108429986329.963471813361707; Tue, 21 Oct 2025 15:04:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBKSu-0003qw-4D; Tue, 21 Oct 2025 18:04:24 -0400 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 1vBKSs-0003pj-MP for qemu-devel@nongnu.org; Tue, 21 Oct 2025 18:04:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vBKSq-0001Ky-Uy for qemu-devel@nongnu.org; Tue, 21 Oct 2025 18:04:22 -0400 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-639-R748Db2UNxGENXN3Hel0vQ-1; Tue, 21 Oct 2025 18:04:17 -0400 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-88fec61f826so2153541085a.1 for ; Tue, 21 Oct 2025 15:04:17 -0700 (PDT) Received: from x1.com ([142.188.210.50]) by smtp.gmail.com with ESMTPSA id af79cd13be357-891cd098edasm849197285a.19.2025.10.21.15.04.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 15:04:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761084260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kjie+EYy7hcnSGU2LzbAjxCFfmcoQEk64RorSJjWBpg=; b=EF4963qm27+35nXbu+V6ub8HnqR65+Tj3DQtPW5+AneYfUATvpmvIAwVmeQKjcCilnpNF1 NJ1f1RsXTv/sX7Jta0AsnPw90EVjjgZ0OaaKk6JIzFLtXMD0d4ICQuU14xTH/DLeMUvcRI EX7pNYp5XBh2Gx7Na6jYw7wO8TVxSgI= X-MC-Unique: R748Db2UNxGENXN3Hel0vQ-1 X-Mimecast-MFC-AGG-ID: R748Db2UNxGENXN3Hel0vQ_1761084257 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761084256; x=1761689056; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kjie+EYy7hcnSGU2LzbAjxCFfmcoQEk64RorSJjWBpg=; b=mQGaS6saq2OU4t92AldAfxapxGgIjD2PhuIL4Zw+k7HRWuxNs1QNeH8KV7HVzfnEIS MHxKIREjaJr4kTVqiBe7pBNhKFaXjoT5plUe1706fQvIHvhsWz7O5Kxnz8JkvNJ31gYQ owFmt5uYt6HONi+mWirLiviAPj7izT2hDS9OSGKrJ2+bKuLo/F4Lb3/KkMdcjkjCPx7R ImRm6n/8A6PqAU8trud31zyiUusfw0agQ+/pTJx/aiGS4hk1fHagw4iHWtdfR1jQsKpe a8tgKxRguzSPVZkCrqRx/Xe1oeZ6PG1ZdX/29Y88NQYZ6JSkTEZWuwoljncz2vamE9CB ky2A== X-Gm-Message-State: AOJu0Yz6/PK6SujBs/mdskh1VeQaj49+yKzfpB1RpXHAASocbsJDztYC iralcBmvG03SGtBpEklUZLeh5xcicpJIrWlpFBYDAuUiIVy9+xSYMC7lEL0mxDprTh3txDNhsEA kSRWXoVsV9akzM9HurH/Su2TCxXOt1eoTYERG/PVYeyNfr853L6svmlG/CZ4FepXPkfB6bvu/Ea RuopzJL/YkydWbRKG3rMgm/aH54rcp6vAe01PwyQ== X-Gm-Gg: ASbGnctsoKKZl4WG5iRb47rlezKCE+UCCG/SCrte6tSQNYZIywGSrgBVFR1ywHIdmyp HkBP3Z4Tcqywothot+ogUwGMfsSl1EhZVqcSHZ9X2EbFHujJQyO763Hq2u3dK9jAGUk2i+clwtQ M1duwv6S1PR5lipNoEpou1/dpPfscOrpeM0ONVa8RSXnrfPWYzntxL5jgUPaTec9bHVeT7shidU TD2BFbpI+hZOmcNitSBLLJTm6p4O1KDDiOFhuaE/XLFfI4tc6Z9nYcd31jWFi3DnJXu84ta4cMd OgTHxqCgoKIlJ3Y/UcyObsnTuk25fnMQeKwJ1wjhyyMi01bG7D+j7jURJ0lztHLy X-Received: by 2002:a05:620a:1721:b0:893:5433:7427 with SMTP id af79cd13be357-89354337760mr1179292785a.51.1761084256262; Tue, 21 Oct 2025 15:04:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHVzkvSR/XBYtxDj27KV3aGL1srz3sdS8A0LmBJLKnRT7YqCenbjsEk++t8ZMAGlZcvSMJzNA== X-Received: by 2002:a05:620a:1721:b0:893:5433:7427 with SMTP id af79cd13be357-89354337760mr1179287685a.51.1761084255646; Tue, 21 Oct 2025 15:04:15 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Maydell , Arun Menon , Juraj Marcin , peterx@redhat.com, Fabiano Rosas Subject: [PATCH v2 3/4] migration/cpr: Fix UAF in cpr_exec_cb() when execvp() fails Date: Tue, 21 Oct 2025 18:04:06 -0400 Message-ID: <20251021220407.2662288-4-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251021220407.2662288-1-peterx@redhat.com> References: <20251021220407.2662288-1-peterx@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 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 @redhat.com) X-ZM-MESSAGEID: 1761084303734154100 Content-Type: text/plain; charset="utf-8" Per reported and analyzed by Peter: https://lore.kernel.org/r/CAFEAcA82ih8RVCm-u1oxiS0V2K4rV4jMzNb13pAV=3De2ivm= iDRA@mail.gmail.com Fix the issue by moving the error_setg_errno() earlier. When at it, clear argv variable after freed. Resolves: Coverity CID 1641397 Fixes: a3eae205c6 ("migration: cpr-exec mode") Reviewed-by: Fabiano Rosas Signed-off-by: Peter Xu --- migration/cpr-exec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/cpr-exec.c b/migration/cpr-exec.c index 087ca94c87..d284f6e734 100644 --- a/migration/cpr-exec.c +++ b/migration/cpr-exec.c @@ -152,10 +152,10 @@ static void cpr_exec_cb(void *opaque) * exec should only fail if argv[0] is bogus, or has a permissions pro= blem, * or the system is very short on resources. */ - g_strfreev(argv); + error_setg_errno(&err, errno, "execvp %s failed", argv[0]); + g_clear_pointer(&argv, g_strfreev); cpr_exec_unpreserve_fds(); =20 - error_setg_errno(&err, errno, "execvp %s failed", argv[0]); error_report_err(error_copy(err)); migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED); migrate_set_error(s, err); --=20 2.50.1 From nobody Fri Nov 14 19:45:24 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1761084331; cv=none; d=zohomail.com; s=zohoarc; b=F/xtnYXYlfItCwMVhH62uUDpljoExjaWcrpd6DRahI0ja7Lf1T4We9xMQU5Ozc12ZYIzLJ37ms0lUCAQcO9Z30kTrITIhW4ARzvsRrlYr8AVEryt6PiWvH/P0dUXuJol/oFPdnes9JCJEMvPoPLxLU3J6FsP9qU0KIMTYB1BVOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761084331; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TiDECXXm/XmJQvxVQNSIb/eABk9ABvi3OJ7FJq/HmTo=; b=bHKVo7ZJ+/6M4KLrpejrLHhhNso4dF7PwvHVTwZgsm0BwHFuEFzHIblYn1h9eiN8pwizZSJXTXsm/B2OfQtwTU7GHo16kqwbjASIeb5VNvAdD11KJidJ0d9Z3gTt8XZptgNvAY1SbDh4uVv6H9vfaUie72NcuoRqdMIWkndlFgE= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761084331823905.0680800026626; Tue, 21 Oct 2025 15:05:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBKSv-0003rV-Oa; Tue, 21 Oct 2025 18:04:25 -0400 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 1vBKSt-0003qo-Mb for qemu-devel@nongnu.org; Tue, 21 Oct 2025 18:04:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vBKSs-0001LF-6T for qemu-devel@nongnu.org; Tue, 21 Oct 2025 18:04:23 -0400 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-461-ON4RMu1eMgKRcI7PfCgkKw-1; Tue, 21 Oct 2025 18:04:19 -0400 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-85dd8633b1bso100576085a.1 for ; Tue, 21 Oct 2025 15:04:19 -0700 (PDT) Received: from x1.com ([142.188.210.50]) by smtp.gmail.com with ESMTPSA id af79cd13be357-891cd098edasm849197285a.19.2025.10.21.15.04.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 15:04:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761084261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TiDECXXm/XmJQvxVQNSIb/eABk9ABvi3OJ7FJq/HmTo=; b=CImo6PJIEXEF9mRcXc2/uvd8Z0k9dUVNH2UVamzszmTb+CQ+kTnCHjJQYaooc6IB9HG4jv sNmoia983qFmW8YilNAKIb35p4P4ZPrJhO9CcjKWwUpXrpXOTzhDu8WJIXXqbUEWyxiSpY vZ57Il7G2wNDBNMI5JrfWPx7znXzXRg= X-MC-Unique: ON4RMu1eMgKRcI7PfCgkKw-1 X-Mimecast-MFC-AGG-ID: ON4RMu1eMgKRcI7PfCgkKw_1761084259 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761084258; x=1761689058; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TiDECXXm/XmJQvxVQNSIb/eABk9ABvi3OJ7FJq/HmTo=; b=G/U1cJeIN1+j0L7Az9XGnHxOgii9Kuq8mznfPXu1sHjX1crTrAYZVNW5H+qL2cF1fC sRXXWKFmXvQKKzfWXQltu16u2+0cHgUv+2BEx6V1BU1+KiyXvhtbKkxvPexI3t/JKtup TG6th/GMMWXHkUTbfEl++cmZLMZnwSdslhsZQwsb72gxxDuWAhGQjuK+zek/YhezdtZm PZC5GVJ5wQYMp9xCIDTiSU4EeoHoVi0H+5C8t3Q8losVqzPrhRljYwagf8eaVixAzJzo vkq42c/G0R4LAJrpgQJrL9EpGDGGL+nqdqV4zchvXedZBKic0NhsszkZuD0Xig7kN0Vu 9Gew== X-Gm-Message-State: AOJu0YyUbJtEH10nkk5jDwFTsCdNo2L3DrMeNglVAbRyBU4qHPhz/c0c rHKZtCMYIsAexvdYnAXh8o3jBc42ZasG5MZHlq3sWA5V5+0FzA7FQ4apy4B/VYEksp/1ZwTqWzp rdMLh3X05R9igISiQZFhd3E8LwGy6ZKR+RQGd/OZVyXZl1vwnoX7mp1UDNEJwrz60E4CZk37YOi Kr6Q4TlN7r8dxlep6zBxRvMLVJBSf71bMqi+ucVA== X-Gm-Gg: ASbGncvtxUKw4eOMnakz7/8zx5L0i3XK1fBz8WeC20A9oHMK+eelv8pWWxmrawXtyvO 513C/+LyzYFmBDj0TYU7Khu+2s+YeY83iYS07gEdrFJo2WFePgfSYBCYSaep6hLzvn9eFlCWj9d JY3qVVD8INnLv4SGEZ9RKUCPXd35MzQ3qdZmlm+pCI5Ec6Nli6j12jmE9+l+P/QADp8FMgZwSdT YTwbQaOTo856GD2jhON25E9JRMowmz/y044Dd5ibBuXEW8hUevF7nE2fcechlxKrHKXFGWMMolz 9JcYql9fUPzpVObuZiaQy1y5mIkzuINFFiVJ114a/f1BPD3bkksjDe82XeoYLzyM X-Received: by 2002:a05:620a:44c5:b0:891:19be:32b2 with SMTP id af79cd13be357-899df630540mr207707985a.26.1761084258107; Tue, 21 Oct 2025 15:04:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFnknELRPq7TYfKXBGv8PoBCavS6rV4/frYKILwbQZH6X7Z1XOQweAM17GYdqwXPx5hnygw8Q== X-Received: by 2002:a05:620a:44c5:b0:891:19be:32b2 with SMTP id af79cd13be357-899df630540mr207700785a.26.1761084257369; Tue, 21 Oct 2025 15:04:17 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Maydell , Arun Menon , Juraj Marcin , peterx@redhat.com, Fabiano Rosas Subject: [PATCH v2 4/4] migration/cpr: Avoid crashing QEMU when cpr-exec runs with no args Date: Tue, 21 Oct 2025 18:04:07 -0400 Message-ID: <20251021220407.2662288-5-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251021220407.2662288-1-peterx@redhat.com> References: <20251021220407.2662288-1-peterx@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 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 @redhat.com) X-ZM-MESSAGEID: 1761084336187154101 Content-Type: text/plain; charset="utf-8" If an user invokes cpr-exec without setting the exec args first, currently it'll crash QEMU. Avoid it, instead fail the QMP migrate command. Signed-off-by: Peter Xu Reviewed-by: Fabiano Rosas --- migration/migration.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index c8a5712993..4ed2a2e881 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2195,6 +2195,12 @@ static bool migrate_prepare(MigrationState *s, bool = resume, Error **errp) error_setg(errp, "Cannot use %s with CPR", conflict); return false; } + + if (s->parameters.mode =3D=3D MIG_MODE_CPR_EXEC && + !s->parameters.cpr_exec_command) { + error_setg(errp, "Parameter 'cpr-exec-command' required for cp= r-exec"); + return false; + } } =20 if (migrate_init(s, errp)) { --=20 2.50.1