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: linux-kernel@vger.kernel.org,
	Chunyan Zhang <zhang.chunyan@linaro.org>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>
Subject: [PATCH v3 6/9] stm class: Fix an off-by-one in master array allocation
Date: Tue, 22 Dec 2015 17:25:20 +0200	[thread overview]
Message-ID: <1450797923-23072-7-git-send-email-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <1450797923-23072-1-git-send-email-alexander.shishkin@linux.intel.com>

From: Chunyan Zhang <zhang.chunyan@linaro.org>

Since both sw_start and sw_end are master indices, the size of array
that holds them is sw_end - sw_start + 1, which the current code gets
wrong, allocating one item less than required.

This patch corrects the allocation size, avoiding potential slab
corruption.

Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
[alexander.shishkin@linux.intel.com: re-wrote the commit message]
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
 drivers/hwtracing/stm/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
index ddcb606ace..40a8b79ab7 100644
--- a/drivers/hwtracing/stm/core.c
+++ b/drivers/hwtracing/stm/core.c
@@ -618,7 +618,7 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data,
 	if (!stm_data->packet || !stm_data->sw_nchannels)
 		return -EINVAL;
 
-	nmasters = stm_data->sw_end - stm_data->sw_start;
+	nmasters = stm_data->sw_end - stm_data->sw_start + 1;
 	stm = kzalloc(sizeof(*stm) + nmasters * sizeof(void *), GFP_KERNEL);
 	if (!stm)
 		return -ENOMEM;
-- 
2.6.4


  parent reply	other threads:[~2015-12-22 15:26 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-22 15:25 [PATCH v3 0/9] stm/intel_th: Updates for 4.4 Alexander Shishkin
2015-12-22 15:25 ` [PATCH v3 1/9] stm class: Hide STM-specific options if STM is disabled Alexander Shishkin
2015-12-22 15:25 ` [PATCH v3 2/9] intel_th: INTEL_TH should depend on HAS_DMA Alexander Shishkin
2015-12-22 15:25 ` [PATCH v3 3/9] stm class: Select CONFIG_SRCU Alexander Shishkin
2015-12-22 15:25 ` [PATCH v3 4/9] stm class: Fix locking in unbinding policy path Alexander Shishkin
2015-12-22 15:25 ` [PATCH v3 5/9] stm class: Fix link list locking Alexander Shishkin
2015-12-22 15:25 ` Alexander Shishkin [this message]
2015-12-22 15:25 ` [PATCH v3 7/9] stm class: Prevent user-controllable allocations Alexander Shishkin
2015-12-22 15:25 ` [PATCH v3 8/9] intel_th: pci: Add Apollo Lake SOC support Alexander Shishkin
2015-12-22 15:25 ` [PATCH v3 9/9] intel_th: pci: Add Broxton " 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=1450797923-23072-7-git-send-email-alexander.shishkin@linux.intel.com \
    --to=alexander.shishkin@linux.intel.com \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --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

all inboxes | Powered by JetHome®