lkml.org 
[lkml]   [2018]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 3.18 90/98] sctp: translate network order to host order when users get a hmacid
    Date
    From: Xin Long <lucien.xin@gmail.com>

    [ Upstream commit 7a84bd46647ff181eb2659fdc99590e6f16e501d ]

    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>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 13693d0adeaf..5c16d0e13987 100644
    --- a/net/sctp/socket.c
    +++ b/net/sctp/socket.c
    @@ -5607,6 +5607,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;
    @@ -5624,8 +5625,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.17.1
    \
     
     \ /
      Last update: 2018-10-25 16:26    [W:5.096 / U:0.748 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site