Commit c4e85f73 authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by David S. Miller
Browse files

net: ipv6: add net argument to ip6_dst_lookup_flow 



This will be used in the conversion of ipv6_stub to ip6_dst_lookup_flow,
as some modules currently pass a net argument without a socket to
ip6_dst_lookup. This is equivalent to commit 343d60aa ("ipv6: change
ipv6_stub_impl.ipv6_dst_lookup to take net argument").

Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ffb055b

include/net/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ static inline struct sk_buff *ip6_finish_skb(struct sock *sk) 


int ip6_dst_lookup(struct net *net, struct sock *sk, struct dst_entry **dst,

		   struct flowi6 *fl6);

struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,

struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struct sock *sk, struct flowi6 *fl6,

				      const struct in6_addr *final_dst);

struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,

					 const struct in6_addr *final_dst,

net/dccp/ipv6.c

+3 −3
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int dccp_v6_send_response(const struct sock *sk, struct request_sock *req 
	final_p = fl6_update_dst(&fl6, rcu_dereference(np->opt), &final);

	rcu_read_unlock();



	dst = ip6_dst_lookup_flow(sk, &fl6, final_p);

	dst = ip6_dst_lookup_flow(sock_net(sk), sk, &fl6, final_p);

	if (IS_ERR(dst)) {

		err = PTR_ERR(dst);

		dst = NULL;
@@ -282,7 +282,7 @@ static void dccp_v6_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb) 
	security_skb_classify_flow(rxskb, flowi6_to_flowi(&fl6));



	/* sk = NULL, but it is safe for now. RST socket required. */

	dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL);

	dst = ip6_dst_lookup_flow(sock_net(ctl_sk), ctl_sk, &fl6, NULL);

	if (!IS_ERR(dst)) {

		skb_dst_set(skb, dst);

		ip6_xmit(ctl_sk, skb, &fl6, 0, NULL, 0, 0);
@@ -912,7 +912,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
	opt = rcu_dereference_protected(np->opt, lockdep_sock_is_held(sk));

	final_p = fl6_update_dst(&fl6, opt, &final);



	dst = ip6_dst_lookup_flow(sk, &fl6, final_p);

	dst = ip6_dst_lookup_flow(sock_net(sk), sk, &fl6, final_p);

	if (IS_ERR(dst)) {

		err = PTR_ERR(dst);

		goto failure;

net/ipv6/af_inet6.c

+1 −1
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ int inet6_sk_rebuild_header(struct sock *sk) 
					 &final);

		rcu_read_unlock();



		dst = ip6_dst_lookup_flow(sk, &fl6, final_p);

		dst = ip6_dst_lookup_flow(sock_net(sk), sk, &fl6, final_p);

		if (IS_ERR(dst)) {

			sk->sk_route_caps = 0;

			sk->sk_err_soft = -PTR_ERR(dst);

net/ipv6/datagram.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ int ip6_datagram_dst_update(struct sock *sk, bool fix_sk_saddr) 
	final_p = fl6_update_dst(&fl6, opt, &final);

	rcu_read_unlock();



	dst = ip6_dst_lookup_flow(sk, &fl6, final_p);

	dst = ip6_dst_lookup_flow(sock_net(sk), sk, &fl6, final_p);

	if (IS_ERR(dst)) {

		err = PTR_ERR(dst);

		goto out;

net/ipv6/inet6_connection_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct dst_entry *inet6_csk_route_req(const struct sock *sk, 
	fl6->flowi6_uid = sk->sk_uid;

	security_req_classify_flow(req, flowi6_to_flowi(fl6));



	dst = ip6_dst_lookup_flow(sk, fl6, final_p);

	dst = ip6_dst_lookup_flow(sock_net(sk), sk, fl6, final_p);

	if (IS_ERR(dst))

		return NULL;
@@ -103,7 +103,7 @@ static struct dst_entry *inet6_csk_route_socket(struct sock *sk, 


	dst = __inet6_csk_dst_check(sk, np->dst_cookie);

	if (!dst) {

		dst = ip6_dst_lookup_flow(sk, fl6, final_p);

		dst = ip6_dst_lookup_flow(sock_net(sk), sk, fl6, final_p);



		if (!IS_ERR(dst))

			ip6_dst_store(sk, dst, NULL, NULL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE