From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Steffen Klassert <steffen.klassert@secunet.com>,
<netdev@vger.kernel.org>
Subject: [PATCH 6/9] xfrm: check for xdo_dev_state_free
Date: Fri, 22 Dec 2017 12:24:36 +0100 [thread overview]
Message-ID: <20171222112439.12476-7-steffen.klassert@secunet.com> (raw)
In-Reply-To: <20171222112439.12476-1-steffen.klassert@secunet.com>
From: Shannon Nelson <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>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.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 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);
}
--
2.14.1
next prev parent reply other threads:[~2017-12-22 11:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-22 11:24 pull request (net-next): ipsec-next 2017-12-22 Steffen Klassert
2017-12-22 11:24 ` [PATCH 1/9] xfrm: Separate ESP handling from segmentation for GRO packets Steffen Klassert
2017-12-22 11:24 ` [PATCH 2/9] net: Add asynchronous callbacks for xfrm on layer 2 Steffen Klassert
2017-12-22 11:24 ` [PATCH 3/9] xfrm: Allow to use the layer2 IPsec GSO codepath for software crypto Steffen Klassert
2017-12-22 11:24 ` [PATCH 4/9] xfrm: Allow IPsec GSO with software crypto for local sockets Steffen Klassert
2017-12-22 11:24 ` [PATCH 5/9] esp: Don't require synchronous crypto fallback on offloading anymore Steffen Klassert
2017-12-22 11:24 ` Steffen Klassert [this message]
2017-12-22 11:24 ` [PATCH 7/9] xfrm: check for xdo_dev_ops add and delete Steffen Klassert
2017-12-22 11:24 ` [PATCH 8/9] xfrm: wrap xfrmdev_ops with offload config Steffen Klassert
2017-12-22 11:24 ` [PATCH 9/9] xfrm: update the stats documentation Steffen Klassert
2017-12-27 16:59 ` pull request (net-next): ipsec-next 2017-12-22 David Miller
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=20171222112439.12476-7-steffen.klassert@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).