3.4.79-stable review
Greg Kroah-Hartman
maintainercover 3.4.79-stable review
This is the start of the stable review cycle for the 3.4.79 release. There are 37 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Feb 6 21:00:31 UTC 2014. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.4.79-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 3.4.79-rc1
Paul Mackerras <[email protected]>
powerpc: Make sure "cache" directory is removed when offlining cpu
Wang Shilong <[email protected]>
Btrfs: handle EAGAIN case properly in btrfs_drop_snapshot()
Andy Grover <[email protected]>
target/iscsi: Fix network portal creation race
Vijaya Mohan Guvva <[email protected]>
SCSI: bfa: Chinook quad port 16G FC HBA claim issue
Thomas Pugliese <[email protected]>
usb: core: get config and string descriptors for unauthorized devices
Andy Honig <[email protected]>
KVM: x86: Fix potential divide by 0 in lapic (CVE-2013-6367)
Richard Weinberger <[email protected]>
net,via-rhine: Fix tx_timeout handling
Hannes Frederic Sowa <[email protected]>
net: avoid reference counter overflows on fib_rules in multicast forwarding
Neal Cardwell <[email protected]>
inet_diag: fix inet_diag_dump_icsk() timewait socket state logic
Michal Schmidt <[email protected]>
bnx2x: fix DMA unmapping of TSO split BDs
Takashi Iwai <[email protected]>
hp_accel: Add a new PnP ID HPQ6007 for new HP laptops
Takashi Iwai <[email protected]>
ALSA: Enable CONFIG_ZONE_DMA for smaller PCI DMA masks
Takashi Iwai <[email protected]>
ALSA: rme9652: fix a missing comma in channel_map_9636_ds[]
Lars-Peter Clausen <[email protected]>
ASoC: adau1701: Fix ADAU1701_SEROCTL_WORD_LEN_16 constant
Borislav Petkov <[email protected]>
rtc-cmos: Add an alarm disable quirk
Sebastian Andrzej Siewior <[email protected]>
parport: parport_pc: remove double PCI ID for NetMos
Yegor Yefremov <[email protected]>
serial: add support for 200 v3 series Titan card
Jean-Jacques Hiblot <[email protected]>
ARM: at91: smc: bug fix in sam9_smc_cs_read()
Marek Roszko <[email protected]>
tty/serial: at91: Handle shutdown more safely
Malcolm Priestley <[email protected]>
staging: vt6656: [BUG] BBvUpdatePreEDThreshold Always set sensitivity on bScanning
Larry Finger <[email protected]>
staging: r8712u: Set device type to wlan
ZHAO Gang <[email protected]>
b43: fix the wrong assignment of status.freq in b43_rx()
Larry Finger <[email protected]>
b43legacy: Fix unload oops if firmware is not available
Larry Finger <[email protected]>
b43: Fix unload oops if firmware is not available
Larry Finger <[email protected]>
b43: Fix lockdep splat
Larry Finger <[email protected]>
rtlwifi: rtl8192cu: Fix some code in RF handling
Larry Finger <[email protected]>
rtlwifi: Set the link state
Larry Finger <[email protected]>
rtlwifi: rtl8192cu: Add new device ID
Jack Pham <[email protected]>
usb: xhci: Check for XHCI_PLAT in xhci_cleanup_msix()
Mikhail Zolotaryov <[email protected]>
USB: Nokia 502 is an unusual device
Johan Hovold <[email protected]>
USB: cypress_m8: fix ring-indicator detection and reporting
Rahul Bedarkar <[email protected]>
USB: serial: add support for iBall 3.5G connect usb modem
张君 <[email protected]>
usb: option: add new zte 3g modem pids to option driver
PaX Team <[email protected]>
x86, x32: Correct invalid use of user timespec in the kernel
Aristeu Rozanski <[email protected]>
e752x_edac: Fix pci_dev usage count
Andrea Arcangeli <[email protected]>
mm: hugetlbfs: fix hugetlbfs optimization
NeilBrown <[email protected]>
md/raid5: fix long-standing problem with bitmap handling on write failure.
-------------
Diffstat:
Makefile | 4 +- arch/arm/mach-at91/sam9_smc.c | 2 +- arch/powerpc/kernel/cacheinfo.c | 3 + arch/x86/kvm/lapic.c | 3 +- drivers/edac/e752x_edac.c | 4 +- drivers/md/raid5.c | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 13 ++- drivers/net/ethernet/via/via-rhine.c | 1 + drivers/net/wireless/b43/b43.h | 4 +- drivers/net/wireless/b43/main.c | 27 +++--- drivers/net/wireless/b43/xmit.c | 4 +- drivers/net/wireless/b43legacy/main.c | 1 + drivers/net/wireless/rtlwifi/core.c | 1 + drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 29 ++++--- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 + drivers/parport/parport_pc.c | 10 +-- drivers/platform/x86/hp_accel.c | 1 + drivers/rtc/rtc-cmos.c | 52 +++++++++++- drivers/scsi/bfa/bfad.c | 6 +- drivers/staging/rtl8712/usb_intf.c | 5 ++ drivers/staging/vt6656/baseband.c | 3 - drivers/target/iscsi/iscsi_target.c | 34 +++++--- drivers/tty/serial/8250/8250_pci.c | 4 + drivers/tty/serial/atmel_serial.c | 20 +++-- drivers/usb/core/config.c | 7 -- drivers/usb/core/hub.c | 40 ++------- drivers/usb/host/xhci.c | 3 + drivers/usb/serial/cypress_m8.h | 2 +- drivers/usb/serial/option.c | 15 ++++ drivers/usb/storage/unusual_devs.h | 7 ++ fs/btrfs/extent-tree.c | 2 +- include/linux/hugetlb.h | 6 ++ mm/hugetlb.c | 17 ++++ mm/swap.c | 107 +++++++++++++++++------- net/compat.c | 9 +- net/ipv4/inet_diag.c | 4 +- net/ipv4/ipmr.c | 7 +- net/ipv6/ip6mr.c | 7 +- sound/pci/Kconfig | 12 +++ sound/pci/rme9652/rme9652.c | 2 +- sound/soc/codecs/adau1701.c | 2 +- 41 files changed, 326 insertions(+), 156 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/37 md/raid5: fix long-standing problem with bitmap handling on write failure.
3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
commit 9f97e4b128d2ea90a5f5063ea0ee3b0911f4c669 upstream.
Before a write starts we set a bit in the write-intent bitmap. When the write completes we clear that bit if the write was successful to all devices. However if the write wasn't fully successful we should not clear the bit. If the faulty drive is subsequently re-added, the fact that the bit is still set ensure that we will re-write the data that is missing.
This logic is mediated by the STRIPE_DEGRADED flag - we only clear the bitmap bit when this flag is not set.
Currently we correctly set the flag if a write starts when some devices are failed or missing. But we do *not* set the flag if some device failed during the write attempt.
This is wrong and can result in clearing the bit inappropriately.
So: set the flag when a write fails.
This bug has been present since bitmaps were introduces, so the fix is suitable for any -stable kernel.
--- drivers/md/raid5.c | 1 + 1 file changed, 1 insertion(+)
drivers/md/raid5.c +1 -0
@@ -1805,6 +1805,7 @@ static void raid5_end_write_request(struset_bit (R5_MadeGoodRepl, &sh->dev[i].flags); }else {if (!uptodate) { +set_bit (STRIPE_DEGRADED , &sh->state);set_bit (WriteErrorSeen, &rdev->flags);set_bit (R5_WriteError, &sh->dev[i].flags);if (!test_and_set_bit (WantReplacement, &rdev->flags))
Greg Kroah-Hartman
maintainerPATCH 2/37 mm: hugetlbfs: fix hugetlbfs optimization
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrea Arcangeli <[email protected]>
commit 27c73ae759774e63313c1fbfeb17ba076cea64c5 upstream.
Commit 7cb2ef56e6a8 ("mm: fix aio performance regression for database caused by THP") can cause dereference of a dangling pointer if split_huge_page runs during PageHuge() if there are updates to the tail_page->private field.
Also it is repeating compound_head twice for hugetlbfs and it is running compound_head+compound_trans_head for THP when a single one is needed in both cases.
The new code within the PageSlab() check doesn't need to verify that the THP page size is never bigger than the smallest hugetlbfs page size, to avoid memory corruption.
A longstanding theoretical race condition was found while fixing the above (see the change right after the skip_unlock label, that is relevant for the compound_lock path too).
By re-establishing the _mapcount tail refcounting for all compound pages, this also fixes the below problem:
echo 0 >/sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages
BUG: Bad page state in process bash pfn:59a01
page:ffffea000139b038 count:0 mapcount:10 mapping: (null) index:0x0
page flags: 0x1c00000000008000(tail)
Modules linked in:
CPU: 6 PID: 2018 Comm: bash Not tainted 3.12.0+ #25
Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
Call Trace:
dump_stack+0x55/0x76
bad_page+0xd5/0x130
free_pages_prepare+0x213/0x280
__free_pages+0x36/0x80
update_and_free_page+0xc1/0xd0
free_pool_huge_page+0xc2/0xe0
set_max_huge_pages.part.58+0x14c/0x220
nr_hugepages_store_common.isra.60+0xd0/0xf0
nr_hugepages_store+0x13/0x20
kobj_attr_store+0xf/0x20
sysfs_write_file+0x189/0x1e0
vfs_write+0xc5/0x1f0
SyS_write+0x55/0xb0
system_call_fastpath+0x16/0x1b--- include/linux/hugetlb.h | 6 ++ mm/hugetlb.c | 17 +++++++ mm/swap.c | 107 ++++++++++++++++++++++++++++++++++-------------- 3 files changed, 101 insertions(+), 29 deletions(-)
include/linux/hugetlb.h +6 -0
@@ -24,6 +24,7 @@ struct hugepage_subpool *hugepage_new_suvoid hugepage_put_subpool (struct hugepage_subpool *spool);int PageHuge (struct page *page); +int PageHeadHuge (struct page *page_head);void reset_vma_resv_huge_pages (struct vm_area_struct *vma);int hugetlb_sysctl_handler (struct ctl_table *,int ,void __user *,size_t *,loff_t *);
@@ -84,6 +85,11 @@ static inline int PageHuge(struct page * {return 0 ; } + +static inline int PageHeadHuge (struct page *page_head) +{ +return 0 ; +}static inline void reset_vma_resv_huge_pages (struct vm_area_struct *vma) {
mm/hugetlb.c +17 -0
@@ -679,6 +679,23 @@ int PageHuge(struct page *page) }EXPORT_SYMBOL_GPL (PageHuge); +/* +* PageHeadHuge() only returns true for hugetlbfs head page, but not for +* normal or transparent huge pages. +*/ +int PageHeadHuge (struct page *page_head) +{ +compound_page_dtor *dtor; + +if (!PageHead (page_head)) +return 0 ; + + dtor =get_compound_page_dtor (page_head); + +return dtor == free_huge_page; +} +EXPORT_SYMBOL_GPL (PageHeadHuge); +pgoff_t __basepage_index (struct page *page) {struct page *page_head =compound_head (page);
mm/swap.c +78 -29
139 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 3/37 e752x_edac: Fix pci_dev usage count
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aristeu Rozanski <[email protected]>
commit 90ed4988b8c030d65b41b7d13140e9376dc6ec5a upstream.
In case the device 0, function 1 is not found using pci_get_device(), pci_scan_single_device() will be used but, differently than pci_get_device(), it allocates a pci_dev but doesn't does bump the usage count on the pci_dev and after few module removals and loads the pci_dev will be freed.
--- drivers/edac/e752x_edac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/edac/e752x_edac.c +3 -1
@@ -1145,9 +1145,11 @@ static int e752x_get_devs(struct pci_dev pvt->bridge_ck =pci_get_device (PCI_VENDOR_ID_INTEL , pvt->dev_info->err_dev, pvt->bridge_ck); -if (pvt->bridge_ck ==NULL ) +if (pvt->bridge_ck ==NULL ) { pvt->bridge_ck =pci_scan_single_device (pdev->bus,PCI_DEVFN (0 ,1 )); +pci_dev_get (pvt->bridge_ck); + }if (pvt->bridge_ck ==NULL ) { e752x_printk(KERN_ERR, "error reporting device not found:"
Greg Kroah-Hartman
maintainerPATCH 4/37 x86, x32: Correct invalid use of user timespec in the kernel
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: PaX Team <[email protected]>
commit 2def2ef2ae5f3990aabdbe8a755911902707d268 upstream.
The x32 case for the recvmsg() timout handling is broken:
asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
unsigned int vlen, unsigned int flags, struct compat_timespec __user *timeout)
{
int datagrams;
struct timespec ktspec;
if (flags & MSG_CMSG_COMPAT)
return -EINVAL;
if (COMPAT_USE_64BIT_TIME)
return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
flags | MSG_CMSG_COMPAT,
(struct timespec *) timeout);
...The timeout pointer parameter is provided by userland (hence the __user annotation) but for x32 syscalls it's simply cast to a kernel pointer and is passed to __sys_recvmmsg which will eventually directly dereference it for both reading and writing. Other callers to __sys_recvmmsg properly copy from userland to the kernel first.
The bug was introduced by commit ee4fa23c4bfc ("compat: Use COMPAT_USE_64BIT_TIME in net/compat.c") and should affect all kernels since 3.4 (and perhaps vendor kernels if they backported x32 support along with this code).
Note that CONFIG_X86_X32_ABI gets enabled at build time and only if CONFIG_X86_X32 is enabled and ld can build x32 executables.
Other uses of COMPAT_USE_64BIT_TIME seem fine.
This addresses CVE-2014-0038.
--- net/compat.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
net/compat.c +2 -7
@@ -789,21 +789,16 @@ asmlinkage long compat_sys_recvmmsg(intif (flags &MSG_CMSG_COMPAT )return -EINVAL ; -if (COMPAT_USE_64BIT_TIME ) -return __sys_recvmmsg (fd, (struct mmsghdr __user *)mmsg, vlen, - flags |MSG_CMSG_COMPAT , - (struct timespec *) timeout); -if (timeout ==NULL )return __sys_recvmmsg (fd, (struct mmsghdr __user *)mmsg, vlen, flags |MSG_CMSG_COMPAT ,NULL ); -if (get_compat_timespec (&ktspec, timeout)) +if (compat_get_timespec (&ktspec, timeout))return -EFAULT ; datagrams =__sys_recvmmsg (fd, (struct mmsghdr __user *)mmsg, vlen, flags |MSG_CMSG_COMPAT , &ktspec); -if (datagrams >0 &&put_compat_timespec (&ktspec, timeout)) +if (datagrams >0 &&compat_put_timespec (&ktspec, timeout)) datagrams = -EFAULT ;return datagrams;
Greg Kroah-Hartman
maintainerPATCH 5/37 usb: option: add new zte 3g modem pids to option driver
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?=E5=BC=A0=E5=90=9B?= <[email protected]>
commit 4d90b819ae4c7ea8fd5e2bb7edc68c0f334be2e4 upstream.
--- drivers/usb/serial/option.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/usb/serial/option.c +11 -0
@@ -1461,6 +1461,17 @@ static const struct usb_device_id option .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0178, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xffe9, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff8b, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff8c, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff8d, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff8e, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff8f, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff90, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff91, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff92, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff93, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff94, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) },
Greg Kroah-Hartman
maintainerPATCH 7/37 USB: cypress_m8: fix ring-indicator detection and reporting
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 440ebadeae9298d7de3d4d105342691841ec88d0 upstream.
Fix ring-indicator (RI) status-bit definition, which was defined as CTS, effectively preventing RI-changes from being detected while reporting false RI status.
This bug predates git.
--- drivers/usb/serial/cypress_m8.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/cypress_m8.h +1 -1
@@ -63,7 +63,7 @@#define UART_DSR 0x20/* data set ready - flow control - device to host */ #define CONTROL_RTS 0x10/* request to send - flow control - host to device */ #define UART_CTS 0x10/* clear to send - flow control - device to host */ -#define UART_RI 0x10/* ring indicator - modem - device to host */ +#define UART_RI 0x80/* ring indicator - modem - device to host */ #define UART_CD 0x40/* carrier detect - modem - device to host */ #define CYP_ERROR 0x08/* received from input report - device to host */ /* Note - the below has nothing to do with the "feature report" reset */
Greg Kroah-Hartman
maintainerPATCH 8/37 USB: Nokia 502 is an unusual device
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikhail Zolotaryov <[email protected]>
commit 0e16114f2db4838251fb64f3b550996ad3585890 upstream.
The USB storage operation of Nokia Asha 502 Dual SIM smartphone running Asha Platform 1.1.1 is unreliable in respect of data consistency (i.e. transfered files are corrupted). A similar issue is described here:
http://discussions.nokia.com/t5/Asha-and-other-Nokia-Series-30/Nokia-301-USB-transfers-and-corrupted-files/td-p/1974170
The workaround is (MAX_SECTORS_64):
rmmod usb_storage && modprobe usb_storage quirks=0421:06aa:m
The patch adds the tested device to the unusual list permanently.
--- drivers/usb/storage/unusual_devs.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/storage/unusual_devs.h +7 -0
@@ -226,6 +226,13 @@ UNUSUAL_DEV( 0x0421, 0x0495, 0x0370, 0x USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_MAX_SECTORS_64 ), +/* Patch submitted by Mikhail Zolotaryov <[email protected]> */ +UNUSUAL_DEV( 0x0421, 0x06aa, 0x1110, 0x1110, + "Nokia", + "502", + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_MAX_SECTORS_64 ), +#ifdef NO_SDDR09 UNUSUAL_DEV( 0x0436, 0x0005, 0x0100, 0x0100, "Microtech",
Greg Kroah-Hartman
maintainerPATCH 9/37 usb: xhci: Check for XHCI_PLAT in xhci_cleanup_msix()
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jack Pham <[email protected]>
commit 9005355af23856c55a5538c9024355785424821b upstream.
If CONFIG_PCI is enabled, make sure xhci_cleanup_msix() doesn't try to free a bogus PCI IRQ or dereference an invalid pci_dev when the xHCI device is actually a platform_device.
This patch should be backported to kernels as old as 3.9, that contain the commit 52fb61250a7a132b0cfb9f4a1060a1f3c49e5a25 "xhci-plat: Don't enable legacy PCI interrupts."
--- drivers/usb/host/xhci.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/host/xhci.c +3 -0
@@ -315,6 +315,9 @@ static void xhci_cleanup_msix(struct xhcstruct usb_hcd *hcd =xhci_to_hcd (xhci);struct pci_dev *pdev =to_pci_dev (hcd->self.controller); +if (xhci->quirks &XHCI_PLAT ) +return ; +xhci_free_irq (xhci);if (xhci->msix_entries) {
Greg Kroah-Hartman
maintainerPATCH 10/37 rtlwifi: rtl8192cu: Add new device ID
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit f87f960b2fb802f26ee3b00c19320e57a9c583ff upstream.
--- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +1 -0
@@ -306,6 +306,7 @@ static struct usb_device_id rtl8192c_usb {RTL_USB_DEVICE(0x0bda, 0x5088, rtl92cu_hal_cfg)}, /*Thinkware-CC&C*/ {RTL_USB_DEVICE(0x0df6, 0x0052, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/ {RTL_USB_DEVICE(0x0df6, 0x005c, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/ + {RTL_USB_DEVICE(0x0df6, 0x0077, rtl92cu_hal_cfg)}, /*Sitecom-WLA2100V2*/ {RTL_USB_DEVICE(0x0eb0, 0x9071, rtl92cu_hal_cfg)}, /*NO Brand - Etop*/ {RTL_USB_DEVICE(0x4856, 0x0091, rtl92cu_hal_cfg)}, /*NetweeN - Feixun*//* HP - Lite-On ,8188CUS Slim Combo */
Greg Kroah-Hartman
maintainerPATCH 11/37 rtlwifi: Set the link state
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit 619ce76f8bb850b57032501a39f26aa6c6731c70 upstream.
The present code fails to set the linked state when an interface is added.
--- drivers/net/wireless/rtlwifi/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/rtlwifi/core.c +1 -0
@@ -175,6 +175,7 @@ static int rtl_op_add_interface(struct i rtlpriv->cfg->maps [RTL_IBSS_INT_MASKS]); } + mac->link_state =MAC80211_LINKED ;break ;case NL80211_IFTYPE_ADHOC : RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
Greg Kroah-Hartman
maintainerPATCH 12/37 rtlwifi: rtl8192cu: Fix some code in RF handling
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit e9b0784bb9de3152e787ee779868c626b137fb3b upstream.
--- drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 29 +++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-)
drivers/net/wireless/rtlwifi/rtl8192cu/rf.c +16 -13
@@ -85,17 +85,15 @@ void rtl92cu_phy_rf6052_set_cck_txpower(if (mac->act_scanning) { tx_agc[RF90_PATH_A ] =0x3f3f3f3f ; tx_agc[RF90_PATH_B ] =0x3f3f3f3f ; -if (turbo_scanoff) { -for (idx1 =RF90_PATH_A ; idx1 <=RF90_PATH_B ; idx1++) { - tx_agc[idx1] = ppowerlevel[idx1] | - (ppowerlevel[idx1] <<8 ) | - (ppowerlevel[idx1] <<16 ) | - (ppowerlevel[idx1] <<24 ); -if (rtlhal->interface ==INTF_USB ) { -if (tx_agc[idx1] >0x20 && - rtlefuse->external_pa) - tx_agc[idx1] =0x20 ; - } +for (idx1 =RF90_PATH_A ; idx1 <=RF90_PATH_B ; idx1++) { + tx_agc[idx1] = ppowerlevel[idx1] | + (ppowerlevel[idx1] <<8 ) | + (ppowerlevel[idx1] <<16 ) | + (ppowerlevel[idx1] <<24 ); +if (rtlhal->interface ==INTF_USB ) { +if (tx_agc[idx1] >0x20 && + rtlefuse->external_pa) + tx_agc[idx1] =0x20 ; } } }else {
@@ -107,7 +105,7 @@ void rtl92cu_phy_rf6052_set_cck_txpower( TXHIGHPWRLEVEL_LEVEL2) { tx_agc[RF90_PATH_A ] =0x00000000 ; tx_agc[RF90_PATH_B ] =0x00000000 ; - } else{ + } else {for (idx1 =RF90_PATH_A ; idx1 <=RF90_PATH_B ; idx1++) { tx_agc[idx1] = ppowerlevel[idx1] | (ppowerlevel[idx1] << 8) |
@@ -379,7 +377,12 @@ static void _rtl92c_write_ofdm_power_reg regoffset == RTXAGC_B_MCS07_MCS04) regoffset =0xc98 ;for (i =0 ; i <3 ; i++) { - writeVal = (writeVal >6 ) ? (writeVal -6 ) :0 ; +if (i !=2 ) + writeVal = (writeVal >8 ) ? + (writeVal -8 ) :0 ; +else + writeVal = (writeVal >6 ) ? + (writeVal -6 ) :0 ;rtl_write_byte (rtlpriv, (u32)(regoffset + i), (u8 )writeVal); }
Greg Kroah-Hartman
maintainerPATCH 13/37 b43: Fix lockdep splat
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit 09164043f63c947a49797750a09ca1cd7c31108e upstream.
In https://bugzilla.kernel.org/show_bug.cgi?id=67561, a locking dependency is reported when b43 is used with hostapd, and rfkill is used to kill the radio output.
The lockdep splat (in part) is as follows:
======================================================
[ INFO: possible circular locking dependency detected ] 3.12.0 #1 Not tainted
-------------------------------------------------------
rfkill/10040 is trying to acquire lock:
(rtnl_mutex){+.+.+.}, at: [<ffffffff8146f282>] rtnl_lock+0x12/0x20
but task is already holding lock:
(rfkill_global_mutex){+.+.+.}, at: [<ffffffffa04832ca>] rfkill_fop_write+0x6a/0x170 [rfkill]
--snip--
Chain exists of: rtnl_mutex --> misc_mtx --> rfkill_global_mutex
The fix is to move the initialization of the hardware random number generator outside the code range covered by the rtnl_mutex.
--- drivers/net/wireless/b43/main.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/net/wireless/b43/main.c +11 -6
@@ -2413,6 +2413,7 @@ error:static int b43_one_core_attach (struct b43_bus_dev *dev,struct b43_wl *wl);static void b43_one_core_detach (struct b43_bus_dev *dev); +static int b43_rng_init (struct b43_wl *wl);static void b43_request_firmware (struct work_struct *work) {
@@ -2459,6 +2460,10 @@ start_ieee80211:if (err) goto err_one_core_detach;b43_leds_register (wl->current_dev); + +/* Register HW RNG driver */ +b43_rng_init (wl); + goto out; err_one_core_detach:
@@ -4583,9 +4588,6 @@ static void b43_wireless_core_exit(strucif (!dev ||b43_status (dev) !=B43_STAT_INITIALIZED )return ; -/* Unregister HW RNG driver */ -b43_rng_exit (dev->wl); -b43_set_status (dev,B43_STAT_UNINIT );/* Stop the microcode PSM. */
@@ -4728,9 +4730,6 @@ static int b43_wireless_core_init(structb43_set_status (dev,B43_STAT_INITIALIZED ); -/* Register HW RNG driver */ -b43_rng_init (dev->wl); - out:return err;
@@ -5388,6 +5387,9 @@ static void b43_bcma_remove(struct bcma_b43_one_core_detach (wldev->dev); +/* Unregister HW RNG driver */ +b43_rng_exit (wl); +b43_leds_unregister (wl);ieee80211_free_hw (wl->hw);
@@ -5468,6 +5470,9 @@ static void b43_ssb_remove(struct ssb_deb43_one_core_detach (dev); +/* Unregister HW RNG driver */ +b43_rng_exit (wl); +if (list_empty (&wl->devlist)) {b43_leds_unregister (wl);/* Last core on the chip unregistered.
Greg Kroah-Hartman
maintainerPATCH 14/37 b43: Fix unload oops if firmware is not available
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit 0673effd41dba323d6a280ef37b5ef29f3f5a653 upstream.
The asyncronous firmware load uses a completion struct to hold firmware processing until the user-space routines are up and running. There is. however, a problem in that the waiter is nevered canceled during teardown. As a result, unloading the driver when firmware is not available causes an oops.
To be able to access the completion structure at teardown, it had to be moved into the b43_wldev structure.
This patch also fixes a typo in a comment.
--- drivers/net/wireless/b43/b43.h | 4 ++-- drivers/net/wireless/b43/main.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/wireless/b43/b43.h +2 -2
@@ -719,8 +719,6 @@ enum b43_firmware_file_type {struct b43_request_fw_context {/* The device we are requesting the fw for. */ struct b43_wldev *dev; -/* a completion event structure needed if this call is asynchronous */ -struct completion fw_load_complete;/* a pointer to the firmware object */ const struct firmware *blob;/* The type of firmware to request. */
@@ -797,6 +795,8 @@ enum {struct b43_wldev {struct b43_bus_dev *dev;struct b43_wl *wl; +/* a completion event structure needed if this call is asynchronous */ +struct completion fw_load_complete;/* The device initialization status. * Use b43_status() to query. */
drivers/net/wireless/b43/main.c +5 -5
@@ -2061,6 +2061,7 @@ void b43_do_release_fw(struct b43_firmwastatic void b43_release_firmware (struct b43_wldev *dev) { +complete (&dev->fw_load_complete);b43_do_release_fw (&dev->fw.ucode);b43_do_release_fw (&dev->fw.pcm);b43_do_release_fw (&dev->fw.initvals);
@@ -2086,7 +2087,7 @@ static void b43_fw_cb(const struct firmwstruct b43_request_fw_context *ctx = context; ctx->blob = firmware; -complete (&ctx->fw_load_complete); +complete (&ctx->dev->fw_load_complete); } int b43_do_request_fw(struct b43_request_fw_context *ctx,
@@ -2133,7 +2134,7 @@ int b43_do_request_fw(struct b43_request }if (async) {/* do this part asynchronously */ -init_completion (&ctx->fw_load_complete); +init_completion (&ctx->dev->fw_load_complete); err =request_firmware_nowait (THIS_MODULE ,1 , ctx->fwname, ctx->dev->dev->dev,GFP_KERNEL , ctx, b43_fw_cb);
@@ -2141,12 +2142,11 @@ int b43_do_request_fw(struct b43_requestpr_err ("Unable to load firmware\n" );return err; } -/* stall here until fw ready */ -wait_for_completion (&ctx->fw_load_complete); +wait_for_completion (&ctx->dev->fw_load_complete);if (ctx->blob) goto fw_ready;/* On some ARM systems, the async request will fail, but the next sync -* request works. For this reason, we dall through here +* request works. For this reason, we fall through here */ } err = request_firmware(&ctx->blob, ctx->fwname,
Greg Kroah-Hartman
maintainerPATCH 15/37 b43legacy: Fix unload oops if firmware is not available
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit 452028665312672c6ba9e16a19248ee00ead9400 upstream.
The asyncronous firmware load uses a completion struct to hold firmware processing until the user-space routines are up and running. There is. however, a problem in that the waiter is nevered canceled during teardown. As a result, unloading the driver when firmware is not available causes an oops.
--- drivers/net/wireless/b43legacy/main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/b43legacy/main.c +1 -0
@@ -3915,6 +3915,7 @@ static void b43legacy_remove(struct ssb_* as the ieee80211 unreg will destroy the workqueue. */ cancel_work_sync (&wldev->restart_work);cancel_work_sync (&wl->firmware_load); +complete (&wldev->fw_load_complete);B43legacy_WARN_ON (!wl);if (!wldev->fw.ucode)
Greg Kroah-Hartman
maintainerPATCH 16/37 b43: fix the wrong assignment of status.freq in b43_rx()
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: ZHAO Gang <[email protected]>
commit 64e5acb09ca6b50c97299cff9ef51299470b29f2 upstream.
Use the right function to update frequency value.
If rx skb is probe response or beacon, the wrong frequency value can cause problem that bss info can't be updated when it should be.
--- drivers/net/wireless/b43/xmit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/b43/xmit.c +2 -2
@@ -819,10 +819,10 @@ void b43_rx(struct b43_wldev *dev, struc* channel number in b43. */ if (chanstat &B43_RX_CHAN_5GHZ ) { status.band =IEEE80211_BAND_5GHZ ; - status.freq =b43_freq_to_channel_5ghz (chanid); + status.freq =b43_channel_to_freq_5ghz (chanid); }else { status.band =IEEE80211_BAND_2GHZ ; - status.freq =b43_freq_to_channel_2ghz (chanid); + status.freq =b43_channel_to_freq_2ghz (chanid); }break ;default :
Greg Kroah-Hartman
maintainerPATCH 17/37 staging: r8712u: Set device type to wlan
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit 3a21f00a5002b14e4aab52aef59d33ed28468a13 upstream.
The latest version of NetworkManager does not recognize the device as wireless without this change.
--- drivers/staging/rtl8712/usb_intf.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/staging/rtl8712/usb_intf.c +5 -0
@@ -361,6 +361,10 @@ static u8 key_2char2num(u8 hch, u8 lch)return (hex_to_bin (hch) <<4 ) |hex_to_bin (lch); } +static const struct device_type wlan_type = { + .name ="wlan" , +}; +/* * drv_init() - a device potentially for us *
@@ -396,6 +400,7 @@ static int r871xu_drv_init(struct usb_in padapter->pusb_intf = pusb_intf;usb_set_intfdata (pusb_intf, pnetdev);SET_NETDEV_DEV (pnetdev, &pusb_intf->dev); + pnetdev->dev.type = &wlan_type;/* step 2. */ padapter->dvobj_init = &r8712_usb_dvobj_init; padapter->dvobj_deinit = &r8712_usb_dvobj_deinit;
Greg Kroah-Hartman
maintainerPATCH 18/37 staging: vt6656: [BUG] BBvUpdatePreEDThreshold Always set sensitivity on bScanning
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Malcolm Priestley <[email protected]>
commit 8f248dae133668bfb8e9379b4b3f0571c858b24a upstream.
byBBPreEDIndex value is initially 0, this means that from cold BBvUpdatePreEDThreshold is never set.
This means that sensitivity may be in an ambiguous state, failing to scan any wireless points or at least distant ones.
--- drivers/staging/vt6656/baseband.c | 3 --- 1 file changed, 3 deletions(-)
drivers/staging/vt6656/baseband.c +0 -3
@@ -1634,7 +1634,6 @@ BBvUpdatePreEDThreshold(if ( bScanning ) {// need Max sensitivity //RSSI -69, -70,.... -if (pDevice->byBBPreEDIndex ==0 )break ; pDevice->byBBPreEDIndex =0 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE)
@@ -1777,7 +1776,6 @@ BBvUpdatePreEDThreshold(if ( bScanning ) {// need Max sensitivity //RSSI -69, -70, ... -if (pDevice->byBBPreEDIndex ==0 )break ; pDevice->byBBPreEDIndex =0 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x24 );//CR206(0xCE)
@@ -1929,7 +1927,6 @@ BBvUpdatePreEDThreshold(case RF_VT3342A0 ://RobertYu:20060627, testing table if ( bScanning ) {// need Max sensitivity //RSSI -67, -68, ... -if (pDevice->byBBPreEDIndex ==0 )break ; pDevice->byBBPreEDIndex =0 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x38 );//CR206(0xCE)
Greg Kroah-Hartman
maintainerPATCH 19/37 tty/serial: at91: Handle shutdown more safely
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Roszko <[email protected]>
commit 0cc7c6c7916b1b6f34350ff1473b80b9f7e459c0 upstream.
Interrupts were being cleaned up late in the shutdown handler, it is possible that an interrupt can occur and schedule a tasklet that runs after the port is cleaned up. There is a null dereference due to this race condition with the following stacktrace:
[<c02092b0>] (atmel_tasklet_func+0x514/0x814) from [<c001fd34>] (tasklet_action+0x70/0xa8) [<c001fd34>] (tasklet_action+0x70/0xa8) from [<c001f60c>] (__do_softirq+0x90/0x144) [<c001f60c>] (__do_softirq+0x90/0x144) from [<c001fa18>] (irq_exit+0x40/0x4c) [<c001fa18>] (irq_exit+0x40/0x4c) from [<c000e298>] (handle_IRQ+0x64/0x84) [<c000e298>] (handle_IRQ+0x64/0x84) from [<c000d6c0>] (__irq_svc+0x40/0x50) [<c000d6c0>] (__irq_svc+0x40/0x50) from [<c0208060>] (atmel_rx_dma_release+0x88/0xb8) [<c0208060>] (atmel_rx_dma_release+0x88/0xb8) from [<c0209740>] (atmel_shutdown+0x104/0x160) [<c0209740>] (atmel_shutdown+0x104/0x160) from [<c0205e8c>] (uart_port_shutdown+0x2c/0x38)
--- drivers/tty/serial/atmel_serial.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
drivers/tty/serial/atmel_serial.c +13 -7
@@ -1022,12 +1022,24 @@ static int atmel_startup(struct uart_porstatic void atmel_shutdown (struct uart_port *port) {struct atmel_uart_port *atmel_port =to_atmel_uart_port (port); + +/* +* Clear out any scheduled tasklets before +* we destroy the buffers +*/ +tasklet_kill (&atmel_port->tasklet); +/* -* Ensure everything is stopped. +* Ensure everything is stopped and +* disable all interrupts, port and break condition. */ atmel_stop_rx (port);atmel_stop_tx (port); +UART_PUT_CR (port,ATMEL_US_RSTSTA ); +UART_PUT_IDR (port,-1 ); + +/* * Shut-down the DMA. */
@@ -1054,12 +1066,6 @@ static void atmel_shutdown(struct uart_p }/* -* Disable all interrupts, port and break condition. -*/ -UART_PUT_CR (port,ATMEL_US_RSTSTA ); -UART_PUT_IDR (port,-1 ); - -/* * Free the interrupt */ free_irq (port->irq, port);
Greg Kroah-Hartman
maintainerPATCH 20/37 ARM: at91: smc: bug fix in sam9_smc_cs_read()
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jean-Jacques Hiblot <[email protected]>
commit 1588c51cf6d782e63a8719681d905ef0ac22ee62 upstream.
There was a copy/paste error when reading the nwe_pulse value.
--- arch/arm/mach-at91/sam9_smc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-at91/sam9_smc.c +1 -1
@@ -101,7 +101,7 @@ static void sam9_smc_cs_read(void __iome/* Pulse register */ val =__raw_readl (base +AT91_SMC_PULSE ); - config->nwe_setup = val &AT91_SMC_NWEPULSE ; + config->nwe_pulse = val &AT91_SMC_NWEPULSE ; config->ncs_write_pulse = (val &AT91_SMC_NCS_WRPULSE ) >>8 ; config->nrd_pulse = (val &AT91_SMC_NRDPULSE ) >>16 ; config->ncs_read_pulse = (val &AT91_SMC_NCS_RDPULSE ) >>24 ;
Greg Kroah-Hartman
maintainerPATCH 21/37 serial: add support for 200 v3 series Titan card
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yegor Yefremov <[email protected]>
commit 48c0247d7b7bf58abb85a39021099529df365c4d upstream.
--- drivers/tty/serial/8250/8250_pci.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/8250/8250_pci.c +4 -0
@@ -1142,6 +1142,7 @@ pci_xr17c154_setup(struct serial_private#define PCI_DEVICE_ID_TITAN_800E 0xA014#define PCI_DEVICE_ID_TITAN_200EI 0xA016#define PCI_DEVICE_ID_TITAN_200EISI 0xA017 +#define PCI_DEVICE_ID_TITAN_200V3 0xA306#define PCI_DEVICE_ID_TITAN_400V3 0xA310#define PCI_DEVICE_ID_TITAN_410V3 0xA312#define PCI_DEVICE_ID_TITAN_800V3 0xA314
@@ -3456,6 +3457,9 @@ static struct pci_device_id serial_pci_t {PCI_VENDOR_ID_TITAN ,PCI_DEVICE_ID_TITAN_200EISI ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_oxsemi_2_4000000 }, + { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200V3, +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , + pbn_b0_bt_2_921600 }, { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400V3,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_b0_4_921600 },
Greg Kroah-Hartman
maintainerPATCH 22/37 parport: parport_pc: remove double PCI ID for NetMos
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
commit d6a484520c5572a4170fa915109ccfc0c38f5008 upstream.
In commit 85747f ("PATCH] parport: add NetMOS 9805 support") Max added the PCI ID for NetMOS 9805 based on a Debian bug report from 2k4 which was at the v2.4.26 time frame. The patch made into 2.6.14. Shortly before that patch akpm merged commit 296d3c783b ("[PATCH] Support NetMOS based PCI cards providing serial and parallel ports") which made into v2.6.9-rc1.
Now we have two different entries for the same PCI id.
I have here the NetMos 9805 which claims to support SPP/EPP/ECP mode. This patch takes Max's entry for titan_1284p1 (base != -1 specifies the ioport for ECP mode) and replaces akpm's entry for netmos_9805 which specified -1 (=none). Both share the same PCI-ID (my card has subsystem 0x1000 / 0x0020 so it should match PCI_ANY).
While here I also drop the entry for titan_1284p2 which is the same as netmos_9815.
--- drivers/parport/parport_pc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/parport/parport_pc.c +2 -8
@@ -2875,8 +2875,6 @@ enum parport_pc_pci_cards { syba_2p_epp, syba_1p_ecp, titan_010l, - titan_1284p1, - titan_1284p2, avlab_1p, avlab_2p, oxsemi_952,
@@ -2935,8 +2933,6 @@ static struct parport_pc_pci { /* syba_2p_epp AP138B */ { 2, { { 0, 0x078 }, { 0, 0x178 }, } }, /* syba_1p_ecp W83787 */ { 1, { { 0, 0x078 }, } }, /* titan_010l */ { 1, { { 3, -1 }, } }, - /* titan_1284p1 */ { 1, { { 0, 1 }, } }, - /* titan_1284p2 */ { 2, { { 0, 1 }, { 2, 3 }, } }, /* avlab_1p */ { 1, { { 0, 1}, } }, /* avlab_2p */ { 2, { { 0, 1}, { 2, 3 },} }, /* The Oxford Semi cards are unusual: 954 doesn't support ECP,
@@ -2952,8 +2948,8 @@ static struct parport_pc_pci { /* netmos_9705 */ { 1, { { 0, -1 }, } }, /* netmos_9715 */ { 2, { { 0, 1 }, { 2, 3 },} }, /* netmos_9755 */ { 2, { { 0, 1 }, { 2, 3 },} }, - /* netmos_9805 */ { 1, { { 0, -1 }, } }, - /* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } }, + /* netmos_9805 */ { 1, { { 0, 1 }, } }, + /* netmos_9815 */ { 2, { { 0, 1 }, { 2, 3 }, } }, /* netmos_9901 */ { 1, { { 0, -1 }, } }, /* netmos_9865 */ { 1, { { 0, -1 }, } }, /* quatech_sppxp100 */ { 1, { { 0, 1 }, } },
@@ -2997,8 +2993,6 @@ static const struct pci_device_id parpor PCI_ANY_ID, PCI_ANY_ID, 0, 0, syba_1p_ecp }, { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_010L, PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_010l }, - { 0x9710, 0x9805, 0x1000, 0x0010, 0, 0, titan_1284p1 }, - { 0x9710, 0x9815, 0x1000, 0x0020, 0, 0, titan_1284p2 },/* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ /* AFAVLAB_TK9902 */ { 0x14db, 0x2120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1p},
Greg Kroah-Hartman
maintainerPATCH 23/37 rtc-cmos: Add an alarm disable quirk
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Borislav Petkov <[email protected]>
commit d5a1c7e3fc38d9c7d629e1e47f32f863acbdec3d upstream.
41c7f7424259f ("rtc: Disable the alarm in the hardware (v2)") added the functionality to disable the RTC wake alarm when shutting down the box.
However, there are at least two b0rked BIOSes we know about:
https://bugzilla.novell.com/show_bug.cgi?id=812592
https://bugzilla.novell.com/show_bug.cgi?id=805740
where, when wakeup alarm is enabled in the BIOS, the machine reboots automatically right after shutdown, regardless of what wakeup time is programmed.
Bisecting the issue lead to this patch so disable its functionality with a DMI quirk only for those boxes.
--- drivers/rtc/rtc-cmos.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-)
drivers/rtc/rtc-cmos.c +51 -1
@@ -34,11 +34,11 @@#include <linux/interrupt.h> #include <linux/spinlock.h> #include <linux/platform_device.h> -#include <linux/mod_devicetable.h> #include <linux/log2.h> #include <linux/pm.h> #include <linux/of.h> #include <linux/of_platform.h> +#include <linux/dmi.h> /* this is for "generic access to PC-style RTC" using CMOS_READ/CMOS_WRITE */ #include <asm-generic/rtc.h>
@@ -377,6 +377,51 @@ static int cmos_set_alarm(struct devicereturn 0 ; } +/* +* Do not disable RTC alarm on shutdown - workaround for b0rked BIOSes. +*/ +static bool alarm_disable_quirk; + +static int __init set_alarm_disable_quirk (const struct dmi_system_id *id) +{ + alarm_disable_quirk = true; +pr_info ("rtc-cmos: BIOS has alarm-disable quirk. " ); +pr_info ("RTC alarms disabled\n" ); +return 0 ; +} + +static const struct dmi_system_id rtc_quirks[]__initconst = { +/* https://bugzilla.novell.com/show_bug.cgi?id=805740 */ + { + .callback = set_alarm_disable_quirk, + .ident ="IBM Truman" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"TOSHIBA" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"4852570" ), + }, + }, +/* https://bugzilla.novell.com/show_bug.cgi?id=812592 */ + { + .callback = set_alarm_disable_quirk, + .ident ="Gigabyte GA-990XA-UD3" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR , +"Gigabyte Technology Co., Ltd." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"GA-990XA-UD3" ), + }, + }, +/* http://permalink.gmane.org/gmane.linux.kernel/1604474 */ + { + .callback = set_alarm_disable_quirk, + .ident ="Toshiba Satellite L300" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"TOSHIBA" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Satellite L300" ), + }, + }, + {} +}; +static int cmos_alarm_irq_enable (struct device *dev,unsigned int enabled) {struct cmos_rtc *cmos =dev_get_drvdata (dev);
@@ -385,6 +430,9 @@ static int cmos_alarm_irq_enable(structif (!is_valid_irq (cmos->irq))return -EINVAL ; +if (alarm_disable_quirk) +return 0 ; +spin_lock_irqsave (&rtc_lock, flags);if (enabled)
@@ -1166,6 +1214,8 @@ static int __init cmos_init(void) platform_driver_registered = true; } +dmi_check_system (rtc_quirks); +if (retval ==0 )return 0 ;
Greg Kroah-Hartman
maintainerPATCH 24/37 ASoC: adau1701: Fix ADAU1701_SEROCTL_WORD_LEN_16 constant
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <[email protected]>
commit e20970ada3f699c113fe64b04492af083d11a7d8 upstream.
The driver defines ADAU1701_SEROCTL_WORD_LEN_16 as 0x10 while it should be b10, so 0x2. This patch fixes it.
--- sound/soc/codecs/adau1701.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/adau1701.c +1 -1
@@ -64,7 +64,7 @@#define ADAU1701_SEROCTL_WORD_LEN_24 0x0000#define ADAU1701_SEROCTL_WORD_LEN_20 0x0001 -#define ADAU1701_SEROCTL_WORD_LEN_16 0x0010 +#define ADAU1701_SEROCTL_WORD_LEN_16 0x0002#define ADAU1701_SEROCTL_WORD_LEN_MASK 0x0003#define ADAU1701_AUXNPOW_VBPD 0x40
Greg Kroah-Hartman
maintainerPATCH 25/37 ALSA: rme9652: fix a missing comma in channel_map_9636_ds[]
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 770bd4bf2e664939a9dacd3d26ec9ff7a3933210 upstream.
The lack of comma leads to the wrong channel for an SPDIF channel. Unfortunately this wasn't caught by compiler because it's still a valid expression.
--- sound/pci/rme9652/rme9652.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/rme9652/rme9652.c +1 -1
@@ -285,7 +285,7 @@ static char channel_map_9636_ds[26] = {/* ADAT channels are remapped */ 1 ,3 ,5 ,7 ,9 ,11 ,13 ,15 ,/* channels 8 and 9 are S/PDIF */ -24 ,25 +24 ,25 ,/* others don't exist */ -1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 };
Greg Kroah-Hartman
maintainerPATCH 26/37 ALSA: Enable CONFIG_ZONE_DMA for smaller PCI DMA masks
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 80ab8eae70e51d578ebbeb228e0f7a562471b8b7 upstream.
The PCI devices with DMA masks smaller than 32bit should enable CONFIG_ZONE_DMA. Since the recent change of page allocator, page allocations via dma_alloc_coherent() with the limited DMA mask bits may fail more frequently, ended up with no available buffers, when CONFIG_ZONE_DMA isn't enabled. With CONFIG_ZONE_DMA, the system has much more chance to obtain such pages.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=68221
--- sound/pci/Kconfig | 12 ++++++++++++ 1 file changed, 12 insertions(+)
sound/pci/Kconfig +12 -0
@@ -30,6 +30,7 @@ config SND_ALS300 select SND_PCM select SND_AC97_CODEC select SND_OPL3_LIB + select ZONE_DMA help Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+
@@ -54,6 +55,7 @@ config SND_ALI5451 tristate "ALi M5451 PCI Audio Controller" select SND_MPU401_UART select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for the integrated AC97 sound device on motherboards using the ALi M5451 Audio Controller
@@ -158,6 +160,7 @@ config SND_AZT3328 select SND_PCM select SND_RAWMIDI select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for Aztech AZF3328 (PCI168) soundcards.
@@ -463,6 +466,7 @@ config SND_EMU10K1 select SND_HWDEP select SND_RAWMIDI select SND_AC97_CODEC + select ZONE_DMA help Say Y to include support for Sound Blaster PCI 512, Live!, Audigy and E-mu APS (partially supported) soundcards.
@@ -478,6 +482,7 @@ config SND_EMU10K1X tristate "Emu10k1X (Dell OEM Version)" select SND_AC97_CODEC select SND_RAWMIDI + select ZONE_DMA help Say Y here to include support for the Dell OEM version of the Sound Blaster Live!.
@@ -511,6 +516,7 @@ config SND_ES1938 select SND_OPL3_LIB select SND_MPU401_UART select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for soundcards based on ESS Solo-1 (ES1938, ES1946, ES1969) chips.
@@ -522,6 +528,7 @@ config SND_ES1968 tristate "ESS ES1968/1978 (Maestro-1/2/2E)" select SND_MPU401_UART select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for soundcards based on ESS Maestro 1/2/2E chips.
@@ -602,6 +609,7 @@ config SND_ICE1712 select SND_MPU401_UART select SND_AC97_CODEC select BITREVERSE + select ZONE_DMA help Say Y here to include support for soundcards based on the ICE1712 (Envy24) chip.
@@ -688,6 +696,7 @@ config SND_LX6464ES config SND_MAESTRO3 tristate "ESS Allegro/Maestro3" select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for soundcards based on ESS Maestro 3 (Allegro) chips.
@@ -782,6 +791,7 @@ config SND_SIS7019 tristate "SiS 7019 Audio Accelerator" depends on X86 && !X86_64 select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for the SiS 7019 Audio Accelerator.
@@ -793,6 +803,7 @@ config SND_SONICVIBES select SND_OPL3_LIB select SND_MPU401_UART select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for soundcards based on the S3 SonicVibes chip.
@@ -804,6 +815,7 @@ config SND_TRIDENT tristate "Trident 4D-Wave DX/NX; SiS 7018" select SND_MPU401_UART select SND_AC97_CODEC + select ZONE_DMA help Say Y here to include support for soundcards based on Trident 4D-Wave DX/NX or SiS 7018 chips.
Greg Kroah-Hartman
maintainerPATCH 28/37 bnx2x: fix DMA unmapping of TSO split BDs
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Schmidt <[email protected]>
[ Upstream commit 95e92fd40c967c363ad66b2fd1ce4dcd68132e54 ]
bnx2x triggers warnings with CONFIG_DMA_API_DEBUG=y:
WARNING: CPU: 0 PID: 2253 at lib/dma-debug.c:887 check_unmap+0xf8/0x920() bnx2x 0000:28:00.0: DMA-API: device driver frees DMA memory with different size [device address=0x00000000da2b389e] [map size=1490 bytes] [unmap size=66 bytes]
The reason is that bnx2x splits a TSO BD into two BDs (headers + data) using one DMA mapping for both, but it uses only the length of the first BD when unmapping.
This patch fixes the bug by unmapping the whole length of the two BDs.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +9 -4
@@ -71,6 +71,7 @@ static u16 bnx2x_free_tx_pkt(struct bnx2struct sk_buff *skb = tx_buf->skb;u16 bd_idx =TX_BD (tx_buf->first_bd), new_cons;int nbd; +u16 split_bd_len =0 ;/* prefetch skb end pointer to speedup dev_kfree_skb() */ prefetch (&skb->end);
@@ -78,10 +79,7 @@ static u16 bnx2x_free_tx_pkt(struct bnx2DP (NETIF_MSG_TX_DONE ,"fp[%d]: pkt_idx %d buff @(%p)->skb %p\n" , txdata->txq_index, idx, tx_buf, skb); -/* unmap first bd */ tx_start_bd = &txdata->tx_desc_ring[bd_idx].start_bd; -dma_unmap_single (&bp->pdev->dev,BD_UNMAP_ADDR (tx_start_bd), -BD_UNMAP_LEN (tx_start_bd),DMA_TO_DEVICE ); nbd =le16_to_cpu (tx_start_bd->nbd) -1 ;
@@ -100,12 +98,19 @@ static u16 bnx2x_free_tx_pkt(struct bnx2 --nbd; bd_idx =TX_BD (NEXT_TX_IDX (bd_idx)); -/* ...and the TSO split header bd since they have no mapping */ +/* TSO headers+data bds share a common mapping. See bnx2x_tx_split() */ if (tx_buf->flags &BNX2X_TSO_SPLIT_BD ) { + tx_data_bd = &txdata->tx_desc_ring[bd_idx].reg_bd; + split_bd_len =BD_UNMAP_LEN (tx_data_bd); --nbd; bd_idx =TX_BD (NEXT_TX_IDX (bd_idx)); } +/* unmap first bd */ +dma_unmap_single (&bp->pdev->dev,BD_UNMAP_ADDR (tx_start_bd), +BD_UNMAP_LEN (tx_start_bd) + split_bd_len, +DMA_TO_DEVICE ); +/* now free frags */ while (nbd >0 ) {
Greg Kroah-Hartman
maintainerPATCH 29/37 inet_diag: fix inet_diag_dump_icsk() timewait socket state logic
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neal Cardwell <[email protected]>
[ Based upon upstream commit 70315d22d3c7383f9a508d0aab21e2eb35b2303a ]
Fix inet_diag_dump_icsk() to reflect the fact that both TIME_WAIT and FIN_WAIT2 connections are represented by inet_timewait_sock (not just TIME_WAIT). Thus:
(a) We need to iterate through the time_wait buckets if the user wants either TIME_WAIT or FIN_WAIT2. (Before fixing this, "ss -nemoi state fin-wait-2" would not return any sockets, even if there were some in FIN_WAIT2.)
(b) We need to check tw_substate to see if the user wants to dump sockets in the particular substate (TIME_WAIT or FIN_WAIT2) that a given connection is in. (Before fixing this, "ss -nemoi state time-wait" would actually return sockets in state FIN_WAIT2.)
An analogous fix is in v3.13: 70315d22d3c7383f9a508d0aab21e2eb35b2303a ("inet_diag: fix inet_diag_dump_icsk() to use correct state for timewait sockets") but that patch is quite different because 3.13 code is very different in this area due to the unification of TCP hash tables in 05dbc7b ("tcp/dccp: remove twchain") in v3.13-rc1.
I tested that this applies cleanly between v3.3 and v3.12, and tested that it works in both 3.3 and 3.12. It does not apply cleanly to 3.2 and earlier (though it makes semantic sense), and semantically is not the right fix for 3.13 and beyond (as mentioned above).
--- net/ipv4/inet_diag.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv4/inet_diag.c +3 -1
@@ -941,7 +941,7 @@ next_normal: ++num; } -if (r->idiag_states &TCPF_TIME_WAIT ) { +if (r->idiag_states & (TCPF_TIME_WAIT |TCPF_FIN_WAIT2 )) {struct inet_timewait_sock *tw; inet_twsk_for_each(tw, node,
@@ -949,6 +949,8 @@ next_normal:if (num < s_num) goto next_dying; +if (!(r->idiag_states & (1 << tw->tw_substate))) + goto next_dying;if (r->sdiag_family !=AF_UNSPEC && tw->tw_family != r->sdiag_family) goto next_dying;
Greg Kroah-Hartman
maintainerPATCH 30/37 net: avoid reference counter overflows on fib_rules in multicast forwarding
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit 95f4a45de1a0f172b35451fc52283290adb21f6e ]
Bob Falken reported that after 4G packets, multicast forwarding stopped working. This was because of a rule reference counter overflow which freed the rule as soon as the overflow happend.
This patch solves this by adding the FIB_LOOKUP_NOREF flag to fib_rules_lookup calls. This is safe even from non-rcu locked sections as in this case the flag only implies not taking a reference to the rule, which we don't need at all.
Rules only hold references to the namespace, which are guaranteed to be available during the call of the non-rcu protected function reg_vif_xmit because of the interface reference which itself holds a reference to the net namespace.
--- net/ipv4/ipmr.c | 7 +++++-- net/ipv6/ip6mr.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
net/ipv4/ipmr.c +5 -2
@@ -154,9 +154,12 @@ static struct mr_table *ipmr_get_table(sstatic int ipmr_fib_lookup (struct net *net,struct flowi4 *flp4,struct mr_table **mrt) { -struct ipmr_result res; -struct fib_lookup_arg arg = { .result = &res, };int err; +struct ipmr_result res; +struct fib_lookup_arg arg = { + .result = &res, + .flags =FIB_LOOKUP_NOREF , + }; err =fib_rules_lookup (net->ipv4.mr_rules_ops,flowi4_to_flowi (flp4),0 , &arg);
net/ipv6/ip6mr.c +5 -2
@@ -138,9 +138,12 @@ static struct mr6_table *ip6mr_get_tablestatic int ip6mr_fib_lookup (struct net *net,struct flowi6 *flp6,struct mr6_table **mrt) { -struct ip6mr_result res; -struct fib_lookup_arg arg = { .result = &res, };int err; +struct ip6mr_result res; +struct fib_lookup_arg arg = { + .result = &res, + .flags =FIB_LOOKUP_NOREF , + }; err =fib_rules_lookup (net->ipv6.mr6_rules_ops,flowi6_to_flowi (flp6),0 , &arg);
Greg Kroah-Hartman
maintainerPATCH 31/37 net,via-rhine: Fix tx_timeout handling
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Weinberger <[email protected]>
[ Upstream commit a926592f5e4e900f3fa903298c4619a131e60963 ]
rhine_reset_task() misses to disable the tx scheduler upon reset, this can lead to a crash if work is still scheduled while we're resetting the tx queue.
Fixes:
[ 93.591707] BUG: unable to handle kernel NULL pointer dereference at 0000004c [ 93.595514] IP: [<c119d10d>] rhine_napipoll+0x491/0x6
--- drivers/net/ethernet/via/via-rhine.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/via/via-rhine.c +1 -0
@@ -1601,6 +1601,7 @@ static void rhine_reset_task(struct work goto out_unlock;napi_disable (&rp->napi); +netif_tx_disable (dev);spin_lock_bh (&rp->lock);/* clear all descriptors */
Greg Kroah-Hartman
maintainerPATCH 32/37 KVM: x86: Fix potential divide by 0 in lapic (CVE-2013-6367)
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Honig <[email protected]>
commit b963a22e6d1a266a67e9eecc88134713fd54775c upstream.
Under guest controllable circumstances apic_get_tmcct will execute a divide by zero and cause a crash. If the guest cpuid support tsc deadline timers and performs the following sequence of requests the host will crash.
- Set the mode to periodic
- Set the TMICT to 0
- Set the mode bits to 11 (neither periodic, nor one shot, nor tsc deadline)
- Set the TMICT to non-zero.
Then the lapic_timer.period will be 0, but the TMICT will not be. If the guest then reads from the TMCCT then the host will perform a divide by 0.
This patch ensures that if the lapic_timer.period is 0, then the division does not occur.
--- arch/x86/kvm/lapic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/lapic.c +2 -1
@@ -538,7 +538,8 @@ static u32 apic_get_tmcct(struct kvm_lapASSERT (apic !=NULL );/* if initial count is 0, current count should also be 0 */ -if (apic_get_reg (apic,APIC_TMICT ) ==0 ) +if (apic_get_reg (apic,APIC_TMICT ) ==0 || + apic->lapic_timer.period ==0 )return 0 ; remaining =hrtimer_get_remaining (&apic->lapic_timer.timer);
Greg Kroah-Hartman
maintainerPATCH 33/37 usb: core: get config and string descriptors for unauthorized devices
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Pugliese <[email protected]>
commit 83e83ecb79a8225e79bc8e54e9aff3e0e27658a2 upstream.
There is no need to skip querying the config and string descriptors for unauthorized WUSB devices when usb_new_device is called. It is allowed by WUSB spec. The only action that needs to be delayed until authorization time is the set config. This change allows user mode tools to see the config and string descriptors earlier in enumeration which is needed for some WUSB devices to function properly on Android systems. It also reduces the amount of divergent code paths needed for WUSB devices.
--- drivers/usb/core/config.c | 7 ------- drivers/usb/core/hub.c | 40 +++++++--------------------------------- 2 files changed, 7 insertions(+), 40 deletions(-)
drivers/usb/core/config.c +0 -7
@@ -651,10 +651,6 @@ void usb_destroy_configuration(struct us* * hub-only!! ... and only in reset path, or usb_new_device() * (used by real hubs and virtual root hubs) -* -* NOTE: if this is a WUSB device and is not authorized, we skip the -* whole thing. A non-authorized USB device has no -* configurations. */ int usb_get_configuration (struct usb_device *dev) {
@@ -666,8 +662,6 @@ int usb_get_configuration(struct usb_devstruct usb_config_descriptor *desc; cfgno =0 ; -if (dev->authorized ==0 )/* Not really an error */ - goto out_not_authorized; result = -ENOMEM ;if (ncfg >USB_MAXCONFIG ) { dev_warn(ddev, "too many configurations: %d, "
@@ -749,7 +743,6 @@ int usb_get_configuration(struct usb_dev err:kfree (desc); -out_not_authorized: dev->descriptor.bNumConfigurations = cfgno; err2:if (result == -ENOMEM )
drivers/usb/core/hub.c +7 -33
@@ -1919,18 +1919,13 @@ static int usb_enumerate_device(struct u goto fail; } } -if (udev->wusb ==1 && udev->authorized ==0 ) { - udev->product =kstrdup ("n/a (unauthorized)" ,GFP_KERNEL ); - udev->manufacturer =kstrdup ("n/a (unauthorized)" ,GFP_KERNEL ); - udev->serial =kstrdup ("n/a (unauthorized)" ,GFP_KERNEL ); - } -else { -/* read the standard strings and cache them if present */ - udev->product =usb_cache_string (udev, udev->descriptor.iProduct); - udev->manufacturer =usb_cache_string (udev, - udev->descriptor.iManufacturer); - udev->serial =usb_cache_string (udev, udev->descriptor.iSerialNumber); - } + +/* read the standard strings and cache them if present */ + udev->product =usb_cache_string (udev, udev->descriptor.iProduct); + udev->manufacturer =usb_cache_string (udev, + udev->descriptor.iManufacturer); + udev->serial =usb_cache_string (udev, udev->descriptor.iSerialNumber); + err =usb_enumerate_device_otg (udev); fail:return err;
@@ -2084,16 +2079,6 @@ int usb_deauthorize_device(struct usb_de usb_dev->authorized =0 ;usb_set_configuration (usb_dev,-1 ); -kfree (usb_dev->product); - usb_dev->product =kstrdup ("n/a (unauthorized)" ,GFP_KERNEL ); -kfree (usb_dev->manufacturer); - usb_dev->manufacturer =kstrdup ("n/a (unauthorized)" ,GFP_KERNEL ); -kfree (usb_dev->serial); - usb_dev->serial =kstrdup ("n/a (unauthorized)" ,GFP_KERNEL ); - -usb_destroy_configuration (usb_dev); - usb_dev->descriptor.bNumConfigurations =0 ; - out_unauthorized:usb_unlock_device (usb_dev);return 0 ;
@@ -2121,17 +2106,7 @@ int usb_authorize_device(struct usb_devi goto error_device_descriptor; } -kfree (usb_dev->product); - usb_dev->product =NULL ; -kfree (usb_dev->manufacturer); - usb_dev->manufacturer =NULL ; -kfree (usb_dev->serial); - usb_dev->serial =NULL ; - usb_dev->authorized =1 ; - result =usb_enumerate_device (usb_dev); -if (result <0 ) - goto error_enumerate;/* Choose and set the configuration. This registers the interfaces * with the driver core and lets interface drivers bind to them. */
@@ -2147,7 +2122,6 @@ int usb_authorize_device(struct usb_devi }dev_info (&usb_dev->dev,"authorized to connect\n" ); -error_enumerate: error_device_descriptor:usb_autosuspend_device (usb_dev); error_autoresume:
Greg Kroah-Hartman
maintainerPATCH 34/37 SCSI: bfa: Chinook quad port 16G FC HBA claim issue
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vijaya Mohan Guvva <[email protected]>
commit dcaf9aed995c2b2a49fb86bbbcfa2f92c797ab5d upstream.
Bfa driver crash is observed while pushing the firmware on to chinook quad port card due to uninitialized bfi_image_ct2 access which gets initialized only for CT2 ASIC based cards after request_firmware(). For quard port chinook (CT2 ASIC based), bfi_image_ct2 is not getting initialized as there is no check for chinook PCI device ID before request_firmware and instead bfi_image_cb is initialized as it is the default case for card type check.
This patch includes changes to read the right firmware for quad port chinook.
--- drivers/scsi/bfa/bfad.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/scsi/bfa/bfad.c +4 -2
@@ -1615,7 +1615,7 @@ out:static u32 *bfad_load_fwimg (struct pci_dev *pdev) { -if (pdev->device ==BFA_PCI_DEVICE_ID_CT2 ) { +if (bfa_asic_id_ct2 (pdev->device)) {if (bfi_image_ct2_size ==0 )bfad_read_firmware (pdev, &bfi_image_ct2, &bfi_image_ct2_size,BFAD_FW_FILE_CT2 );
@@ -1625,12 +1625,14 @@ bfad_load_fwimg(struct pci_dev *pdev)bfad_read_firmware (pdev, &bfi_image_ct, &bfi_image_ct_size,BFAD_FW_FILE_CT );return bfi_image_ct; - }else { + }else if (bfa_asic_id_cb (pdev->device)) {if (bfi_image_cb_size ==0 )bfad_read_firmware (pdev, &bfi_image_cb, &bfi_image_cb_size,BFAD_FW_FILE_CB );return bfi_image_cb; } + +return NULL ; } static void
Greg Kroah-Hartman
maintainerPATCH 35/37 target/iscsi: Fix network portal creation race
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Grover <[email protected]>
commit ee291e63293146db64668e8d65eb35c97e8324f4 upstream.
When creating network portals rapidly, such as when restoring a configuration, LIO's code to reuse existing portals can return a false negative if the thread hasn't run yet and set np_thread_state to ISCSI_NP_THREAD_ACTIVE. This causes an error in the network stack when attempting to bind to the same address/port.
This patch sets NP_THREAD_ACTIVE before the np is placed on g_np_list, so even if the thread hasn't run yet, iscsit_get_np will return the existing np.
Also, convert np_lock -> np_mutex + hold across adding new net portal to g_np_list to prevent a race where two threads may attempt to create the same network portal, resulting in one of them failing.
(nab: Add missing mutex_unlocks in iscsit_add_np failure paths) (DanC: Fix incorrect spin_unlock -> spin_unlock_bh)
--- drivers/target/iscsi/iscsi_target.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)
drivers/target/iscsi/iscsi_target.c +21 -13
@@ -50,7 +50,7 @@static LIST_HEAD (g_tiqn_list);static LIST_HEAD (g_np_list);static DEFINE_SPINLOCK (tiqn_lock); -static DEFINE_SPINLOCK (np_lock); +static DEFINE_MUTEX (np_lock);static struct idr tiqn_idr;struct idr sess_idr;
@@ -262,6 +262,9 @@ int iscsit_deaccess_np(struct iscsi_np *return 0 ; } +/* +* Called with mutex np_lock held +*/ static struct iscsi_np *iscsit_get_np (struct __kernel_sockaddr_storage *sockaddr,int network_transport)
@@ -272,11 +275,10 @@ static struct iscsi_np *iscsit_get_np(int ip_match =0 ;u16 port; -spin_lock_bh (&np_lock);list_for_each_entry (np, &g_np_list, np_list) { -spin_lock (&np->np_thread_lock); +spin_lock_bh (&np->np_thread_lock);if (np->np_thread_state !=ISCSI_NP_THREAD_ACTIVE ) { -spin_unlock (&np->np_thread_lock); +spin_unlock_bh (&np->np_thread_lock);continue ; }
@@ -309,13 +311,11 @@ static struct iscsi_np *iscsit_get_np(* while iscsi_tpg_add_network_portal() is called. */ np->np_exports++; -spin_unlock (&np->np_thread_lock); -spin_unlock_bh (&np_lock); +spin_unlock_bh (&np->np_thread_lock);return np; } -spin_unlock (&np->np_thread_lock); +spin_unlock_bh (&np->np_thread_lock); } -spin_unlock_bh (&np_lock);return NULL ; }
@@ -329,16 +329,22 @@ struct iscsi_np *iscsit_add_np(struct sockaddr_in6 *sock_in6;struct iscsi_np *np;int ret; + +mutex_lock (&np_lock); +/* * Locate the existing struct iscsi_np if already active.. */ np =iscsit_get_np (sockaddr, network_transport); -if (np) +if (np) { +mutex_unlock (&np_lock);return np; + } np =kzalloc (sizeof (struct iscsi_np ),GFP_KERNEL );if (!np) {pr_err ("Unable to allocate memory for struct iscsi_np\n" ); +mutex_unlock (&np_lock);return ERR_PTR (-ENOMEM ); }
@@ -361,6 +367,7 @@ struct iscsi_np *iscsit_add_np( ret =iscsi_target_setup_login_socket (np, sockaddr);if (ret !=0 ) {kfree (np); +mutex_unlock (&np_lock);return ERR_PTR (ret); }
@@ -369,6 +376,7 @@ struct iscsi_np *iscsit_add_np(pr_err ("Unable to create kthread: iscsi_np\n" ); ret =PTR_ERR (np->np_thread);kfree (np); +mutex_unlock (&np_lock);return ERR_PTR (ret); }/*
@@ -379,10 +387,10 @@ struct iscsi_np *iscsit_add_np(* point because iscsi_np has not been added to g_np_list yet. */ np->np_exports =1 ; + np->np_thread_state =ISCSI_NP_THREAD_ACTIVE ; -spin_lock_bh (&np_lock);list_add_tail (&np->np_list, &g_np_list); -spin_unlock_bh (&np_lock); +mutex_unlock (&np_lock); pr_debug("CORE[0] - Added Network Portal: %s:%hu on %s\n", np->np_ip, np->np_port, (np->np_network_transport == ISCSI_TCP) ?
@@ -453,9 +461,9 @@ int iscsit_del_np(struct iscsi_np *np) }iscsit_del_np_comm (np); -spin_lock_bh (&np_lock); +mutex_lock (&np_lock);list_del (&np->np_list); -spin_unlock_bh (&np_lock); +mutex_unlock (&np_lock); pr_debug("CORE[0] - Removed Network Portal: %s:%hu on %s\n", np->np_ip, np->np_port, (np->np_network_transport == ISCSI_TCP) ?
Greg Kroah-Hartman
maintainerPATCH 36/37 Btrfs: handle EAGAIN case properly in btrfs_drop_snapshot()
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Shilong <[email protected]>
commit 90515e7f5d7d24cbb2a4038a3f1b5cfa2921aa17 upstream.
We may return early in btrfs_drop_snapshot(), we shouldn't call btrfs_std_err() for this case, fix it.
--- fs/btrfs/extent-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/extent-tree.c +1 -1
@@ -7033,7 +7033,7 @@ out:*/ if (root_dropped == false)btrfs_add_dead_root (root); -if (err) +if (err && err != -EAGAIN )btrfs_std_error (root->fs_info, err);return err; }
Greg Kroah-Hartman
maintainerPATCH 37/37 powerpc: Make sure "cache" directory is removed when offlining cpu
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Mackerras <[email protected]>
commit 91b973f90c1220d71923e7efe1e61f5329806380 upstream.
The code in remove_cache_dir() is supposed to remove the "cache" subdirectory from the sysfs directory for a CPU when that CPU is being offlined. It tries to do this by calling kobject_put() on the kobject for the subdirectory. However, the subdirectory only gets removed once the last reference goes away, and the reference being put here may well not be the last reference. That means that the "cache" subdirectory may still exist when the offlining operation has finished. If the same CPU subsequently gets onlined, the code tries to add a new "cache" subdirectory. If the old subdirectory has not yet been removed, we get a WARN_ON in the sysfs code, with stack trace, and an error message printed on the console. Further, we ultimately end up with an online cpu with no "cache" subdirectory.
This fixes it by doing an explicit kobject_del() at the point where we want the subdirectory to go away. kobject_del() removes the sysfs directory even though the object still exists in memory. The object will get freed at some point in the future. A subsequent onlining operation can create a new sysfs directory, even if the old object still exists in memory, without causing any problems.
--- arch/powerpc/kernel/cacheinfo.c | 3 +++ 1 file changed, 3 insertions(+)
arch/powerpc/kernel/cacheinfo.c +3 -0
@@ -788,6 +788,9 @@ static void remove_cache_dir(struct cach {remove_index_dirs (cache_dir); +/* Remove cache dir from sysfs */ +kobject_del (cache_dir->kobj); +kobject_put (cache_dir->kobj);kfree (cache_dir);
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.4.79 release. There are 37 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
(snip)
Borislav Petkov <[email protected]>
rtc-cmos: Add an alarm disable quirk
This is just one of the 3 patches posted by John Stultz on
http://git.linaro.org/people/john.stultz/linux.git/shortlog/refs/heads/stable/3.4/timefix
The other 2 are backports of 6fdda9a9c5db367130cf32df5d6618d08b89f46a (timekeeping: Avoid possible deadlock from clock_was_set_delayed) and ec145babe754f9ea1079034a108104b6001e001c (timekeeping: fix 32-bit overflow in get_monotonic_boottime)
Could you explain why there were not included? Are you simply planning to include these in 3.4.80?
Sorry if this was discussed somewhere but the original thread does not say when/if they are going to be included in 3.4. If this information is somewhere else, could you just point me to the discussion?
Thanks in advance for your help,
Guillaume.
Signature · 1 line
Guillaume Morin <[email protected]>
Greg Kroah-Hartman
maintainerQuoted 11 lines · Guillaume Morin
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.4.79 release. There are 37 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
(snip)
Borislav Petkov <[email protected]>
rtc-cmos: Add an alarm disable quirkThis is just one of the 3 patches posted by John Stultz on
http://git.linaro.org/people/john.stultz/linux.git/shortlog/refs/heads/stable/3.4/timefix
I have no idea what that tree is, nor what I am supposed to do with it.
Quoted 6 lines
The other 2 are backports of
6fdda9a9c5db367130cf32df5d6618d08b89f46a(timekeeping: Avoid possible deadlock fromclock_was_set_delayed) andec145babe754f9ea1079034a108104b6001e001c(timekeeping: fix 32-bit overflow inget_monotonic_boottime)Could you explain why there were not included?
Can you explain why I would include them?
Quoted 1 line
Are you simply planning to include these in 3.4.80?
I have no idea what people send me in the future...
Quoted 2 lines
Sorry if this was discussed somewhere but the original thread does not say when/if they are going to be included in 3.4.
What original thread?
confused,
greg k-h
Quoted 7 lines · Greg Kroah-Hartman
Quoted 5 lines
Quoted 2 lines
Borislav Petkov <[email protected]>
rtc-cmos: Add an alarm disable quirkThis is just one of the 3 patches posted by John Stultz on
http://git.linaro.org/people/john.stultz/linux.git/shortlog/refs/heads/stable/3.4/timefixI have no idea what that tree is, nor what I am supposed to do with it.
Ok, sorry. This is all coming from
http://article.gmane.org/gmane.linux.kernel.stable/77575/
I assumed you were aware of it because you participated in the thread and one of the patch mentioned in this message (Borislav's change) is applied to the 3.4 branch
Quoted 8 lines
Quoted 6 lines
The other 2 are backports of
6fdda9a9c5db367130cf32df5d6618d08b89f46a(timekeeping: Avoid possible deadlock fromclock_was_set_delayed) andec145babe754f9ea1079034a108104b6001e001c(timekeeping: fix 32-bit overflow inget_monotonic_boottime)Could you explain why there were not included?
Can you explain why I would include them?
:) they seem to fix important issues and you seemed to be ok with including them in stable trees at some point:
http://article.gmane.org/gmane.linux.kernel.stable/77261/
Note that I am not pushing for anything. I was just under the (incorrect) impression that you would apply them to the 3.4 branch and was surprised when it did not happen
I hope the situation is a bit clearer.
Guillaume.
Signature · 1 line
Guillaume Morin <[email protected]>
Greg Kroah-Hartman
maintainerQuoted 7 lines · Guillaume Morin
Quoted 6 lines · Greg Kroah-Hartman
Quoted 5 lines
Quoted 2 lines
Borislav Petkov <[email protected]>
rtc-cmos: Add an alarm disable quirkThis is just one of the 3 patches posted by John Stultz on
http://git.linaro.org/people/john.stultz/linux.git/shortlog/refs/heads/stable/3.4/timefix
Quoted 8 lines
Quoted 1 line
I have no idea what that tree is, nor what I am supposed to do with it.
Ok, sorry. This is all coming from
http://article.gmane.org/gmane.linux.kernel.stable/77575/I assumed you were aware of it because you participated in the thread and one of the patch mentioned in this message (Borislav's change) is applied to the 3.4 branch
John said he would submit those patches after -rc2 came out, I wasn't aware that this specific patch was part of that series, sorry, should I drop it for now?
thanks,
greg k-h
Quoted 10 lines · Greg Kroah-Hartman
Quoted 9 lines · Guillaume Morin
Quoted 5 lines · Greg Kroah-Hartman
Quoted 4 lines
Quoted 2 lines
Borislav Petkov <[email protected]>
rtc-cmos: Add an alarm disable quirkThis is just one of the 3 patches posted by John Stultz on
http://git.linaro.org/people/john.stultz/linux.git/shortlog/refs/heads/stable/3.4/timefixI have no idea what that tree is, nor what I am supposed to do with it.
Ok, sorry. This is all coming from
http://article.gmane.org/gmane.linux.kernel.stable/77575/
Quoted 6 lines
Quoted 3 lines
I assumed you were aware of it because you participated in the thread and one of the patch mentioned in this message (Borislav's change) is applied to the 3.4 branch
John said he would submit those patches after -rc2 came out, I wasn't aware that this specific patch was part of that series, sorry, should I drop it for now?
Yea. Hold off on it for now, I'll resubmit it after -rc2.
thanks
-john
Greg Kroah-Hartman
maintainerQuoted 11 lines · John Stultz
Quoted 10 lines · Greg Kroah-Hartman
Quoted 9 lines · Guillaume Morin
Quoted 5 lines · Greg Kroah-Hartman
Quoted 4 lines
Quoted 2 lines
Borislav Petkov <[email protected]>
rtc-cmos: Add an alarm disable quirkThis is just one of the 3 patches posted by John Stultz on
http://git.linaro.org/people/john.stultz/linux.git/shortlog/refs/heads/stable/3.4/timefixI have no idea what that tree is, nor what I am supposed to do with it.
Ok, sorry. This is all coming from
http://article.gmane.org/gmane.linux.kernel.stable/77575/
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
I assumed you were aware of it because you participated in the thread and one of the patch mentioned in this message (Borislav's change) is applied to the 3.4 branch
John said he would submit those patches after -rc2 came out, I wasn't aware that this specific patch was part of that series, sorry, should I drop it for now?
Yea. Hold off on it for now, I'll resubmit it after -rc2.
Now dropped from 3.4, 3.10, 3.12, and 3.13 trees.
thanks,
greg k-h
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.4.79 release. There are 37 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Feb 6 21:00:31 UTC 2014. Anything received after that time might be too late.
Version tested: v3.4.78-36
Build results:
total: 119 pass: 97 skipped: 18 fail: 4
qemu tests all passed.
Results are as expected.
Details are available at http://server.roeck-us.net:8010/builders.
Guenter
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.4.79 release. There are 37 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Feb 6 21:00:31 UTC 2014. Anything received after that time might be too late.
Quoted 8 lines
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.4.79-rc1.gzand the diffstat can be found below.
thanks,
greg k-h
Patch applied cleanly. boot tests passed on all test systems. No dmesg regressions: emerg, crit, alert, err are clean. No regressions in warn.
-- Shuah
Signature · 4 lines
Shuah Khan Senior Linux Kernel Developer - Open Source Group Samsung Research America(Silicon Valley) [email protected] | (970) 672-0658