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

Commit f8fc341b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents dfae359f 6fd98c12

drivers/remoteproc/remoteproc_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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));