From nobody Mon Apr 29 05:20:05 2024 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1630507422; cv=none; d=zohomail.com; s=zohoarc; b=ApVp9j2x8CQxw1UvNkSxbj9I3iOBmyM4uzQfROvzHXVFcYBcsvZmNEO9jquueYXbeLgs+QfipZwTHRlDqEJE/H/HleQSlJ48DOE/ZZC7XuGmdU2IaZBBIZDN+ass/0jFDcOK3l3D/zKRPmmKABeHdd41pfSrd+qV/tnz9mwBm5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630507422; h=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=Jv2xWtDIw2LfDLHnT/A2nMBA0chq8cqfSt6+2jGOSyI=; b=MOLkuQ9angGB/qy5AwY2kxAFP2/vqd2mbWlY0oaRb/gldoDKmEWuBKsob+SmYulrOyhFo7ey8Oaq1Womj6AuzIMdWZdpj3tnxlMdXH7t9UK01DINiPg7xfAdVlFkHXpparpmWDA5qmZ+L1QSecRKVt3d0tGE6YNwUf2ifiKZQJE= 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 1630507422049318.7797061793168; Wed, 1 Sep 2021 07:43:42 -0700 (PDT) Received: from localhost ([::1]:44600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLRSn-0002zI-0o for importer@patchew.org; Wed, 01 Sep 2021 10:43:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLROW-0006UT-Tw for qemu-devel@nongnu.org; Wed, 01 Sep 2021 10:39:16 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:46955) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mLROU-0007GG-Ou for qemu-devel@nongnu.org; Wed, 01 Sep 2021 10:39:16 -0400 Received: by mail-wr1-x433.google.com with SMTP id x6so4820821wrv.13 for ; Wed, 01 Sep 2021 07:39:14 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r10sm16907461wrc.85.2021.09.01.07.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Sep 2021 07:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jv2xWtDIw2LfDLHnT/A2nMBA0chq8cqfSt6+2jGOSyI=; b=Z/itiPK/HNQo1AQvPxPy2Q5LugRE8cN0vXoS9f1WpG1PY6iBqChwHar2kMH4tQfuKZ yoqYH4XluYRaUkovoel+pny46ATlF3sbsQtrZVqrHmpdQdvIwx3KBfEX9hJseDoQ5OgZ C6vYf77G+hIIo35KaY1mJpPeyMKndMiOoOeYtaIimoKgOFJEAwmnTm+fcQOqu5dBcHyi MmePNu7jy6TS3rvJms0M4GcTDfL+os+/KzXAw+wXeIt2S8sfuaYUSHwWHQGXhMEkwCd8 VqMwYWI13ZVmkFbtzk9u4bamHTpFAd9j6x2wpIzocw7WaLH96ENVJvgWu2zyBiA8YW5A Disg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jv2xWtDIw2LfDLHnT/A2nMBA0chq8cqfSt6+2jGOSyI=; b=uipW0/8fdJSraWBvmcSU4hUaJ+Um4BDiC7wL3kdTCDBpPgpVjxHb8XXHYeb4Oc337T iJ5P9F9Pv9PwYXRPJkg051OWGEYjrdfrjxT+zqYsDEdlceLLxul+zvBrKanZcx/rDRuA yX/MMliatHYtqLZd54N8Fyf6p2jI2Fsy9PjWFnUQXD7XCE8nhydpDVcnTq9jw8RdQo1t sazSRU/YNDcbPErixaQpzv97T/wZrDWcCbefHZZneq1aKix1b//ex8y6lOI1RZWSFFMy uu4KrQUATT+nFC30sL6KKoxQwC3wlnUU7c9q7epXoHI5dSFs6/N+xa3xxsomoD+0ZE5a moLg== X-Gm-Message-State: AOAM5321pA0YAUd/Yd3EjTxjppz5v/JEnmuiPTy5jF6hyUbFwlewEwlD GHDDrHSyrUojLFjGwdPNV29ULDkFNGGmJA== X-Google-Smtp-Source: ABdhPJxbwxK3k8nicXAwDtu9NGuykPOGDwUJMscnlHshuMNHmjQMqX0ZAQppmvpuPnTmmPcgSb5ClA== X-Received: by 2002:adf:c452:: with SMTP id a18mr33169956wrg.225.1630507152952; Wed, 01 Sep 2021 07:39:12 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 1/2] elf2dmp: Check curl_easy_setopt() return value Date: Wed, 1 Sep 2021 15:39:09 +0100 Message-Id: <20210901143910.17112-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210901143910.17112-1-peter.maydell@linaro.org> References: <20210901143910.17112-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::433; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x433.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 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: Viktor Prutyanov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1630507423612100001 Content-Type: text/plain; charset="utf-8" Coverity points out that we aren't checking the return value from curl_easy_setopt(). Fixes: Coverity CID 1458895 Signed-off-by: Peter Maydell --- contrib/elf2dmp/download.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/contrib/elf2dmp/download.c b/contrib/elf2dmp/download.c index d09e607431f..01e4a7fc0dc 100644 --- a/contrib/elf2dmp/download.c +++ b/contrib/elf2dmp/download.c @@ -21,21 +21,19 @@ int download_url(const char *name, const char *url) =20 file =3D fopen(name, "wb"); if (!file) { - err =3D 1; - goto out_curl; + goto fail; } =20 - curl_easy_setopt(curl, CURLOPT_URL, url); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, NULL); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, file); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0); + if (curl_easy_setopt(curl, CURLOPT_URL, url) !=3D CURLE_OK || + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, NULL) !=3D CURLE_OK = || + curl_easy_setopt(curl, CURLOPT_WRITEDATA, file) !=3D CURLE_OK || + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1) !=3D CURLE_OK || + curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0) !=3D CURLE_OK) { + goto fail; + } =20 if (curl_easy_perform(curl) !=3D CURLE_OK) { - err =3D 1; - fclose(file); - unlink(name); - goto out_curl; + goto fail; } =20 err =3D fclose(file); @@ -44,4 +42,12 @@ out_curl: curl_easy_cleanup(curl); =20 return err; + +fail: + err =3D 1; + if (file) { + fclose(file); + unlink(name); + } + goto out_curl; } --=20 2.20.1 From nobody Mon Apr 29 05:20:05 2024 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1630507284; cv=none; d=zohomail.com; s=zohoarc; b=JoAc76ufVFz377LiuMoYZVnNiDjaD1qyya2Jp91UDBoIcq7YamRx0dzbZdzMoyyDRNd5nS7dIMjyDJ+fXd8NPJkWTov4Ed2nxye8hUvoHNsqq9HDL+IzfXemsSgX/J72ISzt8M1J6xKDJlNlbwAjeFfMnpqmK/uDW5hg1vyOQT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630507284; h=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=BpiLSJbcN0PV1g3+TsZ/sqXQEQGbs34oBVTTbry1SrM=; b=SJo9Vo0YQjRktJXmV4T0nGrAUO2lO5KCDfN/IWINxfHkE7TmRXFmak1O0Hx/LxQz7Z7rOYOR27RkOaxL9E1TSxeeHYkyr1aOpEV8IkJMM8WCu8O/K+pmhWVUZREex/1jo/jUF8YUs+UPZRtBQ1YsVgWcR7cS0nJn3hBqO2JmzWI= 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 1630507284833748.859865338888; Wed, 1 Sep 2021 07:41:24 -0700 (PDT) Received: from localhost ([::1]:40728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLRQZ-00008N-RD for importer@patchew.org; Wed, 01 Sep 2021 10:41:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLROY-0006VU-14 for qemu-devel@nongnu.org; Wed, 01 Sep 2021 10:39:18 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:43933) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mLROU-0007GO-Uz for qemu-devel@nongnu.org; Wed, 01 Sep 2021 10:39:17 -0400 Received: by mail-wr1-x42b.google.com with SMTP id b6so4850623wrh.10 for ; Wed, 01 Sep 2021 07:39:14 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r10sm16907461wrc.85.2021.09.01.07.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Sep 2021 07:39:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BpiLSJbcN0PV1g3+TsZ/sqXQEQGbs34oBVTTbry1SrM=; b=d16qfOZ89IqUT2JiMYHDUIsM2mBzXwLhTVcHTM3JlS1OOxE5PsWb2fqHqTVX52m2iV HeL+s21Qd4nqsJDTdCMHTEUWpWWbDB6LbChCYm0zDXxfxKOR9PQog2rMIKy5vrZsdqCC pUTtb85gdhAXvGg+E8HB/1vTbIxDE65A53YdulZSWPkJbtoIO80fum83ifrRI+BO2qGO ZGSHGwlci/Rw5k4UnSDp77uAj4XKAP8RRAOBU4y1cMoTbN1nLnnTHBAT08BebsPWD6lk A/ynZo3t7XOWVIyEfbZ55cbEw95hpu3QES7AWANrDxR8D59WOVTbMNTQOeHLEh6OPwrg fjxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BpiLSJbcN0PV1g3+TsZ/sqXQEQGbs34oBVTTbry1SrM=; b=aqCmTUOSbBeW+hvdjO9sPfIpGS6/ZBEG2s5WY/AbTrNJ186p60X1ha6iNVQ3IoUTL6 OeL4pR7lRQfZWKv2pTjLPJOmJ6pyOHEY/xW7YJdGj24O7+RezuhXX65iWJtPkU9jJB3E qEghtwqORDjVOhVc1Y71kIfx7L5E4IC1L8/dLvdaOpaTV5rL1kIPGKhmiZN6k0TkdT1B 9C74ppvnLAApvkKV6L2oKlyBBUEz5jLq+5jr73sxSiLWnVsoSyUcWGHnRSVBBX1+dkkd zQdeSpEdcj2wAAiwboiCcYLKPZ7e4Cg0noJkbuXXkeKIMVVcTdVCfF2qMnhtj0DVrmyd cIag== X-Gm-Message-State: AOAM530NPO5XDOkD/nDNDw+4+rPawW2zopf3FPLcKDvNy3vMdsm9cYiD k+xTlAM3il8mNOwcc8bqKnvMtvVago1AEA== X-Google-Smtp-Source: ABdhPJwG5YEXSBXbNK7x9TIbJTci05SI3WfAY3yrzC2NAuWYFmxizJJGKzGQ4e6WfV6/9ATaWqXQlQ== X-Received: by 2002:adf:8169:: with SMTP id 96mr38559335wrm.207.1630507153502; Wed, 01 Sep 2021 07:39:13 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 2/2] elf2dmp: Fail cleanly if PDB file specifies zero block_size Date: Wed, 1 Sep 2021 15:39:10 +0100 Message-Id: <20210901143910.17112-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210901143910.17112-1-peter.maydell@linaro.org> References: <20210901143910.17112-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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 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: Viktor Prutyanov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1630507285823100001 Content-Type: text/plain; charset="utf-8" Coverity points out that if the PDB file we're trying to read has a header specifying a block_size of zero then we will end up trying to divide by zero in pdb_ds_read_file(). Check for this and fail cleanly instead. Fixes: Coverity CID 1458869 Signed-off-by: Peter Maydell Reviewed-by: Viktor Prutyanov --- contrib/elf2dmp/pdb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/elf2dmp/pdb.c b/contrib/elf2dmp/pdb.c index b3a65470680..adcfa7e154c 100644 --- a/contrib/elf2dmp/pdb.c +++ b/contrib/elf2dmp/pdb.c @@ -215,6 +215,10 @@ out_symbols: =20 static int pdb_reader_ds_init(struct pdb_reader *r, PDB_DS_HEADER *hdr) { + if (hdr->block_size =3D=3D 0) { + return 1; + } + memset(r->file_used, 0, sizeof(r->file_used)); r->ds.header =3D hdr; r->ds.toc =3D pdb_ds_read(hdr, (uint32_t *)((uint8_t *)hdr + --=20 2.20.1