arp: Move ATF_COM setting in arp_req_set().

In arp_req_set(), if ATF_PERM is set in arpreq.arp_flags,
ATF_COM is set automatically.

The flag will be used later for neigh_update() only when
a neighbour entry is found.

Let's set ATF_COM just before calling neigh_update().

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20240430015813.71143-2-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index ab82ca1044963a5bf412961d423c256e70649334..3093374165fabd6000d575756f66d3aa93569863 100644 (file)
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -1054,8 +1054,7 @@ static int arp_req_set(struct net *net, struct arpreq *r,
                return arp_req_set_public(net, r, dev);
 
        ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr;
-       if (r->arp_flags & ATF_PERM)
-               r->arp_flags |= ATF_COM;
+
        if (!dev) {
                struct rtable *rt = ip_route_output(net, ip, 0, 0, 0,
                                                    RT_SCOPE_LINK);
@@ -1092,8 +1091,12 @@ static int arp_req_set(struct net *net, struct arpreq *r,
        err = PTR_ERR(neigh);
        if (!IS_ERR(neigh)) {
                unsigned int state = NUD_STALE;
-               if (r->arp_flags & ATF_PERM)
+
+               if (r->arp_flags & ATF_PERM) {
+                       r->arp_flags |= ATF_COM;
                        state = NUD_PERMANENT;
+               }
+
                err = neigh_update(neigh, (r->arp_flags & ATF_COM) ?
                                   r->arp_ha.sa_data : NULL, state,
                                   NEIGH_UPDATE_F_OVERRIDE |