From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46EABC43603 for ; Wed, 4 Dec 2019 18:07:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1346420674 for ; Wed, 4 Dec 2019 18:07:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482866; bh=a447VtLoBcHspGJtXTLPnO8EL1HGKQ6WjUQ/PY3aloY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jERgMNkmdhyohAAmFF02WGuStjVi95A1yijawn/kgETWmsHGMz739WMvndO9h4e3z R8jjRonU6fPIpymV/nW9pbR0Tq2SHnbrFvcmItA8gm+7tKP680ocg91LbnPgy50dUH WxjexS9Guvj8uOf3lX4PcBBc1mTXziVWD2FZ1FxU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730805AbfLDSHo (ORCPT ); Wed, 4 Dec 2019 13:07:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:58018 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730233AbfLDSHj (ORCPT ); Wed, 4 Dec 2019 13:07:39 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 02B4020833; Wed, 4 Dec 2019 18:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482859; bh=a447VtLoBcHspGJtXTLPnO8EL1HGKQ6WjUQ/PY3aloY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Iho0DmX3aOeh2j17CEIL1BNtzIjNp01GL56OGZzq/v0FFGs5eutxXZI2Rq5dSZYAS 27b99GaEHS6OZepssPaoowMhbSdI/JlgNjF+/NeEpmfQ0XXDzkTtGbGCSqrD8NueVg N9BDytPatP0UvGwLTnSojQ3cLu0w0MllA7mfWCYo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, JD , Paul Wouters , Steffen Klassert Subject: [PATCH 4.14 163/209] xfrm: Fix memleak on xfrm state destroy Date: Wed, 4 Dec 2019 18:56:15 +0100 Message-Id: <20191204175334.705921054@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steffen Klassert commit 86c6739eda7d2a03f2db30cbee67a5fb81afa8ba upstream. We leak the page that we use to create skb page fragments when destroying the xfrm_state. Fix this by dropping a page reference if a page was assigned to the xfrm_state. Fixes: cac2661c53f3 ("esp4: Avoid skb_cow_data whenever possible") Reported-by: JD Reported-by: Paul Wouters Signed-off-by: Steffen Klassert Signed-off-by: Greg Kroah-Hartman --- net/xfrm/xfrm_state.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -449,6 +449,8 @@ static void xfrm_state_gc_destroy(struct x->type->destructor(x); xfrm_put_type(x->type); } + if (x->xfrag.page) + put_page(x->xfrag.page); xfrm_dev_state_free(x); security_xfrm_state_free(x); kfree(x);