netfilter: nft_payload: incorrect arithmetics when rebuiling VLAN header
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nft_payload: incorrect arithmetics when rebuiling VLAN header
If the offset + length goes over the ethernet + vlan header, then the length is adjusted to copy the bytes that are within the boundaries of the vlan_ethhdr scratchpad area. The remaining bytes beyond ethernet + vlan header are copied directly from the skbuff data area.
Fix incorrect arithmetic operator: subtract, not add, the size of the vlan header in case of double-tagged packets to adjust the length accordingly to address CVE-2023-0179.
Reported-by Davide Ornaghi <[email protected]>
Fixes f6ae9f120dad ("netfilter: nft_payload: add C-VLAN support")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nft_payload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_payload.c +1 -1
@@ -63,7 +63,7 @@ nft_payload_copy_vlan(u32 *d, const struct sk_buff *skb, u8 offset, u8 len)return false;if (offset + len >VLAN_ETH_HLEN + vlan_hlen) - ethlen -= offset + len -VLAN_ETH_HLEN + vlan_hlen; + ethlen -= offset + len -VLAN_ETH_HLEN - vlan_hlen;memcpy (dst_u8, vlanh + offset - vlan_hlen, ethlen);
Signature · 1 line
2.30.2