github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 21:45:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

netrom: fix copying in user data in nr_setsockopt

Browse Source 
commit 3087a6f36e upstream.

This code used to copy in an unsigned long worth of data before
the sockptr_t conversion, so restore that.

Fixes: a7b75c5a8c ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christoph Hellwig 2022-01-04 10:21:26 +01:00 committed by Greg Kroah-Hartman
parent beeb0fdeda
commit a7c2cae997
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/netrom/af_netrom.c
View File

@ -306,7 +306,7 @@ static int nr_setsockopt(struct socket *sock, int level, int optname,
if (optlen < sizeof(unsigned int)) if (optlen < sizeof(unsigned int))
return -EINVAL; return -EINVAL;
if (copy_from_sockptr(&opt, optval, sizeof(unsigned int))) if (copy_from_sockptr(&opt, optval, sizeof(unsigned long)))
return -EFAULT; return -EFAULT;
switch (optname) { switch (optname) {