From: Dan Carpenter <dan.carpenter@oracle.com>
To: Christoph Hellwig <hch@lst.de>, ralf@linux-mips.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-hams@vger.kernel.org,
netdev@vger.kernel.org
Subject: Re: [PATCH] netrom: fix copying in user data in nr_setsockopt
Date: Thu, 6 Jan 2022 17:52:11 +0300 [thread overview]
Message-ID: <20220106145211.GN7674@kadam> (raw)
In-Reply-To: <20220104092126.172508-1-hch@lst.de>
On Tue, Jan 04, 2022 at 10:21:26AM +0100, Christoph Hellwig wrote:
> This code used to copy in an unsigned long worth of data before
> the sockptr_t conversion, so restore that.
>
> Fixes: a7b75c5a8c41 ("net: pass a sockptr_t into ->setsockopt")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> net/netrom/af_netrom.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
> index 775064cdd0ee4..f1ba7dd3d253d 100644
> --- a/net/netrom/af_netrom.c
> +++ b/net/netrom/af_netrom.c
> @@ -306,7 +306,7 @@ 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 int)))
> + if (copy_from_sockptr(&opt, optval, sizeof(unsigned long)))
> return -EFAULT;
No this isn't right. In the original code, it copied an unsigned int.
if (get_user(opt, (unsigned int __user *)optval))
The fix is to probably to change "opt" to an unsigned int. I wonder if
I need to update all the integer overflow checks to from:
- if (opt > ULONG_MAX / HZ)
+ if (opt > UINT_MAX / HZ)
...
Probably no one cares, right? Ralf?
regards,
dan carpenter
prev parent reply other threads:[~2022-01-06 14:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-04 9:21 [PATCH] netrom: fix copying in user data in nr_setsockopt Christoph Hellwig
2022-01-04 12:40 ` patchwork-bot+netdevbpf
2022-01-06 14:52 ` Dan Carpenter [this message]
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=20220106145211.GN7674@kadam \
--to=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=hch@lst.de \
--cc=kuba@kernel.org \
--cc=linux-hams@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).