diff options
| author | Michal Luczaj <mhal@rbox.co> | 2024-11-11 00:17:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-11-22 15:38:32 +0100 |
| commit | 09621bd402054103e335ad3b91efd9704f215c20 (patch) | |
| tree | 6d8266fe98c7496bf5073277b91745c279c5d4a9 /include | |
| parent | 007bdd7878f9fa935beedb25613a28c8b9e2ad2e (diff) | |
| download | linux-09621bd402054103e335ad3b91efd9704f215c20.tar.gz linux-09621bd402054103e335ad3b91efd9704f215c20.tar.bz2 linux-09621bd402054103e335ad3b91efd9704f215c20.zip | |
net: Make copy_safe_from_sockptr() match documentation
[ Upstream commit eb94b7bb10109a14a5431a67e5d8e31cfa06b395 ]
copy_safe_from_sockptr()
return copy_from_sockptr()
return copy_from_sockptr_offset()
return copy_from_user()
copy_from_user() does not return an error on fault. Instead, it returns a
number of bytes that were not copied. Have it handled.
Patch has a side effect: it un-breaks garbage input handling of
nfc_llcp_setsockopt() and mISDN's data_sock_setsockopt().
Fixes: 6309863b31dd ("net: add copy_safe_from_sockptr() helper")
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Link: https://patch.msgid.link/20241111-sockptr-copy-ret-fix-v1-1-a520083a93fb@rbox.co
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sockptr.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/sockptr.h b/include/linux/sockptr.h index 1c1a5d926b17..0eb3a2b1f81f 100644 --- a/include/linux/sockptr.h +++ b/include/linux/sockptr.h @@ -77,7 +77,9 @@ static inline int copy_safe_from_sockptr(void *dst, size_t ksize, { if (optlen < ksize) return -EINVAL; - return copy_from_sockptr(dst, optval, ksize); + if (copy_from_sockptr(dst, optval, ksize)) + return -EFAULT; + return 0; } static inline int copy_to_sockptr_offset(sockptr_t dst, size_t offset, |