diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2009-05-13 12:58:17 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-19 01:15:58 -0400 |
commit | 5007392d8512e666107dc356d4c2e05627b9029b (patch) | |
tree | 95f89bd01bca414a6bd40ea46fd6065bebe6b135 /net | |
parent | 336ca57c3b4e2b58ea3273e6d978ab3dfa387b4c (diff) |
net: FIX ipv6_forward sysctl restart
Just returning -ERESTARTSYS without a signal pending is not
good that will just leak it to userspace. We need return
-ERESTARTNOINTR so we always restart and set signal pending
so that we fall of the fast path of syscall return and setup
the system call restart.
So use restart_syscall() which does all of this for us.
Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/addrconf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index a8218bc1806a..9eb61c7cae57 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -503,7 +503,7 @@ static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old) | |||
503 | return 0; | 503 | return 0; |
504 | 504 | ||
505 | if (!rtnl_trylock()) | 505 | if (!rtnl_trylock()) |
506 | return -ERESTARTSYS; | 506 | return restart_syscall(); |
507 | 507 | ||
508 | if (p == &net->ipv6.devconf_all->forwarding) { | 508 | if (p == &net->ipv6.devconf_all->forwarding) { |
509 | __s32 newf = net->ipv6.devconf_all->forwarding; | 509 | __s32 newf = net->ipv6.devconf_all->forwarding; |