From: Su Hui <suhui@nfschina.com>
To: David Laight <david.laight.linux@gmail.com>,
Nikita Zhandarovich <n.zhandarovich@fintech.ru>
Cc: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>,
linux-hams@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, lvc-project@linuxtesting.org,
stable@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH net] net/rose: prevent integer overflows in rose_setsockopt()
Date: Thu, 16 Jan 2025 10:04:47 +0800 [thread overview]
Message-ID: <6f79c23a-7acb-5faf-5e8d-104ca37dbb08@nfschina.com> (raw)
In-Reply-To: <20250115232952.1d4ef002@pumpkin>
On 2025/1/16 07:29, David Laight wrote:
> On Wed, 15 Jan 2025 08:42:20 -0800
> Nikita Zhandarovich <n.zhandarovich@fintech.ru> wrote:
>
>> In case of possible unpredictably large arguments passed to
>> rose_setsockopt() and multiplied by extra values on top of that,
>> integer overflows may occur.
>>
>> Do the safest minimum and fix these issues by checking the
>> contents of 'opt' and returning -EINVAL if they are too large. Also,
>> switch to unsigned int and remove useless check for negative 'opt'
>> in ROSE_IDLE case.
>>
>> Found by Linux Verification Center (linuxtesting.org) with static
>> analysis tool SVACE.
>>
>> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Nikita Zhandarovich <n.zhandarovich@fintech.ru>
>> ---
>> 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 59050caab65c..72c65d938a15 100644
>> --- a/net/rose/af_rose.c
>> +++ b/net/rose/af_rose.c
>> @@ -397,15 +397,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 int opt;
>>
>> if (level != SOL_ROSE)
>> return -ENOPROTOOPT;
>>
>> - if (optlen < sizeof(int))
>> + if (optlen < sizeof(unsigned int))
>> return -EINVAL;
>>
>> - if (copy_from_sockptr(&opt, optval, sizeof(int)))
>> + if (copy_from_sockptr(&opt, optval, sizeof(unsigned int)))
> Shouldn't all those be 'sizeof (opt)' ?
>
> David
>
>> return -EFAULT;
>>
>> switch (optname) {
>> @@ -414,31 +414,31 @@ static int rose_setsockopt(struct socket *sock, int level, int optname,
>> return 0;
>>
>> case ROSE_T1:
>> - if (opt < 1)
>> + if (opt < 1 || opt > UINT_MAX / HZ)
'rose->t1' is unsigned long, how about 'opt > ULONG_MAX / HZ' ?
BTW, I think only in 32bit or 16bit machine when 'sizeof(int) ==
sizeof(unsigned long)',
this integer overflows may occur..
Su Hui
>> return -EINVAL;
>> rose->t1 = opt * HZ;
>> return 0;
>>
>> case ROSE_T2:
>> - if (opt < 1)
>> + if (opt < 1 || opt > UINT_MAX / HZ)
>> return -EINVAL;
>> rose->t2 = opt * HZ;
>> return 0;
>>
>> case ROSE_T3:
>> - if (opt < 1)
>> + if (opt < 1 || opt > UINT_MAX / HZ)
>> return -EINVAL;
>> rose->t3 = opt * HZ;
>> return 0;
>>
>> case ROSE_HOLDBACK:
>> - if (opt < 1)
>> + if (opt < 1 || opt > UINT_MAX / HZ)
>> return -EINVAL;
>> rose->hb = opt * HZ;
>> return 0;
>>
>> case ROSE_IDLE:
>> - if (opt < 0)
>> + if (opt > UINT_MAX / (60 * HZ))
>> return -EINVAL;
>> rose->idle = opt * 60 * HZ;
>> return 0;
>>
next prev parent reply other threads:[~2025-01-16 2:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-15 16:42 Nikita Zhandarovich
2025-01-15 23:29 ` David Laight
2025-01-16 2:04 ` Su Hui [this message]
2025-01-16 12:37 ` Nikita Zhandarovich
2025-01-21 1:10 ` patchwork-bot+netdevbpf
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=6f79c23a-7acb-5faf-5e8d-104ca37dbb08@nfschina.com \
--to=suhui@nfschina.com \
--cc=davem@davemloft.net \
--cc=david.laight.linux@gmail.com \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=kuba@kernel.org \
--cc=linux-hams@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lvc-project@linuxtesting.org \
--cc=n.zhandarovich@fintech.ru \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=stable@vger.kernel.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
all inboxes | Powered by JetHome®