leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] media: Check for active and has_no_links overrun

Browse Source 
The active and has_no_links arrays will overrun in
media_entity_pipeline_start() if there's an entity which has more than
MEDIA_ENTITY_MAX_PAD pads. Ensure in media_entity_init() that there are
fewer pads than that.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Sakari Ailus 2015-10-05 12:45:29 -03:00 committed by Mauro Carvalho Chehab
parent 19fab6fe67
commit 885ca801e3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/media-entity.c
View File

@ -214,12 +214,20 @@ void media_gobj_destroy(struct media_gobj *gobj)
gobj->mdev = NULL; gobj->mdev = NULL;
} }
/*
* TODO: Get rid of this.
*/
#define MEDIA_ENTITY_MAX_PADS 512
int media_entity_pads_init(struct media_entity *entity, u16 num_pads, int media_entity_pads_init(struct media_entity *entity, u16 num_pads,
struct media_pad *pads) struct media_pad *pads)
{ {
struct media_device *mdev = entity->graph_obj.mdev; struct media_device *mdev = entity->graph_obj.mdev;
unsigned int i; unsigned int i;
if (num_pads >= MEDIA_ENTITY_MAX_PADS)
return -E2BIG;
entity->num_pads = num_pads; entity->num_pads = num_pads;
entity->pads = pads; entity->pads = pads;
@ -280,11 +288,6 @@ static struct media_entity *stack_pop(struct media_graph *graph)
#define link_top(en) ((en)->stack[(en)->top].link) #define link_top(en) ((en)->stack[(en)->top].link)
#define stack_top(en) ((en)->stack[(en)->top].entity) #define stack_top(en) ((en)->stack[(en)->top].entity)
/*
* TODO: Get rid of this.
*/
#define MEDIA_ENTITY_MAX_PADS 512
/** /**
* media_graph_walk_init - Allocate resources for graph walk * media_graph_walk_init - Allocate resources for graph walk
* @graph: Media graph structure that will be used to walk the graph * @graph: Media graph structure that will be used to walk the graph