diff options
| author |   Christoph Hellwig <hch@lst.de> | 2020-07-28 18:38:36 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-07-28 13:43:40 -0700 |
| commit | a31edb2059ed4e498f9aa8230c734b59d0ad797a (patch) | |
| tree | 050f16554295c22db098bb4e81021e21d2718c5f /net/socket.c | |
| parent | net: remove sockptr_advance (diff) | |
| download | linux-dev-a31edb2059ed4e498f9aa8230c734b59d0ad797a.tar.xz linux-dev-a31edb2059ed4e498f9aa8230c734b59d0ad797a.zip | |
net: improve the user pointer check in init_user_sockptr
Make sure not just the pointer itself but the whole range lies in
the user address space. For that pass the length and then use
the access_ok helper to do the check.
Fixes: 6d04fe15f78a ("net: optimize the sockptr_t for unified kernel/user address spaces")
Reported-by: David Laight <David.Laight@ACULAB.COM>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 94ca4547cd7c..aff52e81653c 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2105,7 +2105,7 @@ int __sys_setsockopt(int fd, int level, int optname, char __user *user_optval, if (optlen < 0) return -EINVAL; - err = init_user_sockptr(&optval, user_optval); + err = init_user_sockptr(&optval, user_optval, optlen); if (err) return err; |