tree 54588395fa965e1e8635252c82c273e4cfa8ff79
parent 9445d2ea32282cb7e3e5011391c354beef88eb93
author Kyle Zeng <zengyhkyle@gmail.com> 1693951449 -0700
committer He Gao <hegao@google.com> 1696353277 +0000

netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c

commit 050d91c03b28ca479df13dfb02bcd2c60dd6a878 upstream.

The missing IP_SET_HASH_WITH_NET0 macro in ip_set_hash_netportnet can
lead to the use of wrong `CIDR_POS(c)` for calculating array offsets,
which can lead to integer underflow. As a result, it leads to slab
out-of-bound access.
This patch adds back the IP_SET_HASH_WITH_NET0 macro to
ip_set_hash_netportnet to address the issue.

BUG=b/302507717
SOURCE=UPSTREAM(050d91c03b28ca479df13dfb02bcd2c60dd6a878)
TEST=presubmit
RELEASE_NOTE=Fixed CVE-2023-42753 in the Linux kernel.

cos-patch: security-high
Fixes: 886503f34d63 ("netfilter: ipset: actually allow allowable CIDR 0 in hash:net,port,net")
Suggested-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Acked-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Change-Id: Ia3048ca64f64bef58972c0c645b4948ade82b63e
Signed-off-by: Kyle Zeng <zengyhkyle@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/58409
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Oleksandr Tymoshenko <ovt@google.com>