aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-11-27ath9k: Revert change that broke AR928X on Acer Ferrari OneRafael J. Wysocki1-1/+2
Revert a hunk in drivers/net/wireless/ath/ath9k/hw.c introduced by commit 2577c6e8f232 ("ath9k_hw: Add support for AR946/8x chipsets") that caused a nasty regression to appear on my Acer Ferrari One (the box locks up entirely at random times after the wireless has been started without any way to get debug information out of it). Signed-off-by: Rafael J. Wysocki <[email protected]> Acked-by: Felix Fietkau <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-11-28Staging: comedi: fix integer overflow in do_insnlist_ioctl()Xi Wang1-1/+1
There is a potential integer overflow in do_insnlist_ioctl() if userspace passes in a large insnlist.n_insns. The call to kmalloc() would allocate a small buffer, leading to a memory corruption. The bug was reported by Dan Carpenter <[email protected]> and Haogang Chen <[email protected]>. The patch was suggested by Ian Abbott <[email protected]> and Lars-Peter Clausen <[email protected]>. Reported-by: Dan Carpenter <[email protected]> Reported-by: Haogang Chen <[email protected]>. Cc: Ian Abbott <[email protected]> Cc: Lars-Peter Clausen <[email protected]> Signed-off-by: Xi Wang <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-28Revert "Staging: comedi: integer overflow in do_insnlist_ioctl()"Greg Kroah-Hartman1-5/+0
This reverts commit e384a41141949843899affcf51f4e6e646c1fe9f. It's not the correct way to solve this issue. Acked-by: Dan Carpenter <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-27Merge branch 'fix/hda' into for-linusTakashi Iwai3-46/+56
2011-11-27ALSA: hda - Fix jack-detection control of VT1708Takashi Iwai1-33/+43
VT1708 has no support for unsolicited events per jack-plug, the driver implements the workq for polling the jack-detection. The mixer element "Jack Detect" was supposed to control this behavior on/off, but this doesn't work properly as is now. The workq is always started and the HP automute is always enabled. This patch fixes the jack-detect control behavior by triggering / stopping the work appropriately at the state change. Also the work checks the internal state to continue scheduling or not. Cc: <[email protected]> [v3.1] Signed-off-by: Takashi Iwai <[email protected]>
2011-11-27ALSA: hda - cut and paste typo in cs420x_models[]Dan Carpenter1-1/+1
The CS420X_IMAC27 was copied from the line before but CS420X_APPLE was clearly intented. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-11-27ASoC: Correct name of Speyside Main Speaker widgetMark Brown1-1/+1
Signed-off-by: Mark Brown <[email protected]>
2011-11-26USB: whci-hcd: fix endian conversion in qset_clear()Dan Carpenter1-1/+1
qset->qh.link is an __le64 field and we should be using cpu_to_le64() to fill it. Signed-off-by: Dan Carpenter <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-26USB: usb-storage: unusual_devs entry for Kingston DT 101 G2Qinglin Ye1-0/+7
Kingston DT 101 G2 replies a wrong tag while transporting, add an unusal_devs entry to ignore the tag validation. Signed-off-by: Qinglin Ye <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-26usb: option: add SIMCom SIM5218Veli-Pekka Peltola1-0/+1
Tested with SIM5218EVB-KIT evaluation kit. Signed-off-by: Veli-Pekka Peltola <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-26usb: option: add Huawei E353 controlling interfacesDirk Nehring1-0/+3
This patch creates the missing controlling devices for the Huawei E353 HSPA+ stick. Signed-off-by: Dirk Nehring <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-26Staging: comedi: integer overflow in do_insnlist_ioctl()Dan Carpenter1-0/+5
There is an integer overflow here that could cause memory corruption on 32 bit systems. insnlist.n_insns could be a very high value size calculation for kmalloc() could overflow resulting in a smaller "insns" than expected. In the for (i = 0; i < insnlist.n_insns; i++) {... loop we would read past the end of the buffer, possibly corrupting memory as well. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-26Staging: comedi: fix signal handling in read and writeFederico Vaga1-2/+2
After sleeping on a wait queue, signal_pending(current) should be checked (not before sleeping). Acked-by: Alessandro Rubini <[email protected]> Signed-off-by: Federico Vaga <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-26Staging: comedi: fix mmap_countFederico Vaga1-2/+17
In comedi_fops, mmap_count is decremented at comedi_vm_ops->close but it is not incremented at comedi_vm_ops->open. This may result in a negative counter. The patch introduces the open method to keep the counter consistent. The bug was triggerd by this sample code: mmap(0, ...., comedi_fd); fork(); exit(0); Acked-by: Alessandro Rubini <[email protected]> Signed-off-by: Federico Vaga <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-26staging: comedi: fix oops for USB DAQ devices.Bernd Porr1-18/+53
This fixes kernel oops when an USB DAQ device is plugged out while it's communicating with the userspace software. Signed-off-by: Bernd Porr <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-26staging: comedi: usbduxsigma: Fixed wrong range for the analogue channel.Bernd Porr1-3/+4
It's actually +/-2.65V/2 and not +/-2.65V. Signed-off-by: Bernd Porr <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-26staging:rts_pstor:Complete scanning_done variablewwang1-0/+1
Complete scanning_done variable if rtsx-scan thread created failed. Signed-off-by: wwang <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-26staging: usbip: bugfix for deadlockBart Westgeest1-4/+6
Interrupts must be disabled prior to calling usb_hcd_unlink_urb_from_ep. If interrupts are not disabled, it can potentially lead to a deadlock. The deadlock is readily reproduceable on a slower (ARM based) device such as the TI Pandaboard. Signed-off-by: Bart Westgeest <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-26inet: add a redirect generation id in inetpeerEric Dumazet2-1/+10
Now inetpeer is the place where we cache redirect information for ipv4 destinations, we must be able to invalidate informations when a route is added/removed on host. As inetpeer is not yet namespace aware, this patch adds a shared redirect_genid, and a per inetpeer redirect_genid. This might be changed later if inetpeer becomes ns aware. Cache information for one inerpeer is valid as long as its redirect_genid has the same value than global redirect_genid. Reported-by: Arkadiusz Miśkiewicz <[email protected]> Tested-by: Arkadiusz Miśkiewicz <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-26ARM: 7177/1: GIC: avoid skipping non-existent PPIs in irq_start calculationWill Deacon1-5/+8
Commit 4294f8baa ("ARM: gic: add irq_domain support") defines irq_start as irq_start = (irq_start & ~31) + 16; On a platform with a GIC and a CPU without PPIs, this results in irq_start being off by 16. This patch fixes gic_init so that we only carve out a PPI space when PPIs exist for the GIC being initialised. Cc: Rob Herring <[email protected]> Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-11-26ARM: 7176/1: cpu_pm: register GIC PM notifier only onceMarc Zyngier1-1/+2
When multiple GICs exist on a platform (RealView PB1176/11MP), we must make sure the PM notifier block is only registered once, otherwise we end up corrupting the PM notifier list. The fix is to only register the notifier when initializing the first GIC, as the power management functions seem to iterate over all the registered GICs. Tested on PB11MP and PB1176. Reported-by: Will Deacon <[email protected]> Tested-by: Will Deacon <[email protected]> Cc: Colin Cross <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-11-26ARM: 7175/1: add subname parameter to mfp_set_groupg callersAxel Lin3-3/+4
commit 798681bf "ARM: 7158/1: add new MFP implement for NUC900" adds subname parameter for mfp_set_groupg. Thus add subname parameter to the callers. Signed-off-by: Axel Lin <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Wan Zongshun <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-11-26ARM: 7174/1: Fix build error in kprobes test code on Thumb2 kernelsJon Medhurst2-38/+78
When compiling kprobes-test-thumb.c an error like below may occur: /tmp/ccKcuJcG.s:19179: Error: offset out of range This is caused by the compiler underestimating the size of the inline assembler instructions containing ".space 0x1000" and failing to spill the literal pool in time to prevent the generation of PC relative load instruction with invalid offsets. The fix implemented by this patch is to replace a single large .space directive by a number of 4 byte .space's. This requires splitting the macros which generate test cases for branch instructions into two forms: one with, and one without support for inserting extra code between branch and target. Acked-by: Nicolas Pitre <[email protected]> Signed-off-by: Jon Medhurst <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-11-26ARM: 7172/1: dma: Drop GFP_COMP for DMA memory allocationsSumit Bhattacharya1-0/+9
dma_alloc_coherent wants to split pages after allocation in order to reduce the memory footprint. This does not work well with GFP_COMP pages, so drop this flag before allocation. This patch is ported from arch/avr32 (commit 3611553ef985ef7c5863c8a94641738addd04cff). [swarren: s/HUGETLB_PAGE/HUGETLBFS/ in comment, minor comment cleanup] Signed-off-by: Sumit Bhattacharya <[email protected]> Tested-by: Varun Colbert <[email protected]> Signed-off-by: Stephen Warren <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-11-26ARM: 7171/1: unwind: add unwind directives to bitops assembly macrosWill Deacon7-22/+28
The bitops functions (e.g. _test_and_set_bit) on ARM do not have unwind annotations and therefore the kernel cannot backtrace out of them on a fatal error (for example, NULL pointer dereference). This patch annotates the bitops assembly macros with UNWIND annotations so that we can produce a meaningful backtrace on error. Callers of the macros are modified to pass their function name as a macro parameter, enforcing that the macros are used as standalone function implementations. Acked-by: Dave Martin <[email protected]> Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-11-26ARM: 7170/2: fix compilation breakage in entry-armv.SGuennadi Liakhovetski1-1/+1
Fix compilation failure, when Thumb support is not enabled: arch/arm/kernel/entry-armv.S: Assembler messages: arch/arm/kernel/entry-armv.S:501: Error: backward ref to unknown label "2:" arch/arm/kernel/entry-armv.S:502: Error: backward ref to unknown label "3:" make[2]: *** [arch/arm/kernel/entry-armv.o] Error 1 Signed-off-by: Guennadi Liakhovetski <[email protected]> Reviewed-by: Dave Martin <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-11-26ARM: 7168/1: use cache type functions for arch_get_unmapped_areaRob Herring1-17/+6
There are already cache type decoding functions, so use those instead of custom decode code which only works for ARMv6. Signed-off-by: Rob Herring <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-11-26AF_UNIX: Fix poll blocking problem when reading from a stream socketAlexey Moiseytsev1-0/+4
poll() call may be blocked by concurrent reading from the same stream socket. Signed-off-by: Alexey Moiseytsev <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-26iio: iio_event_getfd -- fix ev_int build failureAndy Whitcroft1-10/+9
Fix build failure in staging iio driver: .../drivers/staging/iio/industrialio-core.c: In function 'iio_event_getfd': .../drivers/staging/iio/industrialio-core.c:262:32: error: 'ev_int' undeclared (first use in this function) Also convert the rest of the function to use the new variable. Signed-off-by: Andy Whitcroft <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-11-26dm9000: Fix check for disabled wake on LANMark Brown1-1/+1
We're trying to check if any options are defined which isn't wha the existing code does due to confusing & and &&. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-26l2tp: ensure sk->dst is still validFlorian Westphal1-1/+1
When using l2tp over ipsec, the tunnel will hang when rekeying occurs. Reason is that the transformer bundle attached to the dst entry is now in STATE_DEAD and thus xfrm_output_one() drops all packets (XfrmOutStateExpired increases). Fix this by calling __sk_dst_check (which drops the stale dst if xfrm dst->check callback finds that the bundle is no longer valid). Cc: James Chapman <[email protected]> Signed-off-by: Florian Westphal <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-26decnet: proper socket refcountingEric Dumazet1-12/+5
Better use sk_reset_timer() / sk_stop_timer() helpers to make sure we dont access already freed/reused memory later. Reported-by: Sasha Levin <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Tested-by: Sasha Levin <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-26net: Revert ARCNET and PHYLIB to tristate optionsBen Hutchings2-2/+2
commit 88491d8103498a6166f70d5999902fec70924314 ("drivers/net: Kconfig & Makefile cleanup") changed the type of these options to bool, but they select code that could (and still can) be built as modules. Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-26ipv4: Don't use the cached pmtu informations for input routesSteffen Klassert1-2/+2
The pmtu informations on the inetpeer are visible for output and input routes. On packet forwarding, we might propagate a learned pmtu to the sender. As we update the pmtu informations of the inetpeer on demand, the original sender of the forwarded packets might never notice when the pmtu to that inetpeer increases. So use the mtu of the outgoing device on packet forwarding instead of the pmtu to the final destination. Signed-off-by: Steffen Klassert <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-26route: struct rtable can be const in rt_is_input_route and rt_is_output_routeSteffen Klassert1-2/+2
Signed-off-by: Steffen Klassert <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-26net: Move mtu handling down to the protocol depended handlersSteffen Klassert5-12/+25
We move all mtu handling from dst_mtu() down to the protocol layer. So each protocol can implement the mtu handling in a different manner. Signed-off-by: Steffen Klassert <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-26net: Rename the dst_opt default_mtu method to mtuSteffen Klassert6-18/+18
We plan to invoke the dst_opt->default_mtu() method unconditioally from dst_mtu(). So rename the method to dst_opt->mtu() to match the name with the new meaning. Signed-off-by: Steffen Klassert <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-26route: Use the device mtu as the default for blackhole routesSteffen Klassert2-2/+2
As it is, we return null as the default mtu of blackhole routes. This may lead to a propagation of a bogus pmtu if the default_mtu method of a blackhole route is invoked. So return dst->dev->mtu as the default mtu instead. Signed-off-by: Steffen Klassert <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-26Merge branch 'merge' of ↵Linus Torvalds9-8/+22
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/44x: Add mtd ndfc to the ppx44x defconfig powerpc: Fix compiliation with hugetlbfs enabled arch/powerpc/sysdev/ehv_pic.c: add missing kfree powerpc/fsl-lbc: Fix for fsl_upm drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac powerpc/qe: Fixup QE_General4 errata powerpc/85xx: Fix compile error on p3060_qds.c powerpc/p3060qds: Fix select of 'MPC8xxx_GPIO' powerpc/p1023: set IRQ[4:6,11] to active-high level sensitive for PCIe
2011-11-26hwmon: convert drivers/hwmon/* to use module_platform_driver()Axel Lin11-130/+11
This patch converts the drivers in drivers/hwmon/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler. Cc: Donggeun Kim <[email protected]> Cc: Simon Guinot <[email protected]> Cc: Lars-Peter Clausen <[email protected]> Cc: MyungJoo Ham <[email protected]> Cc: Ben Dooks <[email protected]> Cc: Hans de Goede <[email protected]> Cc: J Keerthy <[email protected]> Cc: David S. Miller <[email protected]> Cc: Mark Brown <[email protected]> Signed-off-by: Axel Lin <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-11-25Merge git://github.com/herbertx/cryptoLinus Torvalds1-5/+7
* git://github.com/herbertx/crypto: crypto: mv_cesa - fix hashing of chunks > 1920 bytes
2011-11-25Merge branch 'gpio-fixes' of ↵Linus Torvalds1-2/+2
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson * 'gpio-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: gpio: pca953x: Staticise pca953x_get_altdata()
2011-11-25x86: consolidate xchg and xadd macrosJeremy Fitzhardinge1-78/+36
They both have a basic "put new value in location, return old value" pattern, so they can use the same macro easily. Signed-off-by: Jeremy Fitzhardinge <[email protected]>
2011-11-25x86/cmpxchg: add a locked add() helperJeremy Fitzhardinge2-14/+43
Mostly to remove some conditional code in spinlock.h. Signed-off-by: Jeremy Fitzhardinge <[email protected]>
2011-11-25netns: fix proxy ARP entries listing on a netnsJorge Boncompte [DTI2]1-1/+4
Skip entries from foreign network namespaces. Signed-off-by: Jorge Boncompte [DTI2] <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-25hwmon: Remove redundant spi driver bus initializationLars-Peter Clausen2-2/+0
In ancient times it was necessary to manually initialize the bus field of an spi_driver to spi_bus_type. These days this is done in spi_register_driver(), so we can drop the manual assignment. The patch was generated using the following coccinelle semantic patch: // <smpl> @@ identifier _driver; @@ struct spi_driver _driver = { .driver = { - .bus = &spi_bus_type, }, }; // </smpl> Signed-off-by: Lars-Peter Clausen <[email protected]> Cc: Jean Delvare <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: [email protected] Signed-off-by: Guenter Roeck <[email protected]>
2011-11-25net/netlabel: copy and paste bug in netlbl_cfg_unlbl_map_add()Dan Carpenter1-2/+2
This was copy and pasted from the IPv4 code. We're calling the ip4 version of that function and map4 is NULL. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-24ext4: fix racy use-after-free in ext4_end_io_dio()Tejun Heo1-1/+1
ext4_end_io_dio() queues io_end->work and then clears iocb->private; however, io_end->work calls aio_complete() which frees the iocb object. If that slab object gets reallocated, then ext4_end_io_dio() can end up clearing someone else's iocb->private, this use-after-free can cause a leak of a struct ext4_io_end_t structure. Detected and tested with slab poisoning. [ Note: Can also reproduce using 12 fio's against 12 file systems with the following configuration file: [global] direct=1 ioengine=libaio iodepth=1 bs=4k ba=4k size=128m [create] filename=${TESTDIR} rw=write -- tytso ] Google-Bug-Id: 5354697 Signed-off-by: Tejun Heo <[email protected]> Signed-off-by: "Theodore Ts'o" <[email protected]> Reported-by: Kent Overstreet <[email protected]> Tested-by: Kent Overstreet <[email protected]> Cc: [email protected]
2011-11-25powerpc/44x: Add mtd ndfc to the ppx44x defconfigTony Breeds1-0/+2
Signed-off-by: Tony Breeds <[email protected]> Acked-by: Josh Boyer <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-11-25powerpc: Fix compiliation with hugetlbfs enabledKumar Gala1-0/+1
arch/powerpc/mm/hugetlbpage.c: In function 'reserve_hugetlb_gpages': arch/powerpc/mm/hugetlbpage.c:312:2: error: implicit declaration of function 'parse_args' Signed-off-by: Kumar Gala <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.