Linux v3.10.6
This commit is contained in:
parent
15b4ccaab8
commit
781a64a27c
|
@ -1,72 +0,0 @@
|
|||
Memory allocated by vmalloc (including stack) can not be used for DMA,
|
||||
i.e. data pointer on usb_control_msg() should not point to stack memory.
|
||||
|
||||
Resolves:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=977558
|
||||
|
||||
Reported-and-tested-by: Andy Lawrence <dr.diesel@gmail.com>
|
||||
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
---
|
||||
drivers/bluetooth/ath3k.c | 38 +++++++++++++++++++++++++++++---------
|
||||
1 file changed, 29 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
|
||||
index 11f467c..81b636c 100644
|
||||
--- a/drivers/bluetooth/ath3k.c
|
||||
+++ b/drivers/bluetooth/ath3k.c
|
||||
@@ -193,24 +193,44 @@ error:
|
||||
|
||||
static int ath3k_get_state(struct usb_device *udev, unsigned char *state)
|
||||
{
|
||||
- int pipe = 0;
|
||||
+ int ret, pipe = 0;
|
||||
+ char *buf;
|
||||
+
|
||||
+ buf = kmalloc(1, GFP_KERNEL);
|
||||
+ if (!buf)
|
||||
+ return -ENOMEM;
|
||||
|
||||
pipe = usb_rcvctrlpipe(udev, 0);
|
||||
- return usb_control_msg(udev, pipe, ATH3K_GETSTATE,
|
||||
- USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
|
||||
- state, 0x01, USB_CTRL_SET_TIMEOUT);
|
||||
+ ret = usb_control_msg(udev, pipe, ATH3K_GETSTATE,
|
||||
+ USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
|
||||
+ buf, 1, USB_CTRL_SET_TIMEOUT);
|
||||
+
|
||||
+ *state = *buf;
|
||||
+ kfree(buf);
|
||||
+
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
static int ath3k_get_version(struct usb_device *udev,
|
||||
struct ath3k_version *version)
|
||||
{
|
||||
- int pipe = 0;
|
||||
+ int ret, pipe = 0;
|
||||
+ char *buf;
|
||||
+ const int size = sizeof(struct ath3k_version);
|
||||
+
|
||||
+ buf = kmalloc(size, GFP_KERNEL);
|
||||
+ if (!buf)
|
||||
+ return -ENOMEM;
|
||||
|
||||
pipe = usb_rcvctrlpipe(udev, 0);
|
||||
- return usb_control_msg(udev, pipe, ATH3K_GETVERSION,
|
||||
- USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, version,
|
||||
- sizeof(struct ath3k_version),
|
||||
- USB_CTRL_SET_TIMEOUT);
|
||||
+ ret = usb_control_msg(udev, pipe, ATH3K_GETVERSION,
|
||||
+ USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
|
||||
+ buf, size, USB_CTRL_SET_TIMEOUT);
|
||||
+
|
||||
+ memcpy(version, buf, size);
|
||||
+ kfree(buf);
|
||||
+
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
static int ath3k_load_fwfile(struct usb_device *udev,
|
||||
--
|
||||
1.7.11.7
|
|
@ -41,3 +41,4 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
|
|||
CONFIG_SERIAL_AMBA_PL011=y
|
||||
|
||||
# CONFIG_CRYPTO_TEST is not set
|
||||
CONFIG_KUSER_HELPERS=y
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
|
||||
index 6c80083..77cc85d 100644
|
||||
--- a/fs/notify/fanotify/fanotify_user.c
|
||||
+++ b/fs/notify/fanotify/fanotify_user.c
|
||||
@@ -122,6 +122,7 @@ static int fill_event_metadata(struct fsnotify_group *group,
|
||||
metadata->event_len = FAN_EVENT_METADATA_LEN;
|
||||
metadata->metadata_len = FAN_EVENT_METADATA_LEN;
|
||||
metadata->vers = FANOTIFY_METADATA_VERSION;
|
||||
+ metadata->reserved = 0;
|
||||
metadata->mask = event->mask & FAN_ALL_OUTGOING_EVENTS;
|
||||
metadata->pid = pid_vnr(event->tgid);
|
||||
if (unlikely(event->mask & FAN_Q_OVERFLOW))
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From 7b29fdb8cd8f92e31f550611a8c031986dba2e8f Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Berg <johannes.berg@intel.com>
|
||||
Date: Fri, 03 May 2013 16:58:16 +0000
|
||||
Subject: iwlwifi: dvm: don't send BT_CONFIG on devices w/o Bluetooth
|
||||
|
||||
The BT_CONFIG command that is sent to the device during
|
||||
startup will enable BT coex unless the module parameter
|
||||
turns it off, but on devices without Bluetooth this may
|
||||
cause problems, as reported in Redhat BZ 885407.
|
||||
|
||||
Fix this by sending the BT_CONFIG command only when the
|
||||
device has Bluetooth.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
||||
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
|
||||
---
|
||||
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
|
||||
index 3952ddf..1531a4f 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
|
||||
@@ -758,7 +758,7 @@ int iwl_alive_start(struct iwl_priv *priv)
|
||||
BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);
|
||||
if (ret)
|
||||
return ret;
|
||||
- } else {
|
||||
+ } else if (priv->cfg->bt_params) {
|
||||
/*
|
||||
* default is 2-wire BT coexexistence support
|
||||
*/
|
||||
--
|
||||
cgit v0.9.2
|
25
kernel.spec
25
kernel.spec
|
@ -62,7 +62,7 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be appended after the rcX and
|
||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||
#
|
||||
%global baserelease 101
|
||||
%global baserelease 100
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
@ -74,7 +74,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 5
|
||||
%define stable_update 6
|
||||
# Is it a -stable RC?
|
||||
%define stable_rc 0
|
||||
# Set rpm version accordingly
|
||||
|
@ -740,9 +740,6 @@ Patch25024: intel_iommu-Downgrade-the-warning-if-enabling-irq-remapping-fails.pa
|
|||
#CVE-2013-2147 rhbz 971242 971249
|
||||
Patch25032: cve-2013-2147-ciss-info-leak.patch
|
||||
|
||||
#CVE-2013-2148 rhbz 971258 971261
|
||||
Patch25033: fanotify-info-leak-in-copy_event_to_user.patch
|
||||
|
||||
#rhbz 969644
|
||||
Patch25046: KVM-x86-handle-idiv-overflow-at-kvm_write_tsc.patch
|
||||
|
||||
|
@ -756,9 +753,6 @@ Patch25054: bridge-send-query-as-soon-as-leave-is-received.patch
|
|||
Patch25061: bridge-timer-fix.patch
|
||||
Patch25066: bridge-do-not-call-setup_timer-multiple-times.patch
|
||||
|
||||
#rhbz 977558
|
||||
Patch25055: ath3k-dont-use-stack-memory-for-DMA.patch
|
||||
|
||||
#rhbz 977040
|
||||
Patch25056: iwl3945-better-skb-management-in-rx-path.patch
|
||||
Patch25057: iwl4965-better-skb-management-in-rx-path.patch
|
||||
|
@ -766,9 +760,6 @@ Patch25057: iwl4965-better-skb-management-in-rx-path.patch
|
|||
#rhbz 959721
|
||||
Patch25063: HID-kye-Add-report-fixup-for-Genius-Gila-Gaming-mouse.patch
|
||||
|
||||
#rhbz 885407
|
||||
Patch25064: iwlwifi-dvm-dont-send-BT_CONFIG-on-devices-wo-Bluetooth.patch
|
||||
|
||||
#rhbz 979581
|
||||
Patch25069: iwlwifi-dvm-fix-calling-ieee80211_chswitch_done-with-NULL.patch
|
||||
|
||||
|
@ -1458,9 +1449,6 @@ ApplyPatch intel_iommu-Downgrade-the-warning-if-enabling-irq-remapping-fails.pat
|
|||
#CVE-2013-2147 rhbz 971242 971249
|
||||
ApplyPatch cve-2013-2147-ciss-info-leak.patch
|
||||
|
||||
#CVE-2013-2148 rhbz 971258 971261
|
||||
ApplyPatch fanotify-info-leak-in-copy_event_to_user.patch
|
||||
|
||||
#rhbz 969644
|
||||
ApplyPatch KVM-x86-handle-idiv-overflow-at-kvm_write_tsc.patch
|
||||
|
||||
|
@ -1474,9 +1462,6 @@ ApplyPatch bridge-send-query-as-soon-as-leave-is-received.patch
|
|||
ApplyPatch bridge-timer-fix.patch
|
||||
ApplyPatch bridge-do-not-call-setup_timer-multiple-times.patch
|
||||
|
||||
#rhbz 977558
|
||||
ApplyPatch ath3k-dont-use-stack-memory-for-DMA.patch
|
||||
|
||||
#rhbz 977040
|
||||
ApplyPatch iwl3945-better-skb-management-in-rx-path.patch
|
||||
ApplyPatch iwl4965-better-skb-management-in-rx-path.patch
|
||||
|
@ -1484,9 +1469,6 @@ ApplyPatch iwl4965-better-skb-management-in-rx-path.patch
|
|||
#rhbz 959721
|
||||
ApplyPatch HID-kye-Add-report-fixup-for-Genius-Gila-Gaming-mouse.patch
|
||||
|
||||
#rhbz 885407
|
||||
ApplyPatch iwlwifi-dvm-dont-send-BT_CONFIG-on-devices-wo-Bluetooth.patch
|
||||
|
||||
#rhbz 979581
|
||||
ApplyPatch iwlwifi-dvm-fix-calling-ieee80211_chswitch_done-with-NULL.patch
|
||||
|
||||
|
@ -2342,6 +2324,9 @@ fi
|
|||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Mon Aug 12 2013 Justin M. Forbes <jforbes@redhat.com> 3.10.6-100
|
||||
- Linux v3.10.6
|
||||
|
||||
* Wed Aug 07 2013 Justin M. Forbes <jforbes@redhat.com> 3.10.5-101
|
||||
- Bump for rebuild after koji hiccup
|
||||
|
||||
|
|
Loading…
Reference in New Issue