net: FIX ipv6_forward sysctl restart
authorEric W. Biederman <ebiederm@xmission.com>
Wed, 13 May 2009 16:58:17 +0000 (16:58 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 May 2009 05:15:58 +0000 (22:15 -0700)
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>
net/ipv6/addrconf.c

index a8218bc1806a6c541fdeac42eaf00ee66faf0950..9eb61c7cae5783574efbf4d3d293221b26d9c9ac 100644 (file)
@@ -503,7 +503,7 @@ static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old)
                return 0;
 
        if (!rtnl_trylock())
-               return -ERESTARTSYS;
+               return restart_syscall();
 
        if (p == &net->ipv6.devconf_all->forwarding) {
                __s32 newf = net->ipv6.devconf_all->forwarding;