Skip to content

Commit

Permalink
staging: ti dspbridge: avoid errors if node handle is zero
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ernesto Ramos authored and Greg Kroah-Hartman committed Aug 3, 2010
1 parent 0624f52 commit 8df327c
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/staging/tidspbridge/pmgr/dspapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 8df327c

Please sign in to comment.