From nobody Mon Feb 9 16:02:02 2026 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588145616; cv=none; d=zohomail.com; s=zohoarc; b=RilIS0cMdTc4WF7/+xpAIx4byTjDfAlbSiG6smEoPgTPBjTqwuSJdnhs7AGVBRZ4Q52espornfEXKMGS3S0q6OBGUjb8EkiPlRxcfhA4ZXj02XboJMacWEbPUBIvhv5kzieyTKpaUT8x6O5EpLZyWBDLvThw1iCwZyiy4/mlLJc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588145616; h=Content-Type: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=IE0ACh06lsV4xdUtL6CVvp7fPI2t78e9W1N+YfzHsbY=; b=VbE5tb81vsSvDHE8dsI0WbaLxVHiUWS+etsYmSRkT4xMsjslBgJweerG0QyK+yns+PirYGXreFZ/H1Nx5ytQlAso7oMCJCF9K4MabYp68wrz9fmWHz7a3m3pCo4+gnaL1FAzW10E7xlWkEoNBLs2RTkZQHxRX2wKlSUqGOM9Oq4= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588145616829318.52251563007576; Wed, 29 Apr 2020 00:33:36 -0700 (PDT) Received: from localhost ([::1]:37978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jThDr-0002ke-J1 for importer@patchew.org; Wed, 29 Apr 2020 03:33:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46206) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTh21-0007u1-Gu for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:22:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTh1i-0003yS-R2 for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:21:21 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:60951 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTh1h-0003wu-KY for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:21:01 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-325-cU81mEKMNLq05zJK78rA3w-1; Wed, 29 Apr 2020 03:20:58 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 410041009446; Wed, 29 Apr 2020 07:20:52 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-6.ams2.redhat.com [10.36.113.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0E8C21000329; Wed, 29 Apr 2020 07:20:52 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 054CF11358C7; Wed, 29 Apr 2020 09:20:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588144860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IE0ACh06lsV4xdUtL6CVvp7fPI2t78e9W1N+YfzHsbY=; b=PnJuEAWpeS0SJLRgl/RA1KPxqALaVh1GBwec2Xs8CHT+ThMK+SiJ7g0VzHDyXWhWTZcrVO 4VQB17k47SMcOtEHsjH3cpljMAFOUvZzgA+OQjaKDUgkmX6NL7oqOq/Bd04EMnWA3HpxsK p7C+GDJBj6Y/LUzQ+/+gcNAZxRfBwI0= X-MC-Unique: cU81mEKMNLq05zJK78rA3w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 11/32] cryptodev: Fix cryptodev_builtin_cleanup() error API violation Date: Wed, 29 Apr 2020 09:20:27 +0200 Message-Id: <20200429072048.29963-12-armbru@redhat.com> In-Reply-To: <20200429072048.29963-1-armbru@redhat.com> References: <20200429072048.29963-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=207.211.31.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:18:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Gonglei Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The Error ** argument must be NULL, &error_abort, &error_fatal, or a pointer to a variable containing NULL. Passing an argument of the latter kind twice without clearing it in between is wrong: if the first call sets an error, it no longer points to NULL for the second call. cryptodev_builtin_cleanup() passes @errp to cryptodev_builtin_sym_close_session() in a loop. Harmless, because cryptodev_builtin_sym_close_session() can't actually fail. Fix it anyway. Cc: Gonglei Signed-off-by: Markus Armbruster Message-Id: <20200422130719.28225-2-armbru@redhat.com> --- backends/cryptodev-builtin.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/backends/cryptodev-builtin.c b/backends/cryptodev-builtin.c index c8ae3b9742..14316333fe 100644 --- a/backends/cryptodev-builtin.c +++ b/backends/cryptodev-builtin.c @@ -282,12 +282,7 @@ static int cryptodev_builtin_sym_close_session( CryptoDevBackendBuiltin *builtin =3D CRYPTODEV_BACKEND_BUILTIN(backend); =20 - if (session_id >=3D MAX_NUM_SESSIONS || - builtin->sessions[session_id] =3D=3D NULL) { - error_setg(errp, "Cannot find a valid session id: %" PRIu64 "", - session_id); - return -1; - } + assert(session_id < MAX_NUM_SESSIONS && builtin->sessions[session_id]); =20 qcrypto_cipher_free(builtin->sessions[session_id]->cipher); g_free(builtin->sessions[session_id]); @@ -356,8 +351,7 @@ static void cryptodev_builtin_cleanup( =20 for (i =3D 0; i < MAX_NUM_SESSIONS; i++) { if (builtin->sessions[i] !=3D NULL) { - cryptodev_builtin_sym_close_session( - backend, i, 0, errp); + cryptodev_builtin_sym_close_session(backend, i, 0, &error_abor= t); } } =20 --=20 2.21.1