mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-26 16:51:48 +00:00
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
|
|
index 4ec34275..d76698df 100644
|
|
--- a/net/ipv4/ip_vti.c
|
|
+++ b/net/ipv4/ip_vti.c
|
|
@@ -338,7 +338,7 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
be32_to_cpu(tunnel->parms.o_key), RT_TOS(tos),
|
|
RT_SCOPE_UNIVERSE,
|
|
IPPROTO_IPIP, 0,
|
|
- dst, tiph->saddr, 0, 0);
|
|
+ dst, tiph->saddr, 0, 0, sock_i_uid(skb->sk));
|
|
rt = ip_route_output_key(dev_net(dev), &fl4);
|
|
if (IS_ERR(rt)) {
|
|
dev->stats.tx_carrier_errors++;
|
|
@@ -405,7 +405,7 @@ static int vti_tunnel_bind_dev(struct net_device *dev)
|
|
be32_to_cpu(tunnel->parms.i_key),
|
|
RT_TOS(iph->tos), RT_SCOPE_UNIVERSE,
|
|
IPPROTO_IPIP, 0,
|
|
- iph->daddr, iph->saddr, 0, 0);
|
|
+ iph->daddr, iph->saddr, 0, 0, KUIDT_INIT(0));
|
|
rt = ip_route_output_key(dev_net(dev), &fl4);
|
|
if (!IS_ERR(rt)) {
|
|
tdev = rt->dst.dev;
|
|
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
|
|
index db96af97..fdbdb265 100644
|
|
--- a/net/l2tp/l2tp_ip6.c
|
|
+++ b/net/l2tp/l2tp_ip6.c
|
|
@@ -667,7 +667,7 @@ static int l2tp_ip6_recvmsg(struct kiocb *iocb, struct sock *sk,
|
|
*addr_len = sizeof(*lsa);
|
|
|
|
if (flags & MSG_ERRQUEUE)
|
|
- return ipv6_recv_error(sk, msg, len, addr_len);
|
|
+ return ipv6_recv_error(sk, msg, len);
|
|
|
|
skb = skb_recv_datagram(sk, flags, noblock, &err);
|
|
if (!skb)
|