mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
To: Greg KH <greg@kroah.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>,
	Chunyan Zhang <zhang.chunyan@linaro.org>,
	laurent.fert@intel.com, yann.fouassier@intel.com,
	linux-kernel@vger.kernel.org,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>
Subject: [PATCH 07/20] intel_th: msu: Release resources on read error
Date: Mon, 15 Feb 2016 19:11:57 +0200	[thread overview]
Message-ID: <1455556330-12473-8-git-send-email-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <1455556330-12473-1-git-send-email-alexander.shishkin@linux.intel.com>

From: Laurent FERT <laurent.fert@intel.com>

Right now, reading from msc character device will leak its's user count
on read error.

This patch makes sure resources are released when there is no data left
to read from the buffer.

Signed-off-by: Laurent FERT <laurent.fert@intel.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
 drivers/hwtracing/intel_th/msu.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c
index 3c793bbf6a..d9d6022c5a 100644
--- a/drivers/hwtracing/intel_th/msu.c
+++ b/drivers/hwtracing/intel_th/msu.c
@@ -1112,12 +1112,11 @@ static ssize_t intel_th_msc_read(struct file *file, char __user *buf,
 		size = msc->nr_pages << PAGE_SHIFT;
 
 	if (!size)
-		return 0;
+		goto put_count;
 
-	if (off >= size) {
-		len = 0;
+	if (off >= size)
 		goto put_count;
-	}
+
 	if (off + len >= size)
 		len = size - off;
 
-- 
2.7.0

  parent reply	other threads:[~2016-02-15 17:16 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-15 16:08 [git pull] stm class/intel_th: Updates for char-misc-next Alexander Shishkin
2016-02-15 16:44 ` Greg KH
2016-02-15 17:11   ` [PATCH 00/20] " Alexander Shishkin
2016-02-15 17:11     ` [PATCH 01/20] stm class: Use a signed return type for stm_find_master_chan Alexander Shishkin
2016-02-15 17:11     ` [PATCH 02/20] stm class: Fix master deallocation in device unregistering Alexander Shishkin
2016-02-15 17:11     ` [PATCH 03/20] intel_th: Depend on HAS_IOMEM Alexander Shishkin
2016-02-15 17:11     ` [PATCH 04/20] intel_th: gth: Remove commented-out code Alexander Shishkin
2016-02-15 17:11     ` [PATCH 05/20] intel_th: Update scratchpad bits according to enabled output activity Alexander Shishkin
2016-02-15 17:11     ` [PATCH 06/20] intel_th: msu: Fix offset for wrapped block Alexander Shishkin
2016-02-15 17:11     ` Alexander Shishkin [this message]
2016-02-15 17:11     ` [PATCH 08/20] intel_th: sth: Sanitize packet callback's return values Alexander Shishkin
2016-02-15 17:11     ` [PATCH 09/20] intel_th: Set root device's drvdata early Alexander Shishkin
2016-02-15 17:12     ` [PATCH 10/20] intel_th: Use real device index in the node names Alexander Shishkin
2016-02-15 17:12     ` [PATCH 11/20] stm class: Use driver's packet callback return value Alexander Shishkin
2016-02-15 17:12     ` [PATCH 12/20] stm class: Support devices with multiple instances Alexander Shishkin
2016-02-15 17:12     ` [PATCH 13/20] stm class: dummy_stm: Create multiple devices Alexander Shishkin
2016-02-15 17:12     ` [PATCH 14/20] stm class: Add heartbeat stm source device Alexander Shishkin
2016-02-15 17:12     ` [PATCH 15/20] stm class: Fix unlocking braino in the error path Alexander Shishkin
2016-02-15 17:12     ` [PATCH 16/20] stm class: Guard output assignment against concurrency Alexander Shishkin
2016-02-15 17:12     ` [PATCH 17/20] stm class: Fix unbalanced module/device refcounting Alexander Shishkin
2016-02-15 17:12     ` [PATCH 18/20] stm class: Fix a race in unlinking Alexander Shishkin
2016-02-15 17:12     ` [PATCH 19/20] stm class: Plug stm device's unlink callback Alexander Shishkin
2016-02-15 17:12     ` [PATCH 20/20] stm class: dummy_stm: Add link callback for fault injection Alexander Shishkin
2016-02-16 12:29   ` [git pull] stm class/intel_th: Updates for char-misc-next Alexander Shishkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1455556330-12473-8-git-send-email-alexander.shishkin@linux.intel.com \
    --to=alexander.shishkin@linux.intel.com \
    --cc=greg@kroah.com \
    --cc=laurent.fert@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mathieu.poirier@linaro.org \
    --cc=yann.fouassier@intel.com \
    --cc=zhang.chunyan@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome