Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp1967623rwe; Fri, 2 Sep 2022 06:44:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR6wfGTsO1PxRrFXhPb4kkY8BDG8zO14JVxqqokOuQUH8kjNDWW5hSW/yGGLNdxyjT2WxvF6 X-Received: by 2002:a17:90b:2bca:b0:1fd:a06b:ef4f with SMTP id ru10-20020a17090b2bca00b001fda06bef4fmr4894092pjb.201.1662126284967; Fri, 02 Sep 2022 06:44:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662126284; cv=none; d=google.com; s=arc-20160816; b=YXu4B59kB5JOs5juMrGNjivvHFcL9gSDVZRyeWZ7DGsjjI1608f+u9DjkbM5m7C842 DXoEDoLEU2Ipg8NZmc32+MZY3IStGQS6NNzTYLIBQ4BErvTWY+zJ3SHLahRdERxfbY0M qIQ9ue1+IlL+VJf+2MFeplMR3HXdRBFh8t6irrFG8eS/7X8OXCB1sjUAQMvjTfdRZcOh qqSTO2MLSDTmlKLoUJ8xdE9K7DllRYx1deopbTowaNXRxGLpgNT1pfibadfAr7vRbGob fP9qQ4CfR3CHHFcjL5SUOI8zw+1Adp5oYId6uA8QxIMlJVcdTNjP7gmgLiQI4gjBtbSb mviA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=K7M5FdXKcqLb9ulJd3kU35gfX9HcnT9QqAE5Mb499is=; b=arPGVwmdjJxPokmp+uPzbHdTzyqjwBqaM+3RyqgiK0cCkllZixLKaXanPTYU9djIsp yWAlr1p7S4rPRI/R8jCAD+XLWb0eLnfFK8uhtiH9gZLgY/3xDUs9PzLGtDHi+dMkxGKF iSw/9KMf6aJNLdkBap3rGo3HA1P7s2mDhkrC5PHDUXWRgfa6ohQ6VuLK5WYUTVw1yfYu fILFIQUjXlZCJRUk2Jb9AeX32McnaspF9wCsNql1Qm9f6norvCZuGGhWEpUH6ENNmLQy cunwyatkWSxCgIeFf3LXUin6rl+BeJZMrJ7i7aPqRAh4be+ZLU2FzOvxTLBfTkDbKQq1 BHLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jcTwpat3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f12-20020a056a001acc00b0052e677b7056si2253912pfv.279.2022.09.02.06.44.32; Fri, 02 Sep 2022 06:44:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jcTwpat3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236472AbiIBM1L (ORCPT + 99 others); Fri, 2 Sep 2022 08:27:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235984AbiIBM0K (ORCPT ); Fri, 2 Sep 2022 08:26:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C0BDD6324; Fri, 2 Sep 2022 05:23:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BA7B8620B2; Fri, 2 Sep 2022 12:23:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBCD3C433D7; Fri, 2 Sep 2022 12:23:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662121421; bh=zjwEXxb++TeUTAa1pfKN3QoIk0hmTP11K/4XesBwa5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jcTwpat349AKSPVMobhpvDtDiGmyMCHcQTryPfdOqEyeFXGNuEFZogwuqCgPn8xPH 85HDmo+tz2+PiCfBJv9HtXV379frdtjzDR6NsCf5aT64biMNOqgMEApiaLpFJvMGFc s5nOeMvhEYaksQlqrWa/fHIH4V/RAyzH816N6YQM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xin Xiong , Xin Tan , Steffen Klassert , Sasha Levin Subject: [PATCH 4.14 04/42] xfrm: fix refcount leak in __xfrm_policy_check() Date: Fri, 2 Sep 2022 14:18:28 +0200 Message-Id: <20220902121358.937148262@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220902121358.773776406@linuxfoundation.org> References: <20220902121358.773776406@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xin Xiong [ Upstream commit 9c9cb23e00ddf45679b21b4dacc11d1ae7961ebe ] The issue happens on an error path in __xfrm_policy_check(). When the fetching process of the object `pols[1]` fails, the function simply returns 0, forgetting to decrement the reference count of `pols[0]`, which is incremented earlier by either xfrm_sk_policy_lookup() or xfrm_policy_lookup(). This may result in memory leaks. Fix it by decreasing the reference count of `pols[0]` in that path. Fixes: 134b0fc544ba ("IPsec: propagate security module errors up from flow_cache_lookup") Signed-off-by: Xin Xiong Signed-off-by: Xin Tan Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin --- net/xfrm/xfrm_policy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index e1840f70c0ff0..66c23a1b8758f 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -2332,6 +2332,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, if (pols[1]) { if (IS_ERR(pols[1])) { XFRM_INC_STATS(net, LINUX_MIB_XFRMINPOLERROR); + xfrm_pol_put(pols[0]); return 0; } pols[1]->curlft.use_time = get_seconds(); -- 2.35.1