[kernel/f16] Add patch to fix deadlock in ipw2x00 (rhbz 738387)
Josh Boyer
jwboyer at fedoraproject.org
Fri Sep 16 11:49:56 UTC 2011
commit 10328f76dcdbbc95ed3bfdc04103aaa414fb2c2e
Author: Josh Boyer <jwboyer at redhat.com>
Date: Fri Sep 16 07:47:40 2011 -0400
Add patch to fix deadlock in ipw2x00 (rhbz 738387)
Also adjust %files list to not include x86-only binaries on non-x86 arches
in kernel-tools
ipw2x00-fix-rtnl-mutex-deadlock.patch | 224 +++++++++++++++++++++++++++++++++
kernel.spec | 12 ++-
2 files changed, 235 insertions(+), 1 deletions(-)
---
diff --git a/ipw2x00-fix-rtnl-mutex-deadlock.patch b/ipw2x00-fix-rtnl-mutex-deadlock.patch
new file mode 100644
index 0000000..3c98bc2
--- /dev/null
+++ b/ipw2x00-fix-rtnl-mutex-deadlock.patch
@@ -0,0 +1,224 @@
+Path: news.gmane.org!not-for-mail
+From: Stanislaw Gruszka <sgruszka-H+wXaHxf7aLQT0dZR+AlfA at public.gmane.org>
+Newsgroups: gmane.linux.kernel.wireless.general
+Subject: [PATCH] ipw2x00: fix rtnl mutex deadlock
+Date: Wed, 14 Sep 2011 16:47:50 +0200
+Lines: 173
+Approved: news at gmane.org
+Message-ID: <1316011670-6787-1-git-send-email-sgruszka at redhat.com>
+NNTP-Posting-Host: lo.gmane.org
+X-Trace: dough.gmane.org 1316011688 20989 80.91.229.12 (14 Sep 2011 14:48:08 GMT)
+X-Complaints-To: usenet at dough.gmane.org
+NNTP-Posting-Date: Wed, 14 Sep 2011 14:48:08 +0000 (UTC)
+Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA at public.gmane.org,
+ Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b at public.gmane.org>,
+ "Rafael J. Wysocki" <rjw-KKrjLPT3xs0 at public.gmane.org>,
+ Maciej Rutecki <maciej.rutecki-Re5JQEeQqe8AvxtiuMwx3w at public.gmane.org>,
+ Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w at public.gmane.org>,
+ Witold Baryluk <baryluk-W6Hso+/wx31C2Nf1M/Lcnw at public.gmane.org>,
+ Stanislaw Gruszka <sgruszka-H+wXaHxf7aLQT0dZR+AlfA at public.gmane.org>
+To: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ at public.gmane.org>
+Original-X-From: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA at public.gmane.org Wed Sep 14 16:48:02 2011
+Return-path: <linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA at public.gmane.org>
+Envelope-to: glkwg-linux-wireless-1dZseelyfdZg9hUCZPvPmw at public.gmane.org
+Original-Received: from vger.kernel.org ([209.132.180.67])
+ by lo.gmane.org with esmtp (Exim 4.69)
+ (envelope-from <linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA at public.gmane.org>)
+ id 1R3qkr-0005Xu-KZ
+ for glkwg-linux-wireless-1dZseelyfdZg9hUCZPvPmw at public.gmane.org; Wed, 14 Sep 2011 16:48:02 +0200
+Original-Received: (majordomo-u79uwXL29TY76Z2rM5mHXA at public.gmane.org) by vger.kernel.org via listexpand
+ id S1755562Ab1INOr7 (ORCPT
+ <rfc822;glkwg-linux-wireless at m.gmane.org>);
+ Wed, 14 Sep 2011 10:47:59 -0400
+Original-Received: from mx1.redhat.com ([209.132.183.28]:50585 "EHLO mx1.redhat.com"
+ rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
+ id S1751756Ab1INOr7 (ORCPT <rfc822;linux-wireless-u79uwXL29TY76Z2rM5mHXA at public.gmane.org>);
+ Wed, 14 Sep 2011 10:47:59 -0400
+Original-Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
+ by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8EEldiu028562
+ (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
+ Wed, 14 Sep 2011 10:47:40 -0400
+Original-Received: from localhost (dhcp-27-35.brq.redhat.com [10.34.27.35])
+ by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p8EElaD3010274;
+ Wed, 14 Sep 2011 10:47:37 -0400
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
+Original-Sender: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA at public.gmane.org
+Precedence: bulk
+List-ID: <linux-wireless.vger.kernel.org>
+X-Mailing-List: linux-wireless-u79uwXL29TY76Z2rM5mHXA at public.gmane.org
+Xref: news.gmane.org gmane.linux.kernel.wireless.general:77103
+Archived-At: <http://permalink.gmane.org/gmane.linux.kernel.wireless.general/77103>
+
+This fix regression introduced by:
+
+commit: ecb4433550f0620f3d1471ae7099037ede30a91e
+Author: Stanislaw Gruszka <sgruszka-H+wXaHxf7aLQT0dZR+AlfA at public.gmane.org>
+Date: Fri Aug 12 14:00:59 2011 +0200
+
+ mac80211: fix suspend/resume races with unregister hw
+
+Above commit add rtnl_lock() into wiphy_register(), what cause deadlock
+when initializing ipw2x00 driver, which itself call wiphy_register()
+from register_netdev() internal callback with rtnl mutex taken.
+
+To fix move wiphy_register() outside register_netdev(). This solution
+have side effect of not creating /sys/class/net/wlanX/phy80211 link,
+but that's a minor issue we can live with.
+
+Bisected-by: Witold Baryluk <baryluk-W6Hso+/wx31C2Nf1M/Lcnw at public.gmane.org>
+Bisected-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w at public.gmane.org>
+Tested-by: Witold Baryluk <baryluk-W6Hso+/wx31C2Nf1M/Lcnw at public.gmane.org>
+Tested-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w at public.gmane.org>
+Signed-off-by: Stanislaw Gruszka <sgruszka-H+wXaHxf7aLQT0dZR+AlfA at public.gmane.org>
+---
+ecb4433550f0620f3d1471ae7099037ede30a91e was CCed to stable but we
+drop it there, when bug was reported. So this patch is only intended
+to 3.1
+
+ drivers/net/wireless/ipw2x00/ipw2100.c | 21 +++++++++++-----
+ drivers/net/wireless/ipw2x00/ipw2200.c | 39 +++++++++++++++++++++----------
+ 2 files changed, 40 insertions(+), 20 deletions(-)
+
+diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
+index 3774dd0..ef9ad79 100644
+--- a/drivers/net/wireless/ipw2x00/ipw2100.c
++++ b/drivers/net/wireless/ipw2x00/ipw2100.c
+@@ -1903,15 +1903,17 @@ static void ipw2100_down(struct ipw2100_priv *priv)
+ static int ipw2100_net_init(struct net_device *dev)
+ {
+ struct ipw2100_priv *priv = libipw_priv(dev);
++
++ return ipw2100_up(priv, 1);
++}
++
++static int ipw2100_wdev_init(struct net_device *dev)
++{
++ struct ipw2100_priv *priv = libipw_priv(dev);
+ const struct libipw_geo *geo = libipw_get_geo(priv->ieee);
+ struct wireless_dev *wdev = &priv->ieee->wdev;
+- int ret;
+ int i;
+
+- ret = ipw2100_up(priv, 1);
+- if (ret)
+- return ret;
+-
+ memcpy(wdev->wiphy->perm_addr, priv->mac_addr, ETH_ALEN);
+
+ /* fill-out priv->ieee->bg_band */
+@@ -6350,9 +6352,13 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
+ "Error calling register_netdev.\n");
+ goto fail;
+ }
++ registered = 1;
++
++ err = ipw2100_wdev_init(dev);
++ if (err)
++ goto fail;
+
+ mutex_lock(&priv->action_mutex);
+- registered = 1;
+
+ IPW_DEBUG_INFO("%s: Bound to %s\n", dev->name, pci_name(pci_dev));
+
+@@ -6389,7 +6395,8 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
+
+ fail_unlock:
+ mutex_unlock(&priv->action_mutex);
+-
++ wiphy_unregister(priv->ieee->wdev.wiphy);
++ kfree(priv->ieee->bg_band.channels);
+ fail:
+ if (dev) {
+ if (registered)
+diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
+index 87813c3..4ffebed 100644
+--- a/drivers/net/wireless/ipw2x00/ipw2200.c
++++ b/drivers/net/wireless/ipw2x00/ipw2200.c
+@@ -11425,16 +11425,23 @@ static void ipw_bg_down(struct work_struct *work)
+ /* Called by register_netdev() */
+ static int ipw_net_init(struct net_device *dev)
+ {
++ int rc = 0;
++ struct ipw_priv *priv = libipw_priv(dev);
++
++ mutex_lock(&priv->mutex);
++ if (ipw_up(priv))
++ rc = -EIO;
++ mutex_unlock(&priv->mutex);
++
++ return rc;
++}
++
++static int ipw_wdev_init(struct net_device *dev)
++{
+ int i, rc = 0;
+ struct ipw_priv *priv = libipw_priv(dev);
+ const struct libipw_geo *geo = libipw_get_geo(priv->ieee);
+ struct wireless_dev *wdev = &priv->ieee->wdev;
+- mutex_lock(&priv->mutex);
+-
+- if (ipw_up(priv)) {
+- rc = -EIO;
+- goto out;
+- }
+
+ memcpy(wdev->wiphy->perm_addr, priv->mac_addr, ETH_ALEN);
+
+@@ -11519,13 +11526,9 @@ static int ipw_net_init(struct net_device *dev)
+ set_wiphy_dev(wdev->wiphy, &priv->pci_dev->dev);
+
+ /* With that information in place, we can now register the wiphy... */
+- if (wiphy_register(wdev->wiphy)) {
++ if (wiphy_register(wdev->wiphy))
+ rc = -EIO;
+- goto out;
+- }
+-
+ out:
+- mutex_unlock(&priv->mutex);
+ return rc;
+ }
+
+@@ -11832,14 +11835,22 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
+ goto out_remove_sysfs;
+ }
+
++ err = ipw_wdev_init(net_dev);
++ if (err) {
++ IPW_ERROR("failed to register wireless device\n");
++ goto out_unregister_netdev;
++ }
++
+ #ifdef CONFIG_IPW2200_PROMISCUOUS
+ if (rtap_iface) {
+ err = ipw_prom_alloc(priv);
+ if (err) {
+ IPW_ERROR("Failed to register promiscuous network "
+ "device (error %d).\n", err);
+- unregister_netdev(priv->net_dev);
+- goto out_remove_sysfs;
++ wiphy_unregister(priv->ieee->wdev.wiphy);
++ kfree(priv->ieee->a_band.channels);
++ kfree(priv->ieee->bg_band.channels);
++ goto out_unregister_netdev;
+ }
+ }
+ #endif
+@@ -11851,6 +11862,8 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
+
+ return 0;
+
++ out_unregister_netdev:
++ unregister_netdev(priv->net_dev);
+ out_remove_sysfs:
+ sysfs_remove_group(&pdev->dev.kobj, &ipw_attribute_group);
+ out_release_irq:
+--
+1.7.1
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA at public.gmane.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+
diff --git a/kernel.spec b/kernel.spec
index 49fb20d..8538a24 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3
#
-%global baserelease 2
+%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -740,6 +740,8 @@ Patch13013: powerpc-Fix-deadlock-in-icswx-code.patch
# CVE-2011-3191
Patch13014: cifs-fix-possible-memory-corruption-in-CIFSFindNext.patch
+Patch13015: ipw2x00-fix-rtnl-mutex-deadlock.patch
+
Patch20000: utrace.patch
# Flattened devicetree support
@@ -1369,6 +1371,8 @@ ApplyPatch powerpc-Fix-deadlock-in-icswx-code.patch
# CVE-2011-3191
ApplyPatch cifs-fix-possible-memory-corruption-in-CIFSFindNext.patch
+ApplyPatch ipw2x00-fix-rtnl-mutex-deadlock.patch
+
# utrace.
ApplyPatch utrace.patch
@@ -1987,8 +1991,10 @@ fi
%ifarch %{cpupowerarchs}
%{_bindir}/cpupower
+%ifarch %{ix86} x86_64
%{_bindir}/centrino-decode
%{_bindir}/powernow-k8-decode
+%endif
%{_libdir}/libcpupower.so.0
%{_libdir}/libcpupower.so.0.0.0
%{_unitdir}/cpupower.service
@@ -2071,6 +2077,10 @@ fi
# and build.
%changelog
+* Fri Sep 16 2011 Josh Boyer <jwboyer at redhat.com> 3.1.0-0.rc6.git0.3.fc16
+- Add patch to fix deadlock in ipw2x00 (rhbz 738387)
+- Fixup kernel-tools file section for ppc/ppc64
+
* Thu Sep 15 2011 Josh Boyer <jwboyer at redhat.com>
- CVE-2011-3191: cifs: fix possible memory corruption in CIFSFindNext
More information about the scm-commits
mailing list