diff --git a/src/system/kernel/fs/fd.cpp b/src/system/kernel/fs/fd.cpp
index 4389bfe557..905414ff5b 100644
--- a/src/system/kernel/fs/fd.cpp
+++ b/src/system/kernel/fs/fd.cpp
@@ -759,7 +759,7 @@ common_user_io(int fd, off_t pos, void* buffer, size_t length, bool write)
 	if (length == 0)
 		return 0;
 
-	if (!IS_USER_ADDRESS(buffer))
+	if (!is_user_address_range(buffer, length))
 		return B_BAD_ADDRESS;
 
 	SyscallRestartWrapper<status_t> status;
diff --git a/src/system/kernel/fs/socket.cpp b/src/system/kernel/fs/socket.cpp
index e4c02f46c9..f234e92f93 100644
--- a/src/system/kernel/fs/socket.cpp
+++ b/src/system/kernel/fs/socket.cpp
@@ -918,7 +918,7 @@ _user_accept(int socket, struct sockaddr *userAddress,
 ssize_t
 _user_recv(int socket, void *data, size_t length, int flags)
 {
-	if (data == NULL || !IS_USER_ADDRESS(data))
+	if (data == NULL || !is_user_address_range(data, length))
 		return B_BAD_ADDRESS;
 
 	SyscallRestartWrapper<ssize_t> result;
@@ -930,7 +930,7 @@ ssize_t
 _user_recvfrom(int socket, void *data, size_t length, int flags,
 	struct sockaddr *userAddress, socklen_t *_addressLength)
 {
-	if (data == NULL || !IS_USER_ADDRESS(data))
+	if (data == NULL || !is_user_address_range(data, length))
 		return B_BAD_ADDRESS;
 
 	// check parameters
@@ -1021,7 +1021,7 @@ _user_recvmsg(int socket, struct msghdr *userMessage, int flags)
 ssize_t
 _user_send(int socket, const void *data, size_t length, int flags)
 {
-	if (data == NULL || !IS_USER_ADDRESS(data))
+	if (data == NULL || !is_user_address_range(data, length))
 		return B_BAD_ADDRESS;
 
 	SyscallRestartWrapper<ssize_t> result;
@@ -1033,7 +1033,7 @@ ssize_t
 _user_sendto(int socket, const void *data, size_t length, int flags,
 	const struct sockaddr *userAddress, socklen_t addressLength)
 {
-	if (data == NULL || !IS_USER_ADDRESS(data))
+	if (data == NULL || !is_user_address_range(data, length))
 		return B_BAD_ADDRESS;
 
 	if (addressLength <= 0