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.
Unified · Split
| @@ -2245,7 +2245,7 @@ ppp_do_recv(struct ppp *ppp, struct sk_buff *skb, struct channel *pch) · 2244 unmodified lines | ||
| 2245 | 2245 | */ |
| 2246 | 2246 | static void __ppp_decompress_proto(struct sk_buff *skb) |
| 2247 | 2247 | { |
| 2248 | − if (skb->data[0] & 0x01) | |
| 2248 | + if (ppp_skb_is_compressed_proto(skb)) | |
| 2249 | 2249 | *(u8 *)skb_push(skb, 1) = 0x00; |
| 2250 | 2250 | } |
| 2251 | 2251 | |
| @@ -393,7 +393,7 @@ static int pppoe_rcv(struct sk_buff *skb, struct net_device *dev, · 392 unmodified lines | ||
| 393 | 393 | if (skb_mac_header_len(skb) < ETH_HLEN) |
| 394 | 394 | goto drop; |
| 395 | 395 | |
| 396 | − if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) | |
| 396 | + if (!pskb_may_pull(skb, PPPOE_SES_HLEN)) | |
| 397 | 397 | goto drop; |
| 398 | 398 | |
| 399 | 399 | ph = pppoe_hdr(skb); |
| @@ -403,6 +403,12 @@ static int pppoe_rcv(struct sk_buff *skb, struct net_device *dev, · 3 unmodified lines | ||
| 403 | 403 | if (skb->len < len) |
| 404 | 404 | goto drop; |
| 405 | 405 | |
| 406 | + /* skb->data points to the PPP protocol header after skb_pull_rcsum. | |
| 407 | + * Drop PFC frames. | |
| 408 | + */ | |
| 409 | + if (ppp_skb_is_compressed_proto(skb)) | |
| 410 | + goto drop; | |
| 411 | + | |
| 406 | 412 | if (pskb_trim_rcsum(skb, len)) |
| 407 | 413 | goto drop; |
| 408 | 414 | |
| @@ -8,6 +8,7 @@ · 7 unmodified lines | ||
| 8 | 8 | #define _PPP_DEFS_H_ |
| 9 | 9 | |
| 10 | 10 | #include <linux/crc-ccitt.h> |
| 11 | +#include <linux/skbuff.h> | |
| 11 | 12 | #include <uapi/linux/ppp_defs.h> |
| 12 | 13 | |
| 13 | 14 | #define PPP_FCS(fcs, c) crc_ccitt_byte(fcs, c) |
| @@ -25,4 +26,19 @@ static inline bool ppp_proto_is_valid(u16 proto) · 11 unmodified lines | ||
| 25 | 26 | return !!((proto & 0x0101) == 0x0001); |
| 26 | 27 | } |
| 27 | 28 | |
| 29 | +/** | |
| 30 | + * ppp_skb_is_compressed_proto - checks if PPP protocol in a skb is compressed | |
| 31 | + * @skb: skb to check | |
| 32 | + * | |
| 33 | + * Check if the PPP protocol field is compressed (the least significant | |
| 34 | + * bit of the most significant octet is 1). skb->data must point to the PPP | |
| 35 | + * protocol header. | |
| 36 | + * | |
| 37 | + * Return: Whether the PPP protocol field is compressed. | |
| 38 | + */ | |
| 39 | +static inline bool ppp_skb_is_compressed_proto(const struct sk_buff *skb) | |
| 40 | +{ | |
| 41 | + return unlikely(skb->data[0] & 0x01); | |
| 42 | +} | |
| 43 | + | |
| 28 | 44 | #endif /* _PPP_DEFS_H_ */ |