mirror of https://gitee.com/openkylin/linux.git
netfilter: xtables: add scheduling opportunity in get_counters
There are reports about spurious softlockups during iptables-restore, a backtrace i saw points at get_counters -- it uses a sequence lock and also has unbounded restart loop. Signed-off-by: Florian Westphal <fw@strlen.de> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
75c2631468
commit
a5d7a71456
|
@ -629,6 +629,7 @@ static void get_counters(const struct xt_table_info *t,
|
|||
|
||||
ADD_COUNTER(counters[i], bcnt, pcnt);
|
||||
++i;
|
||||
cond_resched();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -776,6 +776,7 @@ get_counters(const struct xt_table_info *t,
|
|||
|
||||
ADD_COUNTER(counters[i], bcnt, pcnt);
|
||||
++i; /* macro does multi eval of i */
|
||||
cond_resched();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -795,6 +795,7 @@ get_counters(const struct xt_table_info *t,
|
|||
|
||||
ADD_COUNTER(counters[i], bcnt, pcnt);
|
||||
++i;
|
||||
cond_resched();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue