From nobody Mon Apr 29 10:49:53 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1574879961; cv=none; d=zohomail.com; s=zohoarc; b=kLpCB66cwSt0m/AOz63++toR2gaS92QUDTsWXY0UUf+DXr20jPS8xsBv8X84kKDqhvHGijC6oNRcti73t6kFYaxw9uO28W0gdatU2VzadmrLGraY1XIUjwyDIrqtBFh15gvGq6km8PDxjDIVmklRbYoV1HXYlaYOnpXpAwIfIHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574879961; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=4vigpk//+SJrLv6rVs7qMX3nNbXlpXgIujh4VVw01ak=; b=iGoS06pMDCD9gNdkuuOGLLsgqJ/5Ip+uJvZagv5XgDzbQJhjlYM3s4EfBPhXtlLA2orHVeWWZ8OLN6NBT+UPgeK2vHd7QWJBrIb/wcpyf6EX7B9IwzsHesmAx51rgh7q7sr2Q8/OmQ8GgPsRyd6sn+63YL6GhQh1AyWNbmbM5GA= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 15748799610087.563872285281491; Wed, 27 Nov 2019 10:39:21 -0800 (PST) Received: from localhost ([::1]:41686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2Df-0000OR-G8 for importer@patchew.org; Wed, 27 Nov 2019 13:39:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38233) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia25A-0001zs-Vq for qemu-devel@nongnu.org; Wed, 27 Nov 2019 13:30:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ia258-0003OG-Ln for qemu-devel@nongnu.org; Wed, 27 Nov 2019 13:30:32 -0500 Received: from relay.sw.ru ([185.231.240.75]:50620) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ia256-0003LV-Sa for qemu-devel@nongnu.org; Wed, 27 Nov 2019 13:30:30 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ia24u-0002Zf-9X; Wed, 27 Nov 2019 21:30:16 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [PATCH v6] hw/core/loader-fit: fix freeing errp in fit_load_fdt Date: Wed, 27 Nov 2019 21:30:16 +0300 Message-Id: <20191127183016.13852-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 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: pburton@wavecomp.com, aleksandar.rikalo@rt-rk.com, vsementsov@virtuozzo.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" fit_load_fdt forget to check that errp is not NULL and to zero it after freeing. Fix it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- hw/core/loader-fit.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c index 953b16bc82..3ee9fb2f2e 100644 --- a/hw/core/loader-fit.c +++ b/hw/core/loader-fit.c @@ -200,7 +200,10 @@ static int fit_load_fdt(const struct fit_loader *ldr, = const void *itb, err =3D fit_image_addr(itb, img_off, "load", &load_addr, errp); if (err =3D=3D -ENOENT) { load_addr =3D ROUND_UP(kernel_end, 64 * KiB) + (10 * MiB); - error_free(*errp); + if (errp) { + error_free(*errp); + *errp =3D NULL; + } } else if (err) { error_prepend(errp, "unable to read FDT load address from FIT: "); ret =3D err; --=20 2.21.0