* [PATCH net] sctp: translate network order to host order when users get a hmacid
@ 2016-02-03 15:33 Xin Long
2016-02-04 9:44 ` Marcelo Ricardo Leitner
2016-02-09 9:54 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Xin Long @ 2016-02-03 15:33 UTC (permalink / raw)
To: network dev, linux-sctp; +Cc: Marcelo Ricardo Leitner, Vlad Yasevich, davem
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 <lucien.xin@gmail.com>
---
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;
@@ -5555,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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net] sctp: translate network order to host order when users get a hmacid
2016-02-03 15:33 [PATCH net] sctp: translate network order to host order when users get a hmacid Xin Long
@ 2016-02-04 9:44 ` Marcelo Ricardo Leitner
2016-02-09 9:54 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Marcelo Ricardo Leitner @ 2016-02-04 9:44 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, Vlad Yasevich, davem
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 <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> ---
> 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;
> @@ -5555,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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] sctp: translate network order to host order when users get a hmacid
2016-02-03 15:33 [PATCH net] sctp: translate network order to host order when users get a hmacid Xin Long
2016-02-04 9:44 ` Marcelo Ricardo Leitner
@ 2016-02-09 9:54 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-02-09 9:54 UTC (permalink / raw)
To: lucien.xin; +Cc: netdev, linux-sctp, marcelo.leitner, vyasevich
From: Xin Long <lucien.xin@gmail.com>
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 <lucien.xin@gmail.com>
Applied and queued up for -stable.
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-09 9:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-03 15:33 [PATCH net] sctp: translate network order to host order when users get a hmacid Xin Long
2016-02-04 9:44 ` Marcelo Ricardo Leitner
2016-02-09 9:54 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox