Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ipv4: Pass explicit destination address to rt_bind_peer().

Browse source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2011-05-18 18:42:43 -04:00
parent ed2361e66e
commit a48eff1288
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/net/route.h
View file

@ -290,14 +290,14 @@ static inline struct rtable *ip_route_newports(struct flowi4 *fl4, struct rtable
return rt; return rt;
} }
extern void rt_bind_peer(struct rtable *rt, int create); extern void rt_bind_peer(struct rtable *rt, __be32 daddr, int create);
static inline struct inet_peer *rt_get_peer(struct rtable *rt, __be32 daddr) static inline struct inet_peer *rt_get_peer(struct rtable *rt, __be32 daddr)
{ {
if (rt->peer) if (rt->peer)
return rt->peer; return rt->peer;
rt_bind_peer(rt, 0); rt_bind_peer(rt, daddr, 0);
return rt->peer; return rt->peer;
} }

8
net/ipv4/icmp.c
View file

@ -234,7 +234,7 @@ static inline void icmp_xmit_unlock(struct sock *sk)
*/ */
static inline bool icmpv4_xrlim_allow(struct net *net, struct rtable *rt, static inline bool icmpv4_xrlim_allow(struct net *net, struct rtable *rt,
int type, int code) struct flowi4 *fl4, int type, int code)
{ {
struct dst_entry *dst = &rt->dst; struct dst_entry *dst = &rt->dst;
bool rc = true; bool rc = true;
@ -253,7 +253,7 @@ static inline bool icmpv4_xrlim_allow(struct net *net, struct rtable *rt,
/* Limit if icmp type is enabled in ratemask. */ /* Limit if icmp type is enabled in ratemask. */
if ((1 << type) & net->ipv4.sysctl_icmp_ratemask) { if ((1 << type) & net->ipv4.sysctl_icmp_ratemask) {
if (!rt->peer) if (!rt->peer)
rt_bind_peer(rt, 1); rt_bind_peer(rt, fl4->daddr, 1);
rc = inet_peer_xrlim_allow(rt->peer, rc = inet_peer_xrlim_allow(rt->peer,
net->ipv4.sysctl_icmp_ratelimit); net->ipv4.sysctl_icmp_ratelimit);
} }
@ -363,7 +363,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb)
rt = ip_route_output_key(net, &fl4); rt = ip_route_output_key(net, &fl4);
if (IS_ERR(rt)) if (IS_ERR(rt))
goto out_unlock; goto out_unlock;
if (icmpv4_xrlim_allow(net, rt, icmp_param->data.icmph.type, if (icmpv4_xrlim_allow(net, rt, &fl4, icmp_param->data.icmph.type,
icmp_param->data.icmph.code)) icmp_param->data.icmph.code))
icmp_push_reply(icmp_param, &fl4, &ipc, &rt); icmp_push_reply(icmp_param, &fl4, &ipc, &rt);
ip_rt_put(rt); ip_rt_put(rt);
@ -603,7 +603,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
if (IS_ERR(rt)) if (IS_ERR(rt))
goto out_unlock; goto out_unlock;
if (!icmpv4_xrlim_allow(net, rt, type, code)) if (!icmpv4_xrlim_allow(net, rt, &fl4, type, code))
goto ende; goto ende;
/* RFC says return as much as we can without exceeding 576 bytes. */ /* RFC says return as much as we can without exceeding 576 bytes. */

16
net/ipv4/route.c
View file

@ -156,7 +156,7 @@ static u32 *ipv4_cow_metrics(struct dst_entry *dst, unsigned long old)
u32 *p = NULL; u32 *p = NULL;
if (!rt->peer) if (!rt->peer)
rt_bind_peer(rt, 1); rt_bind_peer(rt, rt->rt_dst, 1);
peer = rt->peer; peer = rt->peer;
if (peer) { if (peer) {
@ -1193,11 +1193,11 @@ static u32 rt_peer_genid(void)
return atomic_read(&__rt_peer_genid); return atomic_read(&__rt_peer_genid);
} }
void rt_bind_peer(struct rtable *rt, int create) void rt_bind_peer(struct rtable *rt, __be32 daddr, int create)
{ {
struct inet_peer *peer; struct inet_peer *peer;
peer = inet_getpeer_v4(rt->rt_dst, create); peer = inet_getpeer_v4(daddr, create);
if (peer && cmpxchg(&rt->peer, NULL, peer) != NULL) if (peer && cmpxchg(&rt->peer, NULL, peer) != NULL)
inet_putpeer(peer); inet_putpeer(peer);
@ -1231,7 +1231,7 @@ void __ip_select_ident(struct iphdr *iph, struct dst_entry *dst, int more)
if (rt) { if (rt) {
if (rt->peer == NULL) if (rt->peer == NULL)
rt_bind_peer(rt, 1); rt_bind_peer(rt, rt->rt_dst, 1);
/* If peer is attached to destination, it is never detached, /* If peer is attached to destination, it is never detached,
so that we need not to grab a lock to dereference it. so that we need not to grab a lock to dereference it.
@ -1377,7 +1377,7 @@ void ip_rt_send_redirect(struct sk_buff *skb)
rcu_read_unlock(); rcu_read_unlock();
if (!rt->peer) if (!rt->peer)
rt_bind_peer(rt, 1); rt_bind_peer(rt, rt->rt_dst, 1);
peer = rt->peer; peer = rt->peer;
if (!peer) { if (!peer) {
icmp_send(skb, ICMP_REDIRECT, ICMP_REDIR_HOST, rt->rt_gateway); icmp_send(skb, ICMP_REDIRECT, ICMP_REDIR_HOST, rt->rt_gateway);
@ -1445,7 +1445,7 @@ static int ip_error(struct sk_buff *skb)
} }
if (!rt->peer) if (!rt->peer)
rt_bind_peer(rt, 1); rt_bind_peer(rt, rt->rt_dst, 1);
peer = rt->peer; peer = rt->peer;
send = true; send = true;
@ -1552,7 +1552,7 @@ static void ip_rt_update_pmtu(struct dst_entry *dst, u32 mtu)
dst_confirm(dst); dst_confirm(dst);
if (!rt->peer) if (!rt->peer)
rt_bind_peer(rt, 1); rt_bind_peer(rt, rt->rt_dst, 1);
peer = rt->peer; peer = rt->peer;
if (peer) { if (peer) {
if (mtu < ip_rt_min_pmtu) if (mtu < ip_rt_min_pmtu)
@ -1609,7 +1609,7 @@ static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie)
struct inet_peer *peer; struct inet_peer *peer;
if (!rt->peer) if (!rt->peer)
rt_bind_peer(rt, 0); rt_bind_peer(rt, rt->rt_dst, 0);
peer = rt->peer; peer = rt->peer;
if (peer && peer->pmtu_expires) if (peer && peer->pmtu_expires)

2
net/ipv4/tcp_ipv4.c
View file

@ -1781,7 +1781,7 @@ struct inet_peer *tcp_v4_get_peer(struct sock *sk, bool *release_it)
*release_it = true; *release_it = true;
} else { } else {
if (!rt->peer) if (!rt->peer)
rt_bind_peer(rt, 1); rt_bind_peer(rt, inet->inet_daddr, 1);
peer = rt->peer; peer = rt->peer;
*release_it = false; *release_it = false;
} }