Commit 6a24e72d authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'remoteproc-4.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc

Pull remoteproc fixes from Ohad Ben-Cohen:
 "Two one-liners coming from Suman and Arnd"

* tag 'remoteproc-4.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
  remoteproc: fix memory leak of remoteproc ida cache layers
  remoteproc: avoid stack overflow in debugfs file
parents 2255702d f42f79af
...@@ -1478,6 +1478,8 @@ module_init(remoteproc_init); ...@@ -1478,6 +1478,8 @@ module_init(remoteproc_init);
static void __exit remoteproc_exit(void) static void __exit remoteproc_exit(void)
{ {
ida_destroy(&rproc_dev_index);
rproc_exit_debugfs(); rproc_exit_debugfs();
} }
module_exit(remoteproc_exit); module_exit(remoteproc_exit);
......
...@@ -156,7 +156,7 @@ rproc_recovery_write(struct file *filp, const char __user *user_buf, ...@@ -156,7 +156,7 @@ rproc_recovery_write(struct file *filp, const char __user *user_buf,
char buf[10]; char buf[10];
int ret; int ret;
if (count > sizeof(buf)) if (count < 1 || count > sizeof(buf))
return count; return count;
ret = copy_from_user(buf, user_buf, count); ret = copy_from_user(buf, user_buf, count);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment