ip_generic_getfrag, udplite_getfrag: switch to passing msghdr

Al Viro · Al Viro · commit f69e6d131f5d · 2014-12-09T16:28:22.000-05:00
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/include/net/udplite.h b/include/net/udplite.h
@@ -19,7 +19,8 @@ extern struct udp_table		udplite_table;
 static __inline__ int udplite_getfrag(void *from, char *to, int  offset,
 				      int len, int odd, struct sk_buff *skb)
 {
-	return memcpy_fromiovecend(to, (struct iovec *) from, offset, len);
+	struct msghdr *msg = from;
+	return memcpy_fromiovecend(to, msg->msg_iov, offset, len);
 }
 
 /* Designate sk as UDP-Lite socket */
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
@@ -752,14 +752,14 @@ EXPORT_SYMBOL(ip_fragment);
 int
 ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb)
 {
-	struct iovec *iov = from;
+	struct msghdr *msg = from;
 
 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
-		if (memcpy_fromiovecend(to, iov, offset, len) < 0)
+		if (memcpy_fromiovecend(to, msg->msg_iov, offset, len) < 0)
 			return -EFAULT;
 	} else {
 		__wsum csum = 0;
-		if (csum_partial_copy_fromiovecend(to, iov, offset, len, &csum) < 0)
+		if (csum_partial_copy_fromiovecend(to, msg->msg_iov, offset, len, &csum) < 0)
 			return -EFAULT;
 		skb->csum = csum_block_add(skb->csum, csum, odd);
 	}
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
@@ -478,7 +478,7 @@ static int raw_getfrag(void *from, char *to, int offset, int len, int odd,
 
 	offset -= rfv->hlen;
 
-	return ip_generic_getfrag(rfv->msg->msg_iov, to, offset, len, odd, skb);
+	return ip_generic_getfrag(rfv->msg, to, offset, len, odd, skb);
 }
 
 static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
@@ -1049,7 +1049,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 
 	/* Lockless fast path for the non-corking case. */
 	if (!corkreq) {
-		skb = ip_make_skb(sk, fl4, getfrag, msg->msg_iov, ulen,
+		skb = ip_make_skb(sk, fl4, getfrag, msg, ulen,
 				  sizeof(struct udphdr), &ipc, &rt,
 				  msg->msg_flags);
 		err = PTR_ERR(skb);
@@ -1080,7 +1080,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 
 do_append_data:
 	up->len += ulen;
-	err = ip_append_data(sk, fl4, getfrag, msg->msg_iov, ulen,
+	err = ip_append_data(sk, fl4, getfrag, msg, ulen,
 			     sizeof(struct udphdr), &ipc, &rt,
 			     corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags);
 	if (err)
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
@@ -727,7 +727,7 @@ static int raw6_getfrag(void *from, char *to, int offset, int len, int odd,
 
 	offset -= rfv->hlen;
 
-	return ip_generic_getfrag(rfv->msg->msg_iov, to, offset, len, odd, skb);
+	return ip_generic_getfrag(rfv->msg, to, offset, len, odd, skb);
 }
 
 static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
@@ -1312,7 +1312,7 @@ int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk,
 		dontfrag = np->dontfrag;
 	up->len += ulen;
 	getfrag  =  is_udplite ?  udplite_getfrag : ip_generic_getfrag;
-	err = ip6_append_data(sk, getfrag, msg->msg_iov, ulen,
+	err = ip6_append_data(sk, getfrag, msg, ulen,
 		sizeof(struct udphdr), hlimit, tclass, opt, &fl6,
 		(struct rt6_info *)dst,
 		corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags, dontfrag);
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
@@ -619,7 +619,7 @@ static int l2tp_ip6_sendmsg(struct kiocb *iocb, struct sock *sk,
 
 back_from_confirm:
 	lock_sock(sk);
-	err = ip6_append_data(sk, ip_generic_getfrag, msg->msg_iov,
+	err = ip6_append_data(sk, ip_generic_getfrag, msg,
 			      ulen, transhdrlen, hlimit, tclass, opt,
 			      &fl6, (struct rt6_info *)dst,
 			      msg->msg_flags, dontfrag);

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ extern struct udp_table udplite_table;`
`19`	`19`	`static __inline__ int udplite_getfrag(void from, char to, int offset,`
`20`	`20`	`int len, int odd, struct sk_buff *skb)`
`21`	`21`	`{`
`22`		`- return memcpy_fromiovecend(to, (struct iovec *) from, offset, len);`
	`22`	`+ struct msghdr *msg = from;`
	`23`	`+ return memcpy_fromiovecend(to, msg->msg_iov, offset, len);`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`/* Designate sk as UDP-Lite socket */`
Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@ static int raw_getfrag(void from, char to, int offset, int len, int odd,`
`478`	`478`
`479`	`479`	`offset -= rfv->hlen;`
`480`	`480`
`481`		`- return ip_generic_getfrag(rfv->msg->msg_iov, to, offset, len, odd, skb);`
	`481`	`+ return ip_generic_getfrag(rfv->msg, to, offset, len, odd, skb);`
`482`	`482`	`}`
`483`	`483`
`484`	`484`	`static int raw_sendmsg(struct kiocb iocb, struct sock sk, struct msghdr *msg,`
Original file line number	Diff line number	Diff line change
`@@ -727,7 +727,7 @@ static int raw6_getfrag(void from, char to, int offset, int len, int odd,`
`727`	`727`
`728`	`728`	`offset -= rfv->hlen;`
`729`	`729`
`730`		`- return ip_generic_getfrag(rfv->msg->msg_iov, to, offset, len, odd, skb);`
	`730`	`+ return ip_generic_getfrag(rfv->msg, to, offset, len, odd, skb);`
`731`	`731`	`}`
`732`	`732`
`733`	`733`	`static int rawv6_sendmsg(struct kiocb iocb, struct sock sk,`