mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
2d02a4f5bd
Refresh patches. Adapt 704-phy-no-genphy-soft-reset.patch. Remove brcm2708/950-0005-mm-Remove-the-PFN-busy-warning.patch. Compile-tested on brcm2708/bcm2708 and x86/64. Runtime-tested on brcm2708/bcm2708 and x86/64. Fixes the following vulnerabilities: - CVE-2017-7533 - CVE-2017-1000111 - CVE-2017-1000112 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
30 lines
900 B
Diff
30 lines
900 B
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: pppoe: add extra padding for the header (useful for drivers that need headroom)
|
|
|
|
lede-commit 6517a757ec711fc3354b857e273e2621042f3c7a
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
drivers/net/ppp/pppoe.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ppp/pppoe.c
|
|
+++ b/drivers/net/ppp/pppoe.c
|
|
@@ -861,7 +861,7 @@ static int pppoe_sendmsg(struct socket *
|
|
goto end;
|
|
|
|
|
|
- skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
|
|
+ skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
|
|
0, GFP_KERNEL);
|
|
if (!skb) {
|
|
error = -ENOMEM;
|
|
@@ -869,7 +869,7 @@ static int pppoe_sendmsg(struct socket *
|
|
}
|
|
|
|
/* Reserve space for headers. */
|
|
- skb_reserve(skb, dev->hard_header_len);
|
|
+ skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
|
|
skb_reset_network_header(skb);
|
|
|
|
skb->dev = dev;
|