nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-24 10:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

video: tegra: host: dla: use static array for copying user data

Browse Source 
In IOCTL path, temporary handles are dynamically allocated which keeps
user data until it populated and used by driver for different
operations. This dynamic allocation in currently done for buffer pin,
task submit and buffer unpin.

As MISRA C guidelines, keeping minimal dynamic allocation and making
static allocation for temporary handles.

Jira DLA-283

Change-Id: I1589c6f96e674e74b4607614c035ef0a0606b7db
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-on: http://git-master/r/1291492
Reviewed-by: Amit Sharma (SW-TEGRA) <amisharma@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Shridhar Rasal
2017-01-20 14:21:12 +05:30
committed by Laxman Dewangan
parent bf348b16bd
commit 31b532c889
1 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/video/tegra/host/nvdla/nvdla_ioctl.c
View File

@@ -92,7 +92,7 @@ inval_cmd:
static int nvdla_pin(struct nvdla_private *priv, void *arg)
{
u32 *handles;
u32 handles[MAX_NVDLA_PIN_BUFFERS];
int err = 0;
struct nvdla_pin_unpin_args *buf_list =
(struct nvdla_pin_unpin_args *)arg;
@@ -114,10 +114,6 @@ static int nvdla_pin(struct nvdla_private *priv, void *arg)
}
nvdla_dbg_info(pdev, "num of buffers [%d]", count);
handles = kcalloc(count, sizeof(u32), GFP_KERNEL);
if (!handles)
return -ENOMEM;
if (copy_from_user(handles, (void __user *)buf_list->buffers,
(count * sizeof(u32)))) {
err = -EFAULT;
@@ -127,7 +123,6 @@ static int nvdla_pin(struct nvdla_private *priv, void *arg)
err = nvhost_buffer_pin(priv->buffers, handles, count);
nvdla_buffer_cpy_err:
kfree(handles);
fail_to_get_val_cnt:
fail_to_get_val_arg:
return err;
@@ -135,7 +130,7 @@ fail_to_get_val_arg:
static int nvdla_unpin(struct nvdla_private *priv, void *arg)
{
u32 *handles;
u32 handles[MAX_NVDLA_PIN_BUFFERS];
int err = 0;
struct nvdla_pin_unpin_args *buf_list =
(struct nvdla_pin_unpin_args *)arg;
@@ -157,10 +152,6 @@ static int nvdla_unpin(struct nvdla_private *priv, void *arg)
}
nvdla_dbg_info(pdev, "num of buffers [%d]", count);
handles = kcalloc(count, sizeof(u32), GFP_KERNEL);
if (!handles)
return -ENOMEM;
if (copy_from_user(handles, (void __user *)buf_list->buffers,
(count * sizeof(u32)))) {
err = -EFAULT;
@@ -170,7 +161,6 @@ static int nvdla_unpin(struct nvdla_private *priv, void *arg)
nvhost_buffer_unpin(priv->buffers, handles, count);
nvdla_buffer_cpy_err:
kfree(handles);
fail_to_get_val_cnt:
fail_to_get_val_arg:
return err;
@@ -425,7 +415,7 @@ static int nvdla_submit(struct nvdla_private *priv, void *arg)
struct nvdla_submit_args *args =
(struct nvdla_submit_args *)arg;
struct nvdla_ioctl_submit_task __user *user_tasks;
struct nvdla_ioctl_submit_task *local_tasks;
struct nvdla_ioctl_submit_task local_tasks[MAX_TASKS_PER_SUBMIT];
struct platform_device *pdev;
struct nvhost_queue *queue;
struct nvhost_buffers *buffers;
@@ -455,10 +445,6 @@ static int nvdla_submit(struct nvdla_private *priv, void *arg)
nvdla_dbg_info(pdev, "num of tasks [%d]", num_tasks);
/* IOCTL copy descriptors*/
local_tasks = kcalloc(num_tasks, sizeof(*local_tasks), GFP_KERNEL);
if (!local_tasks)
return -ENOMEM;
if (copy_from_user(local_tasks, user_tasks,
(num_tasks * sizeof(*user_tasks)))) {
err = -EFAULT;
@@ -503,10 +489,6 @@ static int nvdla_submit(struct nvdla_private *priv, void *arg)
goto fail_to_send_postfences;
}
}
kfree(local_tasks);
local_tasks = NULL;
return 0;
fail_to_send_postfences:
@@ -516,8 +498,6 @@ fail_to_fill_task:
/*TODO: traverse list in reverse and delete jobs */
fail_to_get_task_mem:
fail_to_copy_task:
kfree(local_tasks);
local_tasks = NULL;
return err;
}