[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <34b6c0490bfa372876e6907eee779c5cd0e89963.1404128998.git.jslaby@suse.cz>
Date: Mon, 30 Jun 2014 13:50:51 +0200
From: Jiri Slaby <jslaby@...e.cz>
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, Lidong Zhong <lzhong@...e.com>,
David Teigland <teigland@...hat.com>,
Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 030/181] dlm: keep listening connection alive with sctp mode
From: Lidong Zhong <lzhong@...e.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
commit 883854c5457a97190f7b0ee20f03bcd9664fc0c2 upstream.
The connection struct with nodeid 0 is the listening socket,
not a connection to another node. The sctp resend function
was not checking that the nodeid was valid (non-zero), so it
would mistakenly get and resend on the listening connection
when nodeid was zero.
Signed-off-by: Lidong Zhong <lzhong@...e.com>
Signed-off-by: David Teigland <teigland@...hat.com>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
---
fs/dlm/lowcomms.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index a5e34dd6a32c..1381d3fb3738 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -617,6 +617,11 @@ static void retry_failed_sctp_send(struct connection *recv_con,
int nodeid = sn_send_failed->ssf_info.sinfo_ppid;
log_print("Retry sending %d bytes to node id %d", len, nodeid);
+
+ if (!nodeid) {
+ log_print("Shouldn't resend data via listening connection.");
+ return;
+ }
con = nodeid2con(nodeid, 0);
if (!con) {
--
2.0.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists