From patchwork Mon Jul 17 10:21:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 107882 Delivered-To: patches@linaro.org Received: by 10.140.101.44 with SMTP id t41csp4328622qge; Mon, 17 Jul 2017 03:22:01 -0700 (PDT) X-Received: by 10.25.79.89 with SMTP id a25mr5920959lfk.160.1500286920980; Mon, 17 Jul 2017 03:22:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500286920; cv=none; d=google.com; s=arc-20160816; b=FhH7e1YpiaCZwa2vxJq3rHtAB0v0tHM5gjc5cEzFt1+O5VNY+kuhsqSDg1cc1AkVbR Xs263V3TDr0vsJ18jBV3aucM4+3zfB5EWZjU0+VnxQDCQP48gIBPB8INmHJD8yGMpn0e 00hJaJ7+9Wgq8lrFnoVe1bvPloMYPgxEE5r69KUBoMtI5yaedwyaWgyMwtWsokD0D55S dVosguqLCJD4Wg4lm3KBwU/NSLcZwNa5yqDTsjGTxWkpvnWGrh4976troTj0iKC7LvWY N5PwWFvhnGxQtdt1oF9j47PWPgWAhHZ9gKZaMXQnJDfz9hrCmsXNGlTdbJnwLWyeR5B1 IeoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=7ug+QqlAXgt+sAAnOIMm6UbsfmdjPCq/g8pNtlPZeYk=; b=hMCTaf3wQZLfHll6PfPkeRb3/uJuasnlCd0p0xqqZg0Ua1Cy2WXHWQL7K2oUxeiaGv Xmu2cb9Mp6f2pHWxo1p6QtNj4ApMW+UuMrHwELj+hIFEM+xZX3aomwx7EAVx6cjPJYxe Gn1xiE/tfNyi8/8Aw9CqzbPFlDm9AhQKRTkrjK+/jxRKqxtpD4lw6bRJTh5I7vTEjpHl ol2iKW6hrqH1NQr5oxkYLggwpmiWCIEud6CI+yOikLzmJKzTCv2c92JdSSjpwkY+SrxW MVsQPR/wcKEZfUVVw7J9l5bYuhfbyApXGjrR2OCi1R+eNsRQkRBz60IVep9bU30jk9bG I/AQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=c+t1i0Yu; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 2a00:1450:4010:c07::22a as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-lf0-x22a.google.com (mail-lf0-x22a.google.com. [2a00:1450:4010:c07::22a]) by mx.google.com with ESMTPS id s6si7485136lja.261.2017.07.17.03.22.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 03:22:00 -0700 (PDT) Received-SPF: pass (google.com: domain of jens.wiklander@linaro.org designates 2a00:1450:4010:c07::22a as permitted sender) client-ip=2a00:1450:4010:c07::22a; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=c+t1i0Yu; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 2a00:1450:4010:c07::22a as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x22a.google.com with SMTP id t72so82834000lff.1 for ; Mon, 17 Jul 2017 03:22: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; bh=7ug+QqlAXgt+sAAnOIMm6UbsfmdjPCq/g8pNtlPZeYk=; b=c+t1i0YutCUYQU3YWbh7HAt/CZ8EVTlAULozhSCsvdFEW1AxpMPvCFYwQyrG2lMcLO 734WaJv2blMdi1CcMYVr2jmFqiEBZxXe5OE/ZGUW7Rj5GpznYu4WOEa3ZSWHQa/YygGg Sc/AWXDppaa/hhl/uLylq1rKqwGnpZY635I2Y= 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; bh=7ug+QqlAXgt+sAAnOIMm6UbsfmdjPCq/g8pNtlPZeYk=; b=qUnULZQwEvSJ+mjWkHESYdBc67aWzfu3rAVbVzixWYEVuQRsJ7wH835PuPmGQ07KMW 9vaGaIdUC2C/oEEhHB4XbY8efBx6YhwEV4bdaFmjjQGO16LkX93pLByauMW6Q/EVjzV5 2eQchdDOoy1N6LUiDG8hUgW4sWbo28dkSQ4UhsVJHxsEV+oVBvdRXbKHmXEm7TS1ZzVi 9csCl/BepdwrUEvKTmE+AEaVP0eSTqUq1G9whXbZQF+5/qw65ZvRMWygwHvsC5qDCQ0l yYgGMyQFEDXKQk+mn+hHb8pnNMopPyZqFeDbuYxmgWoMuc1xQz+JVErFigx4Tq0MEg/U KE0Q== X-Gm-Message-State: AIVw111QTTroID5Fo/EHa122cxi4HXY6W+8Rqi+36rSakMV3Jeh0hEvW 7f/J5USt3hpAnhLEuNEi2bxl X-Received: by 10.25.196.205 with SMTP id u196mr6702825lff.19.1500286920642; Mon, 17 Jul 2017 03:22:00 -0700 (PDT) Return-Path: Received: from jax.urgonet (h-84-45.A175.priv.bahnhof.se. [79.136.84.45]) by smtp.gmail.com with ESMTPSA id r17sm3739329ljd.38.2017.07.17.03.21.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Jul 2017 03:21:59 -0700 (PDT) From: Jens Wiklander To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, tee-dev@lists.linaro.org Cc: Jens Wiklander Subject: [PATCH] tee: indicate privileged dev in gen_caps Date: Mon, 17 Jul 2017 12:21:15 +0200 Message-Id: <1500286875-29888-1-git-send-email-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.7.4 Mirrors the TEE_DESC_PRIVILEGED bit of struct tee_desc:flags into struct tee_ioctl_version_data:gen_caps as TEE_GEN_CAP_PRIVILEGED in tee_ioctl_version() Reviewed-by: Jerome Forissier Signed-off-by: Jens Wiklander --- drivers/tee/tee_core.c | 5 +++++ include/uapi/linux/tee.h | 1 + 2 files changed, 6 insertions(+) -- 2.7.4 diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 5c60bf4423e6..58a5009eacc3 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -90,8 +90,13 @@ static int tee_ioctl_version(struct tee_context *ctx, struct tee_ioctl_version_data vers; ctx->teedev->desc->ops->get_version(ctx->teedev, &vers); + + if (ctx->teedev->desc->flags & TEE_DESC_PRIVILEGED) + vers.gen_caps |= TEE_GEN_CAP_PRIVILEGED; + if (copy_to_user(uvers, &vers, sizeof(vers))) return -EFAULT; + return 0; } diff --git a/include/uapi/linux/tee.h b/include/uapi/linux/tee.h index 370d8845ab21..688782e90140 100644 --- a/include/uapi/linux/tee.h +++ b/include/uapi/linux/tee.h @@ -49,6 +49,7 @@ #define TEE_MAX_ARG_SIZE 1024 #define TEE_GEN_CAP_GP (1 << 0)/* GlobalPlatform compliant TEE */ +#define TEE_GEN_CAP_PRIVILEGED (1 << 1)/* Privileged device (for supplicant) */ /* * TEE Implementation ID