diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-23 10:44:35 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-23 10:29:58 -0700 |
| commit | 46e407dd349c5ffbb869f5999fa596d1e08f2810 (patch) | |
| tree | 3167c1c48ca29d037cb49b02be634a883f7d1854 /drivers/misc | |
| parent | 70135393812f4aa10aa891725786a7657064c2fc (diff) | |
| download | op-kernel-dev-46e407dd349c5ffbb869f5999fa596d1e08f2810.zip op-kernel-dev-46e407dd349c5ffbb869f5999fa596d1e08f2810.tar.gz | |
mei: fix krealloc() misuse in in mei_cl_irq_read_msg()
If krealloc() returns NULL, it doesn't free the original. So any code
of the form 'foo = krealloc(foo, ...);' is almost certainly a bug.
Introduced by commit fcb136e1ac5774909e0d85189f721b8dfa800e0f(mei: fix
reading large reposnes)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/interrupt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c index 5ee2f07..1473cfd 100644 --- a/drivers/misc/mei/interrupt.c +++ b/drivers/misc/mei/interrupt.c @@ -148,16 +148,16 @@ static int mei_cl_irq_read_msg(struct mei_device *dev, dev_dbg(&dev->pdev->dev, "message overflow. size %d len %d idx %ld\n", cb->response_buffer.size, mei_hdr->length, cb->buf_idx); - cb->response_buffer.data = - krealloc(cb->response_buffer.data, - mei_hdr->length + cb->buf_idx, - GFP_KERNEL); + buffer = krealloc(cb->response_buffer.data, + mei_hdr->length + cb->buf_idx, + GFP_KERNEL); - if (!cb->response_buffer.data) { + if (!buffer) { dev_err(&dev->pdev->dev, "allocation failed.\n"); list_del(&cb->list); return -ENOMEM; } + cb->response_buffer.data = buffer; cb->response_buffer.size = mei_hdr->length + cb->buf_idx; } |
