Skip to content

Commit

Permalink
Merge tag 'remoteproc-4.4-fixes' of git://git.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history
…x/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
  • Loading branch information
torvalds committed Dec 1, 2015
2 parents 2255702 + f42f79a commit 6a24e72
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions drivers/remoteproc/remoteproc_core.c
Expand Up @@ -1478,6 +1478,8 @@ module_init(remoteproc_init);

static void __exit remoteproc_exit(void)
{
ida_destroy(&rproc_dev_index);

rproc_exit_debugfs();
}
module_exit(remoteproc_exit);
Expand Down
2 changes: 1 addition & 1 deletion drivers/remoteproc/remoteproc_debugfs.c
Expand Up @@ -156,7 +156,7 @@ rproc_recovery_write(struct file *filp, const char __user *user_buf,
char buf[10];
int ret;

if (count > sizeof(buf))
if (count < 1 || count > sizeof(buf))
return count;

ret = copy_from_user(buf, user_buf, count);
Expand Down

0 comments on commit 6a24e72

Please sign in to comment.