Skip to content

Commit 022152a

Browse files
lxindavem330
authored andcommitted
sctp: handle the error returned from sctp_auth_asoc_init_active_key
When it returns an error from sctp_auth_asoc_init_active_key(), the active_key is actually not updated. The old sh_key will be freeed while it's still used as active key in asoc. Then an use-after-free will be triggered when sending patckets, as found by syzbot: sctp_auth_shkey_hold+0x22/0xa0 net/sctp/auth.c:112 sctp_set_owner_w net/sctp/socket.c:132 [inline] sctp_sendmsg_to_asoc+0xbd5/0x1a20 net/sctp/socket.c:1863 sctp_sendmsg+0x1053/0x1d50 net/sctp/socket.c:2025 inet_sendmsg+0x99/0xe0 net/ipv4/af_inet.c:819 sock_sendmsg_nosec net/socket.c:714 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:734 This patch is to fix it by not replacing the sh_key when it returns errors from sctp_auth_asoc_init_active_key() in sctp_auth_set_key(). For sctp_auth_set_active_key(), old active_key_id will be set back to asoc->active_key_id when the same thing happens. Fixes: 58acd10 ("sctp: update active_key for asoc when old key is being replaced") Reported-by: [email protected] Signed-off-by: Xin Long <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 2568a7e commit 022152a

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

net/sctp/auth.c

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -863,12 +863,17 @@ int sctp_auth_set_key(struct sctp_endpoint *ep,
863863
}
864864

865865
list_del_init(&shkey->key_list);
866-
sctp_auth_shkey_release(shkey);
867866
list_add(&cur_key->key_list, sh_keys);
868867

869-
if (asoc && asoc->active_key_id == auth_key->sca_keynumber)
870-
sctp_auth_asoc_init_active_key(asoc, GFP_KERNEL);
868+
if (asoc && asoc->active_key_id == auth_key->sca_keynumber &&
869+
sctp_auth_asoc_init_active_key(asoc, GFP_KERNEL)) {
870+
list_del_init(&cur_key->key_list);
871+
sctp_auth_shkey_release(cur_key);
872+
list_add(&shkey->key_list, sh_keys);
873+
return -ENOMEM;
874+
}
871875

876+
sctp_auth_shkey_release(shkey);
872877
return 0;
873878
}
874879

@@ -902,8 +907,13 @@ int sctp_auth_set_active_key(struct sctp_endpoint *ep,
902907
return -EINVAL;
903908

904909
if (asoc) {
910+
__u16 active_key_id = asoc->active_key_id;
911+
905912
asoc->active_key_id = key_id;
906-
sctp_auth_asoc_init_active_key(asoc, GFP_KERNEL);
913+
if (sctp_auth_asoc_init_active_key(asoc, GFP_KERNEL)) {
914+
asoc->active_key_id = active_key_id;
915+
return -ENOMEM;
916+
}
907917
} else
908918
ep->active_key_id = key_id;
909919

0 commit comments

Comments
 (0)