xfrm: Fix crash when the hold queue is used.
Subsystems (3)
Steffen Klassert
maintainerRFC PATCH 1/1 xfrm: Fix crash when the hold queue is used.
The commits "xfrm: Move dst->path into struct xfrm_dst" and "net: Create and use new helper xfrm_dst_child()." changed xfrm bundle handling under the assumption that xdst->path and dst->child are not a NULL pointer only if dst->xfrm is not a NULL pointer. That is true with one exception. If the xfrm hold queue is used to wait until a SA is installed by the key manager, we create a dummy bundle without a valid dst->xfrm pointer. The current xfrm bundle handling crashes in that case. Fix this by extending the NULL check of dst->xfrm with a test of the DST_XFRM_QUEUE flag.
--- include/net/xfrm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/net/xfrm.h +2 -2
@@ -941,7 +941,7 @@ struct xfrm_dst {static inline struct dst_entry *xfrm_dst_path (const struct dst_entry *dst) {#ifdef CONFIG_XFRM -if (dst->xfrm) { +if (dst->xfrm || (dst->flags &DST_XFRM_QUEUE )) {const struct xfrm_dst *xdst = (const struct xfrm_dst *) dst;return xdst->path;
@@ -953,7 +953,7 @@ static inline struct dst_entry *xfrm_dst_path(const struct dst_entry *dst)static inline struct dst_entry *xfrm_dst_child (const struct dst_entry *dst) {#ifdef CONFIG_XFRM -if (dst->xfrm) { +if (dst->xfrm || (dst->flags &DST_XFRM_QUEUE )) {struct xfrm_dst *xdst = (struct xfrm_dst *) dst;return xdst->child; }
Signature · 1 line
2.17.1
Steffen Klassert
maintainerQuoted 12 lines · Steffen Klassert
The commits "xfrm: Move
dst->pathinto structxfrm_dst" and "net: Create and use new helperxfrm_dst_child()." changed xfrm bundle handling under the assumption thatxdst->pathanddst->childare not a NULL pointer only ifdst->xfrmis not a NULL pointer. That is true with one exception. If the xfrm hold queue is used to wait until a SA is installed by the key manager, we create a dummy bundle without a validdst->xfrmpointer. The current xfrm bundle handling crashes in that case. Fix this by extending the NULL check ofdst->xfrmwith a test of theDST_XFRM_QUEUEflag.
Quoted 3 lines
Fixes 0f6c480f23f4 ("xfrm: Move dst->path into struct xfrm_dst")Fixes b92cf4aab8e6 ("net: Create and use new helper xfrm_dst_child().")Signed-off-by Steffen Klassert <[email protected]>
Now applied to the ipsec tree.