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

Commit 6f9c9615 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

inet: constify ip_route_output_flow() socket argument 



Very soon, TCP stack might call inet_csk_route_req(), which
calls inet_csk_route_req() with an unlocked listener socket,
so we need to make sure ip_route_output_flow() is not trying to
change any field from its socket argument.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b1964b5f

include/net/dst.h

+5 −4
Original line number Diff line number Diff line
@@ -489,7 +489,8 @@ struct flowi; 
#ifndef CONFIG_XFRM

static inline struct dst_entry *xfrm_lookup(struct net *net,

					    struct dst_entry *dst_orig,

					    const struct flowi *fl, struct sock *sk,

					    const struct flowi *fl,

					    const struct sock *sk,

					    int flags)

{

	return dst_orig;
@@ -498,7 +499,7 @@ static inline struct dst_entry *xfrm_lookup(struct net *net, 
static inline struct dst_entry *xfrm_lookup_route(struct net *net,

						  struct dst_entry *dst_orig,

						  const struct flowi *fl,

						  struct sock *sk,

						  const struct sock *sk,

						  int flags)

{

	return dst_orig;
@@ -511,11 +512,11 @@ static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst) 


#else

struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig,

			      const struct flowi *fl, struct sock *sk,

			      const struct flowi *fl, const struct sock *sk,

			      int flags);



struct dst_entry *xfrm_lookup_route(struct net *net, struct dst_entry *dst_orig,

				    const struct flowi *fl, struct sock *sk,

				    const struct flowi *fl, const struct sock *sk,

				    int flags);



/* skb attached with this dst needs transformation if dst->xfrm is valid */

include/net/route.h

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ void rt_cache_flush(struct net *net); 
void rt_flush_dev(struct net_device *dev);

struct rtable *__ip_route_output_key(struct net *, struct flowi4 *flp);

struct rtable *ip_route_output_flow(struct net *, struct flowi4 *flp,

				    struct sock *sk);

				    const struct sock *sk);

struct dst_entry *ipv4_blackhole_route(struct net *net,

				       struct dst_entry *dst_orig);

net/ipv4/route.c

+1 −1
Original line number Diff line number Diff line
@@ -2291,7 +2291,7 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or 
}



struct rtable *ip_route_output_flow(struct net *net, struct flowi4 *flp4,

				    struct sock *sk)

				    const struct sock *sk)

{

	struct rtable *rt = __ip_route_output_key(net, flp4);

net/xfrm/xfrm_policy.c

+3 −3
Original line number Diff line number Diff line
@@ -1208,7 +1208,7 @@ static inline int policy_to_flow_dir(int dir) 
	}

}



static struct xfrm_policy *xfrm_sk_policy_lookup(struct sock *sk, int dir,

static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir,

						 const struct flowi *fl)

{

	struct xfrm_policy *pol;
@@ -2185,7 +2185,7 @@ static struct dst_entry *make_blackhole(struct net *net, u16 family, 
 */

struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig,

			      const struct flowi *fl,

			      struct sock *sk, int flags)

			      const struct sock *sk, int flags)

{

	struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX];

	struct flow_cache_object *flo;
@@ -2333,7 +2333,7 @@ EXPORT_SYMBOL(xfrm_lookup); 
 */

struct dst_entry *xfrm_lookup_route(struct net *net, struct dst_entry *dst_orig,

				    const struct flowi *fl,

				    struct sock *sk, int flags)

				    const struct sock *sk, int flags)

{

	struct dst_entry *dst = xfrm_lookup(net, dst_orig, fl, sk,

					    flags | XFRM_LOOKUP_QUEUE |