From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6652DC38142 for ; Mon, 23 Jan 2023 15:42:32 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 826468575B; Mon, 23 Jan 2023 16:42:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AP8AEQQW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EA3038574D; Mon, 23 Jan 2023 15:51:37 +0100 (CET) Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A6D518571F for ; Mon, 23 Jan 2023 15:51:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ivan.khoronzhuk@gmail.com Received: by mail-wr1-x435.google.com with SMTP id r9so11055756wrw.4 for ; Mon, 23 Jan 2023 06:51:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=RXGkPmFs5e9svPEQO1hVSJ7j7ckYYZIOg0yiijJ+OUI=; b=AP8AEQQWPgaTzB/Knd4NaOg6r/UgiXc/W19ZDwkdkHR3RKu0f54XnkXx5C14zGU9VF l+qFZJXNYs8nQsrudyFN8NTxJ+7NjWTwDOKuW7eW995pU8wpanzw2m0d5GSxPkchdij4 j8yOyY2KnYuodAO8JeCsHWkrpR5yFMZiXeqY7MoHsa3UPOvOEhZhfKViMyXv+wXk3+am YehSMTPBTurCNi2S8Bh8xMkpUsqKmx4XhoD3b3vcoRFAvDLK3DLT6dhwC+aunbt4Pkac 5jepzIiWSJz/RGTf/BvGedMH9yzlCFILgx97OSEv8Z3v5Bdc3Z/OmjArroYY+nkIUCFm bkMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=RXGkPmFs5e9svPEQO1hVSJ7j7ckYYZIOg0yiijJ+OUI=; b=zhSo7OdLCL+nlFZirZxLgcQIAcHrrfu9u83PGZZG1bzquKJAPpORFV1Zx9HUQvng7q gJBD4GJJL0Z51IZ1v4qWnneQRr0caMQZkRkX5id6T+QTP/tJMpxKSoik7yKTd7MLuvwr RG9Jcd1feAHDHN92jmBQ/1d8p013Fry4uSyVjKJLGaJGILKgAcai0O0011y2AM4zxpis FwM5fjo3gB6xUFqrnEHFFvhNCNSrTjpeRsm76jX0jq8UcQwcOn+CLIcdRr8l9m9169QT MtkqH3O3xrqj9RBWE5+VIYBlmb3Gxno2jJmh5M+mgi5ZC8Mch5I2AJVocWR86jp7AFZu EwhQ== X-Gm-Message-State: AFqh2koQiypxFB0mhv21/G/uDF9V596rPIg9e6/+OeKRkyEQ6Vfwz7Oe duOw/Pn6yA7aMWud/gHyWfA= X-Google-Smtp-Source: AMrXdXuQgLzfUckfM0jZyZpo3akLHw4OSTgOzSqrr93up7GuPub4EkPvJeR8cEkHdsEOQQ1K2pOnRg== X-Received: by 2002:a5d:6a86:0:b0:2bb:e805:c1ef with SMTP id s6-20020a5d6a86000000b002bbe805c1efmr21394502wru.52.1674485495068; Mon, 23 Jan 2023 06:51:35 -0800 (PST) Received: from ikhor.lan ([46.211.163.169]) by smtp.gmail.com with ESMTPSA id t13-20020adfe10d000000b002b6bcc0b64dsm30393836wrz.4.2023.01.23.06.51.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 06:51:34 -0800 (PST) From: Ivan Khoronzhuk To: igor.opaniuk@gmail.com, u-boot@lists.denx.de Cc: Jens Wiklander , Ivan Khoronzhuk Subject: [PATCH v2] common: avb_verify: prevent opening incorrect session Date: Mon, 23 Jan 2023 16:51:29 +0200 Message-Id: <20230123145129.4063929-1-ivan.khoronzhuk@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230122024130.4028621-1-ivan.khoronzhuk@gmail.com> References: <20230122024130.4028621-1-ivan.khoronzhuk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean The arg->session is not valid if arg->ret != NULL, so can't be assigned. Leave retry for just "ret" error to save same behaviour. Signed-off-by: Ivan Khoronzhuk --- common/avb_verify.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/common/avb_verify.c b/common/avb_verify.c index 0520a71455..97451592f5 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -619,10 +619,14 @@ static int get_open_session(struct AvbOpsData *ops_data) memset(&arg, 0, sizeof(arg)); tee_optee_ta_uuid_to_octets(arg.uuid, &uuid); rc = tee_open_session(tee, &arg, 0, NULL); - if (!rc) { - ops_data->tee = tee; - ops_data->session = arg.session; - } + if (rc) + continue; + + if (arg.ret) + return -EIO; + + ops_data->tee = tee; + ops_data->session = arg.session; } return 0; -- 2.34.1