From mboxrd@z Thu Jan 1 00:00:00 1970 From: marcelo.leitner@gmail.com Subject: Re: [PATCH net] sctp: translate host order to network order when setting a hmacid Date: Thu, 12 Nov 2015 08:44:17 -0200 Message-ID: <20151112104417.GC3644@mrl.redhat.com> References: <8cede44279b2f01a58fa02d4bb46b40fb630563f.1447304827.git.lucien.xin@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: network dev , linux-sctp@vger.kernel.org, vyasevic@redhat.com, davem@davemloft.net To: Xin Long Return-path: Received: from mx1.redhat.com ([209.132.183.28]:37802 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753489AbbKLKoV (ORCPT ); Thu, 12 Nov 2015 05:44:21 -0500 Content-Disposition: inline In-Reply-To: <8cede44279b2f01a58fa02d4bb46b40fb630563f.1447304827.git.lucien.xin@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: On Thu, Nov 12, 2015 at 01:07:07PM +0800, Xin Long wrote: > 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. > > Signed-off-by: Xin Long > Signed-off-by: Marcelo Ricardo Leitner Fixes: 65b07e5d0d09 ("[SCTP]: API updates to suport SCTP-AUTH extensions.") Thanks! > --- > net/sctp/auth.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/sctp/auth.c b/net/sctp/auth.c > index 4f15b7d..1543e39 100644 > --- a/net/sctp/auth.c > +++ b/net/sctp/auth.c > @@ -809,8 +809,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; > -- > 2.1.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sctp" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > From mboxrd@z Thu Jan 1 00:00:00 1970 From: marcelo.leitner@gmail.com Date: Thu, 12 Nov 2015 10:44:17 +0000 Subject: Re: [PATCH net] sctp: translate host order to network order when setting a hmacid Message-Id: <20151112104417.GC3644@mrl.redhat.com> List-Id: References: <8cede44279b2f01a58fa02d4bb46b40fb630563f.1447304827.git.lucien.xin@gmail.com> In-Reply-To: <8cede44279b2f01a58fa02d4bb46b40fb630563f.1447304827.git.lucien.xin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Xin Long Cc: network dev , linux-sctp@vger.kernel.org, vyasevic@redhat.com, davem@davemloft.net On Thu, Nov 12, 2015 at 01:07:07PM +0800, Xin Long wrote: > 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. > > Signed-off-by: Xin Long > Signed-off-by: Marcelo Ricardo Leitner Fixes: 65b07e5d0d09 ("[SCTP]: API updates to suport SCTP-AUTH extensions.") Thanks! > --- > net/sctp/auth.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/sctp/auth.c b/net/sctp/auth.c > index 4f15b7d..1543e39 100644 > --- a/net/sctp/auth.c > +++ b/net/sctp/auth.c > @@ -809,8 +809,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; > -- > 2.1.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sctp" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >