summaryrefslogtreecommitdiff
path: root/drivers/net/wan/lapbether.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-27 08:17:14 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-27 08:17:14 +0200
commitc97793089b11f736287b65abe3d530d5ffd3857b (patch)
tree6944831ba049777b40aed51c75bf6dc637cc98e4 /drivers/net/wan/lapbether.c
parent9a360a7cae11461ccd933a9ea366b0dcb3afadb0 (diff)
parent92ed301919932f777713b9172e525674157e983d (diff)
Merge 5.8-rc7 into usb-next
We want the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wan/lapbether.c')
-rw-r--r--drivers/net/wan/lapbether.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index 284832314f31..b2868433718f 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -128,10 +128,12 @@ static int lapbeth_data_indication(struct net_device *dev, struct sk_buff *skb)
{
unsigned char *ptr;
- skb_push(skb, 1);
-
- if (skb_cow(skb, 1))
+ if (skb_cow(skb, 1)) {
+ kfree_skb(skb);
return NET_RX_DROP;
+ }
+
+ skb_push(skb, 1);
ptr = skb->data;
*ptr = X25_IFACE_DATA;