diff mbox

sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()

Message ID 1350309399-23422-1-git-send-email-nicolas.dichtel@6wind.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Nicolas Dichtel Oct. 15, 2012, 1:56 p.m. UTC
From: Zijie Pan <zijie.pan@6wind.com>

Bug introduced by commit edfee0339e681a784ebacec7e8c2dc97dc6d2839
(sctp: check src addr when processing SACK to update transport state)

Signed-off-by: Zijie Pan <zijie.pan@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
 net/sctp/sm_sideeffect.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Vladislav Yasevich Oct. 15, 2012, 3:40 p.m. UTC | #1
On 10/15/2012 09:56 AM, nicolas.dichtel@6wind.com wrote:
> From: Zijie Pan <zijie.pan@6wind.com>
>
> Bug introduced by commit edfee0339e681a784ebacec7e8c2dc97dc6d2839
> (sctp: check src addr when processing SACK to update transport state)
>
> Signed-off-by: Zijie Pan <zijie.pan@6wind.com>
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>

Shutdown case..  ACK.

Acked-by: Vlad Yasevich <vyasevich@gmail.com>


> ---
>   net/sctp/sm_sideeffect.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
> index 57f7de8..6773d78 100644
> --- a/net/sctp/sm_sideeffect.c
> +++ b/net/sctp/sm_sideeffect.c
> @@ -1642,8 +1642,9 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
>   					asoc->outqueue.outstanding_bytes;
>   			sackh.num_gap_ack_blocks = 0;
>   			sackh.num_dup_tsns = 0;
> +			chunk->subh.sack_hdr = &sackh;
>   			sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_SACK,
> -					SCTP_SACKH(&sackh));
> +					SCTP_CHUNK(chunk));
>   			break;
>
>   		case SCTP_CMD_DISCARD_PACKET:
>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller Oct. 16, 2012, 6:56 p.m. UTC | #2
From: Vlad Yasevich <vyasevich@gmail.com>
Date: Mon, 15 Oct 2012 11:40:38 -0400

> On 10/15/2012 09:56 AM, nicolas.dichtel@6wind.com wrote:
>> From: Zijie Pan <zijie.pan@6wind.com>
>>
>> Bug introduced by commit edfee0339e681a784ebacec7e8c2dc97dc6d2839
>> (sctp: check src addr when processing SACK to update transport state)
>>
>> Signed-off-by: Zijie Pan <zijie.pan@6wind.com>
>> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
> 
> Shutdown case..  ACK.
> 
> Acked-by: Vlad Yasevich <vyasevich@gmail.com>

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

Patch

diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index 57f7de8..6773d78 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -1642,8 +1642,9 @@  static int sctp_cmd_interpreter(sctp_event_t event_type,
 					asoc->outqueue.outstanding_bytes;
 			sackh.num_gap_ack_blocks = 0;
 			sackh.num_dup_tsns = 0;
+			chunk->subh.sack_hdr = &sackh;
 			sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_SACK,
-					SCTP_SACKH(&sackh));
+					SCTP_CHUNK(chunk));
 			break;
 
 		case SCTP_CMD_DISCARD_PACKET: