[PATCH 2/2] l2tp: correctly handle ancilliary data for ip6 recv
From: Tom Parkin <hidden>
Date: 2013-01-28 10:49:11
Subsystem:
networking [general], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
l2tp_ip6 was using the IPv4 recv handler function for ancilliary data. This patch changes it over to use the IPv6 handler, which allows l2tp_ip6 sockets to correctly pass ancilliary data to userspace via. recvmsg(). Ref: net/ipv6/udp.c, udpv6_recvmsg Signed-off-by: Tom Parkin <redacted> Signed-off-by: Chris Elston <redacted> Signed-off-by: James Chapman <jchapman@katalix.com> --- net/l2tp/l2tp_ip6.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index 9275471..6824223 100644
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c@@ -647,6 +647,7 @@ static int l2tp_ip6_recvmsg(struct kiocb *iocb, struct sock *sk, int flags, int *addr_len) { struct inet_sock *inet = inet_sk(sk); + struct ipv6_pinfo *np = inet6_sk(sk); struct sockaddr_l2tpip6 *lsa = (struct sockaddr_l2tpip6 *)msg->msg_name; size_t copied = 0; int err = -EOPNOTSUPP;
@@ -688,8 +689,8 @@ static int l2tp_ip6_recvmsg(struct kiocb *iocb, struct sock *sk, lsa->l2tp_scope_id = IP6CB(skb)->iif; } - if (inet->cmsg_flags) - ip_cmsg_recv(msg, skb); + if (np->rxopt.all) + datagram_recv_ctl(sk, msg, skb); if (flags & MSG_TRUNC) copied = skb->len;
--
1.7.9.5