|
 |
734205 |
From 8552f3231628950fb3f2a8966ef78b14006aefb2 Mon Sep 17 00:00:00 2001
|
|
|
734205 |
From: Ryan Sullivan <rysulliv@redhat.com>
|
|
|
734205 |
Date: Tue, 31 Jan 2023 11:26:03 -0500
|
|
|
734205 |
Subject: [KPATCH CVE-2023-0179] kpatch fixes for CVE-2023-0179
|
|
|
734205 |
|
|
|
734205 |
Kernels:
|
|
|
734205 |
5.14.0-162.6.1.el9_1
|
|
|
734205 |
5.14.0-162.12.1.el9_1
|
|
|
734205 |
|
|
|
734205 |
Kpatch-MR: https://gitlab.com/redhat/prdsc/rhel/src/kpatch/rhel-9/-/merge_requests/23
|
|
|
734205 |
Approved-by: Yannick Cote (@ycote1)
|
|
|
734205 |
Approved-by: Joe Lawrence (@joe.lawrence)
|
|
|
734205 |
Changes since last build:
|
|
|
734205 |
arches: x86_64 ppc64le
|
|
|
734205 |
l2cap_core.o: changed function: l2cap_rx_state_recv
|
|
|
734205 |
l2cap_core.o: changed function: l2cap_stream_rx
|
|
|
734205 |
nfs4proc.o: changed function: nfsd4_copy
|
|
|
734205 |
nfs4proc.o: changed function: nfsd4_do_async_copy
|
|
|
734205 |
nft_payload.o: changed function: nft_payload_copy_vlan
|
|
|
734205 |
sysctl.o: changed function: __do_proc_dointvec
|
|
|
734205 |
sysctl.o: changed function: __do_proc_douintvec
|
|
|
734205 |
sysctl.o: changed function: __do_proc_doulongvec_minmax
|
|
|
734205 |
sysctl.o: changed function: proc_get_long.constprop.0
|
|
|
734205 |
---------------------------
|
|
|
734205 |
|
|
|
734205 |
Modifications: none
|
|
|
734205 |
|
|
|
734205 |
commit d4b9787a8f8c75d0c37560d25e817183a700fbec
|
|
|
734205 |
Author: Florian Westphal <fwestpha@redhat.com>
|
|
|
734205 |
Date: Tue Jan 17 19:28:09 2023 +0100
|
|
|
734205 |
|
|
|
734205 |
netfilter: nft_payload: incorrect arithmetics when fetching VLAN header bits
|
|
|
734205 |
|
|
|
734205 |
Bugzilla: https://bugzilla.redhat.com/2161724
|
|
|
734205 |
CVE: CVE-2023-0179
|
|
|
734205 |
Y-Commit: c3747b9b25ff4bfdc9fa5c139126043fc8c0389c
|
|
|
734205 |
|
|
|
734205 |
O-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2161725
|
|
|
734205 |
Upstream Status: net commit 696e1a48b1a1b
|
|
|
734205 |
O-CVE: CVE-2023-0179
|
|
|
734205 |
|
|
|
734205 |
commit 696e1a48b1a1b01edad542a1ef293665864a4dd0
|
|
|
734205 |
Author: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
734205 |
Date: Wed Jan 11 17:07:33 2023 +0100
|
|
|
734205 |
|
|
|
734205 |
netfilter: nft_payload: incorrect arithmetics when fetching VLAN header bits
|
|
|
734205 |
|
|
|
734205 |
If the offset + length goes over the ethernet + vlan header, then the
|
|
|
734205 |
length is adjusted to copy the bytes that are within the boundaries of
|
|
|
734205 |
the vlan_ethhdr scratchpad area. The remaining bytes beyond ethernet +
|
|
|
734205 |
vlan header are copied directly from the skbuff data area.
|
|
|
734205 |
|
|
|
734205 |
Fix incorrect arithmetic operator: subtract, not add, the size of the
|
|
|
734205 |
vlan header in case of double-tagged packets to adjust the length
|
|
|
734205 |
accordingly to address CVE-2023-0179.
|
|
|
734205 |
|
|
|
734205 |
Reported-by: Davide Ornaghi <d.ornaghi97@gmail.com>
|
|
|
734205 |
Fixes: f6ae9f120dad ("netfilter: nft_payload: add C-VLAN support")
|
|
|
734205 |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
734205 |
|
|
|
734205 |
Signed-off-by: Florian Westphal <fwestpha@redhat.com>
|
|
|
734205 |
Signed-off-by: Patrick Talbert <ptalbert@redhat.com>
|
|
|
734205 |
|
|
|
734205 |
Signed-off-by: Ryan Sullivan <rysulliv@redhat.com>
|
|
|
734205 |
---
|
|
|
734205 |
net/netfilter/nft_payload.c | 2 +-
|
|
|
734205 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
734205 |
|
|
|
734205 |
diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c
|
|
|
734205 |
index 9af0d58a33f4..ee603dc05e81 100644
|
|
|
734205 |
--- a/net/netfilter/nft_payload.c
|
|
|
734205 |
+++ b/net/netfilter/nft_payload.c
|
|
|
734205 |
@@ -62,7 +62,7 @@ nft_payload_copy_vlan(u32 *d, const struct sk_buff *skb, u8 offset, u8 len)
|
|
|
734205 |
return false;
|
|
|
734205 |
|
|
|
734205 |
if (offset + len > VLAN_ETH_HLEN + vlan_hlen)
|
|
|
734205 |
- ethlen -= offset + len - VLAN_ETH_HLEN + vlan_hlen;
|
|
|
734205 |
+ ethlen -= offset + len - VLAN_ETH_HLEN - vlan_hlen;
|
|
|
734205 |
|
|
|
734205 |
memcpy(dst_u8, vlanh + offset - vlan_hlen, ethlen);
|
|
|
734205 |
|
|
|
734205 |
--
|
|
|
734205 |
2.39.1
|
|
|
734205 |
|
|
|
734205 |
|