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

Commit bb72845e authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPSEC]: Make callers of xfrm_lookup to use XFRM_LOOKUP_WAIT 



This patch converts all callers of xfrm_lookup that used an
explicit value of 1 to indiciate blocking to use the new flag
XFRM_LOOKUP_WAIT.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7233b9f3

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
	if (final_p)

		ipv6_addr_copy(&fl.fl6_dst, final_p);



	err = __xfrm_lookup(&dst, &fl, sk, 1);

	err = __xfrm_lookup(&dst, &fl, sk, XFRM_LOOKUP_WAIT);

	if (err < 0) {

		if (err == -EREMOTE)

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

net/decnet/dn_route.c

+2 −1
Original line number Diff line number Diff line
@@ -1196,7 +1196,8 @@ int dn_route_output_sock(struct dst_entry **pprt, struct flowi *fl, struct sock 


	err = __dn_route_output_key(pprt, fl, flags & MSG_TRYHARD);

	if (err == 0 && fl->proto) {

		err = xfrm_lookup(pprt, fl, sk, !(flags & MSG_DONTWAIT));

		err = xfrm_lookup(pprt, fl, sk, (flags & MSG_DONTWAIT) ?

						XFRM_LOOKUP_WAIT : 0);

	}

	return err;

}

net/ipv4/route.c

+2 −1
Original line number Diff line number Diff line
@@ -2536,7 +2536,8 @@ int ip_route_output_flow(struct rtable **rp, struct flowi *flp, struct sock *sk, 
			flp->fl4_src = (*rp)->rt_src;

		if (!flp->fl4_dst)

			flp->fl4_dst = (*rp)->rt_dst;

		err = __xfrm_lookup((struct dst_entry **)rp, flp, sk, flags);

		err = __xfrm_lookup((struct dst_entry **)rp, flp, sk,

				    flags ? XFRM_LOOKUP_WAIT : 0);

		if (err == -EREMOTE)

			err = ipv4_dst_blackhole(rp, flp, sk);

net/ipv6/datagram.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ ipv4_connected: 
	if (final_p)

		ipv6_addr_copy(&fl.fl6_dst, final_p);



	if ((err = __xfrm_lookup(&dst, &fl, sk, 1)) < 0) {

	if ((err = __xfrm_lookup(&dst, &fl, sk, XFRM_LOOKUP_WAIT)) < 0) {

		if (err == -EREMOTE)

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

		if (err < 0)

net/ipv6/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk, 
	if (final_p)

		ipv6_addr_copy(&fl.fl6_dst, final_p);



	if ((err = __xfrm_lookup(&dst, &fl, sk, 1)) < 0) {

	if ((err = __xfrm_lookup(&dst, &fl, sk, XFRM_LOOKUP_WAIT)) < 0) {

		if (err == -EREMOTE)

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

		if (err < 0)