From patchwork Wed Jul 7 13:02:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 58116 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 CA407B6EF3 for ; Wed, 7 Jul 2010 23:05:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755284Ab0GGNEx (ORCPT ); Wed, 7 Jul 2010 09:04:53 -0400 Received: from mail.pripojeni.net ([217.66.174.14]:60593 "EHLO mail.pripojeni.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754608Ab0GGNEv (ORCPT ); Wed, 7 Jul 2010 09:04:51 -0400 Received: from anemoi.localdomain ([217.66.174.142]) by mail.pripojeni.net (Kerio Connect 7.0.0 patch 1); Wed, 7 Jul 2010 15:02:47 +0200 From: Jiri Slaby To: johannes@sipsolutions.net Cc: jirislaby@gmail.com, linux-kernel@vger.kernel.org, "John W. Linville" , "David S. Miller" , Jouni Malinen , Samuel Ortiz , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] NET: nl80211, fix lock imbalance and netdev referencing Date: Wed, 7 Jul 2010 15:02:46 +0200 Message-Id: <1278507766-309-1-git-send-email-jirislaby@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Stanse found that nl80211_set_wiphy imporperly handles a lock and netdev reference and contains unreachable code. It is because there return statement isntead of assignment to result variable. Fix that. Signed-off-by: Jiri Slaby Cc: Johannes Berg Cc: "John W. Linville" Cc: "David S. Miller" Cc: Jouni Malinen Cc: Samuel Ortiz Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org --- net/wireless/nl80211.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 85285b4..fbfac58 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -877,7 +877,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) int idx, mbm = 0; if (!rdev->ops->set_tx_power) { - return -EOPNOTSUPP; + result = -EOPNOTSUPP; goto bad_res; }