diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-05-21 19:02:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-04 08:02:33 +0200 |
| commit | fb6cf4f3704b6f058f312a6d228c56698313e1fa (patch) | |
| tree | e8749b343978282f962d5f7dcbc2b916aa735806 /net | |
| parent | fb69403ec2ff56bc587873b88a55812fce39d617 (diff) | |
| download | linux-rpi3-fb6cf4f3704b6f058f312a6d228c56698313e1fa.tar.gz linux-rpi3-fb6cf4f3704b6f058f312a6d228c56698313e1fa.tar.bz2 linux-rpi3-fb6cf4f3704b6f058f312a6d228c56698313e1fa.zip | |
net/tls: don't ignore netdev notifications if no TLS features
[ Upstream commit c3f4a6c39cf269a40d45f813c05fa830318ad875 ]
On device surprise removal path (the notifier) we can't
bail just because the features are disabled. They may
have been enabled during the lifetime of the device.
This bug leads to leaking netdev references and
use-after-frees if there are active connections while
device features are cleared.
Fixes: e8f69799810c ("net/tls: Add generic NIC offload infrastructure")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/tls/tls_device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index 5db330db77a1..8035bf495eb2 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -974,7 +974,8 @@ static int tls_dev_event(struct notifier_block *this, unsigned long event, { struct net_device *dev = netdev_notifier_info_to_dev(ptr); - if (!(dev->features & (NETIF_F_HW_TLS_RX | NETIF_F_HW_TLS_TX))) + if (!dev->tlsdev_ops && + !(dev->features & (NETIF_F_HW_TLS_RX | NETIF_F_HW_TLS_TX))) return NOTIFY_DONE; switch (event) { |