netrom: fix copying in user data in nr_setsockopt
Subsystems (2)
PATCH 1/1 netrom: fix copying in user data in nr_setsockopt
This code used to copy in an unsigned long worth of data before the sockptr_t conversion, so restore that.
--- net/netrom/af_netrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netrom/af_netrom.c +1 -1
@@ -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 ;switch (optname) {
Signature · 1 line
2.30.2
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:
Quoted 8 lines · On Tue, 4 Jan 2022 10:21:26 +0100 you wrote:
This code used to copy in an unsigned long worth of data before the
sockptr_tconversion, so restore that.Fixes a7b75c5a8c41 ("net: pass a sockptr_t into ->setsockopt")Reported-by Dan Carpenter <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>[...]
Here is the summary with links:
- netrom: fix copying in user data in nr_setsockopt
https://git.kernel.org/netdev/net/c/3087a6f36ee0
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 15 lines · Christoph Hellwig
This code used to copy in an unsigned long worth of data before the
sockptr_tconversion, so restore that.Fixes a7b75c5a8c41 ("net: pass a sockptr_t into ->setsockopt")Reported-by Dan Carpenter <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>--- net/netrom/af_netrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/netrom/af_netrom.c +0
-0
net/netrom/af_netrom.c static int nr_setsockopt(struct socket *sock, int level, int optname, · line 310
Quoted 6 lines
net/netrom/af_netrom.c +1
-1@@ -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