lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntb: off by one sanity checks

Browse Source 
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>
This commit is contained in:
Dan Carpenter
2013-01-22 10:19:14 +03:00
committed by Jon Mason
parent 186f27ff9f
commit ad3e2751e7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/ntb/ntb_hw.c
View File

@@ -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) 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 NULL;
return ndev->mw[mw].vbase; 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) 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 0;
return ndev->mw[mw].bar_sz; 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) 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; return;
dev_dbg(&ndev->pdev->dev, "Writing addr %Lx to BAR %d\n", addr, dev_dbg(&ndev->pdev->dev, "Writing addr %Lx to BAR %d\n", addr,