* [PATCH v2 for-rc] iw_cxgb4: fix ECN check on the passive accept
@ 2019-10-03 10:43 Potnuri Bharat Teja
2019-10-18 18:36 ` Doug Ledford
0 siblings, 1 reply; 2+ messages in thread
From: Potnuri Bharat Teja @ 2019-10-03 10:43 UTC (permalink / raw)
To: jgg, dledford; +Cc: linux-rdma, bharat, nirranjan
pass_accept_req() is using the same skb for handling accept request and
sending accept reply to HW. Here req and rpl structures are pointing to
same skb->data which is over written by INIT_TP_WR() and leads to
accessing corrupt req fields in accept_cr() while checking for ECN flags.
Reordered code in accept_cr() to fetch correct req fields.
Fixes: 92e7ae7172 ("iw_cxgb4: Choose appropriate hw mtu index and ISS for iWARP connections")
Signed-off-by: Potnuri Bharat Teja <bharat@chelsio.com>
---
changes from v1:
- added fixes line.
---
drivers/infiniband/hw/cxgb4/cm.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index e87fc0408470..9e8eca7b613c 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -2424,20 +2424,6 @@ static int accept_cr(struct c4iw_ep *ep, struct sk_buff *skb,
enum chip_type adapter_type = ep->com.dev->rdev.lldi.adapter_type;
pr_debug("ep %p tid %u\n", ep, ep->hwtid);
-
- skb_get(skb);
- rpl = cplhdr(skb);
- if (!is_t4(adapter_type)) {
- skb_trim(skb, roundup(sizeof(*rpl5), 16));
- rpl5 = (void *)rpl;
- INIT_TP_WR(rpl5, ep->hwtid);
- } else {
- skb_trim(skb, sizeof(*rpl));
- INIT_TP_WR(rpl, ep->hwtid);
- }
- OPCODE_TID(rpl) = cpu_to_be32(MK_OPCODE_TID(CPL_PASS_ACCEPT_RPL,
- ep->hwtid));
-
cxgb_best_mtu(ep->com.dev->rdev.lldi.mtus, ep->mtu, &mtu_idx,
enable_tcp_timestamps && req->tcpopt.tstamp,
(ep->com.remote_addr.ss_family == AF_INET) ? 0 : 1);
@@ -2483,6 +2469,20 @@ static int accept_cr(struct c4iw_ep *ep, struct sk_buff *skb,
if (tcph->ece && tcph->cwr)
opt2 |= CCTRL_ECN_V(1);
}
+
+ skb_get(skb);
+ rpl = cplhdr(skb);
+ if (!is_t4(adapter_type)) {
+ skb_trim(skb, roundup(sizeof(*rpl5), 16));
+ rpl5 = (void *)rpl;
+ INIT_TP_WR(rpl5, ep->hwtid);
+ } else {
+ skb_trim(skb, sizeof(*rpl));
+ INIT_TP_WR(rpl, ep->hwtid);
+ }
+ OPCODE_TID(rpl) = cpu_to_be32(MK_OPCODE_TID(CPL_PASS_ACCEPT_RPL,
+ ep->hwtid));
+
if (CHELSIO_CHIP_VERSION(adapter_type) > CHELSIO_T4) {
u32 isn = (prandom_u32() & ~7UL) - 1;
opt2 |= T5_OPT_2_VALID_F;
--
2.18.0.232.gb7bd9486b055
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2 for-rc] iw_cxgb4: fix ECN check on the passive accept
2019-10-03 10:43 [PATCH v2 for-rc] iw_cxgb4: fix ECN check on the passive accept Potnuri Bharat Teja
@ 2019-10-18 18:36 ` Doug Ledford
0 siblings, 0 replies; 2+ messages in thread
From: Doug Ledford @ 2019-10-18 18:36 UTC (permalink / raw)
To: Potnuri Bharat Teja, jgg; +Cc: linux-rdma, nirranjan
[-- Attachment #1: Type: text/plain, Size: 769 bytes --]
On Thu, 2019-10-03 at 16:13 +0530, Potnuri Bharat Teja wrote:
> pass_accept_req() is using the same skb for handling accept request
> and
> sending accept reply to HW. Here req and rpl structures are pointing
> to
> same skb->data which is over written by INIT_TP_WR() and leads to
> accessing corrupt req fields in accept_cr() while checking for ECN
> flags.
> Reordered code in accept_cr() to fetch correct req fields.
>
> Fixes: 92e7ae7172 ("iw_cxgb4: Choose appropriate hw mtu index and ISS
> for iWARP connections")
> Signed-off-by: Potnuri Bharat Teja <bharat@chelsio.com>
Thanks, applied to for-rc.
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: B826A3330E572FDD
Fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-18 18:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-03 10:43 [PATCH v2 for-rc] iw_cxgb4: fix ECN check on the passive accept Potnuri Bharat Teja
2019-10-18 18:36 ` Doug Ledford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).