From patchwork Thu Apr 20 07:38:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 97714 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp667373qgf; Thu, 20 Apr 2017 00:39:00 -0700 (PDT) X-Received: by 10.99.119.195 with SMTP id s186mr6717956pgc.179.1492673940115; Thu, 20 Apr 2017 00:39:00 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k5si5463396pgh.379.2017.04.20.00.38.59; Thu, 20 Apr 2017 00:39:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753574AbdDTHi6 (ORCPT + 6 others); Thu, 20 Apr 2017 03:38:58 -0400 Received: from mail-oi0-f52.google.com ([209.85.218.52]:33405 "EHLO mail-oi0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764229AbdDTHi5 (ORCPT ); Thu, 20 Apr 2017 03:38:57 -0400 Received: by mail-oi0-f52.google.com with SMTP id y11so6724997oie.0 for ; Thu, 20 Apr 2017 00:38:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8gREAruLSSzMYFS73pSb0Y+nvCpT16vdZkDiLGlk/jw=; b=Rnkw1Fq+4//MoDCZHcjRSjb8LkHQLI123QFFJbEH9RpIc8WMVG+VdA5HYiQhvxIvCK UyR2In3q+2JtnUTODpNLlFlg0CpK+nLmYm/g2i9dgtzHGG1KG8RZ1TeOrErffk72rO6h eMUAN3ymbgXHDevBb2D1XnHoBOI+5xeS/NqtY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8gREAruLSSzMYFS73pSb0Y+nvCpT16vdZkDiLGlk/jw=; b=U8qJefKCAsZ7uThFY9w4FwM1MSaJgmNf/Qu1zPy1I4B0fmCr6kokTe2YQKApgh7hVt hYEZRIv9Uy+PaRL1NJqzCV6zn/G+6OAu9XCTdwWdnNwDS5UalbORHO1IVWPB9sLZDN2L sZmRr9mXHLD7HeAVzjpCSlsByg7aeerGsyBaTwZ9evxBdfsCe9OKft1C+oZTH3hot6Z5 hlhyJS520Fca6mNUnJpvl72kK81/x+ZV4Q8vm/fr5710xWSm0pAGPUhnR6If4IAZlzTQ rng0tkZ9YoLZ7AF0EU5NyKhHq+D+L5Zi014SpgjBRMgYgookW0pyI7nNaEG2hbJWFSBQ vj1g== X-Gm-Message-State: AN3rC/5hGRxXUP6fN9K6rDWULU3RxZl3QTuKLilzP0oaZsHXT8MP7Qvv mfIglKHr+n8A2o8I X-Received: by 10.84.179.193 with SMTP id b59mr8785456plc.56.1492673936611; Thu, 20 Apr 2017 00:38:56 -0700 (PDT) Received: from phantom.lan ([106.51.225.38]) by smtp.gmail.com with ESMTPSA id t2sm8497717pfl.34.2017.04.20.00.38.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Apr 2017 00:38:55 -0700 (PDT) From: Sumit Semwal To: stable@vger.kernel.org Cc: Vitaly Kuznetsov , "K . Y . Srinivasan" , Greg Kroah-Hartman , Sumit Semwal Subject: [v3 PATCH for-4.4 1/7] Drivers: hv: don't leak memory in vmbus_establish_gpadl() Date: Thu, 20 Apr 2017 13:08:37 +0530 Message-Id: <1492673923-1352-2-git-send-email-sumit.semwal@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492673923-1352-1-git-send-email-sumit.semwal@linaro.org> References: <1492673923-1352-1-git-send-email-sumit.semwal@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vitaly Kuznetsov [ Upstream commit 7cc80c98070ccc7940fc28811c92cca0a681015d ] In some cases create_gpadl_header() allocates submessages but we never free them. [sumits] Note for stable: Upstream commit 4d63763296ab7865a98bc29cc7d77145815ef89f: (Drivers: hv: get rid of redundant messagecount in create_gpadl_header()) changes the list usage to initialize list header in all cases; that patch isn't added to stable, so the current patch is modified a little bit from the upstream commit to check if the list is valid or not. Signed-off-by: Vitaly Kuznetsov Signed-off-by: K. Y. Srinivasan Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sumit Semwal --- drivers/hv/channel.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c index 1ef37c7..49d2449 100644 --- a/drivers/hv/channel.c +++ b/drivers/hv/channel.c @@ -375,7 +375,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, struct vmbus_channel_gpadl_header *gpadlmsg; struct vmbus_channel_gpadl_body *gpadl_body; struct vmbus_channel_msginfo *msginfo = NULL; - struct vmbus_channel_msginfo *submsginfo; + struct vmbus_channel_msginfo *submsginfo, *tmp; u32 msgcount; struct list_head *curr; u32 next_gpadl_handle; @@ -437,6 +437,13 @@ cleanup: list_del(&msginfo->msglistentry); spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags); + if (msgcount > 1) { + list_for_each_entry_safe(submsginfo, tmp, &msginfo->submsglist, + msglistentry) { + kfree(submsginfo); + } + } + kfree(msginfo); return ret; }