From patchwork Fri Apr 4 14:31:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 878496 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7FBC1F5420 for ; Fri, 4 Apr 2025 14:32:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743777159; cv=none; b=WZ4Fd5L0dLEj0B7+bXFkh1+qHXP98gNUcMmJMp1vxFgWiaZVJU1D8zQ1uFgM0CH9JHNeSoRlqaNFuMMydBJuurjcUHV5TcKpiSBSm1ES4lN3U2D7OvP6z4qczSKbhyC+RqS1BEVwjoqFZlM+axQ3/ChMU+hW0JxgjR9pD2tCUns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743777159; c=relaxed/simple; bh=J9LDfo6gNpW71xs4AHsdLctBmBSEcjpZaBz793nPpSU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HHhVWUCYmkIk/NMbb7XBllAjTc0h8B/WOwbKLFUsv6VnTsJdbj8E2abbbPsIM9rUq3jWxPEOgIkMBGNTxKRr3Bb0P7Oset8K4pJJ2kuf5eNDeMWTO2CW/x+1cyn4+yznQ0XGLjdUrPH/7NhjGPXHLzKUFM325fMSGG5dtxFGflA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=B/ANd/Gf; arc=none smtp.client-ip=209.85.208.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="B/ANd/Gf" Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-5e6194e9d2cso3848550a12.2 for ; Fri, 04 Apr 2025 07:32:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743777156; x=1744381956; darn=vger.kernel.org; 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=fs7nqD12lkBPC3o5IKJmDFRrEPWNWVuJ0deEV/XnG9g=; b=B/ANd/Gf0Lo/F5CiDFD0vSztnIai2+87oiCr8rJIm5HAd8QScznnPEgoAhBpxMyZv2 dpPdY1NhNO1SLX0OMsBxZqPmNwWG3CVLnuV736NbfkZVh4p2b5or3SgsTC3V5YLQi+82 LCDtt0vlsEsHBR7qZgEZBtdTeTwWFMLemYokzUO81+cSZQKWToA6beJ2tp6ejsQwSCgv RWjW/4au1X57IA7/72AH1Wrj6Hl/0TSHanG7DISHIubuOPA4HMUIlP+lAIYPW3KIJlGk naXNk+WVUg70ScQXTBgosemQOsCeUaEeNfWzKMkiw2/zcdNKAdi4+ypY1UbZiyAmacGw g6Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743777156; x=1744381956; 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=fs7nqD12lkBPC3o5IKJmDFRrEPWNWVuJ0deEV/XnG9g=; b=EHzxJ65iz//6zdTZtFOAfdcQNL71QVrrGyzXFBdCft8I068UZGPrFMRu08XXiecQzt VJaWwmpXnenQNVesaHzQXIyIMhKA/est+PxQ74BoOcLeMJQeSQY9Vf3ZAjlPPmXvzBIZ 5VFHPKSoAzjmfe5iQJE5SqN2nM8PoVQ9Wf7YdCzdK48+hbfAqFBoFwQCF+JhvteU0MBT v/WNk9+vTfWfYahs1Y9rScBmGOijsbMjNhEO6yb/Pxu3PGBJ6b4yVcYg37GTe4Vvsr9/ iKN4fBuWj9eIXiqwdcYVzlOg7Ol8uo8M3aVLgkPMkKdAcxRVdajw8T9I1jMGlY5U3ucl Hbng== X-Forwarded-Encrypted: i=1; AJvYcCXMI/I92RAbsw5dwla4Sm+MmR+++XWSj1Ym7Ngek4fBdHaALbyDAkC5UUx1WpFoiN6tkDbonIz9THiQLQ==@vger.kernel.org X-Gm-Message-State: AOJu0Yx8NguAsAvRnwi287J6+KjIumNUVF83H4SB8R3itXCyhynrMmFM lVFqk4z/+DAKSX7l5kSMV4wg1dGY6/I+khwBM01HM8flOV7a+6SD+ZE+8w+IUog= X-Gm-Gg: ASbGncsy3vO9fIgxNLo/33+l/sEVbgVHkKhJAmqelsWB/K/w2+cliykKqT7Elqv3aNu JekOjuRMXuJz19TNhzkgCVOFphia+UwZD6P1rvsZb0iu8wTo5M6STrWZ9vfrga09QBLJgfJNtYW u8L8Ifil+Zqs9GSu7mOq5OJK4JRw/5aama8bYENJgXWPjUtH8xaPAy9k5TYeZP2nEM2WK6+tfvQ 2kmaglf2tBKotl7vo2qU534GZXx2TdORPchvO84KObN+L5H1+uHVoFRXN9rnDLbf3UQ/jSXhM0a /qbHJMVGpDws6uTLa88SnQluwm4lrUmC1cXf/kS6wRypV7muT7S2ZiqdsaAxQa2VIZSI2OiLR38 Haf+5wsHz+bmwMyLC9TM0rQ== X-Google-Smtp-Source: AGHT+IFs+Hyg3/qgGfM04VQJy6hexkwcypVkkd955EopjzAxNOwVqKRSb29t6l7fEI6wJVCNyo9dwQ== X-Received: by 2002:a05:6402:42c7:b0:5ec:958b:6f5a with SMTP id 4fb4d7f45d1cf-5f0b4711e42mr2859878a12.28.1743777156026; Fri, 04 Apr 2025 07:32:36 -0700 (PDT) Received: from rayden.urgonet (h-98-128-140-123.A175.priv.bahnhof.se. [98.128.140.123]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f087f0a0f3sm2567450a12.43.2025.04.04.07.32.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Apr 2025 07:32:35 -0700 (PDT) From: Jens Wiklander To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, op-tee@lists.trustedfirmware.org, linux-arm-kernel@lists.infradead.org Cc: Olivier Masse , Thierry Reding , Yong Wu , Sumit Semwal , Benjamin Gaignard , Brian Starkey , John Stultz , "T . J . Mercier" , =?utf-8?q?Christian_K=C3=B6nig?= , Sumit Garg , Matthias Brugger , AngeloGioacchino Del Regno , azarrabi@qti.qualcomm.com, Simona Vetter , Daniel Stone , Jens Wiklander Subject: [PATCH v7 06/11] tee: refactor params_from_user() Date: Fri, 4 Apr 2025 16:31:29 +0200 Message-ID: <20250404143215.2281034-7-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250404143215.2281034-1-jens.wiklander@linaro.org> References: <20250404143215.2281034-1-jens.wiklander@linaro.org> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Break out the memref handling into a separate helper function. No change in behavior. Signed-off-by: Jens Wiklander --- drivers/tee/tee_core.c | 94 ++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 40 deletions(-) diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 685afcaa3ea1..820e394b9054 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -353,6 +353,55 @@ tee_ioctl_shm_register(struct tee_context *ctx, return ret; } +static int param_from_user_memref(struct tee_context *ctx, + struct tee_param_memref *memref, + struct tee_ioctl_param *ip) +{ + struct tee_shm *shm; + + /* + * If a NULL pointer is passed to a TA in the TEE, + * the ip.c IOCTL parameters is set to TEE_MEMREF_NULL + * indicating a NULL memory reference. + */ + if (ip->c != TEE_MEMREF_NULL) { + /* + * If we fail to get a pointer to a shared + * memory object (and increase the ref count) + * from an identifier we return an error. All + * pointers that has been added in params have + * an increased ref count. It's the callers + * responibility to do tee_shm_put() on all + * resolved pointers. + */ + shm = tee_shm_get_from_id(ctx, ip->c); + if (IS_ERR(shm)) + return PTR_ERR(shm); + + /* + * Ensure offset + size does not overflow + * offset and does not overflow the size of + * the referred shared memory object. + */ + if ((ip->a + ip->b) < ip->a || + (ip->a + ip->b) > shm->size) { + tee_shm_put(shm); + return -EINVAL; + } + } else if (ctx->cap_memref_null) { + /* Pass NULL pointer to OP-TEE */ + shm = NULL; + } else { + return -EINVAL; + } + + memref->shm_offs = ip->a; + memref->size = ip->b; + memref->shm = shm; + + return 0; +} + static int params_from_user(struct tee_context *ctx, struct tee_param *params, size_t num_params, struct tee_ioctl_param __user *uparams) @@ -360,8 +409,8 @@ static int params_from_user(struct tee_context *ctx, struct tee_param *params, size_t n; for (n = 0; n < num_params; n++) { - struct tee_shm *shm; struct tee_ioctl_param ip; + int rc; if (copy_from_user(&ip, uparams + n, sizeof(ip))) return -EFAULT; @@ -384,45 +433,10 @@ static int params_from_user(struct tee_context *ctx, struct tee_param *params, case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT: case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT: case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT: - /* - * If a NULL pointer is passed to a TA in the TEE, - * the ip.c IOCTL parameters is set to TEE_MEMREF_NULL - * indicating a NULL memory reference. - */ - if (ip.c != TEE_MEMREF_NULL) { - /* - * If we fail to get a pointer to a shared - * memory object (and increase the ref count) - * from an identifier we return an error. All - * pointers that has been added in params have - * an increased ref count. It's the callers - * responibility to do tee_shm_put() on all - * resolved pointers. - */ - shm = tee_shm_get_from_id(ctx, ip.c); - if (IS_ERR(shm)) - return PTR_ERR(shm); - - /* - * Ensure offset + size does not overflow - * offset and does not overflow the size of - * the referred shared memory object. - */ - if ((ip.a + ip.b) < ip.a || - (ip.a + ip.b) > shm->size) { - tee_shm_put(shm); - return -EINVAL; - } - } else if (ctx->cap_memref_null) { - /* Pass NULL pointer to OP-TEE */ - shm = NULL; - } else { - return -EINVAL; - } - - params[n].u.memref.shm_offs = ip.a; - params[n].u.memref.size = ip.b; - params[n].u.memref.shm = shm; + rc = param_from_user_memref(ctx, ¶ms[n].u.memref, + &ip); + if (rc) + return rc; break; default: /* Unknown attribute */