From nobody Wed May 8 13:25:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1621950526; cv=none; d=zohomail.com; s=zohoarc; b=ZuoI6BY+AT35uar/1HVvl7asr3cvAxgcVZ7mY/Dz8tvwqoNzsuF6cpCHCwZlPSQwoSulMzcYW85rlqlTlXFomMNVseADwtCiI7E8hFVVvUEF58iu5Cc+gVUyR7oKO5Fn1ofQqdi/MJuGUiSv2XPG3JCVzwB2ay4dxQPj1vsyF+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621950526; 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=GO67IXGpoeLhsE9v+Swk468FtjwgUs+tH+D+I37vel4=; b=KzF/zS/aJtRQrJicn0OiL/1Q+xNx9b56+uCOBcznqzH6Pi+kXkxvixKj9NeKcnW2/rjgbWBCG4QaJAhbs1EukOsc1JJQRTjCM/1XCEUWYf9EUDZeGTZgg/VGQtWL0R7QDTwvxRu1c7OyXLIaNZ+Gox7evICDCL+70MhT7HKZNi8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=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 1621950526881739.4472457281686; Tue, 25 May 2021 06:48:46 -0700 (PDT) Received: from localhost ([::1]:60302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llXQL-0004H0-Rn for importer2@patchew.org; Tue, 25 May 2021 09:48:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llXMm-0008Es-HF for qemu-devel@nongnu.org; Tue, 25 May 2021 09:45:04 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:36586) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llXMk-0005md-NS for qemu-devel@nongnu.org; Tue, 25 May 2021 09:45:04 -0400 Received: by mail-wr1-x42e.google.com with SMTP id n4so6390448wrw.3 for ; Tue, 25 May 2021 06:45:02 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t7sm15794460wrs.87.2021.05.25.06.45.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 06:45:00 -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=GO67IXGpoeLhsE9v+Swk468FtjwgUs+tH+D+I37vel4=; b=oBAWbXA2q2Ttgd5InGcf9KqcYuprREY2cGqgfCP9i8Ja7qatqrdQ4djPu+Ke2m84dA 4uSlbYQqwFntKd6GLRPRntI9fuPdql7FPGGC3X2pX3h+dUck5ZeCNB2IoiAkHl0hf9mK FABx3WeZushYombsudcRjmBmguw/fLCs1OAWdkILoWnshwN9+jM5ZUnY5x1nUehvuymT lwPAGzaIN0/T3ncqrhVItjoabucDYi+ma04JadTSUDYnxg93QEJWe9bsdogmQtakqCXD lW89buXPM/0kVxxbZajZz2qikSpLVLIL+ZxHDwHikDCKfils1l+XYY6xeIitKkYIrGJo ryHw== 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=GO67IXGpoeLhsE9v+Swk468FtjwgUs+tH+D+I37vel4=; b=em8m4707xxvtIWe/pgrS5Rmt9gD3mT+IGTAl/zynih9IXX4ZVB2iKS5WxED6Y1CXay +xoEXVuCwAmJPnwhI8HJlvgyyUDh717tdAPRe6Grf3QLe1Y358D9Z5Q8ZYHXJPSFeLum vilV/fXG1YstAQCPEBMY2tHOSaCEMyfmwy7yOnP7bJ4ojJaxEvxP/Krtd/UJ2R71j4Jh 9kY+M4rSkQm93dEfNCiaotgaTZ0qApQglMGlIo3sFi4dVJWEve8aUJ0DPpq3pKSWfZe6 p54FkA52+xFbABWE1HPe5icNDlfPX0lIijpEY3KwYoNCS3cfNf4snhgTASm4TUPgc4RI grlA== X-Gm-Message-State: AOAM533ADQ0Yv3Otgq3CdRIxFvnBKK52ipjrrZKUb/b0LXvKpogrAgzE xwYuxZzKYEBHNVX4EXd5Jl5xzGTh41voVXNH X-Google-Smtp-Source: ABdhPJwtOur6WpgQhJGceIMKRiS/ZJynhMSxun/vrj8fPP/+0hENZOy5mjsDNWTMedVMkKYBtFLtYQ== X-Received: by 2002:adf:e991:: with SMTP id h17mr27239503wrm.265.1621950300956; Tue, 25 May 2021 06:45:00 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 1/6] tests/qtest/bios-tables-test: Check for dup2() failure Date: Tue, 25 May 2021 14:44:53 +0100 Message-Id: <20210525134458.6675-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210525134458.6675-1-peter.maydell@linaro.org> References: <20210525134458.6675-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42e.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: Laurent Vivier , Thomas Huth , Stefan Berger , "Michael S. Tsirkin" , Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Coverity notes that we don't check for dup2() failing. Add some assertions so that if it does ever happen we get some indication. (This is similar to how we handle other "don't expect this syscall to fail" checks in this test code.) Fixes: Coverity CID 1432346 Signed-off-by: Peter Maydell Reviewed-by: Stefan Berger --- tests/qtest/bios-tables-test.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 156d4174aa3..51d3a4e2390 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -489,10 +489,14 @@ static void test_acpi_asl(test_data *data) exp_sdt->asl_file, sdt->a= sl_file); int out =3D dup(STDOUT_FILENO); int ret G_GNUC_UNUSED; + int dupret; =20 - dup2(STDERR_FILENO, STDOUT_FILENO); + g_assert(out >=3D 0); + dupret =3D dup2(STDERR_FILENO, STDOUT_FILENO); + g_assert(dupret >=3D 0); ret =3D system(diff) ; - dup2(out, STDOUT_FILENO); + dupret =3D dup2(out, STDOUT_FILENO); + g_assert(dupret >=3D 0); close(out); g_free(diff); } --=20 2.20.1 From nobody Wed May 8 13:25:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1621950634; cv=none; d=zohomail.com; s=zohoarc; b=dvsDbtQnO/J8TM6Y8/VOboROIW5egrhg85gFQ5FvBrSkgY2odghChkVBczhGP6Jj+9IsyIWmm5wDREoUdi1scezZ2+QejraDMABck61QdOTu/A8u/LtTZ1nv3TX/g8uNnJmsNX3Pq6BU19XQNsXM3PAPOvR9nI7v1g6oMUZ0PVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621950634; 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=UD2dMdGKyLJvMdxSIlQcye8aejj92FAopTvj8ryLMwM=; b=Unb/8XKcn7EuljyVGdejUUaphwnvYvL3WjQNlnlyAxnwZ2MguI6Z3IbU1gRqhOGn574dMR8kPv+i9VEGXqcWYULLa5YRH6Zz0VUSLmtfZ0ba/5SvYmiio/UYwr43sm5QVRWXhTnz5ZZsK1c+LCVvzqcysopgmaMcEvVhpWsHHTw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=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 1621950634244624.4944883389562; Tue, 25 May 2021 06:50:34 -0700 (PDT) Received: from localhost ([::1]:38404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llXS5-0008UJ-6I for importer2@patchew.org; Tue, 25 May 2021 09:50:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llXMm-0008F1-SD for qemu-devel@nongnu.org; Tue, 25 May 2021 09:45:04 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:40659) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llXMl-0005nN-72 for qemu-devel@nongnu.org; Tue, 25 May 2021 09:45:04 -0400 Received: by mail-wr1-x431.google.com with SMTP id z17so32310167wrq.7 for ; Tue, 25 May 2021 06:45:02 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t7sm15794460wrs.87.2021.05.25.06.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 06:45:01 -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=UD2dMdGKyLJvMdxSIlQcye8aejj92FAopTvj8ryLMwM=; b=BD9CY2/BH4UdxAI5DyYW/pv9YwTpQas0h0NNnBwlLck+Ovo7YN8Z85BL5FTdpRGVns 2v/BYcX1AgA30xmJKYF48u/3zP7/PAlEa5HFbNyn4bbtuapWBkx/gLqQ//Idr6CqjlFM odMTCZrLnKDbopYYNSVDHvEKJSWYEDjoaV+30fZTNK/gREqfZlD3jA5aBJHrxmA8o/bF LeslFa7C+RZyqEH6jgqrYdqIJAupatbGB2dcCAOoifrFYkuwO4vnBnJoV5MdZzDj7etH YlTClmKJq74YYQPKfUGxq2B8swUJ7K/yM8O8igeiUzGXcmJivTnCmEb6VwebxDcx/8IB cviQ== 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=UD2dMdGKyLJvMdxSIlQcye8aejj92FAopTvj8ryLMwM=; b=PpoPkf+bhgF6WAp2D7UxMN2nk36ejorlprTo4qr/4cmzyoCOfS8ZNmklx3KuDOaAM5 FRJmAE+2+bIbjQkeWw/VXgCjGnikvYgVGBnTTfqiH8OlcKvYumnVvQWg7CpdmO+OGl+K GvGubScqMkj1R52mdAusBoOAVJK9cdMOl6v8v+8Hvi8yau2ZQ9KWR8mf1ncwhxKtiR58 WDf1NSjAbHUHOJbUgcc6kGS2nszIBQ3t/gYb2Z0fkPjO8yimukKKWn77lejWeakOy9xv upiURdEbhc9Jv60UWrJMwHLsJcd3oSo/9sRx5ax77oEZhZL7TwxKp0eKaCfa+LqMAPVu D6Vw== X-Gm-Message-State: AOAM530vtDIxWy+yNKXxWC82/j3Srayh6mf6giKiHo9FIFn6kenXLqxk 9OvJaG1DedAQWkvgZIhOSs7akobR1u1Y0ZXG X-Google-Smtp-Source: ABdhPJy5QSpHJJUaIdCi8uNiy9u3Gr80CKlB+ln67B8keRD/ebwxqHa3Srbawn6gnKNVVL0ilN4qjQ== X-Received: by 2002:a5d:5707:: with SMTP id a7mr3032880wrv.193.1621950301828; Tue, 25 May 2021 06:45:01 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 2/6] tests/qtest/e1000e-test: Check qemu_recv() succeeded Date: Tue, 25 May 2021 14:44:54 +0100 Message-Id: <20210525134458.6675-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210525134458.6675-1-peter.maydell@linaro.org> References: <20210525134458.6675-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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: Laurent Vivier , Thomas Huth , Stefan Berger , "Michael S. Tsirkin" , Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The e1000e_send_verify() test calls qemu_recv() but doesn't check that the call succeeded, which annoys Coverity. Add an explicit test check for the length of the data. (This is a test check, not a "we assume this syscall always succeeds", so we use g_assert_cmpint() rather than g_assert().) Fixes: Coverity CID 1432324 Signed-off-by: Peter Maydell Reviewed-by: Stefan Berger --- tests/qtest/e1000e-test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qtest/e1000e-test.c b/tests/qtest/e1000e-test.c index fc226fdfeb5..0273fe4c156 100644 --- a/tests/qtest/e1000e-test.c +++ b/tests/qtest/e1000e-test.c @@ -93,7 +93,8 @@ static void e1000e_send_verify(QE1000E *d, int *test_sock= ets, QGuestAllocator *a /* Check data sent to the backend */ ret =3D qemu_recv(test_sockets[0], &recv_len, sizeof(recv_len), 0); g_assert_cmpint(ret, =3D=3D , sizeof(recv_len)); - qemu_recv(test_sockets[0], buffer, 64, 0); + ret =3D qemu_recv(test_sockets[0], buffer, 64, 0); + g_assert_cmpint(ret, >=3D, 5); g_assert_cmpstr(buffer, =3D=3D , "TEST"); =20 /* Free test data buffer */ --=20 2.20.1 From nobody Wed May 8 13:25:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1621950414; cv=none; d=zohomail.com; s=zohoarc; b=i0sHXKKQMLdfPw1Wb9HGdOk0Nt6FNdfhn/6s8QtWxwN/g0MGWjePS7SEoDok4wi58i727QEjyKEtqyIU2d33c4bEjkcBzngYyjhuK8rYciiz3FRtF85h63mswCcUo4VCKokngQDW04J1rqTeuFgg30NZLpK+ejkTuPig8xnXlRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621950414; 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=RpRDsEnH95uu+Ux7JoRWYhEj5tQ2gOOA0yIZFo57BOg=; b=MD5uJ5mwZKZEcj18p+eoOqXVtpocB4m+HqIeiEZFQg3nbYmII/YERUozo/UvdvtUuVKRVleDoz+xG++6db52hAK5ufQRA8LY+0mgwYTEZrzfZrIsi1pHFIEORQA21pxG5XneYPjx+kOORXgAilvY3yKcp8I9y6sD5Ew4F7WWBhA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=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 1621950414437222.29539931820023; Tue, 25 May 2021 06:46:54 -0700 (PDT) Received: from localhost ([::1]:56130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llXOX-0001P9-Eo for importer2@patchew.org; Tue, 25 May 2021 09:46:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llXMo-0008Is-Tj for qemu-devel@nongnu.org; Tue, 25 May 2021 09:45:06 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:46732) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llXMm-0005pG-En for qemu-devel@nongnu.org; Tue, 25 May 2021 09:45:06 -0400 Received: by mail-wm1-x32a.google.com with SMTP id l18-20020a1c79120000b0290181c444b2d0so6305330wme.5 for ; Tue, 25 May 2021 06:45:03 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t7sm15794460wrs.87.2021.05.25.06.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 06:45:02 -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=RpRDsEnH95uu+Ux7JoRWYhEj5tQ2gOOA0yIZFo57BOg=; b=W40VC2fawI+d3LnIVU+rEmwAJr/Yuo6ucm4nj4cQCLFEdt0wFz0odfWqROGgASmE9f RpPtZXS6OIpIvL0/AxNu49WmbX/nE1dqv4fj22V1yrBRqB0PbLev5Ql46xrajcEYuheb Ur0o8y+WILMlltHMqtC57tLiXE7td//WD1un2E0DLUi6h6Q6chOyLig9Qbp7HA0etTab 5ybvCmmAD014zry3iq8IK9RX/XIZCOt1gD5Xmybk+K2Bu9Je0vy4KAWStNRcDwx9YzBo DUcbgOyGDEUpF9AU7aATXi/6m5MD3Yq53noImoLYpkK5/i2bLxbQtzx1hlhp3H4doepO sY/A== 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=RpRDsEnH95uu+Ux7JoRWYhEj5tQ2gOOA0yIZFo57BOg=; b=PXc344NR1iw3s1SwN1l2i1cVTltsVqnae7zaNW2Mi9vnX1aHAm8xfI4Y51EVcHa4B5 sK+BGbstawoE7bQbFCFB+Tf2EtVfYwVSxxRnW+uxRW8ArKUirm/8qvNzMp2R47r4osmg KXsuP2SggmzXPckASRTu2TBE76dyAhaw875GAAnhK4+HOPbhvDqg0imo9arBNlF79MHz QQvrIOA5seeSBFiBf9XyGdqwvTXY2XTAGJoXyt93OTx+0MC3aF8aKp0Vk1I1yI3vQyod KPWDj2Lcn4PdYWukLaKqOBUuR0nxePP3hzdl6nQcEyWhRGGF3TRYzr6IQ0j+UALRpbG3 HJ+w== X-Gm-Message-State: AOAM533vuP6p3Uu/14+s4ngn+l9YT62dYbaipI5vGOKn0s7QUXEQfI6H XSip9bten0nde0UmUewvCSBX+mfE+qh9Um/N X-Google-Smtp-Source: ABdhPJzoeU1s95DkZHOsmtIt5XyIv6KfoX5ApR6vYY3VkvJ0q2Inqy5yvV1bsAnXIhaSMcQFmlKTRw== X-Received: by 2002:a1c:b702:: with SMTP id h2mr24111618wmf.99.1621950302831; Tue, 25 May 2021 06:45:02 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 3/6] tests/qtest/hd-geo-test: Fix checks on mkstemp() return value Date: Tue, 25 May 2021 14:44:55 +0100 Message-Id: <20210525134458.6675-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210525134458.6675-1-peter.maydell@linaro.org> References: <20210525134458.6675-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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: Laurent Vivier , Thomas Huth , Stefan Berger , "Michael S. Tsirkin" , Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Coverity notices that the checks against mkstemp() failing in create_qcow2_with_mbr() are wrong: mkstemp returns -1 on failure but the check is just "g_assert(fd)". Fix to use "g_assert(fd >=3D 0)", matching the correct check in create_test_img(). Fixes: Coverity CID 1432274 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Berger --- tests/qtest/hd-geo-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c index f7b7cfbc2d1..113126ae06c 100644 --- a/tests/qtest/hd-geo-test.c +++ b/tests/qtest/hd-geo-test.c @@ -464,7 +464,7 @@ static char *create_qcow2_with_mbr(MBRpartitions mbr, u= int64_t sectors) } =20 fd =3D mkstemp(raw_path); - g_assert(fd); + g_assert(fd >=3D 0); close(fd); =20 fd =3D open(raw_path, O_WRONLY); @@ -474,7 +474,7 @@ static char *create_qcow2_with_mbr(MBRpartitions mbr, u= int64_t sectors) close(fd); =20 fd =3D mkstemp(qcow2_path); - g_assert(fd); + g_assert(fd >=3D 0); close(fd); =20 qemu_img_path =3D getenv("QTEST_QEMU_IMG"); --=20 2.20.1 From nobody Wed May 8 13:25:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1621950857; cv=none; d=zohomail.com; s=zohoarc; b=H3y/6yCfQG9VM6z+ftw7HdL7gVNgPw1sZ1jqDs2ThRLNbZ4TCmUlco3qXvJW80a/aGlvQFc1p/je+ou8iMQR7vLz6BHc9iLoqba4XQiuJnSiprQ38/pe03E0ztPVy/F6rFejNajXba4Xgk7KsM4OKe1IYygppBvPhYKJJjvn1q0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621950857; 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=ALgUBkaFcxFN/pGGcl4oQPNKi5KOQsKMi8EGZzJAvOo=; b=cV9hBlr+SusxOb4IqCOrXDWX1jc1Ee+1JWvXCw3lWnqExD/o+ocmXMWN+JDRepKn8Xyql1uikGubyh+7/s6rBBKULf1nQJsMCw+JrB2t1P+Z1kKL370mC+SdY1MRP9DNMp09KJTFfCoYS34LgVTnIOIT0aGdmyIr4+cKbTRC2iw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=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 1621950857508792.9296320782051; Tue, 25 May 2021 06:54:17 -0700 (PDT) Received: from localhost ([::1]:44262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llXUE-00044i-6g for importer2@patchew.org; Tue, 25 May 2021 09:52:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llXMo-0008IJ-N4 for qemu-devel@nongnu.org; Tue, 25 May 2021 09:45:06 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:53824) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llXMn-0005q5-2L for qemu-devel@nongnu.org; Tue, 25 May 2021 09:45:06 -0400 Received: by mail-wm1-x335.google.com with SMTP id h3so4032799wmq.3 for ; Tue, 25 May 2021 06:45:04 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t7sm15794460wrs.87.2021.05.25.06.45.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 06:45:03 -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=ALgUBkaFcxFN/pGGcl4oQPNKi5KOQsKMi8EGZzJAvOo=; b=mydUfOiHfzfeabkzVGws0/zZfx5LMeRFxdW0uj086PRiMQa3xVhQoGcnn4ePtKELzg 2G5PUAWUamtzDjgdSWgTaw6iEnDLsjk4nhxXu5UVt1HykuTKrce82ki3idKfpc5F36sd Sn6HneprBluUPClAf50zWz0kjWXtsOTmrzHPxJ2qVtSebhgcE3XKVJqt7u3odqNqPyUO jv4HZW0NKbx6blfgeLj/vgGauHFHTQL/qJj5SV2gSHdvdJc7TZVVcunxbDKuRTZSWqv4 k1i3hm6fflHaj/sQnflb+OBP1hUTEfnsCVcXY1dnbPAQlhzGYlA1V9LkkcAUIOJNv503 0HXw== 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=ALgUBkaFcxFN/pGGcl4oQPNKi5KOQsKMi8EGZzJAvOo=; b=tnIgmVvjegyF2sZyl5a+qjgyu/C2bx9M0K9du0Icn1Y9t8f/YmrLARnktqrYWRf1SP LQZgcA+pranSLLW50V49a8I3tavzrJSkqZ9GVJBmVduXwq+3fnXMe2inUsiy4cOnRFEL LSpLTXAiWV727bWoc8jyewrTfvEWASC4a7rNE6QkqH8m14xOMdd128EGUC1S0yYGNr4h hfJ3hbd+7UkZ0ATdC3R9/6Mzfmomtku1EeeMtzBGiFUTdRsgBpHg6A0Ny4xfOvI7UzTl 0Ef4U5Z1DSVyqudDc7kkqslq2PoiGWHL28+nCwAZ0LIXqKKQ6UXc20K28AmBeU6IcPb0 Cxag== X-Gm-Message-State: AOAM53234zizY3QeavKTBcLVN9WchSjqGU82I2XuBHQ7/nOmgFUOW8pC diZ4jwHb9+T20DgO1+v7UrU/5FRnRM3XuyIN X-Google-Smtp-Source: ABdhPJxn2VhpudxAtv/VUJwXXFUnKt0rTeHvzy0aNSoYLKZ5+LoT6+OKA9hDVBaFnVuzg7fi5jnyNg== X-Received: by 2002:a7b:cb85:: with SMTP id m5mr4036075wmi.118.1621950303737; Tue, 25 May 2021 06:45:03 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 4/6] tests/qtest/pflash-cfi02-test: Avoid potential integer overflow Date: Tue, 25 May 2021 14:44:56 +0100 Message-Id: <20210525134458.6675-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210525134458.6675-1-peter.maydell@linaro.org> References: <20210525134458.6675-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.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: Laurent Vivier , Thomas Huth , Stefan Berger , "Michael S. Tsirkin" , Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Coverity points out that we calculate a 64-bit value using 32-bit arithmetic; add the cast to force the multiply to be done as 64-bits. (The overflow will never happen with the current test data.) Fixes: Coverity CID 1432320 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Berger --- tests/qtest/pflash-cfi02-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/pflash-cfi02-test.c b/tests/qtest/pflash-cfi02-tes= t.c index 60db81a3a2b..6168edc821a 100644 --- a/tests/qtest/pflash-cfi02-test.c +++ b/tests/qtest/pflash-cfi02-test.c @@ -406,7 +406,7 @@ static void test_geometry(const void *opaque) =20 for (int region =3D 0; region < nb_erase_regions; ++region) { for (uint32_t i =3D 0; i < c->nb_blocs[region]; ++i) { - uint64_t byte_addr =3D i * c->sector_len[region]; + uint64_t byte_addr =3D (uint64_t)i * c->sector_len[region]; g_assert_cmphex(flash_read(c, byte_addr), =3D=3D, bank_mask(c)= ); } } --=20 2.20.1 From nobody Wed May 8 13:25:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1621950860; cv=none; d=zohomail.com; s=zohoarc; b=NWE++mAjiBcvJvupSJobTyJJt6AH9YV1bCMebbZwkk6Fs681PxNqMgDhA9x76a6zmcAoLZBuqbn66/go77unQH50Wu3vsTDpwph7V2cFHpYCm6t+kJ43jWqpJEQkHu8A978n2jl95lTPjmJ/TKZ+hMfPW/4mM05oBDJ+SzGKtJA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621950860; 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=81BcStrDLjfG9r2+15kQcn3KAVBeJOQ+xGFWyk9GtLs=; b=fuLgTt286Ujj3GkudWQSrABgMmq2Odm6mzmUjSlL0eoMPpb22PyVM4Qagiq4Mhb09EpaUacNYTaySSwVbpq3DhuucyN7x0MazxE1t7/iL1UHteizErpV43G7JGI9u6JUfuJjsb1WD2tF8VnA+EiASQf/peiSndQT7q82jMTvtaA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=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 1621950860267862.918720632166; Tue, 25 May 2021 06:54:20 -0700 (PDT) Received: from localhost ([::1]:48558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llXVj-0006yF-Kc for importer2@patchew.org; Tue, 25 May 2021 09:54:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36962) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llXMp-0008LS-Mm for qemu-devel@nongnu.org; Tue, 25 May 2021 09:45:07 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:45806) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llXMn-0005qL-Si for qemu-devel@nongnu.org; Tue, 25 May 2021 09:45:07 -0400 Received: by mail-wr1-x430.google.com with SMTP id x7so12709643wrt.12 for ; Tue, 25 May 2021 06:45:05 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t7sm15794460wrs.87.2021.05.25.06.45.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 06:45:04 -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=81BcStrDLjfG9r2+15kQcn3KAVBeJOQ+xGFWyk9GtLs=; b=mNnXmVkl9xOIRNT09Y2jzBjTclNNGh83LJt9aR6ZVa92kckh/qQn1aEw8un5tCyvZx LEH42RBqi7crjv2jLJnsZfAiAPUzXXp6zz6QWPBogzCq8v9Mu3TNGzV45KmHXyJ7IoAE F65aBYc5UelvJGNdKfJyysw1b+jtCmKvetrk2BM+Mx6gT6sn5GRlqYyAc4k1dcIPtKiF 4t7sDIGOUPJpSMR7HD2Xbi57HheuoWrvrZ8Rms3/gwpDR+cMvjMHpf17XQTgssFF9QXK 3AOPkgh1o+fUb6cn//YEIM+AgKRO8HsxP5//vvzhjnePgz38LsPEqOdl0eE9vJaKCkal Tp/A== 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=81BcStrDLjfG9r2+15kQcn3KAVBeJOQ+xGFWyk9GtLs=; b=WZoDDw1Qi972zASvwP0hElmCiR3Wii1RTVYqQcVmS9w2dfAcJ2iPBa7YQtZkWOQNE2 Zq3vfqNRbXywQt2lC70A/ZgGWloHDzJr7Ztu6EOvijCg1K6USJKRaF6k9uJxU0KTk4S9 q13NaQyTM7r4izIuVJG049uKkHfH5Zp4whIiCgAiB2MMPx1tvNEbujgceRbkv8Lyd1Ln VbZaiMxL2d8MvnXfGAD++i16lJysi0bt1gd6v0JaCH5RS74rEtZ614TqDcDQWzB2JDtV RCaihku5NE1yWcNJJB08/9ku0jCkYzAW4X30XZKEztYAt+RBOSibL75iJ6HfftRO99I0 //tw== X-Gm-Message-State: AOAM530yimD9QvfIUGp5H4STzK6DeE2Wmz7huD50xsFtAmTmsBKwRJP/ 6kboobOSKNZ95JnXSQ0LTPudAjYUGkkywVN9 X-Google-Smtp-Source: ABdhPJxaabybQtX6nm4vm6CDXpyqHySRzp6D4lu2mjoWRgBIWw9rpNGtfJePTLgWNcsdY2oiLcQ3lA== X-Received: by 2002:a05:6000:22f:: with SMTP id l15mr27149320wrz.316.1621950304574; Tue, 25 May 2021 06:45:04 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 5/6] tests/qtest/tpm-tests: Remove unnecessary NULL checks Date: Tue, 25 May 2021 14:44:57 +0100 Message-Id: <20210525134458.6675-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210525134458.6675-1-peter.maydell@linaro.org> References: <20210525134458.6675-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.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: Laurent Vivier , Thomas Huth , Stefan Berger , "Michael S. Tsirkin" , Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Coverity points out that in tpm_test_swtpm_migration_test() we assume that src_tpm_addr and dst_tpm_addr are non-NULL (we pass them to tpm_util_migration_start_qemu() which will unconditionally dereference them) but then later explicitly check them for NULL. Remove the pointless checks. Fixes: Coverity CID 1432367, 1432359 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Berger --- tests/qtest/tpm-tests.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/qtest/tpm-tests.c b/tests/qtest/tpm-tests.c index 0da3a8a4df5..25073d1f9e9 100644 --- a/tests/qtest/tpm-tests.c +++ b/tests/qtest/tpm-tests.c @@ -123,14 +123,10 @@ void tpm_test_swtpm_migration_test(const char *src_tp= m_path, qtest_quit(src_qemu); =20 tpm_util_swtpm_kill(dst_tpm_pid); - if (dst_tpm_addr) { - g_unlink(dst_tpm_addr->u.q_unix.path); - qapi_free_SocketAddress(dst_tpm_addr); - } + g_unlink(dst_tpm_addr->u.q_unix.path); + qapi_free_SocketAddress(dst_tpm_addr); =20 tpm_util_swtpm_kill(src_tpm_pid); - if (src_tpm_addr) { - g_unlink(src_tpm_addr->u.q_unix.path); - qapi_free_SocketAddress(src_tpm_addr); - } + g_unlink(src_tpm_addr->u.q_unix.path); + qapi_free_SocketAddress(src_tpm_addr); } --=20 2.20.1 From nobody Wed May 8 13:25:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1621950969; cv=none; d=zohomail.com; s=zohoarc; b=ZFrRMiFYIM0dYUHsqFPT7ch8OdCudTu48yoQhMzsrSRRJlSP+PlPv7O8rDux2d2XZysF6d0LWj7AuvFW0r94gfyYxOXo2pUREfLXuPP3Ih2wcVVJYXCI4umdG6UqMtOSWz/c67TDd7wuI+HtZjYHwuXz2JetCn3Pj3d0Hb8FLIc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621950969; 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=vGm5M8/051WSMHPDUP6YHZvPe3ukIqpIQI0jdiMr5yQ=; b=eO7eLdH+3bb0Lyg3gCd96L7L2sw8AXggOUCUqMUz+kR8/tCk6NXnStvnZhqispjsmVU9ufWPSMUN6KpdBHIyoWNGBO8bUjG1QRcTHYGEXgJ5+fRppX+E36hZnqUhn12dVY5fGEYmoLoWoyLDZ/a4EZ1px9gNKxzMPNamGbeoTA4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=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 1621950969773298.19419853047725; Tue, 25 May 2021 06:56:09 -0700 (PDT) Received: from localhost ([::1]:51736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llXXV-0000fe-47 for importer2@patchew.org; Tue, 25 May 2021 09:56:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llXMs-0008Up-Tt for qemu-devel@nongnu.org; Tue, 25 May 2021 09:45:10 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:40656) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llXMo-0005r2-Ts for qemu-devel@nongnu.org; Tue, 25 May 2021 09:45:10 -0400 Received: by mail-wr1-x42d.google.com with SMTP id z17so32310423wrq.7 for ; Tue, 25 May 2021 06:45:06 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t7sm15794460wrs.87.2021.05.25.06.45.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 06:45:05 -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=vGm5M8/051WSMHPDUP6YHZvPe3ukIqpIQI0jdiMr5yQ=; b=cdl7hZwPvjjiRSQeJ9ZnGVVj+HAjd31EpkvgvommR9EOj2R9LALSbavSpmZhC7NUZR WeM/MrWS7qpzph84FJc0qTzQSIlyGXNiL7g3N07u6BW+Jd2fm20UZYzm6RjjdO9CLiqe WnHGmfG+KBp0jBWVwiIZ58rEGy12Joz0uxR+y4ok+TMdm0edQfIvl1CcdmgVbl5ecCs7 n0aB2kRVLvRp9aoH6E8iufNzndwXKMENBlLjqvrxSM4QJlR8onPlUKx/y0NxixFKJk7f ptpM3udpeFQM+DVhdMSA0eq2ZpXa0an57FF/uYBr2bivCyKow2UUOqA2prdZG78DHfh1 op5A== 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=vGm5M8/051WSMHPDUP6YHZvPe3ukIqpIQI0jdiMr5yQ=; b=iJX711eRM1zKW/1mNGCKdP9NYRHLKZ0PLWxKLjymGIuGGHjBHEnHT+wqwCYyx+8oCZ fwKHx3wjVxIXhM91hLCvWGJItjYbKO0UAjRm2LnaJq+AluWIaHxHQoz8VuyF9iZW0BNS /2NbKwJWtU1hTVODLvjVI8kyZt3CDFCXnNQacLMmSKwXkasIuj5JWezXeMkOwbzgX+O/ 05d2bj9nffurvYoorQU0SjSnS8iNVq+WNOW0KfM0z6m8ZKi/it2O2r2ZYu0AcJHQUNV6 5bP6xIu0Z/HAEnjsj7uIGxTuMZ6Ha5wWrAjKohTC3NzKq53PcnlqlChY7wETyvZ3t+Al KMMw== X-Gm-Message-State: AOAM531lRYriPkGAL7L0J1KYrMJ4C/1DacsMMNVuTFQEM0JeaF0Aq2Ie P/tjYknRwQq81W/Z3WKojqmZFH8YZgEgju8l X-Google-Smtp-Source: ABdhPJwjFQKOCmRWl+i5sKmmhVM+PLgQUUwqRc/bXnZHvIPAtZ2Psybner13CBuCtR6yuq7FThTrVg== X-Received: by 2002:adf:e4c8:: with SMTP id v8mr27814421wrm.345.1621950305529; Tue, 25 May 2021 06:45:05 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 6/6] tests/unit/test-vmstate: Assert that dup() and mkstemp() succeed Date: Tue, 25 May 2021 14:44:58 +0100 Message-Id: <20210525134458.6675-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210525134458.6675-1-peter.maydell@linaro.org> References: <20210525134458.6675-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.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: Laurent Vivier , Thomas Huth , Stefan Berger , "Michael S. Tsirkin" , Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Coverity complains that we don't check for failures from dup() and mkstemp(); add asserts that these syscalls succeeded. Fixes: Coverity CID 1432516, 1432574 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Berger --- tests/unit/test-vmstate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/unit/test-vmstate.c b/tests/unit/test-vmstate.c index a001879585e..8d46af61511 100644 --- a/tests/unit/test-vmstate.c +++ b/tests/unit/test-vmstate.c @@ -44,6 +44,7 @@ static QEMUFile *open_test_file(bool write) QIOChannel *ioc; QEMUFile *f; =20 + g_assert(fd >=3D 0); lseek(fd, 0, SEEK_SET); if (write) { g_assert_cmpint(ftruncate(fd, 0), =3D=3D, 0); @@ -1486,6 +1487,7 @@ int main(int argc, char **argv) g_autofree char *temp_file =3D g_strdup_printf("%s/vmst.test.XXXXXX", g_get_tmp_dir()); temp_fd =3D mkstemp(temp_file); + g_assert(temp_fd >=3D 0); =20 module_call_init(MODULE_INIT_QOM); =20 --=20 2.20.1