From nobody Sat Jun 13 17:03:45 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C846B3E3164 for ; Wed, 6 May 2026 08:24:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778055867; cv=none; b=GnlmypGd3rLebGnHXjYEjqZc9hGUKLPEZPT6czgtoTnUBAql233z6qL8n6J/sKcLZsVAILR8aXaQ+jeXRdr5AWzUqbjANTcSKR5Vvl8D9QyQmZm5lSZzbEk8uuqecPd00BYDT4ugD4ZtSFzAUhU8AazyVv3REi8Rc2XWr6BJanQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778055867; c=relaxed/simple; bh=/Fl6Eup1KJku7VmBbKrDm8Q65djqAuVDuYeegE3umw4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=V1fL6Z7+oPAIBJUhoIlfsikuSc7zbR8YQnKoS1DNYdXNP+M84vbP71D5zTCKoJzXJsH51Jl51gPQFRRa26CIr1pOk9n9k+MiG54yQtEJobl/X6goSdojZuC83zXeMBO0u+124xgb2VnEhshL/925kdgHv3TKr/2bT6uNHN0D4rs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GbkuiFuT; arc=none smtp.client-ip=209.85.216.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GbkuiFuT" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-36520a83186so2690957a91.3 for ; Wed, 06 May 2026 01:24:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778055865; x=1778660665; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kaLjuq9Nze0HU4z8sneE7fCkabZfqnOhZ8tEew7UUs4=; b=GbkuiFuT7rd/q+q/a9Ckw4xtBrwtxlry9JRwTCPCtTK14g4pVYAPqbZUVy5MreOrbr w1f8Rw2+N+t/xK0NiikQ5dmO6VsUtrkgORxNv0HLSl9582BD4idkA50bHF/dCAEic3nd 7BDjCppxJEqLujHos6wAI4+4UeSmdVMopV3P/hmYXn2u7WvcdXTINa8eizVMqq28VoPQ vC/PpNdF2pf6pN8RWiEdV72UWTRj6VRTUzK7Mx4pYRclLjevLJKo6BjyuvMCCK0UaW1R vUM22iCtUvcozP6Oaymg9oW0EfiZUvFvIxX5YLqyPLcFtDjvddcc8AEdR+xdnA8Tbj3U 7qkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778055865; x=1778660665; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kaLjuq9Nze0HU4z8sneE7fCkabZfqnOhZ8tEew7UUs4=; b=Cxi8I5+/jzrIzX7p5e7n81osryEY2fpbjBLqr5ILVSCFdlvCOZRacPNiHmC2juf77Q xo1T6YZP+fytgyvLqhqu4BwEwyvNKeX+5E+KAfupjXLdf3vJEKugknnb35Eh8cc/Y1XS +Y9K64wAITjVhYii9IxTpTqGxNwVArmdsydr9ZFkUadSPCjTbdLVgihYrXRRfXOE7jZL lHU6ieAvDYLKh1SyIJoODfv3ZORm4BGITWghY7S4sVLSyKG3NbdoCIvUsPn4S1whas00 cZ/U4o11gcVSx2VuPgb6MCGLH0lDA7n1mfq6pW/jq3LIifRq2El61aLNQt7tMENStOel ZzhA== X-Forwarded-Encrypted: i=1; AFNElJ9BFKg9IndeGVUXPqtjITSMxsLQN6QqlZ/xo17nnpmLe/znnWLDvlzl2RKkPqAzal0g0nUaT/CUrrsh7wE=@vger.kernel.org X-Gm-Message-State: AOJu0YynIxOvsP171G3c1NFpVniZSgvKmr8j2lleJjo4lIfzl+jAhKD3 gqmjfRJfKau+UcXnTiB54U0NAftx8es60gmVMD0GNS80O5cgfYBNUe45IJuXhA== X-Gm-Gg: AeBDievjOcUOpZRqEMp4GXVyWDcTLP9hRnJyLmcSs+cmuWjSIFm3sdMm4oslad6xtW/ 8VzNB1eDZdOGQJTq0uc0DL7gkobJEiQXJgyxdJL6RySuqXPHU8aKzUIrW2iO0UvPpVqXWFw/bLT GD5aqPt1U6kQnx0rP0/9GfYPI9dOtqYNAzySpR/VHS90JvQU8TCVxYEpewvLMwDXH6hkfXrazQy N07IgnXfa6UBYRaoIvZrcrTuXZlr1ScF0EMt4Sam7gViNL3L1LGgSGAx6WDsc8hdGi/rdpKHN1V 3yPxU3e4wSxtug8cXVJoXVIcMTKgxJvKr+g0MTwMhmvR+nvfwia0fk0go0XVdPpiBSjO8meLflY RIldhbi9vUV0RKE54OwEP1YyZz9fvIgVZ/CcXu1JM4LDFsMJQBg1a+uYuXsDSNMveMPkwG+citA sf3ZSsKqNuBfL5UU30sfQ0SFAg6RLUcXPDrkj2NDswnqLysFg46JV7ff3kco0= X-Received: by 2002:a17:90b:5343:b0:35e:57cf:c0a3 with SMTP id 98e67ed59e1d1-365ac7808f4mr2213995a91.26.1778055864948; Wed, 06 May 2026 01:24:24 -0700 (PDT) Received: from csl-conti-dell7858.ntu.edu.sg ([155.69.195.57]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-365b12a1eddsm1000293a91.6.2026.05.06.01.24.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 01:24:24 -0700 (PDT) From: Maoyi Xie To: "David S . Miller" Cc: Jakub Kicinski , Paolo Abeni , Eric Dumazet , David Ahern , Alexey Kuznetsov , Willem de Bruijn , Willem de Bruijn , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Maoyi Xie Subject: [PATCH net v8 1/2] ipv6: flowlabel: take ip6_fl_lock across mem_check and fl_intern Date: Wed, 6 May 2026 16:24:15 +0800 Message-Id: <20260506082416.2259567-2-maoyixie.tju@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260506082416.2259567-1-maoyixie.tju@gmail.com> References: <20260506082416.2259567-1-maoyixie.tju@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maoyi Xie mem_check() in net/ipv6/ip6_flowlabel.c reads fl_size without holding ip6_fl_lock. fl_intern() takes the lock immediately afterwards. The two checks therefore race against concurrent fl_intern, ip6_fl_gc and ip6_fl_purge writers, which makes the mem_check budget check approximate. Move spin_lock_bh(&ip6_fl_lock) and the matching unlock from fl_intern() into its only caller ipv6_flowlabel_get(). The mem_check() call now runs under the same critical section as the fl_intern() insert, so the budget check is exact. With all writers and the read of fl_size under ip6_fl_lock, convert fl_size from atomic_t to plain int. The four sites that update or read fl_size are fl_intern (insert path), ip6_fl_gc (garbage collector, the !sched check and the per-entry decrement), ip6_fl_purge (per-netns purge), and mem_check (budget check), and all four now run under ip6_fl_lock. This is a prerequisite for adding a per-netns budget alongside fl_size. The follow-up patch adds netns_ipv6::flowlabel_count and folds it into mem_check(). Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Suggested-by: Willem de Bruijn Reviewed-by: Willem de Bruijn Signed-off-by: Maoyi Xie --- net/ipv6/ip6_flowlabel.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index c92f98c6f..a89746431 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c @@ -40,7 +40,7 @@ #define FL_HASH_MASK 255 #define FL_HASH(l) (ntohl(l)&FL_HASH_MASK) =20 -static atomic_t fl_size =3D ATOMIC_INIT(0); +static int fl_size; static struct ip6_flowlabel __rcu *fl_ht[FL_HASH_MASK+1]; =20 static void ip6_fl_gc(struct timer_list *unused); @@ -163,7 +163,7 @@ static void ip6_fl_gc(struct timer_list *unused) if (time_after_eq(now, ttd)) { *flp =3D fl->next; fl_free(fl); - atomic_dec(&fl_size); + fl_size--; continue; } if (!sched || time_before(ttd, sched)) @@ -172,7 +172,7 @@ static void ip6_fl_gc(struct timer_list *unused) flp =3D &fl->next; } } - if (!sched && atomic_read(&fl_size)) + if (!sched && fl_size) sched =3D now + FL_MAX_LINGER; if (sched) { mod_timer(&ip6_fl_gc_timer, sched); @@ -196,7 +196,7 @@ static void __net_exit ip6_fl_purge(struct net *net) atomic_read(&fl->users) =3D=3D 0) { *flp =3D fl->next; fl_free(fl); - atomic_dec(&fl_size); + fl_size--; continue; } flp =3D &fl->next; @@ -210,10 +210,10 @@ static struct ip6_flowlabel *fl_intern(struct net *ne= t, { struct ip6_flowlabel *lfl; =20 + lockdep_assert_held(&ip6_fl_lock); + fl->label =3D label & IPV6_FLOWLABEL_MASK; =20 - rcu_read_lock(); - spin_lock_bh(&ip6_fl_lock); if (label =3D=3D 0) { for (;;) { fl->label =3D htonl(get_random_u32())&IPV6_FLOWLABEL_MASK; @@ -235,8 +235,6 @@ static struct ip6_flowlabel *fl_intern(struct net *net, lfl =3D __fl_lookup(net, fl->label); if (lfl) { atomic_inc(&lfl->users); - spin_unlock_bh(&ip6_fl_lock); - rcu_read_unlock(); return lfl; } } @@ -244,9 +242,7 @@ static struct ip6_flowlabel *fl_intern(struct net *net, fl->lastuse =3D jiffies; fl->next =3D fl_ht[FL_HASH(fl->label)]; rcu_assign_pointer(fl_ht[FL_HASH(fl->label)], fl); - atomic_inc(&fl_size); - spin_unlock_bh(&ip6_fl_lock); - rcu_read_unlock(); + fl_size++; return NULL; } =20 @@ -464,10 +460,14 @@ fl_create(struct net *net, struct sock *sk, struct in= 6_flowlabel_req *freq, =20 static int mem_check(struct sock *sk) { - int room =3D FL_MAX_SIZE - atomic_read(&fl_size); + int room; struct ipv6_fl_socklist *sfl; int count =3D 0; =20 + lockdep_assert_held(&ip6_fl_lock); + + room =3D FL_MAX_SIZE - fl_size; + if (room > FL_MAX_SIZE - FL_MAX_PER_SOCK) return 0; =20 @@ -692,11 +692,19 @@ static int ipv6_flowlabel_get(struct sock *sk, struct= in6_flowlabel_req *freq, if (!sfl1) goto done; =20 + rcu_read_lock(); + spin_lock_bh(&ip6_fl_lock); err =3D mem_check(sk); + if (err =3D=3D 0) + fl1 =3D fl_intern(net, fl, freq->flr_label); + else + fl1 =3D NULL; + spin_unlock_bh(&ip6_fl_lock); + rcu_read_unlock(); + if (err !=3D 0) goto done; =20 - fl1 =3D fl_intern(net, fl, freq->flr_label); if (fl1) goto recheck; =20 --=20 2.34.1 From nobody Sat Jun 13 17:03:45 2026 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 063D13E3C46 for ; Wed, 6 May 2026 08:24:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778055870; cv=none; b=cq5tfa46Xdcz5Llx7RFkcsIiT/Y4uDLUgtY510pgG5fvXtXMvREySudRwsX5Pi7ENolpQbQ1EnaJzhS8TfaNoXQ5RsYOlvKGtESP3NAWHTSQEP010kZqWwVwq3ImQikEAfCtNEmS+QTzZ+UUq7WUCuqodjV9xsYFCIuOvdSKTQE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778055870; c=relaxed/simple; bh=/zhX6pVHc6jKOYVIyZpu2RA8wq4PDni8zJBq8MVeqw8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AT5/clGbmbyfGhtjnfmFQwrS9WLi988BfUCiQP4RlZXLcWAKvwCcRBHU+TmHdVbDg7hkvvkRbrnSVtL4N/6WJARUj5Ka2jaN4DApXx9cXCCnNrj1qixbE//g9v+f8BGus5q9at4Ea58LyqC4EmFfAeO4jVlL4v1aN6D+Vkhvjqg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QdrsxTJb; arc=none smtp.client-ip=209.85.216.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QdrsxTJb" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-36535998b71so397104a91.0 for ; Wed, 06 May 2026 01:24:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778055868; x=1778660668; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MU+BTMLVtF5cm6yr1FFJAfY/wspADdxuXDbB9M810Sk=; b=QdrsxTJb4pssRg4UAyYgdke1301S2EvscGAZ+NC4TDUC93JdNrPzm/eCDf47x4jxNh pjVJezk/m3cV2TEGG2BQ9M3np1hhXNwgnHdeuCdJLD8fKyxnJJoXNj9v9Z6jZNchW+lC 8/GfI5F/SzLzo6f428E5+8FXYNukHQO7xRm3NkNAjbtCwBrrFn9f6S6COMywQ6F1e827 B9Yy6Yu7a+1AVAQw4F6W902PV2uCJxmDXWd0uF4eYoZLVHVmwdmSjvZ7pSPDb2jdJJxv zQ5HX0sRP8uKr6XToWl8TiGrLvV/PSRxKDhCwHJUdbwFVta7CeEXSCwk2fAFP6M0QAiG wikQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778055868; x=1778660668; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MU+BTMLVtF5cm6yr1FFJAfY/wspADdxuXDbB9M810Sk=; b=JBm7Yjh5wDZoCudTIUV/JOtyPA6y1z3tREON+/dXXNH/7uH/ex6t/SkksY515iks66 +pTJaNxNn0wwkWaBQI7058iabtyZK5jnRMQKuOweQ8l9JrE0k3qapGrxGveqvijqSyiz s/eJ9AFY0wKSXeL/EoVHmivObt4tI54MVxb30cpXyvVHdd+Fbbp+3499ljyhGjjo3YbA numdV2wtFGv9f4lE68Re3KSZwU6uhGeJz28m8vkJhcXqa+rTBAKUhQT+JEQEz/oODekt kuDo4E5ogyKQCJ5ga4li1p/Hx7STRaWXr01qri8JuvsxvtHmXddqe2BsK2p2PpGu5SbJ Xg/w== X-Forwarded-Encrypted: i=1; AFNElJ+yP0b/v1ZoZvgKsXiYhvZEVM7AsXR3D8e62zCt4jkgpVZdCYJq66h9zL+EJjF9a3GsPjkqvEtxyXrsaG4=@vger.kernel.org X-Gm-Message-State: AOJu0YyL2Rkvd4X7YvAYjLrkB1XSNJTK3Yxofxks6S0gRFD2HRp/VKX4 y3igwV+vdsR5yycx3Ddobl96hb9R6GWxPDb8Jhlet76NOXpTZtB/OQGB X-Gm-Gg: AeBDieuJQHnh4K/2leJR5JNceWHJXNGZr+zMATabHyKW0uP85aT6vYkvkea8/PL9JnL VGEDJhAV3wwuoKOimE7/a2YbwqAlQJiZOuBR8GWtWm6LKuUznirQuhUEtnlWix1VN/cb1T62N7Z N+wRdRmPko7Gpm8eDPHosTvIW5gUbd33j4iyI1cbzIPoAxq7A+e+OR+1ELAMuhYKxsbfKXDTcol +LuwWNZLnX2XFF2JZhmwFMtD++Zp2KZIevkVkrsuaiQ5m3kY9/NZ6wltw1DZi/V/NgUqZxAv4jy kNqQqip7GPWpVhD8vosoQSpYg1A5unqFdNKHJ7TtcNbYxs4TPppnawTqGkPns4SyO07TObnPxgq 8laZ8Jkr3Kw6XGStjpNk38dMue3N0vUFoKMfGBaGmL/bc8ApGsTwlk2cNRHdST1DLEACSqrcIcg e+p+kSWfdyCUi+wdwcp+QmvK8MH2pa55xPqk1Puss/f3k9+5gGzPh4wgT2tiU= X-Received: by 2002:a17:90b:4a92:b0:35d:aa02:d776 with SMTP id 98e67ed59e1d1-365a96b3b2cmr1880890a91.2.1778055868209; Wed, 06 May 2026 01:24:28 -0700 (PDT) Received: from csl-conti-dell7858.ntu.edu.sg ([155.69.195.57]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-365b12a1eddsm1000293a91.6.2026.05.06.01.24.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 01:24:27 -0700 (PDT) From: Maoyi Xie To: "David S . Miller" Cc: Jakub Kicinski , Paolo Abeni , Eric Dumazet , David Ahern , Alexey Kuznetsov , Willem de Bruijn , Willem de Bruijn , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Maoyi Xie Subject: [PATCH net v8 2/2] ipv6: flowlabel: enforce per-netns limit for unprivileged callers Date: Wed, 6 May 2026 16:24:16 +0800 Message-Id: <20260506082416.2259567-3-maoyixie.tju@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260506082416.2259567-1-maoyixie.tju@gmail.com> References: <20260506082416.2259567-1-maoyixie.tju@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maoyi Xie fl_size, fl_ht and ip6_fl_lock in net/ipv6/ip6_flowlabel.c are file scope and shared across netns. mem_check() reads fl_size to decide whether to deny non-CAP_NET_ADMIN callers. capable() runs against init_user_ns, so an unprivileged user in any non-init userns can push fl_size past FL_MAX_SIZE - FL_MAX_SIZE / 4 and starve every other unprivileged userns on the host. Add struct netns_ipv6::flowlabel_count, bumped and decremented next to fl_size in fl_intern, ip6_fl_gc and ip6_fl_purge. The new field fills the existing 4-byte hole after ipmr_seq, so struct netns_ipv6 stays the same size on 64-bit builds. Bump FL_MAX_SIZE from 4096 to 8192. It has been 4096 since the file was added. Machines and connection counts have grown. mem_check() folds an extra per-netns ceiling into the existing non-CAP_NET_ADMIN conditional. The ceiling is half of the total budget that unprivileged callers have ever been able to use, i.e. (FL_MAX_SIZE - FL_MAX_SIZE / 4) / 2 =3D 3072 entries. With FL_MAX_SIZE doubled, this preserves the original per-user reach of 3K (what an unprivileged caller could already obtain before this change), while forcing an attacker to spread allocations across at least two netns to exhaust the global non-CAP_NET_ADMIN budget. CAP_NET_ADMIN against init_user_ns still bypasses both caps. The previous patch took ip6_fl_lock across mem_check and fl_intern, so the new flowlabel_count read in mem_check and the new flowlabel_count++ in fl_intern run under the same critical section. flowlabel_count is therefore plain int, like fl_size. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Suggested-by: Willem de Bruijn Reviewed-by: Willem de Bruijn Cc: stable@vger.kernel.org # v5.15+ Signed-off-by: Maoyi Xie --- include/net/netns/ipv6.h | 1 + net/ipv6/ip6_flowlabel.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index 499e42881..875916d60 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -119,6 +119,7 @@ struct netns_ipv6 { struct fib_notifier_ops *notifier_ops; struct fib_notifier_ops *ip6mr_notifier_ops; atomic_t ipmr_seq; + int flowlabel_count; struct { struct hlist_head head; spinlock_t lock; diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index a89746431..b1ccdf0dc 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c @@ -36,7 +36,7 @@ /* FL hash table */ =20 #define FL_MAX_PER_SOCK 32 -#define FL_MAX_SIZE 4096 +#define FL_MAX_SIZE 8192 #define FL_HASH_MASK 255 #define FL_HASH(l) (ntohl(l)&FL_HASH_MASK) =20 @@ -162,8 +162,9 @@ static void ip6_fl_gc(struct timer_list *unused) ttd =3D fl->expires; if (time_after_eq(now, ttd)) { *flp =3D fl->next; - fl_free(fl); fl_size--; + fl->fl_net->ipv6.flowlabel_count--; + fl_free(fl); continue; } if (!sched || time_before(ttd, sched)) @@ -197,6 +198,7 @@ static void __net_exit ip6_fl_purge(struct net *net) *flp =3D fl->next; fl_free(fl); fl_size--; + net->ipv6.flowlabel_count--; continue; } flp =3D &fl->next; @@ -243,6 +245,7 @@ static struct ip6_flowlabel *fl_intern(struct net *net, fl->next =3D fl_ht[FL_HASH(fl->label)]; rcu_assign_pointer(fl_ht[FL_HASH(fl->label)], fl); fl_size++; + net->ipv6.flowlabel_count++; return NULL; } =20 @@ -460,6 +463,9 @@ fl_create(struct net *net, struct sock *sk, struct in6_= flowlabel_req *freq, =20 static int mem_check(struct sock *sk) { + const int unpriv_total_limit =3D FL_MAX_SIZE - (FL_MAX_SIZE / 4); + const int unpriv_user_limit =3D unpriv_total_limit / 2; + struct net *net =3D sock_net(sk); int room; struct ipv6_fl_socklist *sfl; int count =3D 0; @@ -478,7 +484,9 @@ static int mem_check(struct sock *sk) =20 if (room <=3D 0 || ((count >=3D FL_MAX_PER_SOCK || - (count > 0 && room < FL_MAX_SIZE/2) || room < FL_MAX_SIZE/4) && + (count > 0 && room < FL_MAX_SIZE / 2) || + room < FL_MAX_SIZE / 4 || + net->ipv6.flowlabel_count >=3D unpriv_user_limit) && !capable(CAP_NET_ADMIN))) return -ENOBUFS; =20 --=20 2.34.1