Message ID | ca8fca62141ed9e108170919cdc12bdb09cdda73.1434043704.git.marcelo.leitner@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: mleitner@redhat.com Date: Thu, 11 Jun 2015 14:49:46 -0300 > From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > > Currently, we can ask to authenticate DATA chunks and we can send DATA > chunks on the same packet as COOKIE_ECHO, but if you try to combine > both, the DATA chunk will be sent unauthenticated and peer won't accept > it, leading to a communication failure. > > This happens because even though the data was queued after it was > requested to authenticate DATA chunks, it was also queued before we > could know that remote peer can handle authenticating, so > sctp_auth_send_cid() returns false. > > The fix is whenever we set up an active key, re-check send queue for > chunks that now should be authenticated. As a result, such packet will > now contain COOKIE_ECHO + AUTH + DATA chunks, in that order. > > Reported-by: Liu Wei <weliu@redhat.com> > Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Vlad/Neil, please review. -- 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
On Thu, Jun 11, 2015 at 05:27:45PM -0700, David Miller wrote: > From: mleitner@redhat.com > Date: Thu, 11 Jun 2015 14:49:46 -0300 > > > From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > > > > Currently, we can ask to authenticate DATA chunks and we can send DATA > > chunks on the same packet as COOKIE_ECHO, but if you try to combine > > both, the DATA chunk will be sent unauthenticated and peer won't accept > > it, leading to a communication failure. > > > > This happens because even though the data was queued after it was > > requested to authenticate DATA chunks, it was also queued before we > > could know that remote peer can handle authenticating, so > > sctp_auth_send_cid() returns false. > > > > The fix is whenever we set up an active key, re-check send queue for > > chunks that now should be authenticated. As a result, such packet will > > now contain COOKIE_ECHO + AUTH + DATA chunks, in that order. > > > > Reported-by: Liu Wei <weliu@redhat.com> > > Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > > Vlad/Neil, please review. > sorry Dave, though I had sent email on that already. I had an initial concern that there could be a race in which a previous iteration of sctp_outq_flush would move some chunks to a packet, but not flush it to the network layer yet (due to not being full), and that would result in the same condition. But since this only happens with a COOKIE_ECHO chunk (which is a control chunk), we should be ok, as those are sent immediately. Acked-by: Neil Horman <nhorman@tuxdriver.com> -- 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
On 06/12/2015 07:26 AM, Neil Horman wrote: > On Thu, Jun 11, 2015 at 05:27:45PM -0700, David Miller wrote: >> From: mleitner@redhat.com >> Date: Thu, 11 Jun 2015 14:49:46 -0300 >> >>> From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> >>> >>> Currently, we can ask to authenticate DATA chunks and we can send DATA >>> chunks on the same packet as COOKIE_ECHO, but if you try to combine >>> both, the DATA chunk will be sent unauthenticated and peer won't accept >>> it, leading to a communication failure. >>> >>> This happens because even though the data was queued after it was >>> requested to authenticate DATA chunks, it was also queued before we >>> could know that remote peer can handle authenticating, so >>> sctp_auth_send_cid() returns false. >>> >>> The fix is whenever we set up an active key, re-check send queue for >>> chunks that now should be authenticated. As a result, such packet will >>> now contain COOKIE_ECHO + AUTH + DATA chunks, in that order. >>> >>> Reported-by: Liu Wei <weliu@redhat.com> >>> Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> >> >> Vlad/Neil, please review. >> > > sorry Dave, though I had sent email on that already. > > I had an initial concern that there could be a race in which a previous > iteration of sctp_outq_flush would move some chunks to a packet, but not flush > it to the network layer yet (due to not being full), and that would result in > the same condition. But since this only happens with a COOKIE_ECHO chunk (which > is a control chunk), we should be ok, as those are sent immediately. Neil. I don't think this race can happen since outq manipulation always happens under a socket lock and so do socket options. So, we are guaranteed that outq will not change in this case. Acked-by: Vlad Yasevich <vyasevich@gmail.com> -vlad > Acked-by: Neil Horman <nhorman@tuxdriver.com> > -- 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
From: mleitner@redhat.com Date: Thu, 11 Jun 2015 14:49:46 -0300 > From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > > Currently, we can ask to authenticate DATA chunks and we can send DATA > chunks on the same packet as COOKIE_ECHO, but if you try to combine > both, the DATA chunk will be sent unauthenticated and peer won't accept > it, leading to a communication failure. > > This happens because even though the data was queued after it was > requested to authenticate DATA chunks, it was also queued before we > could know that remote peer can handle authenticating, so > sctp_auth_send_cid() returns false. > > The fix is whenever we set up an active key, re-check send queue for > chunks that now should be authenticated. As a result, such packet will > now contain COOKIE_ECHO + AUTH + DATA chunks, in that order. > > Reported-by: Liu Wei <weliu@redhat.com> > Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Applied, thanks. -- 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 --git a/net/sctp/auth.c b/net/sctp/auth.c index fb7976aee61c84f38aecdc5c5f0d8be20e577fa9..4f15b7d730e13d6aaa58ba7a28262c9831afea95 100644 --- a/net/sctp/auth.c +++ b/net/sctp/auth.c @@ -381,13 +381,14 @@ nomem: } -/* Public interface to creat the association shared key. +/* Public interface to create the association shared key. * See code above for the algorithm. */ int sctp_auth_asoc_init_active_key(struct sctp_association *asoc, gfp_t gfp) { struct sctp_auth_bytes *secret; struct sctp_shared_key *ep_key; + struct sctp_chunk *chunk; /* If we don't support AUTH, or peer is not capable * we don't need to do anything. @@ -410,6 +411,14 @@ int sctp_auth_asoc_init_active_key(struct sctp_association *asoc, gfp_t gfp) sctp_auth_key_put(asoc->asoc_shared_key); asoc->asoc_shared_key = secret; + /* Update send queue in case any chunk already in there now + * needs authenticating + */ + list_for_each_entry(chunk, &asoc->outqueue.out_chunk_list, list) { + if (sctp_auth_send_cid(chunk->chunk_hdr->type, asoc)) + chunk->auth = 1; + } + return 0; }