lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 354/846] netrom: fix api breakage in nr_setsockopt()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit dc35616e6c2907b0c0c391a205802d8880f7fd85 ]

    This needs to copy an unsigned int from user space instead of a long to
    avoid breaking user space with an API change.

    I have updated all the integer overflow checks from ULONG to UINT as
    well. This is a slight API change but I do not expect it to affect
    anything in real life.

    Fixes: 3087a6f36ee0 ("netrom: fix copying in user data in nr_setsockopt")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/netrom/af_netrom.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
    index eef0e3f2f25b0..e5c8a295e6406 100644
    --- a/net/netrom/af_netrom.c
    +++ b/net/netrom/af_netrom.c
    @@ -298,7 +298,7 @@ static int nr_setsockopt(struct socket *sock, int level, int optname,
    {
    struct sock *sk = sock->sk;
    struct nr_sock *nr = nr_sk(sk);
    - unsigned long opt;
    + unsigned int opt;

    if (level != SOL_NETROM)
    return -ENOPROTOOPT;
    @@ -306,18 +306,18 @@ static int nr_setsockopt(struct socket *sock, int level, int optname,
    if (optlen < sizeof(unsigned int))
    return -EINVAL;

    - if (copy_from_sockptr(&opt, optval, sizeof(unsigned long)))
    + if (copy_from_sockptr(&opt, optval, sizeof(opt)))
    return -EFAULT;

    switch (optname) {
    case NETROM_T1:
    - if (opt < 1 || opt > ULONG_MAX / HZ)
    + if (opt < 1 || opt > UINT_MAX / HZ)
    return -EINVAL;
    nr->t1 = opt * HZ;
    return 0;

    case NETROM_T2:
    - if (opt < 1 || opt > ULONG_MAX / HZ)
    + if (opt < 1 || opt > UINT_MAX / HZ)
    return -EINVAL;
    nr->t2 = opt * HZ;
    return 0;
    @@ -329,13 +329,13 @@ static int nr_setsockopt(struct socket *sock, int level, int optname,
    return 0;

    case NETROM_T4:
    - if (opt < 1 || opt > ULONG_MAX / HZ)
    + if (opt < 1 || opt > UINT_MAX / HZ)
    return -EINVAL;
    nr->t4 = opt * HZ;
    return 0;

    case NETROM_IDLE:
    - if (opt > ULONG_MAX / (60 * HZ))
    + if (opt > UINT_MAX / (60 * HZ))
    return -EINVAL;
    nr->idle = opt * 60 * HZ;
    return 0;
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 00:11    [W:2.047 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site