diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-24 23:44:15 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-24 23:44:15 -0500 |
| commit | 955bd1d216c6ce4f40b181cfd369f4116e0627f2 (patch) | |
| tree | d3f2669d3abb1c53c2f364732e8122ce0f25e3da /drivers/net/ppp/pppoe.c | |
| parent | be1b6e8b5470e8311bfa1a3dfd7bd59e85a99759 (diff) | |
| parent | 5b7d27967dabfb17c21b0d98b29153b9e3ee71e5 (diff) | |
| download | linux-955bd1d216c6ce4f40b181cfd369f4116e0627f2.tar.gz linux-955bd1d216c6ce4f40b181cfd369f4116e0627f2.tar.bz2 linux-955bd1d216c6ce4f40b181cfd369f4116e0627f2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index 4e1da1645b15..5aa59f41bf8c 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -842,6 +842,7 @@ static int pppoe_sendmsg(struct socket *sock, struct msghdr *m, struct pppoe_hdr *ph; struct net_device *dev; char *start; + int hlen; lock_sock(sk); if (sock_flag(sk, SOCK_DEAD) || !(sk->sk_state & PPPOX_CONNECTED)) { @@ -860,16 +861,16 @@ static int pppoe_sendmsg(struct socket *sock, struct msghdr *m, if (total_len > (dev->mtu + dev->hard_header_len)) goto end; - - skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32, - 0, GFP_KERNEL); + hlen = LL_RESERVED_SPACE(dev); + skb = sock_wmalloc(sk, hlen + sizeof(*ph) + total_len + + dev->needed_tailroom, 0, GFP_KERNEL); if (!skb) { error = -ENOMEM; goto end; } /* Reserve space for headers. */ - skb_reserve(skb, dev->hard_header_len); + skb_reserve(skb, hlen); skb_reset_network_header(skb); skb->dev = dev; @@ -930,7 +931,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) /* Copy the data if there is no space for the header or if it's * read-only. */ - if (skb_cow_head(skb, sizeof(*ph) + dev->hard_header_len)) + if (skb_cow_head(skb, LL_RESERVED_SPACE(dev) + sizeof(*ph))) goto abort; __skb_push(skb, sizeof(*ph)); |