tree 9f621a57c5182cd3c6c7743418184cd754805a37
parent c8585e2312256e860351eb05836e6a3518026cff
author Kyle Zeng <zengyhkyle@gmail.com> 1693951449 -0700
committer COS Cherry Picker <cloud-image-release@prod.google.com> 1695863129 -0700

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/302285593
TEST=presubmit
SOURCE=UPSTREAM(050d91c03b28ca479df13dfb02bcd2c60dd6a878)
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>
Change-Id: I843077f9252df236712a9925a2506587c78cd798
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/+/58007
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Michael Kochera <kochera@google.com>
Main-Branch-Verified: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>