| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <3eb585d2-2c1a-273b-c282-93d3ca7a4657@linux.intel.com>
Date: Tue, 1 Sep 2020 21:47:10 -0500
From: Richard Gong <richard.gong@...ux.intel.com>
To: Greg KH <gregkh@...uxfoundation.org>
Cc: derek.kiernan@...inx.com, dragan.cvetic@...inx.com, arnd@...db.de,
linux-kernel@...r.kernel.org, dinguyen@...nel.org,
richard.gong@...el.com
Subject: Re: [PATCHv2 2/2] misc: add Intel SoCFPGA crypto service driver
Hi Greg,
Many thanks for your review comments!
On 8/28/20 5:47 AM, Greg KH wrote:
> On Mon, Aug 17, 2020 at 08:47:30AM -0500, richard.gong@...ux.intel.com wrote:
>> From: Richard Gong <richard.gong@...el.com>
>>
>> Add Intel FPGA crypto service (FCS) driver to support new crypto services
>> on Intel SoCFPGA platforms.
>>
>> The crypto services include security certificate, image boot validation,
>> security key cancellation, get provision data, random number generation,
>> advance encrtption standard (AES) encryption and decryption services.
>>
>> To perform supporting crypto features on Intel SoCFPGA platforms, Linux
>> user-space application interacts with FPGA crypto service (FCS) driver via
>> structures defined in include/uapi/linux/intel_fcs-ioctl.h.
>>
>> The application allocates spaces for IOCTL structure to hold the contents
>> or points to the data that FCS driver needs, uses IOCTL calls to passes
>> data to kernel FCS driver for processing at low level firmware and get
>> processed data or status back form the low level firmware via FCS driver.
>>
>> The user-space application named as fcs_client is at
>> https://github.com/altera-opensource/fcs_apps/tree/fcs_client.
>
> Ugh, a custom userspace api just for one crypto driver? Why can't this
> just be a userspace driver? Why does it have to be in the kernel?
We provide an example of a user space application that performs FPGA
crypto functions.
FPGA crypto firmware is running at exception level 3 (EL3).
We have added a new FPGA crypto service (FCS) driver to the kernel so
that FCS driver acts as one of clients of Intel Stratix10 service layer
driver and uses service layer driver to perform crypto functions.
>
>> @@ -0,0 +1,709 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +/*
>> + * Copyright (C) 2020, Intel Corporation
>> + */
>> +
>> +#include <linux/arm-smccc.h>
>> +#include <linux/bitfield.h>
>> +#include <linux/completion.h>
>> +#include <linux/firmware.h>
>> +#include <linux/fs.h>
>> +#include <linux/kobject.h>
>
> Why is kobject.h needed here?
My fault, I will remove that in next submission.
>
>> +#include <linux/miscdevice.h>
>> +#include <linux/module.h>
>> +#include <linux/mutex.h>
>> +#include <linux/of.h>
>> +#include <linux/of_platform.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/firmware/intel/stratix10-svc-client.h>
>> +#include <linux/string.h>
>> +#include <linux/slab.h>
>> +#include <linux/sysfs.h>
>> +#include <linux/uaccess.h>
>> +
>> +#include <uapi/linux/intel-fcs_ioctl.h>
>> +
>> +#define RANDOM_NUMBER_SIZE 32
>> +#define FILE_NAME_SIZE 32
>> +#define PS_BUF_SIZE 64
>> +#define INVALID_STATUS 0xff
>> +
>> +#define MIN_SDOS_BUF_SZ 16
>> +#define MAX_SDOS_BUF_SZ 32768
>> +
>> +#define FCS_REQUEST_TIMEOUT (msecs_to_jiffies(SVC_FCS_REQUEST_TIMEOUT_MS))
>> +#define FCS_COMPLETED_TIMEOUT (msecs_to_jiffies(SVC_COMPLETED_TIMEOUT_MS))
>> +
>> +typedef void (*fcs_callback)(struct stratix10_svc_client *client,
>> + struct stratix10_svc_cb_data *data);
>> +
>> +struct intel_fcs_priv {
>> + struct stratix10_svc_chan *chan;
>> + struct stratix10_svc_client client;
>> + struct completion completion;
>> + struct mutex lock;
>> + struct miscdevice miscdev;
>> + unsigned int status;
>> + void *kbuf;
>> + unsigned int size;
>> +};
>> +
>> +static void fcs_data_callback(struct stratix10_svc_client *client,
>> + struct stratix10_svc_cb_data *data)
>> +{
>> + struct intel_fcs_priv *priv = client->priv;
>> +
>> + if ((data->status == BIT(SVC_STATUS_OK)) ||
>> + (data->status == BIT(SVC_STATUS_COMPLETED))) {
>> + priv->status = 0;
>> + priv->kbuf = data->kaddr2;
>> + priv->size = *((unsigned int *)data->kaddr3);
>> + } else if (data->status == BIT(SVC_STATUS_ERROR)) {
>> + priv->status = *((unsigned int *)data->kaddr1);
>> + dev_err(client->dev, "error, mbox_error=0x%x\n", priv->status);
>> + priv->kbuf = data->kaddr2;
>> + priv->size = (data->kaddr3) ?
>> + *((unsigned int *)data->kaddr3) : 0;
>> + } else {
>> + dev_err(client->dev, "rejected\n");
>> + priv->status = -EINVAL;
>> + priv->kbuf = NULL;
>> + priv->size = 0;
>> + }
>> +
>> + complete(&priv->completion);
>> +}
>> +
>> +static void fcs_vab_callback(struct stratix10_svc_client *client,
>> + struct stratix10_svc_cb_data *data)
>> +{
>> + struct intel_fcs_priv *priv = client->priv;
>> +
>> + priv->status = 0;
>> +
>> + if (data->status == BIT(SVC_STATUS_INVALID_PARAM)) {
>> + priv->status = -EINVAL;
>> + dev_warn(client->dev, "rejected, invalid param\n");
>> + } else if (data->status == BIT(SVC_STATUS_ERROR)) {
>> + priv->status = *((unsigned int *)data->kaddr1);
>> + dev_err(client->dev, "mbox_error=0x%x\n", priv->status);
>> + } else if (data->status == BIT(SVC_STATUS_BUSY)) {
>> + priv->status = -ETIMEDOUT;
>> + dev_err(client->dev, "timeout to get completed status\n");
>> + }
>> +
>> + complete(&priv->completion);
>> +}
>> +
>> +static int fcs_request_service(struct intel_fcs_priv *priv,
>> + void *msg, unsigned long timeout)
>> +{
>> + struct stratix10_svc_client_msg *p_msg =
>> + (struct stratix10_svc_client_msg *)msg;
>> + int ret;
>> +
>> + mutex_lock(&priv->lock);
>> + reinit_completion(&priv->completion);
>> +
>> + ret = stratix10_svc_send(priv->chan, p_msg);
>> + if (ret) {
>> + ret = -EINVAL;
>> + goto unlock;
>> + }
>> +
>> + ret = wait_for_completion_timeout(&priv->completion,
>> + timeout);
>> + if (!ret) {
>> + dev_err(priv->client.dev,
>> + "timeout waiting for SMC call\n");
>> + ret = -ETIMEDOUT;
>> + } else
>> + ret = 0;
>> +
>> +unlock:
>> + mutex_unlock(&priv->lock);
>> + return ret;
>> +}
>> +
>> +static void fcs_close_services(struct intel_fcs_priv *priv,
>> + void *sbuf, void *dbuf)
>> +{
>> + if (sbuf)
>> + stratix10_svc_free_memory(priv->chan, sbuf);
>> +
>> + if (dbuf)
>> + stratix10_svc_free_memory(priv->chan, dbuf);
>> +
>> + stratix10_svc_done(priv->chan);
>> +}
>> +
>> +static long fcs_ioctl(struct file *file, unsigned int cmd,
>> + unsigned long arg)
>> +{
>> + struct intel_fcs_dev_ioctl *data;
>> + struct intel_fcs_priv *priv;
>> + struct device *dev;
>> + struct stratix10_svc_client_msg *msg;
>> + const struct firmware *fw;
>> + char filename[FILE_NAME_SIZE];
>> + size_t tsz, datasz;
>> + void *s_buf;
>> + void *d_buf;
>> + void *ps_buf;
>> + unsigned int buf_sz;
>> + int ret = 0;
>> + int i;
>
> You seem to "trust" the structure data from userspace a lot in this
> function. Please audit each one of these calls again, I think there are
> some places where you can do "bad things"...
Thanks, I will take a closer look again.
>
>> +
>> + priv = container_of(file->private_data, struct intel_fcs_priv, miscdev);
>> + dev = priv->client.dev;
>> +
>> + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
>> + if (!data)
>> + return -ENOMEM;
>> +
>> + msg = devm_kzalloc(dev, sizeof(*msg), GFP_KERNEL);
>> + if (!msg)
>> + return -ENOMEM;
>> +
>> + switch (cmd) {
>> + case INTEL_FCS_DEV_VALIDATION_REQUEST:
>> + if (copy_from_user(data, (void __user *)arg, sizeof(*data))) {
>> + dev_err(dev, "failure on copy_from_user\n");
>> + return -EFAULT;
>> + }
>> +
>> + /* for bitstream */
>> + dev_dbg(dev, "file_name=%s, status=%d\n",
>> + (char *)data->com_paras.s_request.src, data->status);
>> + scnprintf(filename, FILE_NAME_SIZE, "%s",
>> + (char *)data->com_paras.s_request.src);
>> + ret = request_firmware(&fw, filename, priv->client.dev);
>> + if (ret) {
>> + dev_err(dev, "error requesting firmware %s\n",
>> + (char *)data->com_paras.s_request.src);
>> + return -EFAULT;
>> + }
>> +
>> + dev_dbg(dev, "FW size=%ld\n", fw->size);
>> + s_buf = stratix10_svc_allocate_memory(priv->chan, fw->size);
>> + if (!s_buf) {
>> + dev_err(dev, "failed to allocate VAB buffer\n");
>> + release_firmware(fw);
>> + return -ENOMEM;
>> + }
>> +
>> + memcpy(s_buf, fw->data, fw->size);
>> +
>> + msg->payload_length = fw->size;
>> + release_firmware(fw);
>> +
>> + msg->command = COMMAND_FCS_REQUEST_SERVICE;
>> + msg->payload = s_buf;
>> + priv->client.receive_cb = fcs_vab_callback;
>> +
>> + ret = fcs_request_service(priv, (void *)msg,
>> + FCS_REQUEST_TIMEOUT);
>> + dev_dbg(dev, "fcs_request_service ret=%d\n", ret);
>> + if (!ret && !priv->status) {
>> + /* to query the complete status */
>> + msg->command = COMMAND_POLL_SERVICE_STATUS;
>> + priv->client.receive_cb = fcs_data_callback;
>> + ret = fcs_request_service(priv, (void *)msg,
>> + FCS_COMPLETED_TIMEOUT);
>> + dev_dbg(dev, "fcs_request_service ret=%d\n", ret);
>> + if (!ret && !priv->status)
>> + data->status = 0;
>> + else
>> + data->status = priv->status;
>> + } else
>> + data->status = priv->status;
>> +
>> + if (copy_to_user((void __user *)arg, data, sizeof(*data))) {
>> + dev_err(dev, "failure on copy_to_user\n");
>> + fcs_close_services(priv, s_buf, NULL);
>> + ret = -EFAULT;
>> + }
>> +
>> + fcs_close_services(priv, s_buf, NULL);
>> + break;
>> +
>> + case INTEL_FCS_DEV_SEND_CERTIFICATE:
>> + if (copy_from_user(data, (void __user *)arg, sizeof(*data))) {
>> + dev_err(dev, "failure on copy_from_user\n");
>> + return -EFAULT;
>> + }
>> +
>> + dev_dbg(dev, "Test=%d, Size=%d; Address=0x%p\n",
>> + data->com_paras.c_request.test.test_bit,
>> + data->com_paras.c_request.size,
>> + data->com_paras.c_request.addr);
>> +
>> + /* Allocate memory for certificate + test word */
>> + tsz = sizeof(struct intel_fcs_cert_test_word);
>> + datasz = data->com_paras.s_request.size + tsz;
>> +
>> + s_buf = stratix10_svc_allocate_memory(priv->chan, datasz);
>> + if (!s_buf) {
>> + dev_err(dev, "failed to allocate VAB buffer\n");
>> + return -ENOMEM;
>> + }
>> +
>> + ps_buf = stratix10_svc_allocate_memory(priv->chan, PS_BUF_SIZE);
>> + if (!ps_buf) {
>> + dev_err(dev, "failed to allocate p-status buf\n");
>> + stratix10_svc_free_memory(priv->chan, s_buf);
>> + return -ENOMEM;
>> + }
>> +
>> + /* Copy the test word */
>> + memcpy(s_buf, &data->com_paras.c_request.test, tsz);
>> +
>> + /* Copy in the certificate data (skipping over the test word) */
>> + ret = copy_from_user(s_buf + tsz,
>> + data->com_paras.c_request.addr,
>> + data->com_paras.s_request.size);
>> + if (ret) {
>> + dev_err(dev, "failed copy buf ret=%d\n", ret);
>> + fcs_close_services(priv, s_buf, ps_buf);
>> + return -EFAULT;
>> + }
>> +
>> + msg->payload_length = datasz;
>> + msg->command = COMMAND_FCS_SEND_CERTIFICATE;
>> + msg->payload = s_buf;
>> + priv->client.receive_cb = fcs_vab_callback;
>> +
>> + ret = fcs_request_service(priv, (void *)msg,
>> + FCS_REQUEST_TIMEOUT);
>> + dev_dbg(dev, "fcs_request_service ret=%d\n", ret);
>> + if (!ret && !priv->status) {
>> + /* to query the complete status */
>> + msg->payload = ps_buf;
>> + msg->payload_length = PS_BUF_SIZE;
>> + msg->command = COMMAND_POLL_SERVICE_STATUS;
>> + priv->client.receive_cb = fcs_data_callback;
>> + ret = fcs_request_service(priv, (void *)msg,
>> + FCS_COMPLETED_TIMEOUT);
>> + dev_dbg(dev, "request service ret=%d\n", ret);
>> + if (!ret && !priv->status)
>> + data->status = 0;
>> + else {
>> + if (priv->kbuf)
>> + data->com_paras.c_request.c_status =
>> + (*(u32 *)priv->kbuf);
>> + else
>> + data->com_paras.c_request.c_status =
>> + INVALID_STATUS;
>> + }
>> + } else
>> + data->status = priv->status;
>> +
>> + if (copy_to_user((void __user *)arg, data, sizeof(*data))) {
>> + dev_err(dev, "failure on copy_to_user\n");
>> + fcs_close_services(priv, s_buf, NULL);
>> + ret = -EFAULT;
>> + }
>> +
>> + fcs_close_services(priv, s_buf, ps_buf);
>> + break;
>> +
>> + case INTEL_FCS_DEV_RANDOM_NUMBER_GEN:
>> + if (copy_from_user(data, (void __user *)arg, sizeof(*data))) {
>> + dev_err(dev, "failure on copy_from_user\n");
>> + return -EFAULT;
>> + }
>> +
>> + s_buf = stratix10_svc_allocate_memory(priv->chan,
>> + RANDOM_NUMBER_SIZE);
>> + if (!s_buf) {
>> + dev_err(dev, "failed to allocate RNG buffer\n");
>> + return -ENOMEM;
>> + }
>> +
>> + msg->command = COMMAND_FCS_RANDOM_NUMBER_GEN;
>> + msg->payload = s_buf;
>> + msg->payload_length = RANDOM_NUMBER_SIZE;
>> + priv->client.receive_cb = fcs_data_callback;
>> +
>> + ret = fcs_request_service(priv, (void *)msg,
>> + FCS_REQUEST_TIMEOUT);
>> +
>> + if (!ret && !priv->status) {
>> + if (!priv->kbuf) {
>> + dev_err(dev, "failure on kbuf\n");
>> + fcs_close_services(priv, s_buf, NULL);
>> + return -EFAULT;
>> + }
>> +
>> + for (i = 0; i < 8; i++)
>> + dev_dbg(dev, "output_data[%d]=%d\n", i,
>> + *((int *)priv->kbuf + i));
>> +
>> + for (i = 0; i < 8; i++)
>> + data->com_paras.rn_gen.rndm[i] =
>> + *((int *)priv->kbuf + i);
>> + data->status = priv->status;
>> +
>> + } else {
>> + /* failed to get RNG */
>> + data->status = priv->status;
>> + }
>> +
>> + if (copy_to_user((void __user *)arg, data, sizeof(*data))) {
>> + dev_err(dev, "failure on copy_to_user\n");
>> + fcs_close_services(priv, s_buf, NULL);
>> + ret = -EFAULT;
>> + }
>> +
>> + fcs_close_services(priv, s_buf, NULL);
>> + break;
>> + case INTEL_FCS_DEV_GET_PROVISION_DATA:
>> + if (copy_from_user(data, (void __user *)arg,
>> + sizeof(*data))) {
>> + dev_err(dev, "failure on copy_from_user\n");
>> + return -EFAULT;
>> + }
>> +
>> + s_buf = stratix10_svc_allocate_memory(priv->chan,
>> + data->com_paras.gp_data.size);
>> + if (!s_buf) {
>> + dev_err(dev, "failed allocate provision buffer\n");
>> + return -ENOMEM;
>> + }
>> +
>> + msg->command = COMMAND_FCS_GET_PROVISION_DATA;
>> + msg->payload = s_buf;
>> + msg->payload_length = data->com_paras.gp_data.size;
>> + priv->client.receive_cb = fcs_data_callback;
>> +
>> + ret = fcs_request_service(priv, (void *)msg,
>> + FCS_REQUEST_TIMEOUT);
>> + if (!ret && !priv->status) {
>> + if (!priv->kbuf) {
>> + dev_err(dev, "failure on kbuf\n");
>> + fcs_close_services(priv, s_buf, NULL);
>> + return -EFAULT;
>> + }
>> + data->com_paras.gp_data.size = priv->size;
>> + memcpy(data->com_paras.gp_data.addr, priv->kbuf,
>> + priv->size);
>> + data->status = 0;
>> + } else {
>> + data->com_paras.gp_data.addr = NULL;
>> + data->com_paras.gp_data.size = 0;
>> + data->status = priv->status;
>> + }
>> +
>> + if (copy_to_user((void __user *)arg, data, sizeof(*data))) {
>> + dev_err(dev, "failure on copy_to_user\n");
>> + fcs_close_services(priv, s_buf, NULL);
>> + return -EFAULT;
>> + }
>> +
>> + fcs_close_services(priv, s_buf, NULL);
>> + break;
>> + case INTEL_FCS_DEV_DATA_ENCRYPTION:
>> + if (copy_from_user(data, (void __user *)arg, sizeof(*data))) {
>> + dev_err(dev, "failure on copy_from_user\n");
>> + return -EFAULT;
>> + }
>> +
>> + if ((data->com_paras.d_encryption.src_size < MIN_SDOS_BUF_SZ) ||
>> + (data->com_paras.d_encryption.src_size > MAX_SDOS_BUF_SZ)) {
>> + dev_err(dev, "Invalid SDOS Buffer src size:%d\n",
>> + data->com_paras.d_encryption.src_size);
>> + return -EFAULT;
>> + }
>> +
>> + if ((data->com_paras.d_encryption.dst_size < MIN_SDOS_BUF_SZ) ||
>> + (data->com_paras.d_encryption.dst_size > MAX_SDOS_BUF_SZ)) {
>> + dev_err(dev, "Invalid SDOS Buffer dst size:%d\n",
>> + data->com_paras.d_encryption.dst_size);
>> + return -EFAULT;
>> + }
>> +
>> + /* allocate buffer for both source and destination */
>> + s_buf = stratix10_svc_allocate_memory(priv->chan,
>> + MAX_SDOS_BUF_SZ);
>> + if (!s_buf) {
>> + dev_err(dev, "failed allocate encrypt src buf\n");
>> + return -ENOMEM;
>> + }
>> + d_buf = stratix10_svc_allocate_memory(priv->chan,
>> + MAX_SDOS_BUF_SZ);
>> + if (!d_buf) {
>> + dev_err(dev, "failed allocate encrypt dst buf\n");
>> + stratix10_svc_free_memory(priv->chan, s_buf);
>> + return -ENOMEM;
>> + }
>> + ps_buf = stratix10_svc_allocate_memory(priv->chan, PS_BUF_SIZE);
>> + if (!ps_buf) {
>> + dev_err(dev, "failed allocate p-status buffer\n");
>> + fcs_close_services(priv, s_buf, d_buf);
>> + return -ENOMEM;
>> + }
>> + ret = copy_from_user(s_buf,
>> + data->com_paras.d_encryption.src,
>> + data->com_paras.d_encryption.src_size);
>> + if (ret) {
>> + dev_err(dev, "failure on copy_from_user\n");
>> + fcs_close_services(priv, ps_buf, NULL);
>> + fcs_close_services(priv, s_buf, d_buf);
>> + return -ENOMEM;
>> + }
>> +
>> + msg->command = COMMAND_FCS_DATA_ENCRYPTION;
>> + msg->payload = s_buf;
>> + msg->payload_length =
>> + data->com_paras.d_encryption.src_size;
>> + msg->payload_output = d_buf;
>> + msg->payload_length_output =
>> + data->com_paras.d_encryption.dst_size;
>> + priv->client.receive_cb = fcs_vab_callback;
>> +
>> + ret = fcs_request_service(priv, (void *)msg,
>> + FCS_REQUEST_TIMEOUT);
>> + if (!ret && !priv->status) {
>> + msg->payload = ps_buf;
>> + msg->payload_length = PS_BUF_SIZE;
>> + msg->command = COMMAND_POLL_SERVICE_STATUS;
>> +
>> + priv->client.receive_cb = fcs_data_callback;
>> + ret = fcs_request_service(priv, (void *)msg,
>> + FCS_COMPLETED_TIMEOUT);
>> + dev_dbg(dev, "request service ret=%d\n", ret);
>> +
>> + if (!ret && !priv->status) {
>> + if (!priv->kbuf) {
>> + dev_err(dev, "failure on kbuf\n");
>> + fcs_close_services(priv, ps_buf, NULL);
>> + fcs_close_services(priv, s_buf, d_buf);
>> + return -EFAULT;
>> + }
>> + buf_sz = *(unsigned int *)priv->kbuf;
>> + data->com_paras.d_encryption.dst_size = buf_sz;
>> + memcpy(data->com_paras.d_encryption.dst,
>> + d_buf, buf_sz);
>> + data->status = 0;
>> + } else {
>> + data->com_paras.d_encryption.dst = NULL;
>> + data->com_paras.d_encryption.dst_size = 0;
>> + data->status = priv->status;
>> + }
>> + } else {
>> + data->com_paras.d_encryption.dst = NULL;
>> + data->com_paras.d_encryption.dst_size = 0;
>> + data->status = priv->status;
>> + }
>> +
>> + if (copy_to_user((void __user *)arg, data, sizeof(*data))) {
>> + dev_err(dev, "failure on copy_to_user\n");
>> + fcs_close_services(priv, ps_buf, NULL);
>> + fcs_close_services(priv, s_buf, d_buf);
>> + ret = -EFAULT;
>> + }
>> +
>> + fcs_close_services(priv, ps_buf, NULL);
>> + fcs_close_services(priv, s_buf, d_buf);
>> + break;
>> + case INTEL_FCS_DEV_DATA_DECRYPTION:
>> + if (copy_from_user(data, (void __user *)arg, sizeof(*data))) {
>> + dev_err(dev, "failure on copy_from_user\n");
>> + return -EFAULT;
>> + }
>> +
>> + if ((data->com_paras.d_encryption.src_size < MIN_SDOS_BUF_SZ) ||
>> + (data->com_paras.d_encryption.src_size > MAX_SDOS_BUF_SZ)) {
>> + dev_err(dev, "Invalid SDOS Buffer src size:%d\n",
>> + data->com_paras.d_encryption.src_size);
>> + return -EFAULT;
>> + }
>> +
>> + if ((data->com_paras.d_encryption.dst_size < MIN_SDOS_BUF_SZ) ||
>> + (data->com_paras.d_encryption.dst_size > MAX_SDOS_BUF_SZ)) {
>> + dev_err(dev, "Invalid SDOS Buffer dst size:%d\n",
>> + data->com_paras.d_encryption.dst_size);
>> + return -EFAULT;
>> + }
>> +
>> + /* allocate buffer for both source and destination */
>> + s_buf = stratix10_svc_allocate_memory(priv->chan,
>> + MAX_SDOS_BUF_SZ);
>> + if (!s_buf) {
>> + dev_err(dev, "failed allocate decrypt src buf\n");
>> + return -ENOMEM;
>> + }
>> + d_buf = stratix10_svc_allocate_memory(priv->chan,
>> + MAX_SDOS_BUF_SZ);
>> + if (!d_buf) {
>> + dev_err(dev, "failed allocate decrypt dst buf\n");
>> + stratix10_svc_free_memory(priv->chan, s_buf);
>> + return -ENOMEM;
>> + }
>> +
>> + ps_buf = stratix10_svc_allocate_memory(priv->chan,
>> + PS_BUF_SIZE);
>> + if (!ps_buf) {
>> + dev_err(dev, "failed allocate p-status buffer\n");
>> + fcs_close_services(priv, s_buf, d_buf);
>> + return -ENOMEM;
>> + }
>> +
>> + ret = copy_from_user(s_buf,
>> + data->com_paras.d_decryption.src,
>> + data->com_paras.d_decryption.src_size);
>> + if (ret) {
>> + dev_err(dev, "failure on copy_from_user\n");
>> + fcs_close_services(priv, ps_buf, NULL);
>> + fcs_close_services(priv, s_buf, d_buf);
>> + return -EFAULT;
>> + }
>> +
>> + msg->command = COMMAND_FCS_DATA_DECRYPTION;
>> + msg->payload = s_buf;
>> + msg->payload_length =
>> + data->com_paras.d_decryption.src_size;
>> + msg->payload_output = d_buf;
>> + msg->payload_length_output =
>> + data->com_paras.d_decryption.dst_size;
>> + priv->client.receive_cb = fcs_vab_callback;
>> +
>> + ret = fcs_request_service(priv, (void *)msg,
>> + FCS_REQUEST_TIMEOUT);
>> + if (!ret && !priv->status) {
>> + msg->command = COMMAND_POLL_SERVICE_STATUS;
>> + msg->payload = ps_buf;
>> + msg->payload_length = PS_BUF_SIZE;
>> + priv->client.receive_cb = fcs_data_callback;
>> + ret = fcs_request_service(priv, (void *)msg,
>> + FCS_COMPLETED_TIMEOUT);
>> + dev_dbg(dev, "request service ret=%d\n", ret);
>> + if (!ret && !priv->status) {
>> + if (!priv->kbuf) {
>> + dev_err(dev, "failure on kbuf\n");
>> + fcs_close_services(priv, ps_buf, NULL);
>> + fcs_close_services(priv, s_buf, d_buf);
>> + return -EFAULT;
>> + }
>> + buf_sz = *((unsigned int *)priv->kbuf);
>> + memcpy(data->com_paras.d_decryption.dst,
>> + d_buf, buf_sz);
>> + data->com_paras.d_decryption.dst_size = buf_sz;
>> + data->status = 0;
>> + } else {
>> + data->com_paras.d_decryption.dst = NULL;
>> + data->com_paras.d_decryption.dst_size = 0;
>> + data->status = priv->status;
>> + }
>> + } else {
>> + data->com_paras.d_decryption.dst = NULL;
>> + data->com_paras.d_decryption.dst_size = 0;
>> + data->status = priv->status;
>> + }
>> +
>> + if (copy_to_user((void __user *)arg, data, sizeof(*data))) {
>> + dev_err(dev, "failure on copy_to_user\n");
>> + fcs_close_services(priv, ps_buf, NULL);
>> + fcs_close_services(priv, s_buf, d_buf);
>> + ret = -EFAULT;
>> + }
>> +
>> + fcs_close_services(priv, ps_buf, NULL);
>> + fcs_close_services(priv, s_buf, d_buf);
>> + break;
>> + default:
>> + dev_warn(dev, "shouldn't be here [0x%x]\n", cmd);
>> + break;
>> + }
>> +
>> + return ret;
>> +}
>> +
>> +static int fcs_open(struct inode *inode, struct file *file)
>> +{
>> + pr_debug("%s\n", __func__);
>> +
>> + return 0;
>> +}
>> +
>> +static int fcs_close(struct inode *inode, struct file *file)
>> +{
>> +
>> + pr_debug("%s\n", __func__);
>> +
>> + return 0;
>> +}
>
> If you do nothing in an open/close function, do not include them, they
> are not needed.
Sure, I will remove them in the next submission.
>
>> +
>> +static const struct file_operations fcs_fops = {
>> + .owner = THIS_MODULE,
>> + .unlocked_ioctl = fcs_ioctl,
>> + .open = fcs_open,
>> + .release = fcs_close,
>> +};
>> +
>> +static int fcs_driver_probe(struct platform_device *pdev)
>> +{
>> + struct device *dev = &pdev->dev;
>> + struct intel_fcs_priv *priv;
>> + int ret;
>> +
>> + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
>> + if (!priv)
>> + return -ENOMEM;
>> +
>> + priv->client.dev = dev;
>> + priv->client.receive_cb = NULL;
>> + priv->client.priv = priv;
>> + priv->status = INVALID_STATUS;
>> +
>> + mutex_init(&priv->lock);
>> + priv->chan = stratix10_svc_request_channel_byname(&priv->client,
>> + SVC_CLIENT_FCS);
>> + if (IS_ERR(priv->chan)) {
>> + dev_err(dev, "couldn't get service channel %s\n",
>> + SVC_CLIENT_FCS);
>> + return PTR_ERR(priv->chan);
>> + }
>> +
>> + priv->miscdev.minor = MISC_DYNAMIC_MINOR;
>> + priv->miscdev.name = "fcs";
>> + priv->miscdev.fops = &fcs_fops;
>> +
>> + init_completion(&priv->completion);
>> +
>> + platform_set_drvdata(pdev, priv);
>> +
>> + ret = misc_register(&priv->miscdev);
>> + if (ret) {
>> + dev_err(dev, "can't register on minor=%d\n",
>> + MISC_DYNAMIC_MINOR);
>> + return ret;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int fcs_driver_remove(struct platform_device *pdev)
>> +{
>> + struct intel_fcs_priv *priv = platform_get_drvdata(pdev);
>> +
>> + misc_deregister(&priv->miscdev);
>> + stratix10_svc_free_channel(priv->chan);
>> +
>> + return 0;
>> +}
>> +
>> +static struct platform_driver fcs_driver = {
>> + .probe = fcs_driver_probe,
>> + .remove = fcs_driver_remove,
>> + .driver = {
>> + .name = "intel-fcs",
>> + },
>> +};
>> +
>> +module_platform_driver(fcs_driver);
>> +
>> +MODULE_LICENSE("GPL v2");
>> +MODULE_DESCRIPTION("Intel FGPA Crypto Services Driver");
>> +MODULE_AUTHOR("Richard Gong <richard.gong@...el.com>");
>> +
>> diff --git a/include/uapi/linux/intel-fcs_ioctl.h b/include/uapi/linux/intel-fcs_ioctl.h
>> new file mode 100644
>> index 00000000..4d530ec
>> --- /dev/null
>> +++ b/include/uapi/linux/intel-fcs_ioctl.h
>> @@ -0,0 +1,222 @@
>> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>> +/*
>> + * Copyright (C) 2020, Intel Corporation
>> + */
>> +
>> +#ifndef __INTEL_FCS_IOCTL_H
>> +#define __INTEL_FCS_IOCTL_H
>> +
>> +#include <linux/types.h>
>> +
>> +#define INTEL_FCS_IOCTL 0xA2
>> +
>> +/**
>> + * enum fcs_vab_img_type - enumeration of image types
>> + * @INTEL_FCS_IMAGE_HPS: Image to validate is HPS image
>> + * @INTEL_FCS_IMAGE_BITSTREAM: Image to validate is bitstream
>> + */
>> +enum fcs_vab_img_type {
>> + INTEL_FCS_IMAGE_HPS = 0,
>> + INTEL_FCS_IMAGE_BITSTREAM = 1
>> +};
>> +
>> +/**
>> + * enum fcs_certificate_test - enumeration of certificate test
>> + * @INTEL_FCS_NO_TEST: Write to eFuses
>> + * @INTEL_FCS_TEST: Write to cache, do not write eFuses
>> + */
>> +enum fcs_certificate_test {
>> + INTEL_FCS_NO_TEST = 0,
>> + INTEL_FCS_TEST = 1
>> +};
>> +
>> +/**
>> + * struct intel_fcs_cert_test_word - certificate test word
>> + * @test_bit: if set, do not write fuses, write to cache only.
>> + * @rsvd: write as 0
>> + */
>> +struct intel_fcs_cert_test_word {
>> + __u32 test_bit:1;
>> + __u32 rsvd:31;
>> +};
>
> What endian is this? Bit fields for ioctls is almost always a very bad
> idea when done like this. Pick it apart in the kernel please.
>
Sure, will do
> >> +
>> +/**
>> + * struct fcs_validation_request - validate HPS or bitstream image
>> + * @so_type: the type of signed object, 0 for HPS and 1 for bitstream
>> + * @src: the source of signed object,
>> + * for HPS, this is the virtual address of the signed source
>> + * for Bitstream, this is path of the signed source, the default
>> + * path is /lib/firmware
>> + * @size: the size of the signed object
>> + */
>> +struct fcs_validation_request {
>> + enum fcs_vab_img_type so_type;
>> + void *src;
>
> void *????
>
> Shouldn't you be using a portable type, otherwise this, and all of your
> other pointers are going to break on 32/64 split user/kernel systems,
> right?
>
You are correct. I will take a closer look and update accordingly.
>
>
>> + __u32 size;
>> +};
>> +
>> +/**
>> + * struct fcs_key_manage_request - Request key management from SDM
>> + * @addr: the virtual address of the signed object,
>> + * @size: the size of the signed object
>> + */
>> +struct fcs_key_manage_request {
>> + void *addr;
>> + __u32 size;
>> +};
>> +
>> +/**
>> + * struct fcs_certificate_request - Certificate request to SDM
>> + * @test: test bit (1 if want to write to cache instead of fuses)
>> + * @addr: the virtual address of the signed object,
>> + * @size: the size of the signed object
>> + * @c_status: returned certificate status
>> + */
>> +struct fcs_certificate_request {
>> + struct intel_fcs_cert_test_word test;
>> + void *addr;
>> + __u32 size;
>> + __u32 c_status;
>> +};
>> +
>> +/**
>> + * struct fcs_data_encryption - aes data encryption command layout
>> + * @src: the virtual address of the input data
>> + * @src_size: the size of the unencrypted source
>> + * @dst: the virtual address of the output data
>> + * @dst_size: the size of the encrypted result
>> + */
>> +struct fcs_data_encryption {
>> + void *src;
>> + __u32 src_size;
>> + void *dst;
>> + __u32 dst_size;
>> +};
>
> Why put holes in your structures when you do not need them?
>
> Please get all of these structures reviewed by someone within Intel who
> understands how user/kernel apis work. :(
>
> greg k-h
>
Sure, I will do that.
Regards,
Richard
Powered by blists - more mailing lists