Skip to content

Commit d6db761

Browse files
edumazetmehmetb0
authored andcommitted
inetpeer: remove create argument of inet_getpeer_v[46]()
BugLink: https://bugs.launchpad.net/bugs/2111953 [ Upstream commit 661cd8f ] All callers of inet_getpeer_v4() and inet_getpeer_v6() want to create an inetpeer. Signed-off-by: Eric Dumazet <edumazet@google.com> Link: https://patch.msgid.link/20241215175629.1248773-2-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Stable-dep-of: a853c60 ("inetpeer: do not get a refcount in inet_getpeer()") Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Mehmet Basaran <mehmet.basaran@canonical.com>
1 parent 901d169 commit d6db761

File tree

7 files changed

+11
-12
lines changed

7 files changed

+11
-12
lines changed

include/net/inetpeer.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,25 +101,24 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base,
101101

102102
static inline struct inet_peer *inet_getpeer_v4(struct inet_peer_base *base,
103103
__be32 v4daddr,
104-
int vif, int create)
104+
int vif)
105105
{
106106
struct inetpeer_addr daddr;
107107

108108
daddr.a4.addr = v4daddr;
109109
daddr.a4.vif = vif;
110110
daddr.family = AF_INET;
111-
return inet_getpeer(base, &daddr, create);
111+
return inet_getpeer(base, &daddr, 1);
112112
}
113113

114114
static inline struct inet_peer *inet_getpeer_v6(struct inet_peer_base *base,
115-
const struct in6_addr *v6daddr,
116-
int create)
115+
const struct in6_addr *v6daddr)
117116
{
118117
struct inetpeer_addr daddr;
119118

120119
daddr.a6 = *v6daddr;
121120
daddr.family = AF_INET6;
122-
return inet_getpeer(base, &daddr, create);
121+
return inet_getpeer(base, &daddr, 1);
123122
}
124123

125124
static inline int inetpeer_addr_cmp(const struct inetpeer_addr *a,

net/ipv4/icmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ static bool icmpv4_xrlim_allow(struct net *net, struct rtable *rt,
326326
goto out;
327327

328328
vif = l3mdev_master_ifindex(dst->dev);
329-
peer = inet_getpeer_v4(net->ipv4.peers, fl4->daddr, vif, 1);
329+
peer = inet_getpeer_v4(net->ipv4.peers, fl4->daddr, vif);
330330
rc = inet_peer_xrlim_allow(peer,
331331
READ_ONCE(net->ipv4.sysctl_icmp_ratelimit));
332332
if (peer)

net/ipv4/ip_fragment.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static void ip4_frag_init(struct inet_frag_queue *q, const void *a)
8989
q->key.v4 = *key;
9090
qp->ecn = 0;
9191
qp->peer = q->fqdir->max_dist ?
92-
inet_getpeer_v4(net->ipv4.peers, key->saddr, key->vif, 1) :
92+
inet_getpeer_v4(net->ipv4.peers, key->saddr, key->vif) :
9393
NULL;
9494
}
9595

net/ipv4/route.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ void ip_rt_send_redirect(struct sk_buff *skb)
885885
rcu_read_unlock();
886886

887887
net = dev_net(rt->dst.dev);
888-
peer = inet_getpeer_v4(net->ipv4.peers, ip_hdr(skb)->saddr, vif, 1);
888+
peer = inet_getpeer_v4(net->ipv4.peers, ip_hdr(skb)->saddr, vif);
889889
if (!peer) {
890890
icmp_send(skb, ICMP_REDIRECT, ICMP_REDIR_HOST,
891891
rt_nexthop(rt, ip_hdr(skb)->daddr));
@@ -988,7 +988,7 @@ static int ip_error(struct sk_buff *skb)
988988
}
989989

990990
peer = inet_getpeer_v4(net->ipv4.peers, ip_hdr(skb)->saddr,
991-
l3mdev_master_ifindex(skb->dev), 1);
991+
l3mdev_master_ifindex(skb->dev));
992992

993993
send = true;
994994
if (peer) {

net/ipv6/icmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ static bool icmpv6_xrlim_allow(struct sock *sk, u8 type,
222222
if (rt->rt6i_dst.plen < 128)
223223
tmo >>= ((128 - rt->rt6i_dst.plen)>>5);
224224

225-
peer = inet_getpeer_v6(net->ipv6.peers, &fl6->daddr, 1);
225+
peer = inet_getpeer_v6(net->ipv6.peers, &fl6->daddr);
226226
res = inet_peer_xrlim_allow(peer, tmo);
227227
if (peer)
228228
inet_putpeer(peer);

net/ipv6/ip6_output.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ int ip6_forward(struct sk_buff *skb)
616616
else
617617
target = &hdr->daddr;
618618

619-
peer = inet_getpeer_v6(net->ipv6.peers, &hdr->daddr, 1);
619+
peer = inet_getpeer_v6(net->ipv6.peers, &hdr->daddr);
620620

621621
/* Limit redirects both by destination (here)
622622
and by source (inside ndisc_send_redirect)

net/ipv6/ndisc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1717,7 +1717,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
17171717
"Redirect: destination is not a neighbour\n");
17181718
goto release;
17191719
}
1720-
peer = inet_getpeer_v6(net->ipv6.peers, &ipv6_hdr(skb)->saddr, 1);
1720+
peer = inet_getpeer_v6(net->ipv6.peers, &ipv6_hdr(skb)->saddr);
17211721
ret = inet_peer_xrlim_allow(peer, 1*HZ);
17221722
if (peer)
17231723
inet_putpeer(peer);

0 commit comments

Comments
 (0)