ipv6: fix sysctl error handling and missing notifications
Subsystems (3)
v2 cover ipv6: fix sysctl error handling and missing notifications
While working on a different IPv6 patch series I have spotted multiple minor bugs around sysctl error handling and notifications. In general, they are not serious issues.
In addition, there is one more issue in forwarding sysctl as it does not check for CAP_NET_ADMIN for the namespace. I am keeping that patch out of this series and I am aiming it at the net-next tree once it re-opens.
Changes:
v2: Patch 3: fix return code of addrconf_fixup_forwarding()
Patch 5: acquire lock before calling proc_dointvec() Patch 7: new on this revision of the series
Fernando Fernandez Mancera (7):
ipv6: fix error handling in disable_ipv6 sysctl
ipv6: fix error handling in ignore_routes_with_linkdown sysctl
ipv6: fix error handling in forwarding sysctl
ipv6: fix error handling in disable_policy sysctl
ipv6: reset value and position for proxy_ndp sysctl restart
ipv6: fix missing notification for ignore_routes_with_linkdown
ipv6: reset position for force_forwarding sysctl restart
net/ipv6/addrconf.c | 48 +++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 17 deletions(-)
Signature · 1 line
2.54.0
PATCH v2 1/7 ipv6: fix error handling in disable_ipv6 sysctl
When writing to the disable_ipv6 sysctl, if proc_dointvec() fails to parse the input, it returns a negative error code. The current implementation is overwriting that error for write operations.
This results in a silent failure, it returns a successful write although the configuration was not modified at all. When modifying the "all" variant it can also modify the configuration of existing interfaces to the wrong value.
Fix this by checking the return value of proc_dointvec() and returning early on failure.
--- net/ipv6/addrconf.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv6/addrconf.c +2 -0
@@ -6467,6 +6467,8 @@ static int addrconf_sysctl_disable(const struct ctl_table *ctl, int write, lctl.data = &val; ret =proc_dointvec (&lctl, write, buffer, lenp, ppos); +if (ret) +return ret;if (write) ret =addrconf_disable_ipv6 (ctl, valp, val);
Signature · 1 line
2.54.0
PATCH v2 2/7 ipv6: fix error handling in ignore_routes_with_linkdown sysctl
In reply to Fernando Fernandez ManceraWhen writing to the ignore_routes_with_linkdown sysctl, if proc_dointvec() fails to parse the input, it returns a negative error code. The current implementation is overwriting that error for write operations.
This results in a silent failure, it returns a successful write although the configuration was not modified at all. When modifying the "all" variant it can also modify the configuration of existing interfaces to the wrong value.
Fix this by checking the return value of proc_dointvec() and returning early on failure.
--- net/ipv6/addrconf.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv6/addrconf.c +2 -0
@@ -6671,6 +6671,8 @@ int addrconf_sysctl_ignore_routes_with_linkdown(const struct ctl_table *ctl, lctl.data = &val; ret =proc_dointvec (&lctl, write, buffer, lenp, ppos); +if (ret) +return ret;if (write) ret =addrconf_fixup_linkdown (ctl, valp, val);
Signature · 1 line
2.54.0
PATCH v2 3/7 ipv6: fix error handling in forwarding sysctl
In reply to Fernando Fernandez ManceraWhen writing to the forwarding sysctl, if proc_dointvec() fails to parse the input, it returns a negative error code. The current implementation is overwriting that error for write operations.
This results in a silent failure, it returns a successful write although the configuration was not modified at all. When modifying the "all" variant it can also modify the configuration of existing interfaces to the wrong value.
Fix this by checking the return value of proc_dointvec() and returning early on failure. In addition, adjust return code of addrconf_fixup_forwarding() for successful operation.
--- net/ipv6/addrconf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv6/addrconf.c +3 -1
@@ -913,7 +913,7 @@ static int addrconf_fixup_forwarding(const struct ctl_table *table, int *p, intif (newf)rt6_purge_dflt_routers (net); -return 1 ; +return 0 ; }static void addrconf_linkdown_change (struct net *net,__s32 newf)
@@ -6370,6 +6370,8 @@ static int addrconf_sysctl_forward(const struct ctl_table *ctl, int write, lctl.data = &val; ret =proc_dointvec (&lctl, write, buffer, lenp, ppos); +if (ret) +return ret;if (write) ret =addrconf_fixup_forwarding (ctl, valp, val);
Signature · 1 line
2.54.0
PATCH v2 4/7 ipv6: fix error handling in disable_policy sysctl
In reply to Fernando Fernandez ManceraWhen writing to the disable_policy sysctl, if proc_dointvec() fails to parse the input, it returns a negative error code. The current implementation is resetting the position argument even if an error occurred during proc_dointvec() and not only during sysctl restart.
Fix this by checking the return value of proc_dointvec() and returning early on failure.
--- net/ipv6/addrconf.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv6/addrconf.c +2 -0
@@ -6769,6 +6769,8 @@ static int addrconf_sysctl_disable_policy(const struct ctl_table *ctl, int write lctl = *ctl; lctl.data = &val; ret =proc_dointvec (&lctl, write, buffer, lenp, ppos); +if (ret) +return ret;if (write && (*valp != val)) ret =addrconf_disable_policy (ctl, valp, val);
Signature · 1 line
2.54.0
PATCH v2 5/7 ipv6: reset value and position for proxy_ndp sysctl restart
In reply to Fernando Fernandez ManceraWhen handling proxy_ndp, if rtnl_net_trylock() fails, the operation is retried but as the value was already modified by the initial proc_dointvec() call, the restarted syscall will read the newly modified value as the 'old' state.
Fix this by taking the RTNL lock before parsing the input value if the operation is a write.
--- net/ipv6/addrconf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/ipv6/addrconf.c +7 -7
@@ -6482,20 +6482,19 @@ static int addrconf_sysctl_disable(const struct ctl_table *ctl, int write,static int addrconf_sysctl_proxy_ndp (const struct ctl_table *ctl,int write,void *buffer,size_t *lenp,loff_t *ppos) { +struct net *net = ctl->extra2;int *valp = ctl->data; -int ret;int old, new; +int ret; + +if (write && !rtnl_net_trylock (net)) +return restart_syscall (); old = *valp; ret =proc_dointvec (ctl, write, buffer, lenp, ppos); new = *valp;if (write && old != new) { -struct net *net = ctl->extra2; - -if (!rtnl_net_trylock (net)) -return restart_syscall (); -if (valp == &net->ipv6.devconf_dflt->proxy_ndp) { inet6_netconf_notify_devconf(net, RTM_NEWNETCONF, NETCONFA_PROXY_NEIGH,
@@ -6514,8 +6513,9 @@ static int addrconf_sysctl_proxy_ndp(const struct ctl_table *ctl, int write, idev->dev->ifindex, &idev->cnf); } -rtnl_net_unlock (net); } +if (write) +rtnl_net_unlock (net);return ret; }
Signature · 1 line
2.54.0
Re: [PATCH net v2 5/7] ipv6: reset value and position for proxy_ndp sysctl restart
Le 20/06/2026 à 18:18, Fernando Fernandez Mancera a écrit :
Quoted 10 lines
When handling
proxy_ndp, ifrtnl_net_trylock()fails, the operation is retried but as the value was already modified by the initialproc_dointvec()call, the restarted syscall will read the newly modified value as the 'old' state.Fix this by taking the RTNL lock before parsing the input value if the operation is a write.
Fixes c92d5491a6d9 ("netconf: add support for IPv6 proxy_ndp")Signed-off-by Fernando Fernandez Mancera <[email protected]>
PATCH v2 6/7 ipv6: fix missing notification for ignore_routes_with_linkdown
In reply to Fernando Fernandez ManceraWhen changing the ignore_routes_with_linkdown sysctl for a specific interface, the RTM_NEWNETCONF netlink notification was not being emitted to userspace. Fix this by emitting the notification when needed.
In addition, fix bogus return value for successful "all" and specific interface write operation leading to a wrong reset of the position pointer.
--- net/ipv6/addrconf.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
net/ipv6/addrconf.c +12 -6
@@ -955,11 +955,7 @@ static int addrconf_fixup_linkdown(const struct ctl_table *table, int *p, int neNETCONFA_IGNORE_ROUTES_WITH_LINKDOWN ,NETCONFA_IFINDEX_DEFAULT , net->ipv6.devconf_dflt); -rtnl_net_unlock (net); -return 0 ; - } - -if (p == &net->ipv6.devconf_all->ignore_routes_with_linkdown) { + }else if (p == &net->ipv6.devconf_all->ignore_routes_with_linkdown) {WRITE_ONCE (net->ipv6.devconf_dflt->ignore_routes_with_linkdown, newf);addrconf_linkdown_change (net, newf);if ((!newf) ^ (!old))
@@ -968,11 +964,21 @@ static int addrconf_fixup_linkdown(const struct ctl_table *table, int *p, int neNETCONFA_IGNORE_ROUTES_WITH_LINKDOWN ,NETCONFA_IFINDEX_ALL , net->ipv6.devconf_all); + }else { +if (!newf ^ !old) { +struct inet6_dev *idev = table->extra1; + +inet6_netconf_notify_devconf (net, +RTM_NEWNETCONF , +NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN , + idev->dev->ifindex, + &idev->cnf); + } }rtnl_net_unlock (net); -return 1 ; +return 0 ; }#endif
Signature · 1 line
2.54.0
PATCH v2 7/7 ipv6: reset position for force_forwarding sysctl restart
In reply to Fernando Fernandez ManceraWhen handling proxy_ndp, if rtnl_net_trylock() fails, the operation is retried but the position pointer was already advanced meaning that the restarted sysctl will read from an incorrect offset.
Fix this by restoring the original position pointer before restarting the syscall.
In addition, remove the redundant position pointer restoration at the end of the function.
--- net/ipv6/addrconf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/ipv6/addrconf.c +3 -3
@@ -6825,8 +6825,10 @@ static int addrconf_sysctl_force_forwarding(const struct ctl_table *ctl, int wri ret =proc_douintvec_minmax (&tmp_ctl, write, buffer, lenp, ppos);if (write && old_val != new_val) { -if (!rtnl_net_trylock (net)) +if (!rtnl_net_trylock (net)) { + *ppos = pos;return restart_syscall (); + }WRITE_ONCE (*valp, new_val);
@@ -6851,8 +6853,6 @@ static int addrconf_sysctl_force_forwarding(const struct ctl_table *ctl, int wrirtnl_net_unlock (net); } -if (ret) - *ppos = pos;return ret; }
Signature · 1 line
2.54.0
Ido Schimmel
maintainerRe: [PATCH net v2 7/7] ipv6: reset position for force_forwarding sysctl restart
Quoted 1 line · Fernando Fernandez Mancera
When handling
proxy_ndp, ifrtnl_net_trylock()fails, the operation is
s/proxy_ndp/force_forwarding/
Quoted 20 lines
retried but the position pointer was already advanced meaning that the restarted sysctl will read from an incorrect offset.
Fix this by restoring the original position pointer before restarting the syscall.
In addition, remove the redundant position pointer restoration at the end of the function.
Fixes f24987ef6959 ("ipv6: add `force_forwarding` sysctl to enable per-interface forwarding")Signed-off-by Fernando Fernandez Mancera <[email protected]>--- net/ipv6/addrconf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)net/ipv6/addrconf.c +0
-0
net/ipv6/addrconf.c static int addrconf_sysctl_force_forwarding(const struct ctl_table *ctl, int wri · line 6831
Quoted 8 lines
net/ipv6/addrconf.c +3
-1@@ -6825,8 +6825,10 @@ static int addrconf_sysctl_force_forwarding(const struct ctl_table *ctl, int wri ret =proc_douintvec_minmax (&tmp_ctl, write, buffer, lenp, ppos);if (write && old_val != new_val) { -if (!rtnl_net_trylock (net)) +if (!rtnl_net_trylock (net)) { + *ppos = pos;return restart_syscall (); + }
Are you sure that this is needed?
AFAICT, the position pointer is only advanced if the return value is positive. From new_sync_write():
kiocb.ki_pos = (ppos ? *ppos : 0);
[...]
ret = filp->f_op->write_iter(&kiocb, &iter);
[...]
if (ret > 0 && ppos)
*ppos = kiocb.ki_pos;
And restart_syscall() returns '-ERESTARTNOINTR'.
Quoted 15 lines
net/ipv6/addrconf.c +0
-2WRITE_ONCE (*valp, new_val);@@ -6851,8 +6853,6 @@ static int addrconf_sysctl_force_forwarding(const struct ctl_table *ctl, int wrirtnl_net_unlock (net); } -if (ret) - *ppos = pos;return ret; }Signature · 1 line
2.54.0
Re: [PATCH net v2 7/7] ipv6: reset position for force_forwarding sysctl restart
Quoted 39 lines · Ido Schimmel
Quoted 1 line · Fernando Fernandez Mancera
When handling
proxy_ndp, ifrtnl_net_trylock()fails, the operation iss/proxy_ndp/force_forwarding/
Quoted 20 lines
retried but the position pointer was already advanced meaning that the restarted sysctl will read from an incorrect offset.
Fix this by restoring the original position pointer before restarting the syscall.
In addition, remove the redundant position pointer restoration at the end of the function.
Fixes f24987ef6959 ("ipv6: add `force_forwarding` sysctl to enable per-interface forwarding")Signed-off-by Fernando Fernandez Mancera <[email protected]>--- net/ipv6/addrconf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)net/ipv6/addrconf.c +0
-0net/ipv6/addrconf.c static int addrconf_sysctl_force_forwarding(const struct ctl_table *ctl, int wri · line 6831
Quoted 8 lines
net/ipv6/addrconf.c +3
-1@@ -6825,8 +6825,10 @@ static int addrconf_sysctl_force_forwarding(const struct ctl_table *ctl, int wri ret =proc_douintvec_minmax (&tmp_ctl, write, buffer, lenp, ppos);if (write && old_val != new_val) { -if (!rtnl_net_trylock (net)) +if (!rtnl_net_trylock (net)) { + *ppos = pos;return restart_syscall (); + }Are you sure that this is needed?
AFAICT, the position pointer is only advanced if the return value is positive. From
new_sync_write():
Quoted 9 lines
kiocb.ki_pos = (ppos ? *ppos : 0);
[...]
ret =filp->f_op->write_iter(&kiocb, &iter);
[...]
if (ret > 0 && ppos)*ppos = kiocb.ki_pos;And
restart_syscall()returns '-ERESTARTNOINTR'.
Hm, I think you are right. I was not aware of this check, thanks for pointing it out. That means we can get rid of position pointer reset from the rest of the code.. the are plenty of sysctl following this pattern. I will prepare a batch for net-next.
I am sending a v3 dropping this patch.
Thank you Ido!
Quoted 15 lines
Quoted 15 lines
net/ipv6/addrconf.c +0
-2WRITE_ONCE (*valp, new_val);@@ -6851,8 +6853,6 @@ static int addrconf_sysctl_force_forwarding(const struct ctl_table *ctl, int wrirtnl_net_unlock (net); } -if (ret) - *ppos = pos;return ret; }Signature · 1 line
2.54.0
This series was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Sat, 20 Jun 2026 18:18:43 +0200 you wrote:
While working on a different IPv6 patch series I have spotted multiple minor bugs around sysctl error handling and notifications. In general, they are not serious issues.
In addition, there is one more issue in forwarding sysctl as it does not check for
CAP_NET_ADMINfor the namespace. I am keeping that patch out of this series and I am aiming it at the net-next tree once it re-opens.[...]
Here is the summary with links:
- [net,v2,1/7] ipv6: fix error handling in disable_ipv6 sysctl
https://git.kernel.org/netdev/net/c/c779441e5070 - [net,v2,2/7] ipv6: fix error handling in ignore_routes_with_linkdown sysctl https://git.kernel.org/netdev/net/c/cf4f2b14401f - [net,v2,3/7] ipv6: fix error handling in forwarding sysctl https://git.kernel.org/netdev/net/c/058b9b19f963 - [net,v2,4/7] ipv6: fix error handling in disable_policy sysctl https://git.kernel.org/netdev/net/c/3e0e51c0ee1d - [net,v2,5/7] ipv6: reset value and position for proxy_ndp sysctl restart https://git.kernel.org/netdev/net/c/6a1b50e585f0 - [net,v2,6/7] ipv6: fix missing notification for ignore_routes_with_linkdown https://git.kernel.org/netdev/net/c/17dc3b245de4
- [net,v2,7/7] ipv6: reset position for force_forwarding sysctl restart (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html