From: walter harms <wharms@bfs.de>
To: Young Xiao <92siuyang@gmail.com>
Cc: ralf@linux-mips.org, davem@davemloft.net,
linux-hams@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] rose: af_rose: avoid overflows in rose_setsockopt()
Date: Tue, 04 Jun 2019 15:13:50 +0200 [thread overview]
Message-ID: <5CF66E8E.1050100@bfs.de> (raw)
In-Reply-To: <1559650290-17054-1-git-send-email-92siuyang@gmail.com>
Am 04.06.2019 14:11, schrieb Young Xiao:
> Check setsockopt arguments to avoid overflows and return -EINVAL for
> too large arguments.
>
> See commit 32288eb4d940 ("netrom: avoid overflows in nr_setsockopt()")
> for details.
>
> Signed-off-by: Young Xiao <92siuyang@gmail.com>
> ---
> net/rose/af_rose.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
> index e274bc6..af831ee9 100644
> --- a/net/rose/af_rose.c
> +++ b/net/rose/af_rose.c
> @@ -372,15 +372,15 @@ static int rose_setsockopt(struct socket *sock, int level, int optname,
> {
> struct sock *sk = sock->sk;
> struct rose_sock *rose = rose_sk(sk);
> - int opt;
> + unsigned long opt;
>
> if (level != SOL_ROSE)
> return -ENOPROTOOPT;
>
> - if (optlen < sizeof(int))
> + if (optlen < sizeof(unsigned int))
> return -EINVAL;
I do not thing that this will change much,
but maybe you would like to check against the sizeof (opt) here ?
>
> - if (get_user(opt, (int __user *)optval))
> + if (get_user(opt, (unsigned int __user *)optval))
> return -EFAULT;
>
> switch (optname) {
> @@ -389,31 +389,31 @@ static int rose_setsockopt(struct socket *sock, int level, int optname,
> return 0;
>
> case ROSE_T1:
> - if (opt < 1)
> + if (opt < 1 || opt > ULONG_MAX / HZ)
> return -EINVAL;
> rose->t1 = opt * HZ;
> return 0;
>
> case ROSE_T2:
> - if (opt < 1)
> + if (opt < 1 || opt > ULONG_MAX / HZ)
> return -EINVAL;
> rose->t2 = opt * HZ;
> return 0;
>
> case ROSE_T3:
> - if (opt < 1)
> + if (opt < 1 || opt > ULONG_MAX / HZ)
> return -EINVAL;
> rose->t3 = opt * HZ;
> return 0;
>
> case ROSE_HOLDBACK:
> - if (opt < 1)
> + if (opt < 1 || opt > ULONG_MAX / HZ)
> return -EINVAL;
> rose->hb = opt * HZ;
> return 0;
you can simplify this jungle by checking and calculation first
and then set the correct rose->XX
>
> case ROSE_IDLE:
> - if (opt < 0)
> + if (opt < 0 || opt > ULONG_MAX / HZ)
> return -EINVAL;
You made opt unsigned or ?
> rose->idle = opt * 60 * HZ;
> return 0;
my 2 cents,
re,
wh
next prev parent reply other threads:[~2019-06-04 13:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-04 12:11 [PATCH] rose: af_rose: avoid overflows in rose_setsockopt() Young Xiao
2019-06-04 13:13 ` walter harms [this message]
2019-06-04 13:31 ` Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5CF66E8E.1050100@bfs.de \
--to=wharms@bfs.de \
--cc=92siuyang@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-hams@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).