Update to 3.10.10
svn path=/dists/sid/linux/; revision=20531
This commit is contained in:
Ben Hutchings
parent
018ad0d8b0
commit
283813ab80
|
|
@ -1,3 +1,50 @@
|
|||
linux (3.10.10-1) UNRELEASED; urgency=low
|
||||
|
||||
* New upstream stable update:
|
||||
http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.10.8
|
||||
- [arm] perf/arm: Fix armpmu_map_hw_event()
|
||||
- memcg: don't initialize kmem-cache destroying work for root caches
|
||||
- fs/proc/task_mmu.c: fix buffer overflow in add_page_map()
|
||||
- elevator: Fix a race in elevator switching
|
||||
- mac80211: fix infinite loop in ieee80211_determine_chantype
|
||||
- can: pcan_usb: fix wrong memcpy() bytes length
|
||||
- cfg80211: fix P2P GO interface teardown
|
||||
- ASoC: dapm: Fix empty list check in dapm_new_mux()
|
||||
- ALSA: 6fire: make buffers DMA-able (pcm)
|
||||
- ALSA: 6fire: make buffers DMA-able (midi)
|
||||
- USB: ti_usb_3410_5052: fix big-endian firmware handling
|
||||
- USB: mos7720: fix broken control requests
|
||||
- Fix TLB gather virtual address range invalidation corner cases
|
||||
- [arm] 7809/1: perf: fix event validation for software group leaders
|
||||
(CVE-2013-4254)
|
||||
- jbd2: Fix use after free after error in jbd2_journal_dirty_metadata()
|
||||
http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.10.9
|
||||
http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.10.10
|
||||
- [s390] KVM: s390: move kvm_guest_enter,exit closer to sie
|
||||
- mac80211: don't wait for TX status forever
|
||||
- tracing/kprobe: Wait for disabling all running kprobe handlers
|
||||
- tracing: Fix many race conditions including potential use-after-free
|
||||
- tracing/kprobes: Fail to unregister if probe event files are in use
|
||||
- tracing/uprobes: Fail to unregister if probe event files are in use
|
||||
- ftrace: Check module functions being traced on reload
|
||||
- zd1201: do not use stack as URB transfer_buffer
|
||||
- VFS: collect_mounts() should return an ERR_PTR
|
||||
- [arm] davinci: nand: specify ecc strength
|
||||
- drm/radeon/r7xx: fix copy paste typo in golden register setup
|
||||
- drm/radeon: fix UVD message buffer validation
|
||||
- drm/i915: Invalidate TLBs for the rings after a reset
|
||||
- nilfs2: remove double bio_put() in nilfs_end_bio_write() for
|
||||
BIO_EOPNOTSUPP error
|
||||
- Hostap: copying wrong data prism2_ioctl_giwaplist()
|
||||
- SCSI: zfcp: fix lock imbalance by reworking request queue locking
|
||||
- SCSI: zfcp: fix schedule-inside-lock in scsi_device list loops
|
||||
- SCSI: sg: Fix user memory corruption when SG_IO is interrupted by a
|
||||
signal
|
||||
- [x86] get_unmapped_area: Access mmap_legacy_base through mm_struct member
|
||||
- bcache: FUA fixes
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Fri, 30 Aug 2013 02:31:22 +0100
|
||||
|
||||
linux (3.10.7-1) unstable; urgency=low
|
||||
|
||||
* New upstream stable update:
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
From: Johannes Berg <johannes.berg@intel.com>
|
||||
Date: Tue, 30 Jul 2013 22:38:42 +0200
|
||||
Subject: nl80211: fix another nl80211_fam.attrbuf race
|
||||
Origin: https://git.kernel.org/cgit/linux/kernel/git/jberg/mac80211.git/commit/?id=c319d50bfcf678c2857038276d9fab3c6646f3bf
|
||||
|
||||
This is similar to the race Linus had reported, but in this case
|
||||
it's an older bug: nl80211_prepare_wdev_dump() uses the wiphy
|
||||
index in cb->args[0] as it is and thus parses the message over
|
||||
and over again instead of just once because 0 is the first valid
|
||||
wiphy index. Similar code in nl80211_testmode_dump() correctly
|
||||
offsets the wiphy_index by 1, do that here as well.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Reported-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
||||
---
|
||||
net/wireless/nl80211.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
|
||||
index 25d217d..3fcba69 100644
|
||||
--- a/net/wireless/nl80211.c
|
||||
+++ b/net/wireless/nl80211.c
|
||||
@@ -441,10 +441,12 @@ static int nl80211_prepare_wdev_dump(struct sk_buff *skb,
|
||||
goto out_unlock;
|
||||
}
|
||||
*rdev = wiphy_to_dev((*wdev)->wiphy);
|
||||
- cb->args[0] = (*rdev)->wiphy_idx;
|
||||
+ /* 0 is the first index - add 1 to parse only once */
|
||||
+ cb->args[0] = (*rdev)->wiphy_idx + 1;
|
||||
cb->args[1] = (*wdev)->identifier;
|
||||
} else {
|
||||
- struct wiphy *wiphy = wiphy_idx_to_wiphy(cb->args[0]);
|
||||
+ /* subtract the 1 again here */
|
||||
+ struct wiphy *wiphy = wiphy_idx_to_wiphy(cb->args[0] - 1);
|
||||
struct wireless_dev *tmp;
|
||||
|
||||
if (!wiphy) {
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From: Andreas Schwab <schwab@linux-m68k.org>
|
||||
Message-ID: <871u633t27.fsf@igel.home>
|
||||
Date: Fri, 09 Aug 2013 15:14:08 +0200
|
||||
Subject: [PATCH] m68k: truncate base in do_div
|
||||
Origin: http://thread.gmane.org/gmane.linux.ports.m68k/5008
|
||||
|
||||
Explicitly truncate the second operand of do_div to 32 bits to guard
|
||||
against bogus code calling it with a 64bit divisor.
|
||||
|
||||
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
|
||||
---
|
||||
arch/m68k/include/asm/div64.h | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/arch/m68k/include/asm/div64.h
|
||||
+++ b/arch/m68k/include/asm/div64.h
|
||||
@@ -15,16 +15,17 @@
|
||||
unsigned long long n64; \
|
||||
} __n; \
|
||||
unsigned long __rem, __upper; \
|
||||
+ unsigned long __base = (base); \
|
||||
\
|
||||
__n.n64 = (n); \
|
||||
if ((__upper = __n.n32[0])) { \
|
||||
asm ("divul.l %2,%1:%0" \
|
||||
- : "=d" (__n.n32[0]), "=d" (__upper) \
|
||||
- : "d" (base), "0" (__n.n32[0])); \
|
||||
+ : "=d" (__n.n32[0]), "=d" (__upper) \
|
||||
+ : "d" (__base), "0" (__n.n32[0])); \
|
||||
} \
|
||||
asm ("divu.l %2,%1:%0" \
|
||||
- : "=d" (__n.n32[1]), "=d" (__rem) \
|
||||
- : "d" (base), "1" (__upper), "0" (__n.n32[1])); \
|
||||
+ : "=d" (__n.n32[1]), "=d" (__rem) \
|
||||
+ : "d" (__base), "1" (__upper), "0" (__n.n32[1])); \
|
||||
(n) = __n.n64; \
|
||||
__rem; \
|
||||
})
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
From: Johannes Berg <johannes.berg@intel.com>
|
||||
Date: Thu, 13 Jun 2013 16:06:08 +0200
|
||||
Subject: iwlwifi: bump required firmware API version for 3160/7260
|
||||
Origin: https://git.kernel.org/linus/a2d0909a687b4d250cc2b7481072e361678745ba
|
||||
|
||||
As the firmware API has changed significantly and we don't
|
||||
have support code for the old APIs, bump the version to be
|
||||
able to release the version 7 API firmware. Unfortunately
|
||||
this means that the driver in 3.9 and 3.10 can't work, but
|
||||
that's still better than crashing the device/driver there.
|
||||
|
||||
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
||||
---
|
||||
drivers/net/wireless/iwlwifi/iwl-7000.c | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
|
||||
index d4f3b48..22b7fa5 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-7000.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
|
||||
@@ -67,16 +67,16 @@
|
||||
#include "iwl-agn-hw.h"
|
||||
|
||||
/* Highest firmware API version supported */
|
||||
-#define IWL7260_UCODE_API_MAX 6
|
||||
-#define IWL3160_UCODE_API_MAX 6
|
||||
+#define IWL7260_UCODE_API_MAX 7
|
||||
+#define IWL3160_UCODE_API_MAX 7
|
||||
|
||||
/* Oldest version we won't warn about */
|
||||
-#define IWL7260_UCODE_API_OK 6
|
||||
-#define IWL3160_UCODE_API_OK 6
|
||||
+#define IWL7260_UCODE_API_OK 7
|
||||
+#define IWL3160_UCODE_API_OK 7
|
||||
|
||||
/* Lowest firmware API version supported */
|
||||
-#define IWL7260_UCODE_API_MIN 6
|
||||
-#define IWL3160_UCODE_API_MIN 6
|
||||
+#define IWL7260_UCODE_API_MIN 7
|
||||
+#define IWL3160_UCODE_API_MIN 7
|
||||
|
||||
/* NVM versions */
|
||||
#define IWL7260_NVM_VERSION 0x0a1d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
From: Johannes Berg <johannes.berg@intel.com>
|
||||
Date: Wed, 15 May 2013 11:44:49 +0200
|
||||
Subject: iwlwifi: mvm: adjust firmware D3 configuration API
|
||||
Origin: https://git.kernel.org/linus/dfcb4c3aacedee6838e436fb575b31e138505203
|
||||
|
||||
The D3 firmware API changed to include a new field, adjust
|
||||
the driver to it to avoid getting an NMI when configuring.
|
||||
|
||||
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
||||
---
|
||||
drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
|
||||
index 51e015d..6f8b2c1 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
|
||||
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
|
||||
@@ -75,13 +75,15 @@ enum iwl_d3_wakeup_flags {
|
||||
* struct iwl_d3_manager_config - D3 manager configuration command
|
||||
* @min_sleep_time: minimum sleep time (in usec)
|
||||
* @wakeup_flags: wakeup flags, see &enum iwl_d3_wakeup_flags
|
||||
+ * @wakeup_host_timer: force wakeup after this many seconds
|
||||
*
|
||||
* The structure is used for the D3_CONFIG_CMD command.
|
||||
*/
|
||||
struct iwl_d3_manager_config {
|
||||
__le32 min_sleep_time;
|
||||
__le32 wakeup_flags;
|
||||
-} __packed; /* D3_MANAGER_CONFIG_CMD_S_VER_3 */
|
||||
+ __le32 wakeup_host_timer;
|
||||
+} __packed; /* D3_MANAGER_CONFIG_CMD_S_VER_4 */
|
||||
|
||||
|
||||
/* TODO: OFFLOADS_QUERY_API_S_VER_1 */
|
||||
|
|
@ -103,20 +103,13 @@ bugfix/all/alx-fix-ethtool-support-code.patch
|
|||
bugfix/all/alx-remove-WoL-support.patch
|
||||
|
||||
features/all/iwlwifi-mvm-support-BSS-only.patch
|
||||
features/all/iwlwifi-mvm-adjust-firmware-D3-configuration-API.patch
|
||||
features/all/iwlwifi-bump-required-firmware-API-version-for-3160-.patch
|
||||
|
||||
# m68k Kconfig bugfix
|
||||
bugfix/m68k/ethernat-kconfig.patch
|
||||
|
||||
bugfix/all/nl80211-fix-another-nl80211_fam-attrbuf-race.patch
|
||||
|
||||
# m68k IRQ bugfix
|
||||
bugfix/m68k/atari-irqs.patch
|
||||
|
||||
# m68k workaround for div64 called with wrong type args
|
||||
bugfix/m68k/type-fix-div64.patch
|
||||
|
||||
bugfix/arm/I2C-I2C-mv64xxx-remove-I2C_M_NOSTART-code.patch
|
||||
bugfix/arm/I2C-mv64xxx-move-mv64xxx_i2c_prepare_for_io.patch
|
||||
bugfix/arm/I2C-mv64xxx-fix-race-between-FSM-interrupt-and-proce.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue