netrom: fix api breakage in nr_setsockopt()
Subsystems (3)
PATCH 1/1 netrom: fix api breakage in nr_setsockopt()
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.
--- net/netrom/af_netrom.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/netrom/af_netrom.c +6 -6
@@ -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 ;
Signature · 1 line
2.20.1
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 Fri, 7 Jan 2022 10:12:10 +0300 you wrote:
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.
[...]
Here is the summary with links:
- [net] netrom: fix api breakage in nr_setsockopt()
https://git.kernel.org/netdev/net/c/dc35616e6c29
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html