From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Thu, 25 Aug 2016 03:51:52 +0000 (-0700)
Subject: RDS: IB: Avoid double reject on ACL failures
X-Git-Tag: v4.1.12-92~67^2~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b51e3bdc48a58d3aaf069b658f21b83d2d87e3c9;p=users%2Fjedix%2Flinux-maple.git

RDS: IB: Avoid double reject on ACL failures

We end up sending double reject on ACL failures. Fix it.

Orabug: 22347191

Tested-by: Michael Nowak <michael.nowak@oracle.com>
Tested-by: Rafael Alejandro Peralez <rafael.peralez@oracle.com>
Tested-by: Liwen Huang <liwen.huang@oracle.com>
Tested-by: Hong Liu <hong.x.liu@oracle.com>
Reviewed-by: Mukesh Kacker <mukesh.kacker@oracle.com>
Reviewed-by: Ajaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
---

diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index 58d9e49eb499..f6926c71c217 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -846,9 +846,7 @@ int rds_ib_cm_handle_connect(struct rdma_cm_id *cm_id,
 
 	acl_ret = rds_ib_match_acl(cm_id, dp->dp_saddr);
 	if (acl_ret < 0) {
-		int reject_reason = RDS_ACL_FAILURE;
-
-		rdma_reject(cm_id, &reject_reason, sizeof(int));
+		err = RDS_ACL_FAILURE;
 		rdsdebug("RDS: IB: passive: rds_ib_match_acl failed\n");
 		goto out;
 	}