linux-kernel - Re: [PATCH] libceph: Call con->ops->put(con) if cancel_delayed

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <alpine.DEB.2.00.1306232029480.20076@cobra.newdream.net>
Date:	Sun, 23 Jun 2013 20:30:03 -0700 (PDT)
From:	Sage Weil <sage@...tank.com>
To:	majianpeng <majianpeng@...il.com>
cc:	davem <davem@...emloft.net>,
	ceph-devel <ceph-devel@...r.kernel.org>,
	linux-kernel <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] libceph: Call con->ops->put(con) if cancel_delayed_work(&con->work)
 worked.

On Mon, 24 Jun 2013, majianpeng wrote:
> Because in func queue_con_delay, it will call con->ops->get(con).
> So if we cancel the work successfully,we must call con->ops->put(con).
> Otherwise some resource can't free like 'struct ceph_mds_session'.
> 
> Signed-off-by: Jianpeng Ma <majianpeng@...il.com>

Looks good, applied to the testing branch.

Thanks!
sage

> ---
>  net/ceph/messenger.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
> index eb0a46a..8207b37 100644
> --- a/net/ceph/messenger.c
> +++ b/net/ceph/messenger.c
> @@ -661,7 +661,8 @@ void ceph_con_close(struct ceph_connection *con)
>  
>  	reset_connection(con);
>  	con->peer_global_seq = 0;
> -	cancel_delayed_work(&con->work);
> +	if (cancel_delayed_work(&con->work))
> +		con->ops->put(con);
>  	con_close_socket(con);
>  	mutex_unlock(&con->mutex);
>  }
> -- 
> 1.8.1.2
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/