Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20c59de2 authored by Arnaud Ebalard's avatar Arnaud Ebalard Committed by David S. Miller
Browse files

ipv6: Refactor update of IPv6 flowi destination address for srcrt (RH) option 



There are more than a dozen occurrences of following code in the
IPv6 stack:

    if (opt && opt->srcrt) {
            struct rt0_hdr *rt0 = (struct rt0_hdr *) opt->srcrt;
            ipv6_addr_copy(&final, &fl.fl6_dst);
            ipv6_addr_copy(&fl.fl6_dst, rt0->addr);
            final_p = &final;
    }

Replace those with a helper. Note that the helper overrides final_p
in all cases. This is ok as final_p was previously initialized to
NULL when declared.

Signed-off-by: default avatarArnaud Ebalard <arno@natisbad.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d92222e2

include/net/ipv6.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -551,6 +551,10 @@ extern int ipv6_ext_hdr(u8 nexthdr); 




extern int ipv6_find_tlv(struct sk_buff *skb, int offset, int type);

extern int ipv6_find_tlv(struct sk_buff *skb, int offset, int type);





extern struct in6_addr *fl6_update_dst(struct flowi *fl,

				       const struct ipv6_txoptions *opt,

				       struct in6_addr *orig);



/*

/*

 *	socket options (ipv6_sockglue.c)

 *	socket options (ipv6_sockglue.c)

 */

 */

net/dccp/ipv6.c

+6 −24
Original line number Original line Diff line number Diff line
@@ -248,7 +248,7 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req, 
	struct ipv6_pinfo *np = inet6_sk(sk);

	struct ipv6_pinfo *np = inet6_sk(sk);

	struct sk_buff *skb;

	struct sk_buff *skb;

	struct ipv6_txoptions *opt = NULL;

	struct ipv6_txoptions *opt = NULL;

	struct in6_addr *final_p = NULL, final;

	struct in6_addr *final_p, final;

	struct flowi fl;

	struct flowi fl;

	int err = -1;

	int err = -1;

	struct dst_entry *dst;

	struct dst_entry *dst;
@@ -265,13 +265,7 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req, 




	opt = np->opt;

	opt = np->opt;





	if (opt != NULL && opt->srcrt != NULL) {

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

		const struct rt0_hdr *rt0 = (struct rt0_hdr *)opt->srcrt;



		ipv6_addr_copy(&final, &fl.fl6_dst);

		ipv6_addr_copy(&fl.fl6_dst, rt0->addr);

		final_p = &final;

	}





	err = ip6_dst_lookup(sk, &dst, &fl);

	err = ip6_dst_lookup(sk, &dst, &fl);

	if (err)

	if (err)
