Attachment 923062 Details for Bug 1125774 – iov.patch

[patch] iov.patch

iov.patch (text/plain), 1.80 KB, created by Qiao Zhao on 2014-08-01 03:41:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Qiao Zhao

Created: 2014-08-01 03:41:05 UTC

Size: 1.80 KB

patch

obsolete

>diff --git a/net/core/iovec.c b/net/core/iovec.c
>index 9a31515..be37a9f 100644
>--- a/net/core/iovec.c
>+++ b/net/core/iovec.c
>@@ -39,6 +39,9 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
> {
> 	int size, ct, err;
> 
>+	if(m->msg_name == NULL)
>+		printk("\nDEBUG: verify_iovec msg_name is NULL\n");
>+
> 	if (m->msg_namelen) {
> 		if (mode == VERIFY_READ) {
> 			void __user *namep;
>@@ -50,6 +53,8 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
> 		}
> 		if (m->msg_name)
> 			m->msg_name = address;
>+		if (m->msg_name == NULL)
>+			printk("\nDEBUG: msg_name is NULL, msg_namelen is %d\n", m->msg_namelen);
> 	} else {
> 		m->msg_name = NULL;
> 	}
>diff --git a/net/socket.c b/net/socket.c
>index 01700dc..2b5d6b3 100644
>--- a/net/socket.c
>+++ b/net/socket.c
>@@ -1793,6 +1793,8 @@ SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
> 	msg.msg_control = NULL;
> 	msg.msg_controllen = 0;
> 	msg.msg_namelen = 0;
>+	if (addr == NULL)
>+		printk("\nDEBUG: sendto addr is NULL\n");
> 	if (addr) {
> 		err = move_addr_to_kernel(addr, addr_len, &address);
> 		if (err < 0)
>@@ -2000,6 +2002,9 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
> 	unsigned char *ctl_buf = ctl;
> 	int err, ctl_len, total_len;
> 
>+	if (msg->msg_name == NULL)
>+		printk("\nDEBUG: sendmsg msg->msg_name is NULL\n");
>+
> 	err = -EFAULT;
> 	if (MSG_CMSG_COMPAT & flags) {
> 		if (get_compat_msghdr(msg_sys, msg_compat))
>@@ -2021,6 +2026,8 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
> 			goto out;
> 	}
> 
>+	if (msg_sys->msg_name == NULL)
>+		printk("\nDEBUG: sendmsg msg_sys->msg_name is NULL\n");
> 	/* This will also move the address data into kernel space */
> 	if (MSG_CMSG_COMPAT & flags) {
> 		err = verify_compat_iovec(msg_sys, iov, &address, VERIFY_READ);

Actions: View | Diff

Attachments on bug 1125774: 923062