Received: by 10.223.185.111 with SMTP id b44csp918784wrg; Fri, 9 Mar 2018 16:51:34 -0800 (PST) X-Google-Smtp-Source: AG47ELtxJ4UGh0r1uu5i6wdsZ3899UH6JJHooPtORy0UrDTuvJNWX5JvLcp/D9LeH9x8mBCQzQ3t X-Received: by 2002:a17:902:205:: with SMTP id 5-v6mr395343plc.248.1520643094356; Fri, 09 Mar 2018 16:51:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520643094; cv=none; d=google.com; s=arc-20160816; b=B5CcfcY9vbebpiHFWS+SbaIbacQD4LvyjjiAwEvBKu0LFEaWJ30kjgioWyyvK3U/tt WuumrZlfAGqcG7TcEg8gVzd5Bc1jysDaCtgmCnA9YE8wSzb9mCNJBveM96RxdkjWlK2D ypoSCrdBc6qIU0IiZmsqfmAQQpp02W9oo5gTjbx3huhJP9oLAhjxilOjFKMdlwjZkU/V utq6dz0nnp2UQxtcz521+b/G10LBnYgmMO6MfKYEjnGb0cjnT0XaAdLMh26kUrdXOLu/ vMBnaonoU3qUuESPWebX+HRB8GmxoNU3aLB9lbyhwbO2xi1JnJsDgMy70g4AywHCcPYT rhuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=rD2nMsXz1LzDisLAWI06qgt1Bu8DTPoayMowdSTvZGQ=; b=GhDdWM+ceaagYQ4Sp4SrF/hcenDVBG4S52iThQxNcKeA19oBjjm5JFfbIe/pMHh0Og 6sEl4z74CKSn9UFkoJ/NbZ4na7UZgbDEuavyNX05VHeuXKNXnPTflx/+srT78/VzigI4 cBi5oebqe6TfY+QLBxxv0YH5HZ5FTgpqJit2XoSFvmMvr/qpBR0J0Pmq2ngnuJO9jL/0 75R1ZFeZrgzoGkhdk0LKoiasDw3lDtpqk0aNwbpWZncz+sOBzKJ25VdPt2Jd7Q3rWIDz nvfA7vOPJsZVQ2q7Q6fhg47W6tq6E6+Qo0jNEBxwHwBzTg7BNviAY749b7CDbem1vDmy Rg+Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a100-v6si1768415pli.483.2018.03.09.16.51.19; Fri, 09 Mar 2018 16:51:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933015AbeCJATX (ORCPT + 99 others); Fri, 9 Mar 2018 19:19:23 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:38582 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932967AbeCJATS (ORCPT ); Fri, 9 Mar 2018 19:19:18 -0500 Received: from localhost (unknown [185.236.200.248]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id B42C2F10; Sat, 10 Mar 2018 00:19:17 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexey Kodanev , Neil Horman , Marcelo Ricardo Leitner , "David S. Miller" Subject: [PATCH 3.18 15/21] sctp: fix dst refcnt leak in sctp_v6_get_dst() Date: Fri, 9 Mar 2018 16:18:37 -0800 Message-Id: <20180310001801.988711805@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180310001801.045114869@linuxfoundation.org> References: <20180310001801.045114869@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexey Kodanev [ Upstream commit 957d761cf91cdbb175ad7d8f5472336a4d54dbf2 ] When going through the bind address list in sctp_v6_get_dst() and the previously found address is better ('matchlen > bmatchlen'), the code continues to the next iteration without releasing currently held destination. Fix it by releasing 'bdst' before continue to the next iteration, and instead of introducing one more '!IS_ERR(bdst)' check for dst_release(), move the already existed one right after ip6_dst_lookup_flow(), i.e. we shouldn't proceed further if we get an error for the route lookup. Fixes: dbc2b5e9a09e ("sctp: fix src address selection if using secondary addresses for ipv6") Signed-off-by: Alexey Kodanev Acked-by: Neil Horman Acked-by: Marcelo Ricardo Leitner Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sctp/ipv6.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -323,8 +323,10 @@ static void sctp_v6_get_dst(struct sctp_ final_p = fl6_update_dst(fl6, rcu_dereference(np->opt), &final); bdst = ip6_dst_lookup_flow(sk, fl6, final_p); - if (!IS_ERR(bdst) && - ipv6_chk_addr(dev_net(bdst->dev), + if (IS_ERR(bdst)) + continue; + + if (ipv6_chk_addr(dev_net(bdst->dev), &laddr->a.v6.sin6_addr, bdst->dev, 1)) { if (!IS_ERR_OR_NULL(dst)) dst_release(dst); @@ -333,8 +335,10 @@ static void sctp_v6_get_dst(struct sctp_ } bmatchlen = sctp_v6_addr_match_len(daddr, &laddr->a); - if (matchlen > bmatchlen) + if (matchlen > bmatchlen) { + dst_release(bdst); continue; + } if (!IS_ERR_OR_NULL(dst)) dst_release(dst);