@@ -545,19 +539,13 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, 
		goto out_overflow;

		goto out_overflow;





	if (dst == NULL) {

	if (dst == NULL) {

		struct in6_addr *final_p = NULL, final;

		struct in6_addr *final_p, final;

		struct flowi fl;

		struct flowi fl;





		memset(&fl, 0, sizeof(fl));

		memset(&fl, 0, sizeof(fl));

		fl.proto = IPPROTO_DCCP;

		fl.proto = IPPROTO_DCCP;

		ipv6_addr_copy(&fl.fl6_dst, &ireq6->rmt_addr);

		ipv6_addr_copy(&fl.fl6_dst, &ireq6->rmt_addr);

		if (opt != NULL && opt->srcrt != NULL) {

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

			const struct rt0_hdr *rt0 = (struct rt0_hdr *)opt->srcrt;



			ipv6_addr_copy(&final, &fl.fl6_dst);

			ipv6_addr_copy(&fl.fl6_dst, rt0->addr);

			final_p = &final;

		}

		ipv6_addr_copy(&fl.fl6_src, &ireq6->loc_addr);

		ipv6_addr_copy(&fl.fl6_src, &ireq6->loc_addr);

		fl.oif = sk->sk_bound_dev_if;

		fl.oif = sk->sk_bound_dev_if;

		fl.fl_ip_dport = inet_rsk(req)->rmt_port;

		fl.fl_ip_dport = inet_rsk(req)->rmt_port;
@@ -885,7 +873,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
	struct inet_sock *inet = inet_sk(sk);

	struct inet_sock *inet = inet_sk(sk);

	struct ipv6_pinfo *np = inet6_sk(sk);

	struct ipv6_pinfo *np = inet6_sk(sk);

	struct dccp_sock *dp = dccp_sk(sk);

	struct dccp_sock *dp = dccp_sk(sk);

	struct in6_addr *saddr = NULL, *final_p = NULL, final;

	struct in6_addr *saddr = NULL, *final_p, final;

	struct flowi fl;

	struct flowi fl;

	struct dst_entry *dst;

	struct dst_entry *dst;

	int addr_type;

	int addr_type;
@@ -988,13 +976,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
	fl.fl_ip_sport = inet->inet_sport;

	fl.fl_ip_sport = inet->inet_sport;

	security_sk_classify_flow(sk, &fl);

	security_sk_classify_flow(sk, &fl);





	if (np->opt != NULL && np->opt->srcrt != NULL) {

	final_p = fl6_update_dst(&fl, np->opt, &final);

		const struct rt0_hdr *rt0 = (struct rt0_hdr *)np->opt->srcrt;



		ipv6_addr_copy(&final, &fl.fl6_dst);

		ipv6_addr_copy(&fl.fl6_dst, rt0->addr);

		final_p = &final;

	}





	err = ip6_dst_lookup(sk, &dst, &fl);

	err = ip6_dst_lookup(sk, &dst, &fl);

	if (err)

	if (err)

net/ipv6/af_inet6.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -651,7 +651,7 @@ int inet6_sk_rebuild_header(struct sock *sk) 




	if (dst == NULL) {

	if (dst == NULL) {

		struct inet_sock *inet = inet_sk(sk);

		struct inet_sock *inet = inet_sk(sk);

		struct in6_addr *final_p = NULL, final;

		struct in6_addr *final_p, final;

		struct flowi fl;

		struct flowi fl;





		memset(&fl, 0, sizeof(fl));

		memset(&fl, 0, sizeof(fl));
@@ -665,12 +665,7 @@ int inet6_sk_rebuild_header(struct sock *sk) 
		fl.fl_ip_sport = inet->inet_sport;

		fl.fl_ip_sport = inet->inet_sport;

		security_sk_classify_flow(sk, &fl);

		security_sk_classify_flow(sk, &fl);





		if (np->opt && np->opt->srcrt) {

		final_p = fl6_update_dst(&fl, np->opt, &final);

			struct rt0_hdr *rt0 = (struct rt0_hdr *) np->opt->srcrt;

			ipv6_addr_copy(&final, &fl.fl6_dst);

			ipv6_addr_copy(&fl.fl6_dst, rt0->addr);

			final_p = &final;

		}





		err = ip6_dst_lookup(sk, &dst, &fl);

		err = ip6_dst_lookup(sk, &dst, &fl);

		if (err) {

		if (err) {

net/ipv6/datagram.c

+4 −14
Original line number Original line Diff line number Diff line
@@ -38,10 +38,11 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	struct sockaddr_in6	*usin = (struct sockaddr_in6 *) uaddr;

	struct sockaddr_in6	*usin = (struct sockaddr_in6 *) uaddr;

	struct inet_sock      	*inet = inet_sk(sk);

	struct inet_sock      	*inet = inet_sk(sk);

	struct ipv6_pinfo      	*np = inet6_sk(sk);

	struct ipv6_pinfo      	*np = inet6_sk(sk);

	struct in6_addr		*daddr, *final_p = NULL, final;

	struct in6_addr		*daddr, *final_p, final;

	struct dst_entry	*dst;

	struct dst_entry	*dst;

	struct flowi		fl;

	struct flowi		fl;

	struct ip6_flowlabel	*flowlabel = NULL;

	struct ip6_flowlabel	*flowlabel = NULL;

	struct ipv6_txoptions   *opt;

	int			addr_type;

	int			addr_type;

	int			err;

	int			err;
@@ -155,19 +156,8 @@ ipv4_connected: 




	security_sk_classify_flow(sk, &fl);

	security_sk_classify_flow(sk, &fl);





	if (flowlabel) {

	opt = flowlabel ? flowlabel->opt : np->opt;

		if (flowlabel->opt && flowlabel->opt->srcrt) {

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

			struct rt0_hdr *rt0 = (struct rt0_hdr *) flowlabel->opt->srcrt;

			ipv6_addr_copy(&final, &fl.fl6_dst);

			ipv6_addr_copy(&fl.fl6_dst, rt0->addr);

			final_p = &final;

		}

	} else if (np->opt && np->opt->srcrt) {

		struct rt0_hdr *rt0 = (struct rt0_hdr *)np->opt->srcrt;

		ipv6_addr_copy(&final, &fl.fl6_dst);

		ipv6_addr_copy(&fl.fl6_dst, rt0->addr);

		final_p = &final;

	}





	err = ip6_dst_lookup(sk, &dst, &fl);

	err = ip6_dst_lookup(sk, &dst, &fl);

	if (err)

	if (err)

net/ipv6/exthdrs.c

+24 −0
Original line number Original line Diff line number Diff line
@@ -874,3 +874,27 @@ struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space, 
	return opt;

	return opt;

}

}





/**

 * fl6_update_dst - update flowi destination address with info given

 *                  by srcrt option, if any.

 *

 * @fl: flowi for which fl6_dst is to be updated

 * @opt: struct ipv6_txoptions in which to look for srcrt opt

 * @orig: copy of original fl6_dst address if modified

 *

 * Returns NULL if no txoptions or no srcrt, otherwise returns orig

 * and initial value of fl->fl6_dst set in orig

 */

struct in6_addr *fl6_update_dst(struct flowi *fl,

				const struct ipv6_txoptions *opt,

				struct in6_addr *orig)

{

	if (!opt || !opt->srcrt)

		return NULL;



	ipv6_addr_copy(orig, &fl->fl6_dst);

	ipv6_addr_copy(&fl->fl6_dst, ((struct rt0_hdr *)opt->srcrt)->addr);

	return orig;

}



EXPORT_SYMBOL_GPL(fl6_update_dst);