diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-30 12:38:28 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-30 12:38:28 +0200 |
| commit | d7e25c66c9bf882450060fd9464e784bd229d3ae (patch) | |
| tree | 0fb9525f91b11226a5a4b861cefd9fc5679f5c9b /net/xfrm/xfrm_state.c | |
| parent | 907241dccb4ce5d9413cf3c030b32b0cfc184914 (diff) | |
| parent | e4aad64597d7a2455a541f904365b48d607916db (diff) | |
Merge branch 'x86/urgent' into x86/asm
Get the cr4 fixes so we can apply the final cleanup
Diffstat (limited to 'net/xfrm/xfrm_state.c')
| -rw-r--r-- | net/xfrm/xfrm_state.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 9895a8c56d8c..a30f898dc1c5 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -332,6 +332,7 @@ static void xfrm_state_gc_destroy(struct xfrm_state *x) { tasklet_hrtimer_cancel(&x->mtimer); del_timer_sync(&x->rtimer); + kfree(x->aead); kfree(x->aalg); kfree(x->ealg); kfree(x->calg); |