mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
remoteproc: Fix IDR initialisation in rproc_alloc()
[ Upstream commit6442df4940
] If ida_simple_get() returns an error when called in rproc_alloc(), put_device() is called to clean things up. By this time the rproc device type has been assigned, with rproc_type_release() as the release function. The first thing rproc_type_release() does is call: idr_destroy(&rproc->notifyids); But at the time the ida_simple_get() call is made, the notifyids field in the remoteproc structure has not been initialized. I'm not actually sure this case causes an observable problem, but it's incorrect. Fix this by initializing the notifyids field before calling ida_simple_get() in rproc_alloc(). Fixes:b5ab5e24e9
("remoteproc: maintain a generic child device for each rproc") Signed-off-by: Alex Elder <elder@linaro.org> Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> Reviewed-by: Suman Anna <s-anna@ti.com> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Link: https://lore.kernel.org/r/20200415204858.2448-2-mathieu.poirier@linaro.org Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
8bd207bb1a
commit
7906a075c9
1 changed files with 1 additions and 2 deletions
|
@ -2036,6 +2036,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
|
|||
rproc->dev.type = &rproc_type;
|
||||
rproc->dev.class = &rproc_class;
|
||||
rproc->dev.driver_data = rproc;
|
||||
idr_init(&rproc->notifyids);
|
||||
|
||||
/* Assign a unique device index and name */
|
||||
rproc->index = ida_simple_get(&rproc_dev_index, 0, 0, GFP_KERNEL);
|
||||
|
@ -2060,8 +2061,6 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
|
|||
|
||||
mutex_init(&rproc->lock);
|
||||
|
||||
idr_init(&rproc->notifyids);
|
||||
|
||||
INIT_LIST_HEAD(&rproc->carveouts);
|
||||
INIT_LIST_HEAD(&rproc->mappings);
|
||||
INIT_LIST_HEAD(&rproc->traces);
|
||||
|
|
Loading…
Reference in a new issue