From patchwork Tue Jun 12 20:08:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 164494 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 15A62B6FAA for ; Wed, 13 Jun 2012 06:07:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754021Ab2FLUHj (ORCPT ); Tue, 12 Jun 2012 16:07:39 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:34230 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753644Ab2FLUHg (ORCPT ); Tue, 12 Jun 2012 16:07:36 -0400 Received: by obbtb18 with SMTP id tb18so8758557obb.19 for ; Tue, 12 Jun 2012 13:07:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=Zk1QdAt2UWcKZ8fonZQE+sO5S8yPT5Rq76t9vyGRzXo=; b=L2enxcv54xMvj9v2OC/rhj7qJP8X0nQK6x1HnyvqfMcLK48kulWBze5BsL83NO9gnh h47jTL1K8fYn4OlfgbJEW6FtIxUu+eQQJERAFtudGaslMar3fM5U2UO+3Na4Ch+TwDXS MGA6BzKdJu3Nw3fdjHhPlGI4kbq64T5wpbj9zs9VrahRMWSWc2vdrZrGHcmx+4QrFKwG KWU1BWWf+QftHZ5z1R7JSbZlBiEBOXuVWQG/jmKg18ACknYymQ8rIhwRH+OOGoaQOEob S8231O9dNyi6L2WKJtB8R8f3m4JnE3IRm0xJnlPQh+VriCNth/TlCQBd6vYFFniQd42J 4OQw== Received: by 10.182.119.33 with SMTP id kr1mr22144233obb.60.1339531656142; Tue, 12 Jun 2012 13:07:36 -0700 (PDT) Received: from lappy.us.oracle.com (95-89-78-76-dynip.superkabel.de. [95.89.78.76]) by mx.google.com with ESMTPS id o4sm227770oef.11.2012.06.12.13.07.32 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 13:07:35 -0700 (PDT) From: Sasha Levin To: lauro.venancio@openbossa.org, aloisio.almeida@openbossa.org, sameo@linux.intel.com, linville@tuxdriver.com Cc: davej@redhat.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Levin Subject: [PATCH] NFC: only put local on destruction if it was created before Date: Tue, 12 Jun 2012 22:08:19 +0200 Message-Id: <1339531699-7377-1-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.8.6 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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); } static int llcp_sock_create(struct net *net, struct socket *sock,