aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2014-10-20 15:10:40 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-14 10:10:37 -0800
commit2894a3a2bcb91959207376484c6c4d01ce605e73 (patch)
tree8d42ce5c009b2bbe8b7a39334e550dd639e6bb3a /net
parent50b784c20405c44f5d3b3444dc66915d4901f790 (diff)
staging: comedi: fix memory leak / bad pointer freeing for chanlist
commit 238b5ad855924919e5b98d0c772d9dc78795639b upstream. As a follow-up to commit 6cab7a37f5c04 ("staging: comedi: (regression) channel list must be set for COMEDI_CMD ioctl"), Hartley Sweeten pointed out another couple of bugs stemming from commit 6cab7a37f5c04 ("staging: comedi: comedi_fops: introduce __comedi_get_user_chanlist()"). Firstly, `do_cmdtest_ioctl()` never frees the kernel copy of the user chanlist allocated by `__comedi_get_user_chanlist()`, so that memory is leaked. Fix it by freeing the allocated kernel memory pointed to by `cmd.chanlist` before that pointer is overwritten with its original pointer to user memory before `cmd` is copied back to user-space. Secondly, if `__comedi_get_user_chanlist()` returns an error, `cmd->chanlist` is left unchanged and in fact will be a pointer to user memory. This causes `do_cmd_ioctl()` to `goto cleanup` and call `do_become_nonbusy()` which would attempt to free the memory pointed to by the user-space pointer. Fix it by setting `cmd->chanlist` to NULL at the start of `__comedi_get_user_chanlist()`. Fixes: c6cd0eefb27b ("staging: comedi: comedi_fops: introduce __comedi_get_user_chanlist()") Reported-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions