Commit eb94b7bb authored by Michal Luczaj's avatar Michal Luczaj Committed by Jakub Kicinski
Browse files

net: Make copy_safe_from_sockptr() match documentation 



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: 6309863b ("net: add copy_safe_from_sockptr() helper")
Signed-off-by: default avatarMichal Luczaj <mhal@rbox.co>
Link: https://patch.msgid.link/20241111-sockptr-copy-ret-fix-v1-1-a520083a93fb@rbox.co


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a03b18a7

include/linux/sockptr.h

+3 −1
Original line number Diff line number Diff line
@@ -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_struct_from_sockptr(void *dst, size_t ksize,