summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2022-01-04 10:21:26 +0100
committerDavid S. Miller <davem@davemloft.net>2022-01-04 13:36:01 +0100
commit3087a6f36ee028ec095c04a8531d7d33899b7fed (patch)
tree1343cf3615f8ef34ae0bffd9571eee9fc02aa47b
parentMerge branch 'srv6-traceroute' (diff)
downloadlinux-3087a6f36ee028ec095c04a8531d7d33899b7fed.tar.xz
linux-3087a6f36ee028ec095c04a8531d7d33899b7fed.zip
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. 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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/netrom/af_netrom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 775064cdd0ee..f1ba7dd3d253 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;
switch (optname) {