diff --git a/[refs] b/[refs] index 44b57749c215..ecf29266904c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6569a351da7e58d6f0fbc92fcf0bef5d4a4bc0a4 +refs/heads/master: 9bc18091a5e44a368827f539289b99788eb27d4e diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c index 475dc930380f..0d101a18026a 100644 --- a/trunk/drivers/net/pppoe.c +++ b/trunk/drivers/net/pppoe.c @@ -861,6 +861,9 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) * give dev_queue_xmit something it can free. */ skb2 = skb_clone(skb, GFP_ATOMIC); + + if (skb2 == NULL) + goto abort; } ph = (struct pppoe_hdr *) skb_push(skb2, sizeof(struct pppoe_hdr));