From patchwork Thu Aug 15 14:49:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 819433 Delivered-To: patch@linaro.org Received: by 2002:adf:cd01:0:b0:367:895a:4699 with SMTP id w1csp1199537wrm; Thu, 15 Aug 2024 07:56:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+VNc3rHUgP0QlkilrYshGyJ+G7p0SIzAXsZWrUhzrFwm1L1FdaUBMtm7XiOTpE9lAAeElJThgXdoDzTgFAK5y X-Google-Smtp-Source: AGHT+IGi855dHCBbEwlCcimFwTDj32tbhUYM2S6FOYZ935TawFg+Tr8/xCCrVcUKzBwz+H65MpRG X-Received: by 2002:a05:622a:1b0b:b0:447:eb43:5d0b with SMTP id d75a77b69052e-4535bb0578cmr70125971cf.28.1723733817135; Thu, 15 Aug 2024 07:56:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723733817; cv=none; d=google.com; s=arc-20160816; b=xvpSm6un01Tc8vJhg4ULQ69lgjA/VYtU9P1dIZt4AdhI8UqdXf7a7qocDWMbJkPjoS pdPVgCQ2kWK/us1Fj8dDYgFKluqM6eJunGmleFDXA98YqHgyt41k7J3ZiveZX0rCLMr9 arFeOjypZcbTNSwwx3VqZTEG5EVcVBz8O45UeIWP1CcZyjoe9VKR8wcZTyNC+Ap7hym5 GWO8/3Vn+GXSXiY6uDu0+IHfm4y9RdTtFl5rQIZPDSX9BhOG/58B/3HoJQSTE7wBq7Rl FFKYpJaBXEDodCSwMTIIYw0aO1rhIF8gQrztmSa/nHN0782x4Vb+lpjbprnTDnsd8GSr Nvvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=En32C6zo6LeZ5uTVMpvZgvYVpJHuCehnEf43V3Hg1AQ=; fh=4HhV617Bdd/k9JqI2hPqGFsMNLZ/FBfEFidGR+V1ss0=; b=kGjUrsv7zzoyOGTJq5Ta59q4jcR1Sb7DN6YO0iSiNx1VUqU8K4f1LLttjba43QC+zX LRXg37MpA48HU7rXw4nYaealmhuYoJrcZ4ISVZBv8OMAutZn3BSEEIX+h1x9SYQBx29h Opw2ZlDvSx7dXXB1TquPkr6Fi4krk/rAyGwTZPRQYqe7g/WHHM8EB9vk4NMiCOPB9CcK hHcXFZ5NK/f4tIhOfQiXxznV5M7JYkpwzI5y8AJyUyXtucxjPUQiDeXIVgfjWCD9In2s 61RJ7IR8O7TTwjgjRyHy0jVVadVxBw2l5Uj5QfNfV/T4iLeLHLkZWIs6DaX1L1WQlh/L 6sHQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OwGZ94Iu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4536a06f813si19096561cf.260.2024.08.15.07.56.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Aug 2024 07:56:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OwGZ94Iu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sebtw-0007jc-JY; Thu, 15 Aug 2024 10:56:32 -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 1sebtp-0007Ry-VD for qemu-devel@nongnu.org; Thu, 15 Aug 2024 10:56:26 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sebto-00014U-4k for qemu-devel@nongnu.org; Thu, 15 Aug 2024 10:56:25 -0400 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-5a108354819so1463705a12.0 for ; Thu, 15 Aug 2024 07:56:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723733780; x=1724338580; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=En32C6zo6LeZ5uTVMpvZgvYVpJHuCehnEf43V3Hg1AQ=; b=OwGZ94Iur311OE06stnHDxZeOY1cx4qagGu/qWPg3uPaqp89vJ0aTWOeyupgLOdNgk CyNhfZLC7tg1sjFpp5s+s+WzVZPTko12ailpim6Hi/JDa1auGTwpEqeZTKYbiAKovEG7 8Lp1zRK++J6BDim8hPyeqth6cHkSiGkDEWIWCIUWUN/tE+bB0+2MO5LYJeVJxbclsoN9 gpwdQz4PrEm1Gn/xESd/wMMZlR5OaRRF+rV1tdsCTlzn7yygJCdHuC/n/4HCl0W4xcZJ n9HVOulhetybBTkwKv9dCrXHXULvABYbcUEGuqHybwgUig7F+Vdf5pnm4bJfsgPM7grg nTSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723733780; x=1724338580; 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=En32C6zo6LeZ5uTVMpvZgvYVpJHuCehnEf43V3Hg1AQ=; b=joTRKE9s/r+KAfr5z1MkfrGIOpj6tckJVOsO7LcEdiAyIXk5uNFex1QCnEOL/nKCdR S3T1JFituX/sknbwyWeC2SG9XgbaGTSyBI7FMv/5tHp6WQTve/vk5d8zbWDkzov/k2dR vZ16OE1toCinoHvQ9NbMCrb4i/617omnBnigw+Vd3GkzxPkRaG+/mNtXGi/qK3xJVVWy FUkknH0FiykKSlrC64ABkgBgLLxk1ge+35nPt+V9jRf3NK5Tyyg4I8tjef6+qwH9ZcvL iMhpLmCjSFG6MjMDOjV2xOP6v8KKGiTBlaffiH9DI4kj3DYLhi7pKouG7ebakcysxgub JapA== X-Gm-Message-State: AOJu0YyBPa5d7LLflnLoVdXKRhudpXUGM3oJm784qKnx5OrzA/Q/U1Hk cSDLMP8FreP5zDQaWIbN2t6pqyB32KlzVbF502P6nyNwr68mVYAPnO2PZUzBtYtxDCYOXIT1tSa W X-Received: by 2002:a17:906:eecc:b0:a7d:3ab9:6a5d with SMTP id a640c23a62f3a-a836705aae4mr404095266b.69.1723733779945; Thu, 15 Aug 2024 07:56:19 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a83838cefe0sm113152666b.47.2024.08.15.07.56.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2024 07:56:18 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 646FF60295; Thu, 15 Aug 2024 15:49:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Xu , Fabiano Rosas Subject: [PULL 18/21] savevm: Fix load_snapshot error path crash Date: Thu, 15 Aug 2024 15:49:08 +0100 Message-Id: <20240815144911.1931487-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240815144911.1931487-1-alex.bennee@linaro.org> References: <20240815144911.1931487-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x536.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Nicholas Piggin An error path missed setting *errp, which can cause a NULL deref. Reviewed-by: Alex Bennée Signed-off-by: Nicholas Piggin Message-Id: <20240813050638.446172-11-npiggin@gmail.com> Signed-off-by: Alex Bennée Message-Id: <20240813202329.1237572-19-alex.bennee@linaro.org> diff --git a/migration/savevm.c b/migration/savevm.c index 85958d7b09..6bb404b9c8 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -3288,6 +3288,7 @@ bool load_snapshot(const char *name, const char *vmstate, /* Don't even try to load empty VM states */ ret = bdrv_snapshot_find(bs_vm_state, &sn, name); if (ret < 0) { + error_setg(errp, "Snapshot can not be found"); return false; } else if (sn.vm_state_size == 0) { error_setg(errp, "This is a disk-only snapshot. Revert to it "