From: Greg Kroah-Hartman Date: Tue, 26 Nov 2013 17:23:12 +0000 (-0800) Subject: 3.4-stable patches X-Git-Tag: v3.11.10~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a74b22ab70b3d6d1aeae60499b75e294d045df1f;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: revert-ima-policy-for-ramfs.patch rt2x00-check-if-device-is-still-available-on-rt2x00mac_flush.patch --- diff --git a/queue-3.4/revert-ima-policy-for-ramfs.patch b/queue-3.4/revert-ima-policy-for-ramfs.patch new file mode 100644 index 00000000000..1c76cc471fe --- /dev/null +++ b/queue-3.4/revert-ima-policy-for-ramfs.patch @@ -0,0 +1,32 @@ +From 08de59eb144d7c41351a467442f898d720f0f15f Mon Sep 17 00:00:00 2001 +From: Mimi Zohar +Date: Thu, 17 Oct 2013 07:34:02 -0400 +Subject: Revert "ima: policy for RAMFS" + +From: Mimi Zohar + +commit 08de59eb144d7c41351a467442f898d720f0f15f upstream. + +This reverts commit 4c2c392763a682354fac65b6a569adec4e4b5387. + +Everything in the initramfs should be measured and appraised, +but until the initramfs has extended attribute support, at +least measured. + +Signed-off-by: Mimi Zohar +Signed-off-by: Greg Kroah-Hartman + +--- + security/integrity/ima/ima_policy.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/security/integrity/ima/ima_policy.c ++++ b/security/integrity/ima/ima_policy.c +@@ -62,7 +62,6 @@ static struct ima_measure_rule_entry def + {.action = DONT_MEASURE,.fsmagic = SYSFS_MAGIC,.flags = IMA_FSMAGIC}, + {.action = DONT_MEASURE,.fsmagic = DEBUGFS_MAGIC,.flags = IMA_FSMAGIC}, + {.action = DONT_MEASURE,.fsmagic = TMPFS_MAGIC,.flags = IMA_FSMAGIC}, +- {.action = DONT_MEASURE,.fsmagic = RAMFS_MAGIC,.flags = IMA_FSMAGIC}, + {.action = DONT_MEASURE,.fsmagic = SECURITYFS_MAGIC,.flags = IMA_FSMAGIC}, + {.action = DONT_MEASURE,.fsmagic = SELINUX_MAGIC,.flags = IMA_FSMAGIC}, + {.action = MEASURE,.func = FILE_MMAP,.mask = MAY_EXEC, diff --git a/queue-3.4/rt2x00-check-if-device-is-still-available-on-rt2x00mac_flush.patch b/queue-3.4/rt2x00-check-if-device-is-still-available-on-rt2x00mac_flush.patch new file mode 100644 index 00000000000..4c7ae97929f --- /dev/null +++ b/queue-3.4/rt2x00-check-if-device-is-still-available-on-rt2x00mac_flush.patch @@ -0,0 +1,104 @@ +From 5671ab05cf2a579218985ef56595387932d78ee4 Mon Sep 17 00:00:00 2001 +From: Stanislaw Gruszka +Date: Tue, 15 Oct 2013 14:31:12 +0200 +Subject: rt2x00: check if device is still available on rt2x00mac_flush() + +From: Stanislaw Gruszka + +commit 5671ab05cf2a579218985ef56595387932d78ee4 upstream. + +Fix random kernel panic with below messages when remove dongle. + +[ 2212.355447] BUG: unable to handle kernel NULL pointer dereference at 0000000000000250 +[ 2212.355527] IP: [] rt2x00usb_kick_tx_entry+0x12/0x160 [rt2x00usb] +[ 2212.355599] PGD 0 +[ 2212.355626] Oops: 0000 [#1] SMP +[ 2212.355664] Modules linked in: rt2800usb rt2x00usb rt2800lib crc_ccitt rt2x00lib mac80211 cfg80211 tun arc4 fuse rfcomm bnep snd_hda_codec_realtek snd_hda_intel snd_hda_codec btusb uvcvideo bluetooth snd_hwdep x86_pkg_temp_thermal snd_seq coretemp aesni_intel aes_x86_64 snd_seq_device glue_helper snd_pcm ablk_helper videobuf2_vmalloc sdhci_pci videobuf2_memops videobuf2_core sdhci videodev mmc_core serio_raw snd_page_alloc microcode i2c_i801 snd_timer hid_multitouch thinkpad_acpi lpc_ich mfd_core snd tpm_tis wmi tpm tpm_bios soundcore acpi_cpufreq i915 i2c_algo_bit drm_kms_helper drm i2c_core video [last unloaded: cfg80211] +[ 2212.356224] CPU: 0 PID: 34 Comm: khubd Not tainted 3.12.0-rc3-wl+ #3 +[ 2212.356268] Hardware name: LENOVO 3444CUU/3444CUU, BIOS G6ET93WW (2.53 ) 02/04/2013 +[ 2212.356319] task: ffff880212f687c0 ti: ffff880212f66000 task.ti: ffff880212f66000 +[ 2212.356392] RIP: 0010:[] [] rt2x00usb_kick_tx_entry+0x12/0x160 [rt2x00usb] +[ 2212.356481] RSP: 0018:ffff880212f67750 EFLAGS: 00010202 +[ 2212.356519] RAX: 000000000000000c RBX: 000000000000000c RCX: 0000000000000293 +[ 2212.356568] RDX: ffff8801f4dc219a RSI: 0000000000000000 RDI: 0000000000000240 +[ 2212.356617] RBP: ffff880212f67778 R08: ffffffffa02667e0 R09: 0000000000000002 +[ 2212.356665] R10: 0001f95254ab4b40 R11: ffff880212f675be R12: ffff8801f4dc2150 +[ 2212.356712] R13: 0000000000000000 R14: ffffffffa02667e0 R15: 000000000000000d +[ 2212.356761] FS: 0000000000000000(0000) GS:ffff88021e200000(0000) knlGS:0000000000000000 +[ 2212.356813] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 2212.356852] CR2: 0000000000000250 CR3: 0000000001a0c000 CR4: 00000000001407f0 +[ 2212.356899] Stack: +[ 2212.356917] 000000000000000c ffff8801f4dc2150 0000000000000000 ffffffffa02667e0 +[ 2212.356980] 000000000000000d ffff880212f677b8 ffffffffa03a31ad ffff8801f4dc219a +[ 2212.357038] ffff8801f4dc2150 0000000000000000 ffff8800b93217a0 ffff8801f49bc800 +[ 2212.357099] Call Trace: +[ 2212.357122] [] ? rt2x00usb_interrupt_txdone+0x90/0x90 [rt2x00usb] +[ 2212.357174] [] rt2x00queue_for_each_entry+0xed/0x170 [rt2x00lib] +[ 2212.357244] [] rt2x00usb_kick_queue+0x5c/0x60 [rt2x00usb] +[ 2212.357314] [] rt2x00queue_flush_queue+0x62/0xa0 [rt2x00lib] +[ 2212.357386] [] rt2x00mac_flush+0x30/0x70 [rt2x00lib] +[ 2212.357470] [] ieee80211_flush_queues+0xbd/0x140 [mac80211] +[ 2212.357555] [] ieee80211_set_disassoc+0x2d2/0x3d0 [mac80211] +[ 2212.357645] [] ieee80211_mgd_deauth+0x1d3/0x240 [mac80211] +[ 2212.357718] [] ? try_to_wake_up+0xec/0x290 +[ 2212.357788] [] ieee80211_deauth+0x18/0x20 [mac80211] +[ 2212.357872] [] cfg80211_mlme_deauth+0x9c/0x140 [cfg80211] +[ 2212.357913] [] cfg80211_mlme_down+0x5c/0x60 [cfg80211] +[ 2212.357962] [] cfg80211_disconnect+0x188/0x1a0 [cfg80211] +[ 2212.358014] [] ? __cfg80211_stop_sched_scan+0x1c/0x130 [cfg80211] +[ 2212.358067] [] cfg80211_leave+0xc4/0xe0 [cfg80211] +[ 2212.358124] [] cfg80211_netdev_notifier_call+0x3ab/0x5e0 [cfg80211] +[ 2212.358177] [] ? inetdev_event+0x38/0x510 +[ 2212.358217] [] ? __wake_up+0x44/0x50 +[ 2212.358254] [] notifier_call_chain+0x4c/0x70 +[ 2212.358293] [] raw_notifier_call_chain+0x16/0x20 +[ 2212.358361] [] call_netdevice_notifiers_info+0x35/0x60 +[ 2212.358429] [] __dev_close_many+0x49/0xd0 +[ 2212.358487] [] dev_close_many+0x88/0x100 +[ 2212.358546] [] rollback_registered_many+0xb0/0x220 +[ 2212.358612] [] unregister_netdevice_many+0x19/0x60 +[ 2212.358694] [] ieee80211_remove_interfaces+0x112/0x190 [mac80211] +[ 2212.358791] [] ieee80211_unregister_hw+0x4f/0x100 [mac80211] +[ 2212.361994] [] rt2x00lib_remove_dev+0x161/0x1a0 [rt2x00lib] +[ 2212.365240] [] rt2x00usb_disconnect+0x2e/0x70 [rt2x00usb] +[ 2212.368470] [] usb_unbind_interface+0x64/0x1c0 +[ 2212.371734] [] __device_release_driver+0x7f/0xf0 +[ 2212.374999] [] device_release_driver+0x23/0x30 +[ 2212.378131] [] bus_remove_device+0x108/0x180 +[ 2212.381358] [] device_del+0x135/0x1d0 +[ 2212.384454] [] usb_disable_device+0xb0/0x270 +[ 2212.387451] [] usb_disconnect+0xad/0x1d0 +[ 2212.390294] [] hub_thread+0x63d/0x1660 +[ 2212.393034] [] ? wake_up_atomic_t+0x30/0x30 +[ 2212.395728] [] ? hub_port_debounce+0x130/0x130 +[ 2212.398412] [] kthread+0xc0/0xd0 +[ 2212.401058] [] ? insert_kthread_work+0x40/0x40 +[ 2212.403639] [] ret_from_fork+0x7c/0xb0 +[ 2212.406193] [] ? insert_kthread_work+0x40/0x40 +[ 2212.408732] Code: 24 58 08 00 00 bf 80 00 00 00 e8 3a c3 e0 e0 5b 41 5c 5d c3 0f 1f 44 00 00 0f 1f 44 00 00 55 48 89 e5 41 57 41 56 41 55 41 54 53 <48> 8b 47 10 48 89 fb 4c 8b 6f 28 4c 8b 20 49 8b 04 24 4c 8b 30 +[ 2212.414671] RIP [] rt2x00usb_kick_tx_entry+0x12/0x160 [rt2x00usb] +[ 2212.417646] RSP +[ 2212.420547] CR2: 0000000000000250 +[ 2212.441024] ---[ end trace 5442918f33832bce ]--- + +Signed-off-by: Stanislaw Gruszka +Acked-by: Helmut Schaa +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/rt2x00/rt2x00mac.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/net/wireless/rt2x00/rt2x00mac.c ++++ b/drivers/net/wireless/rt2x00/rt2x00mac.c +@@ -771,6 +771,9 @@ void rt2x00mac_flush(struct ieee80211_hw + struct rt2x00_dev *rt2x00dev = hw->priv; + struct data_queue *queue; + ++ if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags)) ++ return; ++ + tx_queue_for_each(rt2x00dev, queue) + rt2x00queue_flush_queue(queue, drop); + } diff --git a/queue-3.4/series b/queue-3.4/series index 0a3703121c4..7a3d2c8a25f 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -17,3 +17,5 @@ nest-rename_lock-inside-vfsmount_lock.patch exec-do-not-abuse-cred_guard_mutex-in-threadgroup_lock.patch include-linux-fs.h-disable-preempt-when-acquire-i_size_seqcount-write-lock.patch perf-ftrace-fix-paranoid-level-for-enabling-function-tracer.patch +rt2x00-check-if-device-is-still-available-on-rt2x00mac_flush.patch +revert-ima-policy-for-ramfs.patch