diff options
| author |   Mathias Krause <minipli@googlemail.com> | 2018-11-21 21:09:23 +0100 |
|---|---|---|
| committer |   Steffen Klassert <steffen.klassert@secunet.com> | 2018-11-23 07:51:32 +0100 |
| commit | 4a135e538962cb00a9667c82e7d2b9e4d7cd7177 (patch) | |
| tree | ebbf0cd2aec6fe1a4c01fd871f5b3263a50711b0 /net/xfrm/xfrm_user.c | |
| parent | xfrm: Fix NULL pointer dereference in xfrm_input when skb_dst_force clears the dst_entry. (diff) | |
| download | linux-dev-4a135e538962cb00a9667c82e7d2b9e4d7cd7177.tar.xz linux-dev-4a135e538962cb00a9667c82e7d2b9e4d7cd7177.zip | |
xfrm_user: fix freeing of xfrm states on acquire
Commit 565f0fa902b6 ("xfrm: use a dedicated slab cache for struct
xfrm_state") moved xfrm state objects to use their own slab cache.
However, it missed to adapt xfrm_user to use this new cache when
freeing xfrm states.
Fix this by introducing and make use of a new helper for freeing
xfrm_state objects.
Fixes: 565f0fa902b6 ("xfrm: use a dedicated slab cache for struct xfrm_state")
Reported-by: Pan Bian <bianpan2016@163.com>
Cc: <stable@vger.kernel.org> # v4.18+
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to '')
| -rw-r--r-- | net/xfrm/xfrm_user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index ca7a207b81a9..683080172655 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -2288,13 +2288,13 @@ static int xfrm_add_acquire(struct sk_buff *skb, struct nlmsghdr *nlh, } - kfree(x); + xfrm_state_free(x); kfree(xp); return 0; free_state: - kfree(x); + xfrm_state_free(x); nomem: return err; } |