From: Jon Maxwell <jmaxwell37@gmail.com> mainline inclusion from mainline-v6.3-rc1 commit 695a376b59f72c249caad40da64d5cce239c5f48 category: bugfix bugzilla: 189510 CVE: CVE-2023-52340 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i... -------------------------------- v4: fix deprecated typo. Document that max_size is deprecated due to: commit af6d10345ca7 ("ipv6: remove max_size check inline with ipv4") Signed-off-by: Jon Maxwell <jmaxwell37@gmail.com> Link: https://lore.kernel.org/r/20230120232331.1273881-1-jmaxwell37@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Conflicts: Documentation/networking/ip-sysctl.txt Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> --- Documentation/networking/ip-sysctl.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index 710e9d239ece..563558de360e 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -96,6 +96,9 @@ route/max_size - INTEGER From linux kernel 3.6 onwards, this is deprecated for ipv4 as route cache is no longer used. + From linux kernel 6.3 onwards, this is deprecated for ipv6 + as garbage collection manages cached route entries. + neigh/default/gc_thresh1 - INTEGER Minimum number of entries to keep. Garbage collector will not purge entries if there are fewer than this number. -- 2.25.1