diff options
| author | Ernesto Ramos <ernesto@ti.com> | 2010-07-28 16:04:54 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 17:11:02 -0700 |
| commit | 8df327c3904d34527b89d4881bd3ce2966f0e07f (patch) | |
| tree | a0a3e490dbfa07bffb1846ca1473fb52bde9bec2 | |
| parent | 0624f52f77e11a6edfc48827a12190f874d572b8 (diff) | |
| download | talos-obmc-linux-8df327c3904d34527b89d4881bd3ce2966f0e07f.tar.gz talos-obmc-linux-8df327c3904d34527b89d4881bd3ce2966f0e07f.zip | |
staging: ti dspbridge: avoid errors if node handle is zero
As 'zero' can be a perfectly good id, it can be picked up as
a NULL from userspace, avoid issues in API and user apps if node
handle is zero.
Signed-off-by: Ernesto Ramos <ernesto@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/tidspbridge/pmgr/dspapi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c index 6eda7c5324a8..f46aaf683e37 100644 --- a/drivers/staging/tidspbridge/pmgr/dspapi.c +++ b/drivers/staging/tidspbridge/pmgr/dspapi.c @@ -1059,7 +1059,7 @@ inline void find_node_handle(struct node_res_object **noderes, { rcu_read_lock(); *noderes = idr_find(((struct process_context *)pr_ctxt)->node_id, - (int)hnode); + (int)hnode - 1); rcu_read_unlock(); return; } @@ -1077,6 +1077,7 @@ u32 nodewrap_allocate(union trapped_args *args, void *pr_ctxt) u8 *pargs = NULL; struct dsp_nodeattrin proc_attr_in, *attr_in = NULL; struct node_res_object *node_res; + int nodeid; /* Optional argument */ if (psize) { @@ -1112,7 +1113,8 @@ u32 nodewrap_allocate(union trapped_args *args, void *pr_ctxt) attr_in, &node_res, pr_ctxt); } if (!status) { - CP_TO_USR(args->args_node_allocate.ph_node, &node_res->id, + nodeid = node_res->id + 1; + CP_TO_USR(args->args_node_allocate.ph_node, &nodeid, status, 1); if (status) { status = -EFAULT; |
