Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 084f70ee authored by Ernesto Ramos's avatar Ernesto Ramos Committed by Greg Kroah-Hartman
Browse files

staging: ti dspbridge: avoid errors if stream id 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 stream
handle is zero.

Signed-off-by: default avatarErnesto Ramos <ernesto@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4ec09714

drivers/staging/tidspbridge/pmgr/dspapi.c

+6 −2
Original line number Diff line number Diff line
@@ -1527,7 +1527,7 @@ inline void find_strm_handle(struct strm_res_object **strmres, 
{

	rcu_read_lock();

	*strmres = idr_find(((struct process_context *)pr_ctxt)->stream_id,

							(int)hstream);

							(int)hstream - 1);

	rcu_read_unlock();

	return;

}
@@ -1724,6 +1724,7 @@ u32 strmwrap_open(union trapped_args *args, void *pr_ctxt) 
	struct strm_res_object *strm_res_obj;

	struct dsp_streamattrin strm_attr_in;

	struct node_res_object *node_res;

	int strmid;



	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.index, &attr, &strm_res_obj,

			   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;

}