Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5d7a714 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

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: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 75c26314

net/ipv4/netfilter/arp_tables.c

+1 −0
Original line number Diff line number Diff line
@@ -629,6 +629,7 @@ static void get_counters(const struct xt_table_info *t, 


			ADD_COUNTER(counters[i], bcnt, pcnt);

			++i;

			cond_resched();

		}

	}

}

net/ipv4/netfilter/ip_tables.c

+1 −0
Original line number Diff line number Diff line
@@ -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();

		}

	}

}

net/ipv6/netfilter/ip6_tables.c

+1 −0
Original line number Diff line number Diff line
@@ -795,6 +795,7 @@ get_counters(const struct xt_table_info *t, 


			ADD_COUNTER(counters[i], bcnt, pcnt);

			++i;

			cond_resched();

		}

	}

}