summaryrefslogtreecommitdiffstats
path: root/include/net/xfrm.h
diff options
context:
space:
mode:
authorShannon Nelson <shannon.nelson@oracle.com>2017-12-19 15:35:47 -0800
committerSteffen Klassert <steffen.klassert@secunet.com>2017-12-21 08:17:48 +0100
commit7f05b467a735aba1476d9ae8e0ae9d9d8e60066c (patch)
treefd465f66ae953e9abedce0d2374ae48b1900d3bd /include/net/xfrm.h
parentf58869c44fb3f0835dd2dabce06e5919a18655c6 (diff)
downloadblackbird-op-linux-7f05b467a735aba1476d9ae8e0ae9d9d8e60066c.tar.gz
blackbird-op-linux-7f05b467a735aba1476d9ae8e0ae9d9d8e60066c.zip
xfrm: check for xdo_dev_state_free
The current XFRM code assumes that we've implemented the xdo_dev_state_free() callback, even if it is meaningless to the driver. This patch adds a check for it before calling, as done in other APIs, to prevent a NULL function pointer kernel crash. Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'include/net/xfrm.h')
-rw-r--r--include/net/xfrm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 357764a2bb4e..079ea9455bcd 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1933,7 +1933,8 @@ static inline void xfrm_dev_state_free(struct xfrm_state *x)
struct net_device *dev = xso->dev;
if (dev && dev->xfrmdev_ops) {
- dev->xfrmdev_ops->xdo_dev_state_free(x);
+ if (dev->xfrmdev_ops->xdo_dev_state_free)
+ dev->xfrmdev_ops->xdo_dev_state_free(x);
xso->dev = NULL;
dev_put(dev);
}
OpenPOWER on IntegriCloud