mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-21 11:25:22 -04:00
cc1ff87bce
RFC 2516 Section 7 states that Protocol Field Compression (PFC) is NOT
RECOMMENDED for PPPoE. In practice, pppd does not support negotiating
PFC for PPPoE sessions, and the current PPPoE driver assumes an
uncompressed (2-byte) protocol field. However, the generic PPP layer
function ppp_input() is not aware of the negotiation result, and still
accepts PFC frames.
If a peer with a broken implementation or an attacker sends a frame with
a compressed (1-byte) protocol field, the subsequent PPP payload is
shifted by one byte. This causes the network header to be 4-byte
misaligned, which may trigger unaligned access exceptions on some
architectures.
To reduce the attack surface, drop PPPoE PFC frames. Introduce
ppp_skb_is_compressed_proto() helper function to be used in both
ppp_generic.c and pppoe.c to avoid open-coding.
Fixes: 7fb1b8ca8f ("ppp: Move PFC decompression to PPP generic layer")
Signed-off-by: Qingfang Deng <qingfang.deng@linux.dev>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20260415022456.141758-2-qingfang.deng@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
45 lines
1.1 KiB
C
45 lines
1.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* ppp_defs.h - PPP definitions.
|
|
*
|
|
* Copyright 1994-2000 Paul Mackerras.
|
|
*/
|
|
#ifndef _PPP_DEFS_H_
|
|
#define _PPP_DEFS_H_
|
|
|
|
#include <linux/crc-ccitt.h>
|
|
#include <linux/skbuff.h>
|
|
#include <uapi/linux/ppp_defs.h>
|
|
|
|
#define PPP_FCS(fcs, c) crc_ccitt_byte(fcs, c)
|
|
|
|
/**
|
|
* ppp_proto_is_valid - checks if PPP protocol is valid
|
|
* @proto: PPP protocol
|
|
*
|
|
* Assumes proto is not compressed.
|
|
* Protocol is valid if the value is odd and the least significant bit of the
|
|
* most significant octet is 0 (see RFC 1661, section 2).
|
|
*/
|
|
static inline bool ppp_proto_is_valid(u16 proto)
|
|
{
|
|
return !!((proto & 0x0101) == 0x0001);
|
|
}
|
|
|
|
/**
|
|
* ppp_skb_is_compressed_proto - checks if PPP protocol in a skb is compressed
|
|
* @skb: skb to check
|
|
*
|
|
* Check if the PPP protocol field is compressed (the least significant
|
|
* bit of the most significant octet is 1). skb->data must point to the PPP
|
|
* protocol header.
|
|
*
|
|
* Return: Whether the PPP protocol field is compressed.
|
|
*/
|
|
static inline bool ppp_skb_is_compressed_proto(const struct sk_buff *skb)
|
|
{
|
|
return unlikely(skb->data[0] & 0x01);
|
|
}
|
|
|
|
#endif /* _PPP_DEFS_H_ */
|