From: Alexey Klimov <alexey.klimov@arm.com>
To: jassisinghbrar@gmail.com, ashwin.chaugule@linaro.org
Cc: alexey.klimov@arm.com, sudeep.holla@arm.com,
linux-kernel@vger.kernel.org
Subject: [PATCH] mailbox: pcc: fix channel calculation in get_pcc_channel()
Date: Thu, 10 Dec 2015 17:28:37 +0000 [thread overview]
Message-ID: <1449768517-1695-1-git-send-email-alexey.klimov@arm.com> (raw)
This patch fixes the calculation of pcc_chan for non-zero id.
After the compiler ignores the (unsigned long) cast the
pcc_mbox_channels pointer is type-cast and then the type-cast
offset is added which results in address outside of the range
leading to the kernel crashing.
We might add braces and make it:
pcc_chan = (struct mbox_chan *)
((unsigned long) pcc_mbox_channels +
(id * sizeof(*pcc_chan)));
but let's go with array approach here and use id as index.
Tested on Juno board.
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Alexey Klimov <alexey.klimov@arm.com>
---
drivers/mailbox/pcc.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c
index 45d85ae..8f779a1 100644
--- a/drivers/mailbox/pcc.c
+++ b/drivers/mailbox/pcc.c
@@ -81,16 +81,10 @@ static struct mbox_controller pcc_mbox_ctrl = {};
*/
static struct mbox_chan *get_pcc_channel(int id)
{
- struct mbox_chan *pcc_chan;
-
if (id < 0 || id > pcc_mbox_ctrl.num_chans)
return ERR_PTR(-ENOENT);
- pcc_chan = (struct mbox_chan *)
- (unsigned long) pcc_mbox_channels +
- (id * sizeof(*pcc_chan));
-
- return pcc_chan;
+ return &pcc_mbox_channels[id];
}
/**
--
1.9.1
next reply other threads:[~2015-12-10 17:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-10 17:28 Alexey Klimov [this message]
2015-12-10 18:19 ` Ashwin Chaugule
2016-01-15 18:20 ` Ashwin Chaugule
2016-01-15 18:22 ` Ashwin Chaugule
2016-02-01 15:19 ` Alexey Klimov
2016-02-01 15:43 ` Jassi Brar
2016-02-01 20:51 ` Rafael J. Wysocki
2016-02-02 11:12 ` Jassi Brar
2016-02-03 1:22 ` Rafael J. Wysocki
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=1449768517-1695-1-git-send-email-alexey.klimov@arm.com \
--to=alexey.klimov@arm.com \
--cc=ashwin.chaugule@linaro.org \
--cc=jassisinghbrar@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sudeep.holla@arm.com \
/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®