diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-18 09:33:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-18 09:33:27 -0700 |
| commit | e366fa435032db1ce1538a2c029714666985dd48 (patch) | |
| tree | d08bab02ba212339e4cfc0f2e3666435dd795b90 /drivers/net/ppp/pppoe.c | |
| parent | cf7d97e1e54d71679a8b11716dad9d21deb0e1e2 (diff) | |
| parent | 5211da9ca526a5adddee1ccd078e6e33a583ab36 (diff) | |
| download | linux-e366fa435032db1ce1538a2c029714666985dd48.tar.bz2 | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Two new tls tests added in parallel in both net and net-next.
Used Stephen Rothwell's linux-next resolution.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ppp/pppoe.c')
| -rw-r--r-- | drivers/net/ppp/pppoe.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index ce61231e96ea..62dc564b251d 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -429,6 +429,9 @@ static int pppoe_rcv(struct sk_buff *skb, struct net_device *dev, if (!skb) goto out; + if (skb_mac_header_len(skb) < ETH_HLEN) + goto drop; + if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) goto drop; |