diff options
| author | lucien <lucien.xin@gmail.com> | 2015-11-12 13:07:07 +0800 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-12-14 10:17:13 +0000 |
| commit | 99c41c611f9edc4266b55102e521c802c59ca24d (patch) | |
| tree | 01516b43bcd7603c5889199b866b66ad01062aa6 /net/sctp/auth.c | |
| parent | f9bdfe5a55a005bf449f6539333535067d12576d (diff) | |
| download | linux-stable-99c41c611f9edc4266b55102e521c802c59ca24d.tar.gz linux-stable-99c41c611f9edc4266b55102e521c802c59ca24d.tar.bz2 linux-stable-99c41c611f9edc4266b55102e521c802c59ca24d.zip | |
sctp: translate host order to network order when setting a hmacid
commit ed5a377d87dc4c87fb3e1f7f698cba38cd893103 upstream.
now sctp auth cannot work well when setting a hmacid manually, which
is caused by that we didn't use the network order for hmacid, so fix
it by adding the transformation in sctp_auth_ep_set_hmacs.
even we set hmacid with the network order in userspace, it still
can't work, because of this condition in sctp_auth_ep_set_hmacs():
if (id > SCTP_AUTH_HMAC_ID_MAX)
return -EOPNOTSUPP;
so this wasn't working before and thus it won't break compatibility.
Fixes: 65b07e5d0d09 ("[SCTP]: API updates to suport SCTP-AUTH extensions.")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'net/sctp/auth.c')
| -rw-r--r-- | net/sctp/auth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/auth.c b/net/sctp/auth.c index fb7976aee61c..603c3bbc5923 100644 --- a/net/sctp/auth.c +++ b/net/sctp/auth.c @@ -800,8 +800,8 @@ int sctp_auth_ep_set_hmacs(struct sctp_endpoint *ep, if (!has_sha1) return -EINVAL; - memcpy(ep->auth_hmacs_list->hmac_ids, &hmacs->shmac_idents[0], - hmacs->shmac_num_idents * sizeof(__u16)); + for (i = 0; i < hmacs->shmac_num_idents; i++) + ep->auth_hmacs_list->hmac_ids[i] = htons(hmacs->shmac_idents[i]); ep->auth_hmacs_list->param_hdr.length = htons(sizeof(sctp_paramhdr_t) + hmacs->shmac_num_idents * sizeof(__u16)); return 0; |