From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130507035844.897473527@goodmis.org> Date: Mon, 06 May 2013 23:57:36 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= , Ido Yariv , Ohad Ben-Cohen Subject: [024/126] remoteproc: fix error path of handle_vdev References: <20130507035712.909872333@goodmis.org> Content-Disposition: inline; filename=0024-remoteproc-fix-error-path-of-handle_vdev.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.3 stable review patch. If anyone has any objections, please let me know. ------------------ From: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= [ Upstream commit cde42e076c1cdd69a1f955d66ff6596bad3d2105 ] Remove the vdev entry from the list before freeing it, otherwise rproc->vdevs will explode. Cc: stable@vger.kernel.org Signed-off-by: Sjur Brændeland Acked-by: Ido Yariv [edit subject, minor commit log edit, cc stable] Signed-off-by: Ohad Ben-Cohen Signed-off-by: Steven Rostedt --- drivers/remoteproc/remoteproc_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 70b296f..cf68afb 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -342,10 +342,12 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc, /* it is now safe to add the virtio device */ ret = rproc_add_virtio_dev(rvdev, rsc->id); if (ret) - goto free_rvdev; + goto remove_rvdev; return 0; +remove_rvdev: + list_del(&rvdev->node); free_rvdev: kfree(rvdev); return ret; -- 1.7.10.4