Updated from Linux LTS 3.10.22 to 3.10.23
This commit is contained in:
@@ -72,7 +72,7 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
|
||||
__get_user(kmsg->msg_flags, &umsg->msg_flags))
|
||||
return -EFAULT;
|
||||
if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
|
||||
return -EINVAL;
|
||||
kmsg->msg_namelen = sizeof(struct sockaddr_storage);
|
||||
kmsg->msg_name = compat_ptr(tmp1);
|
||||
kmsg->msg_iov = compat_ptr(tmp2);
|
||||
kmsg->msg_control = compat_ptr(tmp3);
|
||||
@@ -93,7 +93,8 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
kern_msg->msg_name = kern_address;
|
||||
if (kern_msg->msg_name)
|
||||
kern_msg->msg_name = kern_address;
|
||||
} else {
|
||||
kern_msg->msg_name = NULL;
|
||||
kern_msg->msg_namelen = 0;
|
||||
|
||||
Reference in New Issue
Block a user