| commit | 77dd8477b7c52179bd0ccbbe009bd28c1ffd9149 | [log] [tgz] |
|---|---|---|
| author | Kyle Zeng <[email protected]> | Tue Sep 05 15:04:09 2023 -0700 |
| committer | Nandhini Rengaraj <[email protected]> | Wed Oct 04 17:44:17 2023 +0000 |
| tree | 915e12fbea90d4fc39b5c373f027b5094d502fcc | |
| parent | 718a346ee1b847127bf441c795a12a5753dfb048 [diff] |
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/302920138
TEST=presubmit
RELEASE_NOTE=Fix 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 <[email protected]>
Change-Id: Id0cd6fac495b003bd6afc5502c999198f6937bb1
Signed-off-by: Kyle Zeng <[email protected]>
Acked-by: Jozsef Kadlecsik <[email protected]>
Signed-off-by: Florian Westphal <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Nandhini Rengaraj <[email protected]>
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/58587
Tested-by: Cusky Presubmit Bot <[email protected]>
Reviewed-by: Oleksandr Tymoshenko <[email protected]>