diff options
| author | Ben Hutchings <benh@debian.org> | 2012-06-27 03:21:03 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2012-06-27 03:21:03 +0000 |
| commit | b31cabb10b38764324d0f2b3c03a0cbb010084e7 (patch) | |
| tree | fd08f6837dd99c9465e8d3483ed8ab96ac6bb665 | |
| parent | d9047a7642e624060825a879ec037b8c4240e8f2 (diff) | |
| download | kernel_replicant_linux-b31cabb10b38764324d0f2b3c03a0cbb010084e7.tar.gz kernel_replicant_linux-b31cabb10b38764324d0f2b3c03a0cbb010084e7.tar.bz2 kernel_replicant_linux-b31cabb10b38764324d0f2b3c03a0cbb010084e7.zip | |
xen/netfront: teardown the device before unregistering it (Closes: #675190)
svn path=/dists/sid/linux/; revision=19222
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/bugfix/all/xen-netfront-teardown-the-device-before-unregistering-it.patch | 49 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 52 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c3059d73d6d1..27a81288880b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ linux (3.2.21-3) UNRELEASED; urgency=low * i2400m: Disable I2400M_SDIO; hardware did not reach production * apparmor: remove advertising the support of network rules from compat iface (Closes: #676515) + * xen/netfront: teardown the device before unregistering it (Closes: #675190) -- Ben Hutchings <ben@decadent.org.uk> Wed, 27 Jun 2012 02:56:49 +0100 diff --git a/debian/patches/bugfix/all/xen-netfront-teardown-the-device-before-unregistering-it.patch b/debian/patches/bugfix/all/xen-netfront-teardown-the-device-before-unregistering-it.patch new file mode 100644 index 000000000000..822c1c0beb9d --- /dev/null +++ b/debian/patches/bugfix/all/xen-netfront-teardown-the-device-before-unregistering-it.patch @@ -0,0 +1,49 @@ +From: Ian Campbell <ian.campbell@citrix.com> +Date: Tue, 26 Jun 2012 09:48:41 +0100 +Subject: xen/netfront: teardown the device before unregistering it. +Bug-Debian: http://bugs.debian.org/675190 + +Fixes: +[ 15.470311] WARNING: at /local/scratch/ianc/devel/kernels/linux/fs/sysfs/file.c:498 sysfs_attr_ns+0x95/0xa0() +[ 15.470326] sysfs: kobject eth0 without dirent +[ 15.470333] Modules linked in: +[ 15.470342] Pid: 12, comm: xenwatch Not tainted 3.4.0-x86_32p-xenU #93 +and +[ 9.150554] BUG: unable to handle kernel paging request at 2b359000 +[ 9.150577] IP: [<c1279561>] linkwatch_do_dev+0x81/0xc0 +[ 9.150592] *pdpt = 000000002c3c9027 *pde = 0000000000000000 +[ 9.150604] Oops: 0002 [#1] SMP +[ 9.150613] Modules linked in: + +This is http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=675190 + +Reported-by: George Shuklin <george.shuklin@gmail.com> +Signed-off-by: Ian Campbell <ian.campbell@citrix.com> +Tested-by: William Dauchy <wdauchy@gmail.com> +Cc: stable@kernel.org +Cc: 675190@bugs.debian.org +--- + drivers/net/xen-netfront.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/net/xen-netfront.c ++++ b/drivers/net/xen-netfront.c +@@ -1922,14 +1922,14 @@ + + dev_dbg(&dev->dev, "%s\n", dev->nodename); + +- unregister_netdev(info->netdev); +- + xennet_disconnect_backend(info); + +- del_timer_sync(&info->rx_refill_timer); +- + xennet_sysfs_delif(info->netdev); + ++ unregister_netdev(info->netdev); ++ ++ del_timer_sync(&info->rx_refill_timer); ++ + free_percpu(info->stats); + + free_netdev(info->netdev); diff --git a/debian/patches/series b/debian/patches/series index ff8d446fe98c..dce2b550e2ef 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -367,3 +367,5 @@ features/all/Input-add-Synaptics-USB-device-driver.patch features/arm/ARM-7259-3-net-JIT-compiler-for-packet-filters.patch features/arm/ARM-fix-Kconfig-warning-for-HAVE_BPF_JIT.patch features/arm/net-drop-NET-dependency-from-HAVE_BPF_JIT.patch + +bugfix/all/xen-netfront-teardown-the-device-before-unregistering-it.patch |