Re: [PATCH net] sctp: translate network order to host order when users get a hmacid

2016-02-09 Thread David Miller
From: Xin Long 
Date: Wed,  3 Feb 2016 23:33:30 +0800

> Commit ed5a377d87dc ("sctp: translate host order to network order when
> setting a hmacid") corrected the hmacid byte-order when setting a hmacid.
> but the same issue also exists on getting a hmacid.
> 
> We fix it by changing hmacids to host order when users get them with
> getsockopt.
> 
> Fixes: Commit ed5a377d87dc ("sctp: translate host order to network order when 
> setting a hmacid")
> Signed-off-by: Xin Long 

Applied and queued up for -stable.

Thanks.


Re: [PATCH net] sctp: translate network order to host order when users get a hmacid

2016-02-04 Thread Marcelo Ricardo Leitner
On Wed, Feb 03, 2016 at 11:33:30PM +0800, Xin Long wrote:
> Commit ed5a377d87dc ("sctp: translate host order to network order when
> setting a hmacid") corrected the hmacid byte-order when setting a hmacid.
> but the same issue also exists on getting a hmacid.
> 
> We fix it by changing hmacids to host order when users get them with
> getsockopt.
> 
> Fixes: Commit ed5a377d87dc ("sctp: translate host order to network order when 
> setting a hmacid")
> Signed-off-by: Xin Long 

Acked-by: Marcelo Ricardo Leitner 

> ---
>  net/sctp/socket.c | 9 +++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index 5ca2ebf..e878da0 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -5538,6 +5538,7 @@ static int sctp_getsockopt_hmac_ident(struct sock *sk, 
> int len,
>   struct sctp_hmac_algo_param *hmacs;
>   __u16 data_len = 0;
>   u32 num_idents;
> + int i;
>  
>   if (!ep->auth_enable)
>   return -EACCES;
> @@ -,8 +5556,12 @@ static int sctp_getsockopt_hmac_ident(struct sock *sk, 
> int len,
>   return -EFAULT;
>   if (put_user(num_idents, &p->shmac_num_idents))
>   return -EFAULT;
> - if (copy_to_user(p->shmac_idents, hmacs->hmac_ids, data_len))
> - return -EFAULT;
> + for (i = 0; i < num_idents; i++) {
> + __u16 hmacid = ntohs(hmacs->hmac_ids[i]);
> +
> + if (copy_to_user(&p->shmac_idents[i], &hmacid, sizeof(__u16)))
> + return -EFAULT;
> + }
>   return 0;
>  }
>  
> -- 
> 2.1.0
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>