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 72A12C27C76 for ; Sun, 22 Jan 2023 13:44:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5F17285697; Sun, 22 Jan 2023 14:43:10 +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="mvixtRoU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E238C854C7; Sun, 22 Jan 2023 03:41:40 +0100 (CET) Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) (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 9EFF7851EB for ; Sun, 22 Jan 2023 03:41:37 +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-x429.google.com with SMTP id y1so3439939wru.2 for ; Sat, 21 Jan 2023 18:41:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=v3eTNLCFui6ti6vxy04QYA6Lposeid8SLpSkGBJUM/Y=; b=mvixtRoUUA8Tvap6Acw3k9Tz5yQ40fS73ZP4hgsOs/K8AH/RwWnTnLcXNyed0KkUKj cX2pqB3DXGy1nkzxggUtw3MEOyrXbUNAaFGFo63rbwqaYGSX6d9OHGhPNHAhd4bay8qF jdmOCRsAvwSq9AzUdWhFq7RMqRsxhj82axMzLmhPUMRHv1gCEg6Y9QF0pjwpa1dDdGOO ZbUEI6XPwNrYRnWxTOuYINmyvp01h9ieKG8Yj4YUIvop+bRAzF9E7/CSjapweYcDmCDb jrK1G7r/Uz/b5W0PZtAPELBqeVEWufM/fzJwUrceuzHnnu2vXdAaH5+SvLdKJV7HOiQZ NLUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=v3eTNLCFui6ti6vxy04QYA6Lposeid8SLpSkGBJUM/Y=; b=A2Ce3kHZgW3+Now17Q/2Z6APjwGQJGXzJGs09yV089r4joFFbKcdhIVklJmgZyhLiE EU2W7w8bu4oY16JvV/LXTGZnHR3nSei/m2FcQ7XKTLHkSL8VOC+Kb26mHbqfi5R7sJNX 6Ioos2VAIpo3JLaChJl1tLKDJKx8kKtjRUEPL3NqpWYzIyrdzEP2wnsPBlEiK4yrpST9 1cJDl3JfGsJS73CP5adgKhLxVE8exzU8geCpoqR7KdFFeYHjxuJCw9UbzCFOV/u3sldf B8WesQuTVH/xlYGIQKy8wbhHh+8Q1+R+i8TnFf1BXIpKQra8xS5dEAt1EANFBPQ7UJyh Fv7w== X-Gm-Message-State: AFqh2koXflFoNtn5J2AOqp5F7kOtjmTr5sSgMshRZ3ERwiEpC1UzJ+jL EAgreOUZ+BH8vqJoSZ1h8ZY= X-Google-Smtp-Source: AMrXdXseC2dOvdtAumIEyLH3qCplHoTaYVfqxb2S7uzQ3CnJQI1/7fJv+zy4k5ihT/+yJJQzbK0j9Q== X-Received: by 2002:a5d:6944:0:b0:2bf:960b:7282 with SMTP id r4-20020a5d6944000000b002bf960b7282mr4061738wrw.44.1674355296965; Sat, 21 Jan 2023 18:41:36 -0800 (PST) Received: from ikhor.lan ([46.211.248.254]) by smtp.gmail.com with ESMTPSA id m9-20020a056000024900b002bdec340a1csm19854259wrz.110.2023.01.21.18.41.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 18:41:36 -0800 (PST) From: Ivan Khoronzhuk To: igor.opaniuk@gmail.com, u-boot@lists.denx.de Cc: Jens Wiklander , Ivan Khoronzhuk Subject: [PATCH] common: avb_verify: prevent opening incorrect session Date: Sun, 22 Jan 2023 04:41:30 +0200 Message-Id: <20230122024130.4028621-1-ivan.khoronzhuk@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Sun, 22 Jan 2023 14:42:59 +0100 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..05d5a97896 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 AVB_IO_RESULT_ERROR_IO; + + ops_data->tee = tee; + ops_data->session = arg.session; } return 0; -- 2.34.1