Merge tag 'rproc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc

torvalds · torvalds · commit f8fc341ba4db · 2012-05-16T14:26:05.000-07:00
Pull remoteproc fix from Ohad Ben-Cohen:
 "Fix a nasty off-by-one remoteproc bug which leaks memory when a remote
  processor is shut down and, on certain circumstances, can indirectly
  prevent it from being reloaded."

* tag 'rproc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
  remoteproc: fix off-by-one bug in __rproc_free_vrings
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
@@ -354,7 +354,7 @@ static void __rproc_free_vrings(struct rproc_vdev *rvdev, int i)
 {
 	struct rproc *rproc = rvdev->rproc;
 
-	for (i--; i > 0; i--) {
+	for (i--; i >= 0; i--) {
 		struct rproc_vring *rvring = &rvdev->vring[i];
 		int size = PAGE_ALIGN(vring_size(rvring->len, rvring->align));
 

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ static void __rproc_free_vrings(struct rproc_vdev *rvdev, int i)`
`354`	`354`	`{`
`355`	`355`	`struct rproc *rproc = rvdev->rproc;`
`356`	`356`
`357`		`- for (i--; i > 0; i--) {`
	`357`	`+ for (i--; i >= 0; i--) {`
`358`	`358`	`struct rproc_vring *rvring = &rvdev->vring[i];`
`359`	`359`	`int size = PAGE_ALIGN(vring_size(rvring->len, rvring->align));`
`360`	`360`