netdev - [PATCH] rds: prevent BUG_ON triggered on congestion update to loopback

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <1385167442-6997-1-git-send-email-venkat.x.venkatsubra@oracle.com>
Date:	Mon, 25 Nov 2013 09:47:34 +0300
From:	Venkat Venkatsubra <venkat.x.venkatsubra@...cle.com>
To:	rds-devel@....oracle.com
Cc:	"David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org,
	Venkat Venkatsubra <venkat.x.venkatsubra@...cle.com>,
	Honggang Li <honli@...hat.com>,
	Josh Hunt <joshhunt00@...il.com>,
	Bang Nguyen <bang.nguyen@...cle.com>
Subject: [PATCH] rds: prevent BUG_ON triggered on congestion update to
 loopback

From: Venkat Venkatsubra <venkat.x.venkatsubra@...cle.com>

After congestion update on a local connection, when rds_ib_xmit returns
less bytes than that are there in the message, rds_send_xmit calls
back rds_ib_xmit with an offset that causes BUG_ON(off & RDS_FRAG_SIZE)
to trigger.

Reported-by: Josh Hunt <joshhunt00@...il.com>
Tested-by: Honggang Li <honli@...hat.com>
Acked-by: Bang Nguyen <bang.nguyen@...cle.com>
Signed-off-by: Venkat Venkatsubra <venkat.x.venkatsubra@...cle.com>
Signed-off-by: Dan Carpenter <dan.carpenter@...cle.com>
---
 net/rds/ib_send.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c
index e590949..37be6e2 100644
--- a/net/rds/ib_send.c
+++ b/net/rds/ib_send.c
@@ -552,9 +552,8 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm,
 	    && rm->m_inc.i_hdr.h_flags & RDS_FLAG_CONG_BITMAP) {
 		rds_cong_map_updated(conn->c_fcong, ~(u64) 0);
 		scat = &rm->data.op_sg[sg];
-		ret = sizeof(struct rds_header) + RDS_CONG_MAP_BYTES;
-		ret = min_t(int, ret, scat->length - conn->c_xmit_data_off);
-		return ret;
+		ret = max_t(int, RDS_CONG_MAP_BYTES, scat->length);
+		return sizeof(struct rds_header) + ret;
 	}
 
 	/* FIXME we may overallocate here */
-- 
1.7.6

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html