summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorIlan Tayari <ilant@mellanox.com>2017-05-08 09:30:18 +0200
committerSteffen Klassert <steffen.klassert@secunet.com>2017-05-08 09:41:09 +0200
commit2c1497bbc8fdee897341ab48ee9c9209b421b8c0 (patch)
treea4cd705e30cf4e8757e0fa82007a2be50a3ea798 /net
parentaf_key: Fix slab-out-of-bounds in pfkey_compile_policy. (diff)
downloadlinux-2c1497bbc8fdee897341ab48ee9c9209b421b8c0.tar.xz
linux-2c1497bbc8fdee897341ab48ee9c9209b421b8c0.zip
xfrm: Fix NETDEV_DOWN with IPSec offload
Upon NETDEV_DOWN event, all xfrm_state objects which are bound to the device are flushed. The condition for this is wrong, though, testing dev->hw_features instead of dev->features. If a device has non-user-modifiable NETIF_F_HW_ESP, then its xfrm_state objects are not flushed, causing a crash later on after the device is deleted. Check dev->features instead of dev->hw_features. Fixes: d77e38e612a0 ("xfrm: Add an IPsec hardware offloading API") Signed-off-by: Ilan Tayari <ilant@mellanox.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c
index 8ec8a3fcf8d4..574e6f32f94f 100644
--- a/net/xfrm/xfrm_device.c
+++ b/net/xfrm/xfrm_device.c
@@ -170,7 +170,7 @@ static int xfrm_dev_feat_change(struct net_device *dev)
static int xfrm_dev_down(struct net_device *dev)
{
- if (dev->hw_features & NETIF_F_HW_ESP)
+ if (dev->features & NETIF_F_HW_ESP)
xfrm_dev_state_flush(dev_net(dev), dev, true);
xfrm_garbage_collect(dev_net(dev));