Commit 56e2c94f authored Jul 30, 2018 by Eric Dumazet Committed by David S. Miller Jul 31, 2018

inet: frag: enforce memory limits earlier



We currently check current frags memory usage only when
a new frag queue is created. This allows attackers to first
consume the memory budget (default : 4 MB) creating thousands
of frag queues, then sending tiny skbs to exceed high_thresh
limit by 2 to 3 order of magnitude.

Note that before commit 648700f7 ("inet: frags: use rhashtables
for reassembly units"), work queue could be starved under DOS,
getting no cpu cycles.
After commit 648700f7, only the per frag queue timer can eventually
remove an incomplete frag queue and its skbs.

Fixes: b13d3cbf ("inet: frag: move eviction of queues to work queue")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Jann Horn <jannh@google.com>
Cc: Florian Westphal <fw@strlen.de>
Cc: Peter Oskolkov <posk@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e39eb599

net/ipv4/inet_fragment.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -157,9 +157,6 @@ static struct inet_frag_queue inet_frag_alloc(struct netns_frags nf,
		{
		struct inet_frag_queue *q;

		if (!nf->high_thresh \|\| frag_mem_limit(nf) > nf->high_thresh)
		return NULL;

		q = kmem_cache_zalloc(f->frags_cachep, GFP_ATOMIC);
		if (!q)
		return NULL;
		@@ -204,6 +201,9 @@ struct inet_frag_queue inet_frag_find(struct netns_frags nf, void *key)
		{
		struct inet_frag_queue *fq;

		if (!nf->high_thresh \|\| frag_mem_limit(nf) > nf->high_thresh)
		return NULL;

		rcu_read_lock();

		fq = rhashtable_lookup(&nf->rhashtable, key, nf->f->rhash_params);

Admin message