Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: ti dspbridge: avoid errors if stream id is zero

Browse Source 
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 stream
handle is zero.

Signed-off-by: Ernesto Ramos <ernesto@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ernesto Ramos 2010-07-28 16:04:57 -05:00 committed by Greg Kroah-Hartman
parent 4ec09714a0
commit 084f70ee09
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/tidspbridge/pmgr/dspapi.c
View File

@ -1527,7 +1527,7 @@ inline void find_strm_handle(struct strm_res_object **strmres,
{ {
rcu_read_lock(); rcu_read_lock();
*strmres = idr_find(((struct process_context *)pr_ctxt)->stream_id, *strmres = idr_find(((struct process_context *)pr_ctxt)->stream_id,
(int)hstream); (int)hstream - 1);
rcu_read_unlock(); rcu_read_unlock();
return; return;
} }
@ -1724,6 +1724,7 @@ u32 strmwrap_open(union trapped_args *args, void *pr_ctxt)
struct strm_res_object *strm_res_obj; struct strm_res_object *strm_res_obj;
struct dsp_streamattrin strm_attr_in; struct dsp_streamattrin strm_attr_in;
struct node_res_object *node_res; struct node_res_object *node_res;
int strmid;
find_node_handle(&node_res, pr_ctxt, args->args_strm_open.hnode); find_node_handle(&node_res, pr_ctxt, args->args_strm_open.hnode);
@ -1745,7 +1746,10 @@ u32 strmwrap_open(union trapped_args *args, void *pr_ctxt)
args->args_strm_open.direction, args->args_strm_open.direction,
args->args_strm_open.index, &attr, &strm_res_obj, args->args_strm_open.index, &attr, &strm_res_obj,
pr_ctxt); pr_ctxt);
CP_TO_USR(args->args_strm_open.ph_stream, &strm_res_obj->id, status, 1); if (!status) {
strmid = strm_res_obj->id + 1;
CP_TO_USR(args->args_strm_open.ph_stream, &strmid, status, 1);
}
return status; return status;
} }