diff options
author | Xin Long <lucien.xin@gmail.com> | 2018-05-02 01:37:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-05-02 11:15:32 -0400 |
commit | 4842a08fb80bc09b7b089af42c58353dfaa8f88f (patch) | |
tree | 914bfac5c6729987cfac62a071269eb139c221e5 | |
parent | e6e6a278b1eaffa19d42186bfacd1ffc15a50b3f (diff) |
sctp: init active key for the new asoc in dupcook_a and dupcook_b
When processing a duplicate cookie-echo chunk, for case 'A' and 'B',
after sctp_process_init for the new asoc, if auth is enabled for the
cookie-ack chunk, the active key should also be initialized.
Otherwise, the cookie-ack chunk made later can not be set with auth
shkey properly, and a crash can even be caused by this, as after
Commit 1b1e0bc99474 ("sctp: add refcnt support for sh_key"), sctp
needs to hold the shkey when making control chunks.
Fixes: 1b1e0bc99474 ("sctp: add refcnt support for sh_key")
Reported-by: Jianwen Ji <jiji@redhat.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/sctp/sm_statefuns.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index dd0594a10961..98acfed45e3b 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
@@ -1794,6 +1794,9 @@ static enum sctp_disposition sctp_sf_do_dupcook_a( | |||
1794 | GFP_ATOMIC)) | 1794 | GFP_ATOMIC)) |
1795 | goto nomem; | 1795 | goto nomem; |
1796 | 1796 | ||
1797 | if (sctp_auth_asoc_init_active_key(new_asoc, GFP_ATOMIC)) | ||
1798 | goto nomem; | ||
1799 | |||
1797 | /* Make sure no new addresses are being added during the | 1800 | /* Make sure no new addresses are being added during the |
1798 | * restart. Though this is a pretty complicated attack | 1801 | * restart. Though this is a pretty complicated attack |
1799 | * since you'd have to get inside the cookie. | 1802 | * since you'd have to get inside the cookie. |
@@ -1906,6 +1909,9 @@ static enum sctp_disposition sctp_sf_do_dupcook_b( | |||
1906 | GFP_ATOMIC)) | 1909 | GFP_ATOMIC)) |
1907 | goto nomem; | 1910 | goto nomem; |
1908 | 1911 | ||
1912 | if (sctp_auth_asoc_init_active_key(new_asoc, GFP_ATOMIC)) | ||
1913 | goto nomem; | ||
1914 | |||
1909 | /* Update the content of current association. */ | 1915 | /* Update the content of current association. */ |
1910 | sctp_add_cmd_sf(commands, SCTP_CMD_UPDATE_ASSOC, SCTP_ASOC(new_asoc)); | 1916 | sctp_add_cmd_sf(commands, SCTP_CMD_UPDATE_ASSOC, SCTP_ASOC(new_asoc)); |
1911 | sctp_add_cmd_sf(commands, SCTP_CMD_NEW_STATE, | 1917 | sctp_add_cmd_sf(commands, SCTP_CMD_NEW_STATE, |