ipv4: remove unnecessary reset of position pointer
Subsystems (3)
PATCH v2 1/2 ipv4: remove unnecessary reset of position pointer
The position pointer is only advanced if the return value of the proc handler is positive at new_sync_write(). Therefore no need to manually reset it when doing error handling.
--- net/ipv4/devinet.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/ipv4/devinet.c +1 -3
@@ -2607,10 +2607,9 @@ static int devinet_conf_proc(const struct ctl_table *ctl, int write,static int devinet_sysctl_forward (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 val = *valp; -loff_t pos = *ppos; -struct net *net = ctl->extra2;int ret;if (write && !ns_capable (net->user_ns,CAP_NET_ADMIN ))
@@ -2623,7 +2622,6 @@ static int devinet_sysctl_forward(const struct ctl_table *ctl, int write,if (!rtnl_net_trylock (net)) {/* Restore the original values before restarting */ *valp = val; - *ppos = pos;return restart_syscall (); }if (valp == &IPV4_DEVCONF_ALL (net,FORWARDING )) {
Signature · 1 line
2.55.0
PATCH v2 2/2 ipv6: remove unnecessary reset of position pointer
The position pointer is only advanced if the return value of the proc handler is positive at new_sync_write(). Therefore no need to manually reset it when doing error handling.
---
Note: The checkpatch warnings here are false positive, lctl cannot be const in this context
--- net/ipv6/addrconf.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-)
net/ipv6/addrconf.c +4 -20
@@ -6363,10 +6363,9 @@ static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)static int addrconf_sysctl_forward (const struct ctl_table *ctl,int write,void *buffer,size_t *lenp,loff_t *ppos) { +struct ctl_table lctl;int *valp = ctl->data;int val = *valp; -loff_t pos = *ppos; -struct ctl_table lctl;int ret;/*
@@ -6382,8 +6381,6 @@ static int addrconf_sysctl_forward(const struct ctl_table *ctl, int write,if (write) ret =addrconf_fixup_forwarding (ctl, valp, val); -if (ret) - *ppos = pos;return ret; }
@@ -6462,10 +6459,9 @@ static int addrconf_disable_ipv6(const struct ctl_table *table, int *p, int newfstatic int addrconf_sysctl_disable (const struct ctl_table *ctl,int write,void *buffer,size_t *lenp,loff_t *ppos) { +struct ctl_table lctl;int *valp = ctl->data;int val = *valp; -loff_t pos = *ppos; -struct ctl_table lctl;int ret;/*
@@ -6481,8 +6477,6 @@ static int addrconf_sysctl_disable(const struct ctl_table *ctl, int write,if (write) ret =addrconf_disable_ipv6 (ctl, valp, val); -if (ret) - *ppos = pos;return ret; }
@@ -6667,10 +6661,9 @@ int addrconf_sysctl_ignore_routes_with_linkdown(const struct ctl_table *ctl,size_t *lenp, loff_t *ppos) { + struct ctl_table lctl;int *valp = ctl->data;int val = *valp; -loff_t pos = *ppos; -struct ctl_table lctl;int ret;/* ctl->data points to idev->cnf.ignore_routes_when_linkdown
@@ -6685,8 +6678,6 @@ int addrconf_sysctl_ignore_routes_with_linkdown(const struct ctl_table *ctl,if (write) ret =addrconf_fixup_linkdown (ctl, valp, val); -if (ret) - *ppos = pos;return ret; }
@@ -6767,10 +6758,9 @@ int addrconf_disable_policy(const struct ctl_table *ctl, int *valp, int val)static int addrconf_sysctl_disable_policy (const struct ctl_table *ctl,int write,void *buffer,size_t *lenp,loff_t *ppos) { +struct ctl_table lctl;int *valp = ctl->data;int val = *valp; -loff_t pos = *ppos; -struct ctl_table lctl;int ret; lctl = *ctl;
@@ -6782,9 +6772,6 @@ static int addrconf_sysctl_disable_policy(const struct ctl_table *ctl, int writeif (write && (*valp != val)) ret =addrconf_disable_policy (ctl, valp, val); -if (ret) - *ppos = pos; -return ret; }
@@ -6816,7 +6803,6 @@ static int addrconf_sysctl_force_forwarding(const struct ctl_table *ctl, int wriint *valp = ctl->data;int new_val = *valp;int old_val = *valp; -loff_t pos = *ppos;int ret; tmp_ctl.extra1 =SYSCTL_ZERO ;
@@ -6852,8 +6838,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.55.0
This series was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Quoted 8 lines · On Mon, 27 Jul 2026 11:18:33 +0200 you wrote:
The position pointer is only advanced if the return value of the proc handler is positive at
new_sync_write(). Therefore no need to manually reset it when doing error handling.Reviewed-by Ido Schimmel <[email protected]>Signed-off-by Fernando Fernandez Mancera <[email protected]>[...]
Here is the summary with links:
- [1/2,net-next,v2] ipv4: remove unnecessary reset of position pointer
https://git.kernel.org/netdev/net-next/c/ea771e17e995 - [2/2,net-next,v2] ipv6: remove unnecessary reset of position pointer https://git.kernel.org/netdev/net-next/c/ac84c8551801
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html