diff options
author | Lee Jones <lee.jones@linaro.org> | 2016-03-23 10:43:42 -0400 |
---|---|---|
committer | Jassi Brar <jaswinder.singh@linaro.org> | 2016-04-12 03:58:30 -0400 |
commit | d1c2f87c9a8f79fa8816bbe7de98da38eae2be5e (patch) | |
tree | f9f90547b42c81aedfbab20531213dfde6e465e7 /drivers/mailbox | |
parent | 17f5f28ffa6e81461a569290ae802a9b05a89072 (diff) |
mailbox: mailbox-test: Prevent memory leak
If we set the Signal twice or more, without using it as part of a message,
memory will be re-allocated and the pointer over-written. Prevent this
potential leak by only allocating memory when there isn't any already.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Diffstat (limited to 'drivers/mailbox')
-rw-r--r-- | drivers/mailbox/mailbox-test.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mailbox/mailbox-test.c b/drivers/mailbox/mailbox-test.c index 5f4b439fd45a..58d04726cdd7 100644 --- a/drivers/mailbox/mailbox-test.c +++ b/drivers/mailbox/mailbox-test.c | |||
@@ -59,9 +59,12 @@ static ssize_t mbox_test_signal_write(struct file *filp, | |||
59 | return -EINVAL; | 59 | return -EINVAL; |
60 | } | 60 | } |
61 | 61 | ||
62 | tdev->signal = kzalloc(MBOX_MAX_SIG_LEN, GFP_KERNEL); | 62 | /* Only allocate memory if we need to */ |
63 | if (!tdev->signal) | 63 | if (!tdev->signal) { |
64 | return -ENOMEM; | 64 | tdev->signal = kzalloc(MBOX_MAX_SIG_LEN, GFP_KERNEL); |
65 | if (!tdev->signal) | ||
66 | return -ENOMEM; | ||
67 | } | ||
65 | 68 | ||
66 | if (copy_from_user(tdev->signal, userbuf, count)) { | 69 | if (copy_from_user(tdev->signal, userbuf, count)) { |
67 | kfree(tdev->signal); | 70 | kfree(tdev->signal); |