Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754168Ab3DWCoh (ORCPT ); Mon, 22 Apr 2013 22:44:37 -0400 Received: from mail-bk0-f51.google.com ([209.85.214.51]:50606 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753929Ab3DWCog (ORCPT ); Mon, 22 Apr 2013 22:44:36 -0400 MIME-Version: 1.0 Date: Tue, 23 Apr 2013 10:44:35 +0800 Message-ID: Subject: [PATCH -next] mei: fix krealloc() misuse in in mei_cl_irq_read_msg() From: Wei Yongjun To: tomas.winkler@intel.com, gregkh@linuxfoundation.org Cc: yongjun_wei@trendmicro.com.cn, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1595 Lines: 45 From: Wei Yongjun 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 --- drivers/misc/mei/interrupt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c index 37a8c35..089c516 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; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/