From: Jon Mason <jon.mason@intel.com>
To: linux-kernel@vger.kernel.org
Cc: Dave Jiang <dave.jiang@intel.com>,
Dan Carpenter <dan.carpenter@oracle.com>
Subject: [PATCH 02/10] ntb: off by one sanity checks
Date: Mon, 6 May 2013 18:55:21 -0700 [thread overview]
Message-ID: <1367891729-11738-3-git-send-email-jon.mason@intel.com> (raw)
In-Reply-To: <1367891729-11738-1-git-send-email-jon.mason@intel.com>
From: Dan Carpenter <dan.carpenter@oracle.com>
These tests are off by one. If "mw" is equal to NTB_NUM_MW then we
would go beyond the end of the ndev->mw[] array.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jon Mason <jon.mason@intel.com>
---
drivers/ntb/ntb_hw.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c
index f802e7c..195cc51 100644
--- a/drivers/ntb/ntb_hw.c
+++ b/drivers/ntb/ntb_hw.c
@@ -345,7 +345,7 @@ int ntb_read_remote_spad(struct ntb_device *ndev, unsigned int idx, u32 *val)
*/
void __iomem *ntb_get_mw_vbase(struct ntb_device *ndev, unsigned int mw)
{
- if (mw > NTB_NUM_MW)
+ if (mw >= NTB_NUM_MW)
return NULL;
return ndev->mw[mw].vbase;
@@ -362,7 +362,7 @@ void __iomem *ntb_get_mw_vbase(struct ntb_device *ndev, unsigned int mw)
*/
resource_size_t ntb_get_mw_size(struct ntb_device *ndev, unsigned int mw)
{
- if (mw > NTB_NUM_MW)
+ if (mw >= NTB_NUM_MW)
return 0;
return ndev->mw[mw].bar_sz;
@@ -380,7 +380,7 @@ resource_size_t ntb_get_mw_size(struct ntb_device *ndev, unsigned int mw)
*/
void ntb_set_mw_addr(struct ntb_device *ndev, unsigned int mw, u64 addr)
{
- if (mw > NTB_NUM_MW)
+ if (mw >= NTB_NUM_MW)
return;
dev_dbg(&ndev->pdev->dev, "Writing addr %Lx to BAR %d\n", addr,
--
1.7.9.5
next prev parent reply other threads:[~2013-05-07 1:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-07 1:55 [PATCH 0/10] NTB: Bug Fixes Jon Mason
2013-05-07 1:55 ` [PATCH 01/10] NTB: variable dereferenced before check Jon Mason
2013-05-07 1:55 ` Jon Mason [this message]
2013-05-07 1:55 ` [PATCH 03/10] NTB: fix pointer math issues Jon Mason
2013-05-07 1:55 ` [PATCH 04/10] NTB: Handle 64bit BAR sizes Jon Mason
2013-05-07 1:55 ` [PATCH 05/10] NTB: Link toggle memory leak Jon Mason
2013-05-07 1:55 ` [PATCH 06/10] NTB: reset tx_index on link toggle Jon Mason
2013-05-07 1:55 ` [PATCH 07/10] NTB: Correctly handle receive buffers of the minimal size Jon Mason
2013-05-07 1:55 ` [PATCH 08/10] NTB: memcpy lockup workaround Jon Mason
2013-05-07 1:55 ` [PATCH 09/10] ntb_netdev: remove from list on exit Jon Mason
2013-05-07 1:55 ` [PATCH 10/10] NTB: Multiple NTB client fix Jon Mason
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=1367891729-11738-3-git-send-email-jon.mason@intel.com \
--to=jon.mason@intel.com \
--cc=dan.carpenter@oracle.com \
--cc=dave.jiang@intel.com \
--cc=linux-kernel@vger.kernel.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