All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: Alexey Kodanev <alexey.kodanev@oracle.com>
Cc: netdev@vger.kernel.org, Xin Long <lucien.xin@gmail.com>,
	Tommi Rantala <tommi.t.rantala@nokia.com>,
	Neil Horman <nhorman@tuxdriver.com>,
	Vlad Yasevich <vyasevich@gmail.com>,
	David Miller <davem@davemloft.net>,
	linux-sctp@vger.kernel.org
Subject: Re: [PATCH] sctp: fix dst refcnt leak in sctp_v6_get_dst()
Date: Mon, 05 Feb 2018 15:53:49 +0000	[thread overview]
Message-ID: <20180205155349.GC27685@localhost.localdomain> (raw)
In-Reply-To: <1517832635-18376-1-git-send-email-alexey.kodanev@oracle.com>

On Mon, Feb 05, 2018 at 03:10:35PM +0300, Alexey Kodanev wrote:
> 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 <alexey.kodanev@oracle.com>

Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>

> ---
>  net/sctp/ipv6.c |   10 +++++++---
>  1 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
> index 5d4c15b..e35d4f7 100644
> --- a/net/sctp/ipv6.c
> +++ b/net/sctp/ipv6.c
> @@ -326,8 +326,10 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr,
>  		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);
> @@ -336,8 +338,10 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr,
>  		}
>  
>  		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);
> -- 
> 1.7.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

WARNING: multiple messages have this Message-ID (diff)
From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: Alexey Kodanev <alexey.kodanev@oracle.com>
Cc: netdev@vger.kernel.org, Xin Long <lucien.xin@gmail.com>,
	Tommi Rantala <tommi.t.rantala@nokia.com>,
	Neil Horman <nhorman@tuxdriver.com>,
	Vlad Yasevich <vyasevich@gmail.com>,
	David Miller <davem@davemloft.net>,
	linux-sctp@vger.kernel.org
Subject: Re: [PATCH] sctp: fix dst refcnt leak in sctp_v6_get_dst()
Date: Mon, 5 Feb 2018 13:53:49 -0200	[thread overview]
Message-ID: <20180205155349.GC27685@localhost.localdomain> (raw)
In-Reply-To: <1517832635-18376-1-git-send-email-alexey.kodanev@oracle.com>

On Mon, Feb 05, 2018 at 03:10:35PM +0300, Alexey Kodanev wrote:
> 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 <alexey.kodanev@oracle.com>

Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>

> ---
>  net/sctp/ipv6.c |   10 +++++++---
>  1 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
> index 5d4c15b..e35d4f7 100644
> --- a/net/sctp/ipv6.c
> +++ b/net/sctp/ipv6.c
> @@ -326,8 +326,10 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr,
>  		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);
> @@ -336,8 +338,10 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr,
>  		}
>  
>  		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);
> -- 
> 1.7.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

  parent reply	other threads:[~2018-02-05 15:53 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-05 12:10 [PATCH] sctp: fix dst refcnt leak in sctp_v6_get_dst() Alexey Kodanev
2018-02-05 12:10 ` Alexey Kodanev
2018-02-05 12:35 ` Neil Horman
2018-02-05 12:35   ` Neil Horman
2018-02-05 15:53 ` Marcelo Ricardo Leitner [this message]
2018-02-05 15:53   ` Marcelo Ricardo Leitner
2018-02-06  2:22 ` David Miller
2018-02-06  2:22   ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180205155349.GC27685@localhost.localdomain \
    --to=marcelo.leitner@gmail.com \
    --cc=alexey.kodanev@oracle.com \
    --cc=davem@davemloft.net \
    --cc=linux-sctp@vger.kernel.org \
    --cc=lucien.xin@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@tuxdriver.com \
    --cc=tommi.t.rantala@nokia.com \
    --cc=vyasevich@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.