drivers/net/macvlan.c:262:23-26: ERROR: skb is NULL but dereferenced.
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): 20140422084934.GU4963@mwanda
Quoted 5 lines · Dan Carpenter
tree: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git master head: 86fd14ad1e8c4b8f5e9a7a27b26bdade91dd4bd0 commit: 412ca1550cbecb2cbed6086df51af08aa3452c86 [5/11] macvlan: Move broadcasts into a work queueQuoted 1 line
Quoted 1 line
drivers/net/macvlan.c:262:23-26: ERROR: skb is NULL but dereferenced.
Thanks for catching this.
macvlan: Fix leak and NULL dereference on error path
The recent patch that moved broadcasts to process context added a couple of bugs on the error path where we may dereference NULL or leak an skb. This patch fixes them.
Reported-by Dan Carpenter <[email protected]>
Signed-off-by Herbert Xu <[email protected]>
drivers/net/macvlan.c +7 -4
@@ -239,25 +239,28 @@ static void macvlan_process_broadcast(struct work_struct *w)static void macvlan_broadcast_enqueue (struct macvlan_port *port,struct sk_buff *skb) { +struct sk_buff *nskb;int err = -ENOMEM ; - skb =skb_clone (skb,GFP_ATOMIC ); -if (!skb) + nskb =skb_clone (skb,GFP_ATOMIC ); +if (!nskb) goto err;spin_lock (&port->bc_queue.lock);if (skb_queue_len (&port->bc_queue) < skb->dev->tx_queue_len) { -__skb_queue_tail (&port->bc_queue, skb); +__skb_queue_tail (&port->bc_queue, nskb); err =0 ; }spin_unlock (&port->bc_queue.lock);if (err) - goto err; + goto free_nskb;schedule_work (&port->bc_work);return ; +free_nskb: +kfree_skb (nskb); err:atomic_long_inc (&skb->dev->rx_dropped); }
Cheers,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
From: Herbert Xu <[email protected]>
Date: Tue, 22 Apr 2014 17:15:34 +0800
Quoted 8 lines
macvlan: Fix leak and NULL dereference on error path
The recent patch that moved broadcasts to process context added a couple of bugs on the error path where we may dereference NULL or leak an skb. This patch fixes them.
Reported-by Dan Carpenter <[email protected]>Signed-off-by Herbert Xu <[email protected]>
Applied, thanks Herbert.