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 03/10] NTB: fix pointer math issues
Date: Mon, 6 May 2013 18:55:22 -0700 [thread overview]
Message-ID: <1367891729-11738-4-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>
->remote_rx_info and ->rx_info are struct ntb_rx_info pointers. If we
add sizeof(struct ntb_rx_info) then it goes too far.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jon Mason <jon.mason@intel.com>
---
drivers/ntb/ntb_transport.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c
index 74c5812..00f5e80 100644
--- a/drivers/ntb/ntb_transport.c
+++ b/drivers/ntb/ntb_transport.c
@@ -486,7 +486,7 @@ static void ntb_transport_setup_qp_mw(struct ntb_transport *nt,
(qp_num / NTB_NUM_MW * rx_size);
rx_size -= sizeof(struct ntb_rx_info);
- qp->rx_buff = qp->remote_rx_info + sizeof(struct ntb_rx_info);
+ qp->rx_buff = qp->remote_rx_info + 1;
qp->rx_max_frame = min(transport_mtu, rx_size);
qp->rx_max_entry = rx_size / qp->rx_max_frame;
qp->rx_index = 0;
@@ -780,7 +780,7 @@ static void ntb_transport_init_queue(struct ntb_transport *nt,
(qp_num / NTB_NUM_MW * tx_size);
tx_size -= sizeof(struct ntb_rx_info);
- qp->tx_mw = qp->rx_info + sizeof(struct ntb_rx_info);
+ qp->tx_mw = qp->rx_info + 1;
qp->tx_max_frame = min(transport_mtu, tx_size);
qp->tx_max_entry = tx_size / qp->tx_max_frame;
qp->tx_index = 0;
--
1.7.9.5
next prev parent reply other threads:[~2013-05-07 1:58 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 ` [PATCH 02/10] ntb: off by one sanity checks Jon Mason
2013-05-07 1:55 ` Jon Mason [this message]
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-4-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