Skip to content

Commit 82159e6

Browse files
author
Paolo Abeni
committed
Merge branch 'ipv6-fix-temporary-address-not-removed-correctly'
Hangbin Liu says: ==================== ipv6: fix temporary address not removed correctly Currently the temporary address is not removed when mngtmpaddr is deleted or becomes unmanaged. The patch set fixed this issue and add a related test. v2: 1) delete the tempaddrs directly instead of remove them in addrconf_verify_rtnl(Sam Edwards) 2) Update the test case by checking the address including, add Sam in SOB (Sam Edwards) ==================== Link: https://patch.msgid.link/20241120095108.199779-1-liuhangbin@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2 parents 59c5e14 + f6e1dcd commit 82159e6

2 files changed

Lines changed: 124 additions & 12 deletions

File tree

‎net/ipv6/addrconf.c‎

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2570,6 +2570,24 @@ static struct inet6_dev *addrconf_add_dev(struct net_device *dev)
25702570
return idev;
25712571
}
25722572

2573+
static void delete_tempaddrs(struct inet6_dev *idev,
2574+
struct inet6_ifaddr *ifp)
2575+
{
2576+
struct inet6_ifaddr *ift, *tmp;
2577+
2578+
write_lock_bh(&idev->lock);
2579+
list_for_each_entry_safe(ift, tmp, &idev->tempaddr_list, tmp_list) {
2580+
if (ift->ifpub != ifp)
2581+
continue;
2582+
2583+
in6_ifa_hold(ift);
2584+
write_unlock_bh(&idev->lock);
2585+
ipv6_del_addr(ift);
2586+
write_lock_bh(&idev->lock);
2587+
}
2588+
write_unlock_bh(&idev->lock);
2589+
}
2590+
25732591
static void manage_tempaddrs(struct inet6_dev *idev,
25742592
struct inet6_ifaddr *ifp,
25752593
__u32 valid_lft, __u32 prefered_lft,
@@ -3124,11 +3142,12 @@ static int inet6_addr_del(struct net *net, int ifindex, u32 ifa_flags,
31243142
in6_ifa_hold(ifp);
31253143
read_unlock_bh(&idev->lock);
31263144

3127-
if (!(ifp->flags & IFA_F_TEMPORARY) &&
3128-
(ifa_flags & IFA_F_MANAGETEMPADDR))
3129-
manage_tempaddrs(idev, ifp, 0, 0, false,
3130-
jiffies);
31313145
ipv6_del_addr(ifp);
3146+
3147+
if (!(ifp->flags & IFA_F_TEMPORARY) &&
3148+
(ifp->flags & IFA_F_MANAGETEMPADDR))
3149+
delete_tempaddrs(idev, ifp);
3150+
31323151
addrconf_verify_rtnl(net);
31333152
if (ipv6_addr_is_multicast(pfx)) {
31343153
ipv6_mc_config(net->ipv6.mc_autojoin_sk,
@@ -4952,14 +4971,12 @@ static int inet6_addr_modify(struct net *net, struct inet6_ifaddr *ifp,
49524971
}
49534972

49544973
if (was_managetempaddr || ifp->flags & IFA_F_MANAGETEMPADDR) {
4955-
if (was_managetempaddr &&
4956-
!(ifp->flags & IFA_F_MANAGETEMPADDR)) {
4957-
cfg->valid_lft = 0;
4958-
cfg->preferred_lft = 0;
4959-
}
4960-
manage_tempaddrs(ifp->idev, ifp, cfg->valid_lft,
4961-
cfg->preferred_lft, !was_managetempaddr,
4962-
jiffies);
4974+
if (was_managetempaddr && !(ifp->flags & IFA_F_MANAGETEMPADDR))
4975+
delete_tempaddrs(ifp->idev, ifp);
4976+
else
4977+
manage_tempaddrs(ifp->idev, ifp, cfg->valid_lft,
4978+
cfg->preferred_lft, !was_managetempaddr,
4979+
jiffies);
49634980
}
49644981

49654982
addrconf_verify_rtnl(net);

‎tools/testing/selftests/net/rtnetlink.sh‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ ALL_TESTS="
2929
kci_test_bridge_parent_id
3030
kci_test_address_proto
3131
kci_test_enslave_bonding
32+
kci_test_mngtmpaddr
3233
"
3334

3435
devdummy="test-dummy0"
@@ -44,6 +45,7 @@ check_err()
4445
if [ $ret -eq 0 ]; then
4546
ret=$1
4647
fi
48+
[ -n "$2" ] && echo "$2"
4749
}
4850

4951
# same but inverted -- used when command must fail for test to pass
@@ -1239,6 +1241,99 @@ kci_test_enslave_bonding()
12391241
ip netns del "$testns"
12401242
}
12411243

1244+
# Called to validate the addresses on $IFNAME:
1245+
#
1246+
# 1. Every `temporary` address must have a matching `mngtmpaddr`
1247+
# 2. Every `mngtmpaddr` address must have some un`deprecated` `temporary`
1248+
#
1249+
# If the mngtmpaddr or tempaddr checking failed, return 0 and stop slowwait
1250+
validate_mngtmpaddr()
1251+
{
1252+
local dev=$1
1253+
local prefix=""
1254+
local addr_list=$(ip -j -n $testns addr show dev ${dev})
1255+
local temp_addrs=$(echo ${addr_list} | \
1256+
jq -r '.[].addr_info[] | select(.temporary == true) | .local')
1257+
local mng_prefixes=$(echo ${addr_list} | \
1258+
jq -r '.[].addr_info[] | select(.mngtmpaddr == true) | .local' | \
1259+
cut -d: -f1-4 | tr '\n' ' ')
1260+
local undep_prefixes=$(echo ${addr_list} | \
1261+
jq -r '.[].addr_info[] | select(.temporary == true and .deprecated != true) | .local' | \
1262+
cut -d: -f1-4 | tr '\n' ' ')
1263+
1264+
# 1. All temporary addresses (temp and dep) must have a matching mngtmpaddr
1265+
for address in ${temp_addrs}; do
1266+
prefix=$(echo ${address} | cut -d: -f1-4)
1267+
if [[ ! " ${mng_prefixes} " =~ " $prefix " ]]; then
1268+
check_err 1 "FAIL: Temporary $address with no matching mngtmpaddr!";
1269+
return 0
1270+
fi
1271+
done
1272+
1273+
# 2. All mngtmpaddr addresses must have a temporary address (not dep)
1274+
for prefix in ${mng_prefixes}; do
1275+
if [[ ! " ${undep_prefixes} " =~ " $prefix " ]]; then
1276+
check_err 1 "FAIL: No undeprecated temporary in $prefix!";
1277+
return 0
1278+
fi
1279+
done
1280+
1281+
return 1
1282+
}
1283+
1284+
kci_test_mngtmpaddr()
1285+
{
1286+
local ret=0
1287+
1288+
setup_ns testns
1289+
if [ $? -ne 0 ]; then
1290+
end_test "SKIP mngtmpaddr tests: cannot add net namespace $testns"
1291+
return $ksft_skip
1292+
fi
1293+
1294+
# 1. Create a dummy Ethernet interface
1295+
run_cmd ip -n $testns link add ${devdummy} type dummy
1296+
run_cmd ip -n $testns link set ${devdummy} up
1297+
run_cmd ip netns exec $testns sysctl -w net.ipv6.conf.${devdummy}.use_tempaddr=1
1298+
run_cmd ip netns exec $testns sysctl -w net.ipv6.conf.${devdummy}.temp_prefered_lft=10
1299+
run_cmd ip netns exec $testns sysctl -w net.ipv6.conf.${devdummy}.temp_valid_lft=25
1300+
run_cmd ip netns exec $testns sysctl -w net.ipv6.conf.${devdummy}.max_desync_factor=1
1301+
1302+
# 2. Create several mngtmpaddr addresses on that interface.
1303+
# with temp_*_lft configured to be pretty short (10 and 35 seconds
1304+
# for prefer/valid respectively)
1305+
for i in $(seq 1 9); do
1306+
run_cmd ip -n $testns addr add 2001:db8:7e57:${i}::1/64 mngtmpaddr dev ${devdummy}
1307+
done
1308+
1309+
# 3. Confirm that a preferred temporary address exists for each mngtmpaddr
1310+
# address at all times, polling once per second for 30 seconds.
1311+
slowwait 30 validate_mngtmpaddr ${devdummy}
1312+
1313+
# 4. Delete each mngtmpaddr address, one at a time (alternating between
1314+
# deleting and merely un-mngtmpaddr-ing), and confirm that the other
1315+
# mngtmpaddr addresses still have preferred temporaries.
1316+
for i in $(seq 1 9); do
1317+
(( $i % 4 == 0 )) && mng_flag="mngtmpaddr" || mng_flag=""
1318+
if (( $i % 2 == 0 )); then
1319+
run_cmd ip -n $testns addr del 2001:db8:7e57:${i}::1/64 $mng_flag dev ${devdummy}
1320+
else
1321+
run_cmd ip -n $testns addr change 2001:db8:7e57:${i}::1/64 dev ${devdummy}
1322+
fi
1323+
# the temp addr should be deleted
1324+
validate_mngtmpaddr ${devdummy}
1325+
done
1326+
1327+
if [ $ret -ne 0 ]; then
1328+
end_test "FAIL: mngtmpaddr add/remove incorrect"
1329+
else
1330+
end_test "PASS: mngtmpaddr add/remove correctly"
1331+
fi
1332+
1333+
ip netns del "$testns"
1334+
return $ret
1335+
}
1336+
12421337
kci_test_rtnl()
12431338
{
12441339
local current_test

0 commit comments

Comments
 (0)