[SCTP] Fix for sideeffect violation in sctp_sf_heartbeat().

include/net/sctp/command.h

@@ -85,6 +85,7 @@ typedef enum {
 	SCTP_CMD_UPDATE_ASSOC,   /* Update association information. */
 	SCTP_CMD_PURGE_OUTQUEUE, /* Purge all data waiting to be sent. */
 	SCTP_CMD_SETUP_T2,       /* Hi-level, setup T2-shutdown parms.  */
+	SCTP_CMD_RTO_PENDING,	 /* Set transport's rto_pending. */
 
 	SCTP_CMD_LAST
 } sctp_verb_t;

net/sctp/sm_sideeffect.c

@@ -595,6 +595,11 @@ int sctp_cmd_interpreter(sctp_event_t event_type, sctp_subtype_t subtype,
 			chunk->pdiscard = 1;
 			break;
 
+		case SCTP_CMD_RTO_PENDING:
+			t = command->obj.transport;
+			t->rto_pending = 1;	
+			break;
+
 		default:
 			printk(KERN_WARNING "Impossible command: %u, %p\n",
 			       command->verb, command->obj.ptr);

net/sctp/sm_statefuns.c

@@ -680,17 +680,18 @@ sctp_disposition_t sctp_sf_heartbeat(const sctp_endpoint_t *ep,
 	hbinfo.daddr = transport->ipaddr;
 	hbinfo.sent_at = jiffies;
 
-	/* Set rto_pending indicating that an RTT measurement
-	 * is started with this heartbeat chunk.
-	 */
-	transport->rto_pending = 1;
-
 	/* Send a heartbeat to our peer.  */
 	paylen = sizeof(sctp_sender_hb_info_t);
 	reply = sctp_make_heartbeat(asoc, transport, &hbinfo, paylen);
 	if (!reply)
 		return SCTP_DISPOSITION_NOMEM;
 
+	/* Set rto_pending indicating that an RTT measurement
+	 * is started with this heartbeat chunk.
+	 */
+	sctp_add_cmd_sf(commands, SCTP_CMD_RTO_PENDING,
+			SCTP_TRANSPORT(transport));
+
 	sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(reply));
 	return SCTP_DISPOSITION_CONSUME;
 }