shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

net: Make copy_safe_from_sockptr() match documentation

Browse Source 
commit eb94b7bb10109a14a5431a67e5d8e31cfa06b395 upstream.

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michal Luczaj
2024-11-11 00:17:34 +01:00
committed by Greg Kroah-Hartman
parent 9b242c4232
commit a0b8fd37fd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/sockptr.h
View File

@@ -77,7 +77,9 @@ static inline int copy_safe_from_sockptr(void *dst, size_t ksize,
{ {
if (optlen < ksize) if (optlen < ksize)
return -EINVAL; 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, static inline int copy_to_sockptr_offset(sockptr_t dst, size_t offset,