mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	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: 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>
			
			
This commit is contained in:
		
							parent
							
								
									d2d9a6d0b4
								
							
						
					
					
						commit
						3087a6f36e
					
				
					 1 changed files with 1 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -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) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue