Message-ID: <1340644546.31710.6.camel@lappy> (sfid-20120625_191538_736706_8A18382A)
Subject: Re: [PATCH] NFC: only put local on destruction if it was created
 before
From: Sasha Levin <levinsasha928@gmail.com>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: lauro.venancio@openbossa.org, aloisio.almeida@openbossa.org,
	linville@tuxdriver.com, davej@redhat.com,
	linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Date: Mon, 25 Jun 2012 19:15:46 +0200
In-Reply-To: <20120625171738.GC16275@sortiz-mobl>
References: <1339531699-7377-1-git-send-email-levinsasha928@gmail.com>
	 <20120625171738.GC16275@sortiz-mobl>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Sender: linux-wireless-owner@vger.kernel.org

On Mon, 2012-06-25 at 19:17 +0200, Samuel Ortiz wrote:
> Hi Sasha,
> 
> On Tue, Jun 12, 2012 at 10:08:19PM +0200, Sasha Levin wrote:
> > Not having 'local' is a valid case when a socket was created but never
> > bound or connected to anything, so avoid putting 'local' if it was
> > never created.
> > 
> > Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
> > ---
> >  net/nfc/llcp/sock.c |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> > 
> > diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
> > index 2c0b317..54daa10 100644
> > --- a/net/nfc/llcp/sock.c
> > +++ b/net/nfc/llcp/sock.c
> > @@ -710,7 +710,8 @@ void nfc_llcp_sock_free(struct nfc_llcp_sock *sock)
> >  
> >  	sock->parent = NULL;
> >  
> > -	nfc_llcp_local_put(sock->local);
> > +	if (sock->local)
> > +		nfc_llcp_local_put(sock->local);
> nfc_llcp_local_put() already checks for its argument being NULL or not.

nfc_llcp_local_put() triggers a warning in this case as well, which
means that this code path shouldn't be happening.

Should we remove the WARN_ON from nfc_llcp_local_put() instead?