Commit f78ed220 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

netpoll: accept NULL np argument in netpoll_send_skb() 



netpoll_send_skb() callers seem to leak skb if
the np pointer is NULL. While this should not happen, we
can make the code more robust.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ddabdfa

drivers/net/macvlan.c

+2 −3
Original line number Diff line number Diff line
@@ -542,12 +542,11 @@ xmit_world: 
static inline netdev_tx_t macvlan_netpoll_send_skb(struct macvlan_dev *vlan, struct sk_buff *skb)

{

#ifdef CONFIG_NET_POLL_CONTROLLER

	if (vlan->netpoll)

		netpoll_send_skb(vlan->netpoll, skb);

	return netpoll_send_skb(vlan->netpoll, skb);

#else

	BUG();

#endif

	return NETDEV_TX_OK;

#endif

}



static netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,

include/linux/if_team.h

+1 −4
Original line number Diff line number Diff line
@@ -102,10 +102,7 @@ static inline bool team_port_dev_txable(const struct net_device *port_dev) 
static inline void team_netpoll_send_skb(struct team_port *port,

					 struct sk_buff *skb)

{

	struct netpoll *np = port->np;



	if (np)

		netpoll_send_skb(np, skb);

	netpoll_send_skb(port->np, skb);

}

#else

static inline void team_netpoll_send_skb(struct team_port *port,

include/net/bonding.h

+1 −4
Original line number Diff line number Diff line
@@ -507,10 +507,7 @@ static inline unsigned long slave_last_rx(struct bonding *bond, 
static inline void bond_netpoll_send_skb(const struct slave *slave,

					 struct sk_buff *skb)

{

	struct netpoll *np = slave->np;



	if (np)

		netpoll_send_skb(np, skb);

	netpoll_send_skb(slave->np, skb);

}

#else

static inline void bond_netpoll_send_skb(const struct slave *slave,

net/8021q/vlan_dev.c

+2 −3
Original line number Diff line number Diff line
@@ -88,12 +88,11 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, 
static inline netdev_tx_t vlan_netpoll_send_skb(struct vlan_dev_priv *vlan, struct sk_buff *skb)

{

#ifdef CONFIG_NET_POLL_CONTROLLER

	if (vlan->netpoll)

		netpoll_send_skb(vlan->netpoll, skb);

	return netpoll_send_skb(vlan->netpoll, skb);

#else

	BUG();

#endif

	return NETDEV_TX_OK;

#endif

}



static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,

net/bridge/br_private.h

+1 −4
Original line number Diff line number Diff line
@@ -598,10 +598,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev); 
static inline void br_netpoll_send_skb(const struct net_bridge_port *p,

				       struct sk_buff *skb)

{

	struct netpoll *np = p->np;



	if (np)

		netpoll_send_skb(np, skb);

	netpoll_send_skb(p->np, skb);

}



int br_netpoll_enable(struct net_bridge_port *p);

CRA Git | Maintained and supported by SUSTech CRA and CCSE