From: Christoph Hellwig <hch@lst.de>
Date: Tue, 4 Jan 2022 09:21:26 +0000 (+0100)
Subject: netrom: fix copying in user data in nr_setsockopt
X-Git-Tag: accepted/tizen/unified/20230118.172025~3844
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6716b40d162f3df8aae23c01c088518bad5cb055;p=platform%2Fkernel%2Flinux-rpi.git

netrom: fix copying in user data in nr_setsockopt

commit 3087a6f36ee028ec095c04a8531d7d33899b7fed upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 6d16e1a..eef0e3f 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) {