diff options
| author | Eric Dumazet <edumazet@google.com> | 2020-05-07 19:32:21 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-08 04:11:07 +0300 |
| commit | f78ed2204db9fc35b545d693865bddbe0149aa1f (patch) | |
| tree | 547a43f4bee21b4880397429cca2a02ab85f397c /include | |
| parent | 1ddabdfaf70c202b88925edd74c66f4707dbd92e (diff) | |
| download | linux-f78ed2204db9fc35b545d693865bddbe0149aa1f.tar.xz | |
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: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_team.h | 5 | ||||
| -rw-r--r-- | include/net/bonding.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/linux/if_team.h b/include/linux/if_team.h index ec7e4bd07f82..537dc2b8c879 100644 --- a/include/linux/if_team.h +++ b/include/linux/if_team.h @@ -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, diff --git a/include/net/bonding.h b/include/net/bonding.h index 0b696da5c115..f211983cd52a 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -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, |