From: Shannon Nelson <shannon.nelson@oracle.com>
To: steffen.klassert@secunet.com
Cc: netdev@vger.kernel.org
Subject: [PATCH v2 ipsec-next 1/3] xfrm: check for xdo_dev_state_free
Date: Thu, 14 Dec 2017 13:01:15 -0800 [thread overview]
Message-ID: <1513285277-21092-2-git-send-email-shannon.nelson@oracle.com> (raw)
In-Reply-To: <1513285277-21092-1-git-send-email-shannon.nelson@oracle.com>
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>
---
include/net/xfrm.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index e015e16..dfabd04 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1891,7 +1891,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);
}
--
2.7.4
next prev parent reply other threads:[~2017-12-14 21:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-14 21:01 [PATCH v2 ipsec-next 0/3] xfrm: offload api fixes Shannon Nelson
2017-12-14 21:01 ` Shannon Nelson [this message]
2017-12-14 21:01 ` [PATCH v2 ipsec-next 2/3] xfrm: check for xdo_dev_ops add and delete Shannon Nelson
2017-12-14 21:01 ` [PATCH v2 ipsec-next 3/3] xfrm: wrap xfrmdev_ops with offload config Shannon Nelson
2017-12-16 19:12 ` kbuild test robot
2017-12-16 20:04 ` kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1513285277-21092-2-git-send-email-shannon.nelson@oracle.com \
--to=shannon.nelson@oracle.com \
--cc=netdev@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox