3.2.52-rc1 review
cover 3.2.52-rc1 review
This is the start of the stable review cycle for the 3.2.52 release. There are 149 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri Oct 25 08:00:00 UTC 2013. Anything received after that time might be too late.
A combined patch relative to 3.2.51 will be posted as an additional response to this. A shortlog and diffstat can be found below.
Ben.
-------------
Alan Stern (4):
USB: OHCI: Allow runtime PM without system sleep
[69820e01aa756b8d228143d997f71523c1e97984]
USB: fix PM config symbol in uhci-hcd, ehci-hcd, and xhci-hcd
[f875fdbf344b9fde207f66b392c40845dd7e5aa6]
USB: fix build error when CONFIG_PM_SLEEP isn't enabled
[9d8924297cd9c256c23c02abae40202563452453]
[SCSI] sd: Fix potential out-of-bounds access
[984f1733fcee3fbc78d47e26c5096921c5d9946a]
Alex Deucher (8):
drm/edid: add quirk for Medion MD30217PG
[118bdbd86b39dbb843155054021d2c59058f1e05]
drm/radeon/atom: workaround vbios bug in transmitter table on rs880 (v2)
[91f3a6aaf280294b07c05dfe606e6c27b7ba3c72]
drm/radeon: disable tests/benchmarks if accel is disabled
[4a1132a023eb48cf10522d84c5908d43b612c041]
drm/radeon: fix LCD record parsing
[95663948ba22a4be8b99acd67fbf83e86ddffba4]
drm/radeon: fix handling of variable sized arrays for router objects
[fb93df1c2d8b3b1fb16d6ee9e32554e0c038815d]
drm/radeon: fix panel scaling with eDP and LVDS bridges
[855f5f1d882a34e4e9dd27b299737cd3508a5624]
drm/radeon: fix resume on some rs4xx boards (v2)
[acf88deb8ddbb73acd1c3fa32fde51af9153227f]
drm/radeon: update line buffer allocation for dce4.1/5
[0b31e02363b0db4e7931561bc6c141436e729d9f]
Alex Williamson (1):
intel-iommu: Fix leaks in pagetable freeing
[3269ee0bd6686baf86630300d528500ac5b516d7]
Alexey Khoroshilov (1):
[media] hdpvr: fix iteration over uninitialized lists in hdpvr_probe()
[2e923a0527ac439e135b9961e58d3acd876bba10]
Anand Avati (1):
fuse: invalidate inode attributes on xattr modification
[d331a415aef98717393dda0be69b7947da08eba3]
Andi Kleen (1):
perf tools: Handle JITed code in shared memory
[89365e6c9ad4c0e090e4c6a4b67a3ce319381d89]
Ansis Atteka (1):
ip: generate unique IP identificator if local fragmentation is allowed
[703133de331a7a7df47f31fb9de51dc6f68a9de8]
Anssi Hannula (1):
ALSA: hda - hdmi: Fallback to ALSA allocation when selecting CA
[18e391862cceaf43ddb8eb5cca05e1a83abdebaa]
Anton Blanchard (1):
powerpc: Handle unaligned ldbrx/stdbrx
[230aef7a6a23b6166bd4003bfff5af23c9bd381f]
Ben Hutchings (3):
Revert "sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()"
[not upstream; this only caused a regression for <3.7]
Revert "zram: use zram->lock to protect zram_free_page() in swap free notify path"
[not upstream; bug was fixed by a much larger change upstream]
sfc: Fix efx_rx_buf_offset() for recycled pages
[not upstream; bug was fixed by a much larger change upstream]
Benjamin Tissoires (1):
HID: validate feature and input report details
[cc6b54aa54bf40b762cab45a9fc8aa81653146eb]
Chen Gang (1):
powerpc/pseries/lparcfg: Fix possible overflow are more than 1026
[5676005acf26ab7e924a8438ea4746e47d405762]
Chris Healy (1):
resubmit bridge: fix message_age_timer calculation
[9a0620133ccce9dd35c00a96405c8d80938c2cc0]
Christian Lamparter (1):
p54usb: add USB ID for Corega WLUSB2GTST USB adapter
[1e43692cdb7cc445d6347d8a5207d9cef0c71434]
Claudiu Manoil (1):
gianfar: Change default HW Tx queue scheduling mode
[b98b8babd6e3370fadb7c6eaacb00eb2f6344a6c]
Daisuke Nishimura (1):
sched/fair: Fix small race where child->se.parent,cfs_rq might point to invalid ones
[6c9a27f5da9609fca46cb2b183724531b48f71ad]Dan Carpenter (7):
ASoC: 88pm860x: array overflow in snd_soc_put_volsw_2r_st()
[d967967e8d1116fb38bad25e58714b5dddd03cca]
ASoC: max98095: a couple array underflows
[f8d7b13e14357ed19d2ca2799539600418dc3939]
USB: mos7720: use GFP_ATOMIC under spinlock
[d0bd9a41186e076ea543c397ad8a67a6cf604b55]
cciss: fix info leak in cciss_ioctl32_passthru()
[58f09e00ae095e46ef9edfcf3a5fd9ccdfad065e]
cpqarray: fix info leak in ida_locked_ioctl()
[627aad1c01da6f881e7f98d71fd928ca0c316b1a]
staging: comedi: dt282x: dt282x_ai_insn_read() always fails
[2c4283ca7cdcc6605859c836fc536fcd83a4525f]
tun: signedness bug in tun_get_user()
[15718ea0d844e4816dbd95d57a8a0e3e264ba90e]Daniel Borkmann (3):
net: bridge: convert MLDv2 Query MRC into msecs_to_jiffies for max_delay
[2d98c29b6fb3de44d9eaa73c09f9cf7209346383]
net: sctp: fix ipv6 ipsec encryption bug in sctp_v6_xmit
[95ee62083cb6453e056562d91f597552021e6ae7]
net: sctp: fix smatch warning in sctp_send_asconf_del_ip
[88362ad8f9a6cea787420b57cc27ccacef000dbe]
Daniel Mack (1):
usb: ehci-mxc: check for pdata before dereferencing
[f375fc520d4df0cd9fcb570f33c103c6c0311f9e]
Daniel Santos (1):
kernel-doc: bugfix - multi-line macros
[654784284430bf2739985914b65e09c7c35a7273]
Dave Jones (1):
caif: Add missing braces to multiline if in cfctrl_linkup_request
[0c1db731bfcf3a9fd6c58132134f8b0f423552f0]
David Cohen (1):
usb: dwc3: add support for Merrifield
[85601f8cf67c56a561a6dd5e130e65fdc179047d]
David Rientjes (1):
mm, show_mem: suppress page counts in non-blockable contexts
[4b59e6c4730978679b414a8da61514a2518da512]
David S. Miller (2):
esp_scsi: Fix tag state corruption when autosensing.
[21af8107f27878813d0364733c0b08813c2c192a]
sparc64: Fix off by one in trampoline TLB mapping installation loop.
[63d499662aeec1864ec36d042aca8184ea6a938e]
Eric Dumazet (4):
fib_trie: remove potential out of bound access
[aab515d7c32a34300312416c50314e755ea6f765]
inetpeer: fix a race in inetpeer_gc_worker()
[55432d2b543a4b6dfae54f5c432a566877a85d90]
tcp: cubic: fix bug in bictcp_acked()
[cd6b423afd3c08b27e1fed52db828ade0addbc6b]
tcp: cubic: fix overflow error in bictcp_update()
[2ed0edf9090bf4afa2c6fc4f38575a85a80d4b20]
Fabio Porcedda (1):
net: usb: cdc_ether: Use wwan interface for Telit modules
[0092820407901a0b2c4e343e85f96bb7abfcded1]
Felix Fietkau (3):
ath9k: always clear ps filter bit on new assoc
[026d5b07c03458f9c0ccd19c3850564a5409c325]
ath9k: avoid accessing MRC registers on single-chain devices
[a1c781bb20ac1e03280e420abd47a99eb8bbdd3b]
ath9k: fix rx descriptor related race condition
[e96542e55a2aacf4bdeccfe2f17b77c4895b4df2]
Florian Wolter (1):
xhci: Fix race between ep halt and URB cancellation
[526867c3ca0caa2e3e846cb993b0f961c33c2abb]
Grant Likely (1):
of: Fix missing memory initialization on FDT unflattening
[0640332e073be9207f0784df43595c0c39716e42]
Greg Thelen (1):
memcg: fix multiple large threshold notifications
[2bff24a3707093c435ab3241c47dcdb5f16e432b]
Greg Ungerer (3):
m68k: consolidate the vmlinux.lds linker scripts
[40c1b9cfeedf79b909c961e0e00a13497e80bc82]
m68k: use non-MMU linker script for ColdFire MMU builds
[ed865e31a8273be200db9ddcdb6b844e48777abd]
m68knommu: clean up linker script
[f84f52a5c15db7d14a534815f27253b001735183]
Hannes Frederic Sowa (4):
ipv6: don't stop backtracking in fib6_lookup_1 if subtree does not match
[3e3be275851bc6fc90bfdcd732cd95563acd982b]
ipv6: drop packets with multiple fragmentation headers
[f46078cfcd77fa5165bf849f5e568a7ac5fa569c]
ipv6: remove max_addresses check from ipv6_create_tempaddr
[4b08a8f1bd8cb4541c93ec170027b4d0782dab52]
ipv6: udp packets following an UFO enqueued packet need also be handled by UFO
[2811ebac2521ceac84f2bdae402455baa6a7fb47]
Hans Verkuil (1):
[media] hdpvr: register the video node at the end of probe
[280847b532433ffe7a22795f926327805a127162]
Hans de Goede (1):
usb: config->desc.bLength may not exceed amount of data returned by the device
[b4f17a488ae2e09bfcf95c0e0b4219c246f1116a]Heikki Krogerus (1):
usb: dwc3: pci: add support for BayTrail
[b62cd96de3161dfb125a769030eec35a4cab3d3a]
Henrik Rydberg (2):
hwmon: (applesmc) Check key count before proceeding
[5f4513864304672e6ea9eac60583eeac32e679f2]
hwmon: (applesmc) Silence uninitialized warnings
[0fc86eca1b338d06ec500b34ef7def79c32b602b]
Herbert Xu (1):
crypto: api - Fix race condition in larval lookup
[77dbd7a95e4a4f15264c333a9e9ab97ee27dc2aa]
Ian Abbott (1):
staging: comedi: ni_65xx: (bug fix) confine insn_bits to one subdevice
[677a31565692d596ef42ea589b53ba289abf4713]
Jan Kara (1):
isofs: Refuse RW mount of the filesystem instead of making it RO
[17b7f7cf58926844e1dd40f5eb5348d481deca6a]
Jani Nikula (2):
drm/i915/dp: increase i2c-over-aux retry interval on AUX DEFER
[8d16f258217f2f583af1fd57c5144aa4bbe73e48]
drm/i915: try not to lose backlight CBLV precision
[cac6a5ae0118832936eb162ec4cedb30f2422bcc]
Jason Wang (1):
macvtap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS
[ece793fcfc417b3925844be88a6a6dc82ae8f7c6]
Jie Liu (1):
ocfs2: fix the end cluster offset of FIEMAP
[28e8be31803b19d0d8f76216cb11b480b8a98bec]
Jiri Bohac (1):
ICMPv6: treat dest unreachable codes 5 and 6 as EACCES, not EPROTO
[61e76b178dbe7145e8d6afa84bb4ccea71918994]
Jiri Kosina (1):
HID: hidraw: put old deallocation mechanism in place
[df0cfd6990347c20ae031f3f34137cba274f1972]
Johan Hovold (3):
USB: mos7720: fix big-endian control requests
[3b716caf190ccc6f2a09387210e0e6a26c1d81a4]
serial: pch_uart: fix tty-kref leak in dma-rx path
[19b85cfb190eb9980eaf416bff96aef4159a430e]
serial: pch_uart: fix tty-kref leak in rx-error path
[fc0919c68cb2f75bb1af759315f9d7e2a9443c28]
Josh Boyer (1):
x86, efi: Don't map Boot Services on i386
[700870119f49084da004ab588ea2b799689efaf7]
Julius Werner (1):
usb: core: don't try to reset_device() a port that got just disconnected
[481f2d4f89f87a0baa26147f323380e31cfa7c44]
Kees Cook (9):
HID: LG: validate HID output report details
[0fb6bd06e06792469acc15bbe427361b56ada528]
HID: check for NULL field when setting values
[be67b68d52fa28b9b721c47bb42068f0c1214855]
HID: logitech-dj: validate output report details
[297502abb32e225fb23801fcdb0e4f6f8e17099a]
HID: ntrig: validate feature report details
[875b4e3763dbc941f15143dd1a18d10bb0be303b]
HID: pantherlord: validate output report details
[412f30105ec6735224535791eed5cdc02888ecb4]
HID: picolcd_core: validate output report details
[1e87a2456b0227ca4ab881e19a11bb99d164e792]
HID: provide a helper for validating hid reports
[331415ff16a12147d57d5c953f3a961b7ede348b]
HID: validate HID report id size
[43622021d2e2b82ea03d883926605bdd0525e1d1]
HID: zeroplus: validate output report details
[78214e81a1bf43740ce89bb5efda78eac2f8ef83]
Kirill Tkhai (4):
sparc32: Fix exit flag passed from traced sys_sigreturn
[7a3b0f89e3fea680f93932691ca41a68eee7ab5e]
sparc64: Fix ITLB handler of null page
[1c2696cdaad84580545a2e9c0879ff597880b1a9]
sparc64: Fix not SRA'ed %o5 in 32-bit traced syscall
[ab2abda6377723e0d5fbbfe5f5aa16a5523344d1]
sparc64: Remove RWSEM export leftovers
[61d9b9355b0d427bd1e732bd54628ff9103e496f]
Kurt Garloff (1):
usb/core/devio.c: Don't reject control message to endpoint with wrong direction bit
[831abf76643555a99b80a3b54adfa7e4fa0a3259]
Lan Tianyu (1):
ACPI / EC: Add ASUSTEK L4R to quirk list in order to validate ECDT
[524f42fab787a9510be826ce3d736b56d454ac6d]
Larry Finger (1):
rtlwifi: Align private space in rtl_priv struct
[60ce314d1750fef843e9db70050e09e49f838b69]
Li Zefan (1):
cgroup: fail if monitored file and event_control are in different cgroup
[f169007b2773f285e098cb84c74aac0154d65ff7]
Libin (1):
mm/huge_memory.c: fix potential NULL pointer dereference
[a8f531ebc33052642b4bd7b812eedf397108ce64]
Lino Sanfilippo (1):
fanotify: dont merge permission events
[03a1cec1f17ac1a6041996b3e40f96b5a2f90e1b]
Lv Zheng (1):
ACPI / IPMI: Fix atomic context requirement of ipmi_msg_handler()
[06a8566bcf5cf7db9843a82cde7a33c7bf3947d9]
Madhavan Srinivasan (1):
powerpc/sysfs: Disable writing to PURR in guest mode
[d1211af3049f4c9c1d8d4eb8f8098cc4f4f0d0c7]
Majianpeng (1):
libceph: unregister request in __map_request failed and nofail == false
[73d9f7eef3d98c3920e144797cc1894c6b005a1e]Malcolm Priestley (1):
staging: vt6656: [BUG] main_usb.c oops on device_close move flag earlier.
[e3eb270fab7734427dd8171a93e4946fe28674bc]
Manoj Chourasia (1):
HID: hidraw: correctly deallocate memory on device disconnect
[212a871a3934beccf43431608c27ed2e05a476ec]
Marc Kleine-Budde (1):
can: flexcan: fix flexcan_chip_start() on imx6
[0d1862ea1a5bb876cf05555a7307080cb75bf379]
Masoud Sharbiani (1):
x86/reboot: Add quirk to make Dell C6100 use reboot=pci automatically
[4f0acd31c31f03ba42494c8baf6c0465150e2621]
Maxim Patlasov (2):
fuse: hotfix truncate_pagecache() issue
[06a7c3c2781409af95000c60a5df743fd4e2f8b4]
fuse: postpone end_page_writeback() in fuse_writepage_locked()
[4a4ac4eba1010ef9a804569058ab29e3450c0315]
Michal Malý (1):
USB: serial: option: Ignore card reader interface on Huawei E1750
[eb2addd4044b4b2ce77693bde5bc810536dd96ee]
Mike Dyer (1):
ASoC: wm8960: Fix PLL register writes
[85fa532b6ef920b32598df86b194571a7059a77c]
Miklos Szeredi (1):
fuse: readdir: check for slash in names
[efeb9e60d48f7778fdcad4a0f3ad9ea9b19e5dfd]
Mikulas Patocka (1):
dm-snapshot: fix performance degradation due to small hash size
[60e356f381954d79088d0455e357db48cfdd6857]
Neil Horman (2):
8139cp: Add dma_mapping_error checking
[cf3c4c03060b688cbc389ebc5065ebcce5653e96,
d06f5187469eee1b2932c02fd093d113cfc60d5e]
bonding: Fix broken promiscuity reference counting issue
[5a0068deb611109c5ba77358be533f763f395ee4]Nikolay Aleksandrov (1):
netpoll: fix NULL pointer dereference in netpoll_cleanup
[d0fe8c888b1fd1a2f84b9962cabcb98a70988aec]
Nishanth Aravamudan (1):
powerpc/iommu: Use GFP_KERNEL instead of GFP_ATOMIC in iommu_init_table()
[1cf389df090194a0976dc867b7fffe99d9d490cb]
Oleg Nesterov (1):
debugfs: debugfs_remove_recursive() must not rely on list_empty(d_subdirs)
[776164c1faac4966ab14418bb0922e1820da1d19]
Oliver Neukum (1):
USB: cdc-wdm: fix race between interrupt handler and tasklet
[6dd433e6cf2475ce8abec1b467720858c24450eb]
Paul E. McKenney (2):
powerpc: Fix parameter clobber in csum_partial_copy_generic()
[d9813c3681a36774b254c0cdc9cce53c9e22c756]
powerpc: Restore registers on error exit from csum_partial_copy_generic()
[8f21bd0090052e740944f9397e2be5ac7957ded7]
Peng Chen (1):
Bluetooth: Add a new PID/VID 0cf3/e005 for AR3012.
[0a3658cccdf5326ea508efeb1879b0e2508bb0c3]Peter Korsgaard (1):
dm9601: fix IFF_ALLMULTI handling
[bf0ea6380724beb64f27a722dfc4b0edabff816e]
Peter Maydell (1):
ARM: PCI: versatile: Fix SMAP register offsets
[99f2b130370b904ca5300079243fdbcafa2c708b]
Peter Zijlstra (2):
perf: Clarify perf_cpu_context::active_pmu usage by renaming it to ::unique_pmu
[3f1f33206c16c7b3839d71372bc2ac3f305aa802]
perf: Fix perf_cgroup_switch for sw-events
[95cf59ea72331d0093010543b8951bb43f262cac]
Raphael Kubo da Costa (1):
Bluetooth: Add support for BCM20702A0 [0b05, 17cb]
[38a172bef8c93ecbfd69715fd88396988e4073fd]Ricardo Ribalda (1):
ll_temac: Reset dma descriptors indexes on ndo_open
[7167cf0e8cd10287b7912b9ffcccd9616f382922]
Roger Luethi (1):
via-rhine: fix VLAN priority field (PCP, IEEE 802.1p)
[207070f5221e2a901d56a49df9cde47d9b716cd7]
Roger Pau Monne (1):
xen-gnt: prevent adding duplicate gnt callbacks
[5f338d9001094a56cf87bd8a280b4e7ff953bb59]
Roman Gushchin (1):
net: check net.core.somaxconn sysctl values
[5f671d6b4ec3e6d66c2a868738af2cdea09e7509]
Salam Noureddine (2):
ipv4 igmp: use in_dev_put in timer handlers instead of __in_dev_put
[e2401654dd0f5f3fb7a8d80dad9554d73d7ca394]
ipv6 mcast: use in6_dev_put in timer handlers instead of __in6_dev_put
[9260d3e1013701aa814d10c8fc6a9f92bd17d643]
Salman Qazi (1):
perf: Use css_tryget() to avoid propping up css refcount
[9c5da09d266ca9b32eb16cf940f8161d949c2fe5]
Sasha Levin (1):
[SCSI] iscsi: don't hang in endless loop if no targets present
[46a7c17d26967922092f3a8291815ffb20f6cabe]
Sergei Shtylyov (1):
mmc: tmio_mmc_dma: fix PIO fallback on SDHI
[f936f9b67b7f8c2eae01dd303a0e90bd777c4679]
Shawn Nematbakhsh (1):
usb: xhci: Disable runtime PM suspend for quirky controllers
[c8476fb855434c733099079063990e5bfa7ecad6]
Stanislaw Gruszka (1):
rt2800: fix wrong TX power compensation
[6e956da2027c767859128b9bfef085cf2a8e233b]
Stefan Kriwanek (1):
HID: Fix Speedlink VAD Cezanne support for some devices
[06bb5219118fb098f4b0c7dcb484b28a52bf1c14]
Steffen Klassert (1):
inetpeer: Invalidate the inetpeer tree along with the routing cache
[5faa5df1fa2024bd750089ff21dcc4191798263d]
Stephen Hemminger (1):
htb: fix sign extension bug
[cbd375567f7e4811b1c721f75ec519828ac6583f]
Takashi Iwai (1):
ALSA: hda - Add Toshiba Satellite C870 to MSI blacklist
[83f72151352791836a1b9c1542614cc9bf71ac61]
Tejun Heo (1):
rculist: list_first_or_null_rcu() should use list_entry_rcu()
[c34ac00caefbe49d40058ae7200bd58725cebb45]
Theodore Ts'o (1):
ext4: avoid hang when mounting non-journal filesystems with orphan list
[0e9a9a1ad619e7e987815d20262d36a2f95717ca]
Thomas Graf (1):
ipv6: Don't depend on per socket memory for neighbour discovery messages
[25a6e6b84fba601eff7c28d30da8ad7cfbef0d43]
Vasily Titskiy (1):
HID: usbhid: quirk for N-Trig DuoSense Touch Screen
[9e0bf92c223dabe0789714f8f85f6e26f8f9cda4]
Vyacheslav Dubeyko (1):
nilfs2: fix issue with race condition of competition between segments for dirty blocks
[7f42ec3941560f0902fe3671e36f2c20ffd3af0a]
Ying Xue (1):
tipc: fix lockdep warning during bearer initialization
[4225a398c1352a7a5c14dc07277cb5cc4473983b]
Makefile | 4 +- arch/arm/mach-versatile/pci.c | 6 +- arch/arm/mm/init.c | 3 + arch/ia64/mm/contig.c | 2 + arch/ia64/mm/discontig.c | 2 + arch/m68k/kernel/vmlinux.lds.S | 15 ++- arch/m68k/kernel/vmlinux.lds_mm.S | 10 -- arch/m68k/kernel/vmlinux.lds_no.S | 187 ---------------------------- arch/parisc/mm/init.c | 2 + arch/powerpc/kernel/align.c | 10 ++ arch/powerpc/kernel/iommu.c | 2 +- arch/powerpc/kernel/lparcfg.c | 1 + arch/powerpc/kernel/sysfs.c | 18 ++- arch/powerpc/lib/checksum_64.S | 58 ++++++--- arch/sparc/kernel/entry.S | 2 +- arch/sparc/kernel/ktlb.S | 3 +- arch/sparc/kernel/syscalls.S | 8 +- arch/sparc/kernel/trampoline_64.S | 2 - arch/sparc/lib/ksyms.c | 9 -- arch/unicore32/mm/init.c | 3 + arch/x86/kernel/reboot.c | 16 +++ arch/x86/platform/efi/efi.c | 11 +- crypto/api.c | 7 +- drivers/acpi/acpi_ipmi.c | 24 ++-- drivers/acpi/ec.c | 4 + drivers/block/cciss.c | 1 + drivers/block/cpqarray.c | 1 + drivers/bluetooth/ath3k.c | 2 + drivers/bluetooth/btusb.c | 2 + drivers/gpu/drm/drm_edid.c | 3 + drivers/gpu/drm/i915/intel_dp.c | 13 +- drivers/gpu/drm/i915/intel_opregion.c | 2 +- drivers/gpu/drm/radeon/atombios_encoders.c | 8 +- drivers/gpu/drm/radeon/evergreen.c | 25 +++- drivers/gpu/drm/radeon/evergreend.h | 4 + drivers/gpu/drm/radeon/radeon_atombios.c | 13 +- drivers/gpu/drm/radeon/radeon_connectors.c | 34 ++++- drivers/gpu/drm/radeon/radeon_device.c | 10 +- drivers/gpu/drm/radeon/rs400.c | 9 +- drivers/hid/hid-core.c | 84 +++++++++++-- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-input.c | 11 +- drivers/hid/hid-lg2ff.c | 19 +-- drivers/hid/hid-lg3ff.c | 29 +---- drivers/hid/hid-lg4ff.c | 20 +-- drivers/hid/hid-lgff.c | 17 +-- drivers/hid/hid-logitech-dj.c | 6 + drivers/hid/hid-ntrig.c | 3 +- drivers/hid/hid-picolcd.c | 2 +- drivers/hid/hid-pl.c | 10 +- drivers/hid/hid-speedlink.c | 11 +- drivers/hid/hid-zpff.c | 18 +-- drivers/hid/hidraw.c | 51 ++++---- drivers/hid/usbhid/hid-quirks.c | 2 + drivers/hwmon/applesmc.c | 19 ++- drivers/iommu/intel-iommu.c | 72 ++++++----- drivers/md/dm-snap.c | 5 +- drivers/media/video/hdpvr/hdpvr-core.c | 22 ++-- drivers/mmc/host/tmio_mmc_dma.c | 4 +- drivers/net/bonding/bond_main.c | 13 +- drivers/net/can/flexcan.c | 12 -- drivers/net/ethernet/freescale/gianfar.c | 11 +- drivers/net/ethernet/freescale/gianfar.h | 11 +- drivers/net/ethernet/realtek/8139cp.c | 49 +++++++- drivers/net/ethernet/sfc/rx.c | 3 +- drivers/net/ethernet/via/via-rhine.c | 9 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 6 + drivers/net/macvtap.c | 62 +++++---- drivers/net/ppp/pptp.c | 2 +- drivers/net/tun.c | 6 +- drivers/net/usb/cdc_ether.c | 5 + drivers/net/usb/dm9601.c | 2 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 4 + drivers/net/wireless/ath/ath9k/ath9k.h | 5 +- drivers/net/wireless/ath/ath9k/recv.c | 17 ++- drivers/net/wireless/ath/ath9k/xmit.c | 1 + drivers/net/wireless/p54/p54usb.c | 1 + drivers/net/wireless/rt2x00/rt2800lib.c | 7 ++ drivers/net/wireless/rtlwifi/wifi.h | 2 +- drivers/of/base.c | 1 + drivers/scsi/esp_scsi.c | 14 ++- drivers/scsi/esp_scsi.h | 1 + drivers/scsi/scsi_transport_iscsi.c | 2 +- drivers/scsi/sd.c | 11 +- drivers/staging/comedi/drivers/dt282x.c | 3 +- drivers/staging/comedi/drivers/ni_65xx.c | 26 ++-- drivers/staging/vt6656/main_usb.c | 3 +- drivers/staging/zram/zram_drv.c | 2 - drivers/staging/zram/zram_drv.h | 5 +- drivers/tty/serial/pch_uart.c | 5 +- drivers/usb/class/cdc-wdm.c | 13 +- drivers/usb/core/config.c | 3 +- drivers/usb/core/devio.c | 16 +++ drivers/usb/core/hub.c | 5 +- drivers/usb/dwc3/dwc3-pci.c | 4 + drivers/usb/host/ehci-mxc.c | 2 +- drivers/usb/host/ehci-pci.c | 2 +- drivers/usb/host/ohci-pci.c | 2 +- drivers/usb/host/uhci-pci.c | 2 +- drivers/usb/host/xhci-pci.c | 2 +- drivers/usb/host/xhci-ring.c | 8 +- drivers/usb/host/xhci.c | 22 ++++ drivers/usb/serial/mos7720.c | 6 +- drivers/usb/serial/option.c | 3 + drivers/xen/grant-table.c | 13 +- fs/debugfs/inode.c | 69 ++++------ fs/ext4/namei.c | 3 +- fs/fuse/dir.c | 13 +- fs/fuse/file.c | 11 +- fs/fuse/fuse_i.h | 9 ++ fs/fuse/inode.c | 4 +- fs/isofs/inode.c | 16 +-- fs/nilfs2/page.c | 2 + fs/nilfs2/segment.c | 11 +- fs/notify/fanotify/fanotify.c | 6 + fs/ocfs2/extent_map.c | 1 - include/linux/hid.h | 8 +- include/linux/icmpv6.h | 2 + include/linux/ipv6.h | 1 + include/linux/mm.h | 3 +- include/linux/perf_event.h | 2 +- include/linux/rculist.h | 5 +- include/linux/usb/hcd.h | 2 +- include/net/inetpeer.h | 6 + include/net/ip.h | 12 +- include/net/ipip.h | 2 +- kernel/cgroup.c | 11 ++ kernel/events/core.c | 31 +++-- kernel/sched_fair.c | 14 ++- lib/show_mem.c | 3 + mm/huge_memory.c | 2 + mm/memcontrol.c | 8 +- mm/page_alloc.c | 7 ++ net/bridge/br_multicast.c | 3 +- net/bridge/br_stp.c | 2 +- net/caif/cfctrl.c | 3 +- net/ceph/osd_client.c | 2 + net/core/netpoll.c | 9 +- net/core/sysctl_net_core.c | 7 +- net/ipv4/fib_trie.c | 5 +- net/ipv4/igmp.c | 8 +- net/ipv4/inetpeer.c | 92 +++++++++++++- net/ipv4/ip_output.c | 6 +- net/ipv4/ipmr.c | 2 +- net/ipv4/raw.c | 2 +- net/ipv4/route.c | 1 + net/ipv4/tcp_cubic.c | 12 +- net/ipv4/xfrm4_mode_tunnel.c | 2 +- net/ipv6/addrconf.c | 10 +- net/ipv6/icmp.c | 10 +- net/ipv6/ip6_fib.c | 16 ++- net/ipv6/ip6_output.c | 53 ++++---- net/ipv6/mcast.c | 4 +- net/ipv6/ndisc.c | 16 +-- net/ipv6/reassembly.c | 5 + net/netfilter/ipvs/ip_vs_xmit.c | 2 +- net/sched/sch_htb.c | 2 +- net/sctp/ipv6.c | 42 ++----- net/sctp/sm_sideeffect.c | 3 +- net/sctp/socket.c | 3 + net/tipc/eth_media.c | 15 ++- scripts/kernel-doc | 3 + sound/pci/hda/hda_intel.c | 1 + sound/pci/hda/patch_hdmi.c | 11 ++ sound/soc/codecs/88pm860x-codec.c | 3 + sound/soc/codecs/max98095.c | 4 +- sound/soc/codecs/wm8960.c | 6 +- tools/perf/util/map.c | 1 + 168 files changed, 1186 insertions(+), 790 deletions(-)
Signature · 2 lines
Ben Hutchings All the simple programs have been written, and all the good names taken.
PATCH 1/149 htb: fix sign extension bug
3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: stephen hemminger <[email protected]>
[ Upstream commit cbd375567f7e4811b1c721f75ec519828ac6583f ]
When userspace passes a large priority value
the assignment of the unsigned value hopt->prio
to signed int cl->prio causes cl->prio to become negative and the comparison is with TC_HTB_NUMPRIO is always false.
The result is that HTB crashes by referencing outside the array when processing packets. With this patch the large value wraps around like other values outside the normal range.
See: https://bugzilla.kernel.org/show_bug.cgi?id=60669
--- net/sched/sch_htb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_htb.c +1 -1
@@ -86,7 +86,7 @@ struct htb_class {unsigned int children;struct htb_class *parent;/* parent class */ -int prio;/* these two are used only by leaves... */ +u32 prio;/* these two are used only by leaves... */ int quantum;/* but stored for parent-to-leaf return */ union {
PATCH 2/149 net: check net.core.somaxconn sysctl values
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Roman Gushchin <[email protected]>
[ Upstream commit 5f671d6b4ec3e6d66c2a868738af2cdea09e7509 ]
It's possible to assign an invalid value to the net.core.somaxconn sysctl variable, because there is no checks at all.
The sk_max_ack_backlog field of the sock structure is defined as unsigned short. Therefore, the backlog argument in inet_listen() shouldn't exceed USHRT_MAX. The backlog argument in the listen() syscall is truncated to the somaxconn value. So, the somaxconn value shouldn't exceed 65535 (USHRT_MAX).
Also, negative values of somaxconn are meaningless.
before:
$ sysctl -w net.core.somaxconn=256 net.core.somaxconn = 256 $ sysctl -w net.core.somaxconn=65536 net.core.somaxconn = 65536 $ sysctl -w net.core.somaxconn=-100 net.core.somaxconn = -100
after:
$ sysctl -w net.core.somaxconn=256 net.core.somaxconn = 256 $ sysctl -w net.core.somaxconn=65536 error: "Invalid argument" setting key "net.core.somaxconn" $ sysctl -w net.core.somaxconn=-100 error: "Invalid argument" setting key "net.core.somaxconn"
Based on a prior patch from Changli Gao.
--- net/core/sysctl_net_core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/core/sysctl_net_core.c +6 -1
@@ -19,6 +19,9 @@#include <net/sock.h> #include <net/net_ratelimit.h> +static int zero =0 ; +static int ushort_max =USHRT_MAX ; +#ifdef CONFIG_RPS static int rps_sock_flow_sysctl (ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos)
@@ -192,7 +195,9 @@ static struct ctl_table netns_core_table[] = { .data = &init_net.core.sysctl_somaxconn, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_dointvec + .extra1 = &zero, + .extra2 = &ushort_max, + .proc_handler = proc_dointvec_minmax }, { } };
PATCH 3/149 fib_trie: remove potential out of bound access
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit aab515d7c32a34300312416c50314e755ea6f765 ]
AddressSanitizer [1] dynamic checker pointed a potential out of bound access in leaf_walk_rcu()
We could allocate one more slot in tnode_new() to leave the prefetch() in-place but it looks not worth the pain.
Bug added in commit 82cfbb008572b ("[IPV4] fib_trie: iterator recode")
[1] :
https://code.google.com/p/address-sanitizer/wiki/AddressSanitizerForKernel
--- net/ipv4/fib_trie.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
net/ipv4/fib_trie.c +1 -4
@@ -72,7 +72,6 @@#include <linux/init.h> #include <linux/list.h> #include <linux/slab.h> -#include <linux/prefetch.h> #include <linux/export.h> #include <net/net_namespace.h> #include <net/ip.h>
@@ -1773,10 +1772,8 @@ static struct leaf *leaf_walk_rcu(struct tnode *p, struct rt_trie_node *c)if (!c)continue ; -if (IS_LEAF (c)) { -prefetch (rcu_dereference_rtnl (p->child[idx])); +if (IS_LEAF (c))return (struct leaf *) c; - }/* Rescan start scanning in new node */ p = (struct tnode *) c;
PATCH 4/149 tcp: cubic: fix overflow error in bictcp_update()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 2ed0edf9090bf4afa2c6fc4f38575a85a80d4b20 ]
commit 17a6e9f1aa9 ("tcp_cubic: fix clock dependency") added an overflow error in bictcp_update() in following code :
/* change the unit from HZ to bictcp_HZ */
t = ((tcp_time_stamp + msecs_to_jiffies(ca->delay_min>>3) -
ca->epoch_start) << BICTCP_HZ) / HZ;
Because msecs_to_jiffies() being unsigned long, compiler does implicit type promotion.
We really want to constrain (tcp_time_stamp - ca->epoch_start) to a signed 32bit value, or else 't' has unexpected high values.
This bugs triggers an increase of retransmit rates ~24 days after boot [1], as the high order bit of tcp_time_stamp flips.
[1] for hosts with HZ=1000
Big thanks to Van Jacobson for spotting this problem.
--- net/ipv4/tcp_cubic.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/ipv4/tcp_cubic.c +6 -4
@@ -204,8 +204,8 @@ static u32 cubic_root(u64 a)*/ static inline void bictcp_update (struct bictcp *ca,u32 cwnd) { -u64 offs; -u32 delta, t, bic_target, max_cnt; +u32 delta, bic_target, max_cnt; +u64 offs, t; ca->ack_cnt++;/* count the number of ACKs */
@@ -248,9 +248,11 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd)* if the cwnd < 1 million packets !!! */ + t = (s32)(tcp_time_stamp - ca->epoch_start); + t +=msecs_to_jiffies (ca->delay_min >>3 );/* change the unit from HZ to bictcp_HZ */ - t = ((tcp_time_stamp +msecs_to_jiffies (ca->delay_min>>3 ) - - ca->epoch_start) <<BICTCP_HZ ) /HZ ; + t <<=BICTCP_HZ ; +do_div (t,HZ );if (t < ca->bic_K)/* t - K */ offs = ca->bic_K - t;
PATCH 5/149 tcp: cubic: fix bug in bictcp_acked()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit cd6b423afd3c08b27e1fed52db828ade0addbc6b ]
While investigating about strange increase of retransmit rates on hosts ~24 days after boot, Van found hystart was disabled if ca->epoch_start was 0, as following condition is true when tcp_time_stamp high order bit is set.
(s32)(tcp_time_stamp - ca->epoch_start) < HZ
Quoting Van :
At initialization & after every loss ca->epoch_start is set to zero so I believe that the above line will turn off hystart as soon as the 2^31 bit is set in tcp_time_stamp & hystart will stay off for 24 days. I think we've observed that cubic's restart is too aggressive without hystart so this might account for the higher drop rate we observe.
--- net/ipv4/tcp_cubic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp_cubic.c +1 -1
@@ -414,7 +414,7 @@ static void bictcp_acked(struct sock *sk, u32 cnt, s32 rtt_us)return ;/* Discard delay samples right after fast recovery */ -if ((s32)(tcp_time_stamp - ca->epoch_start) <HZ ) +if (ca->epoch_start && (s32)(tcp_time_stamp - ca->epoch_start) <HZ )return ; delay = (rtt_us <<3 ) /USEC_PER_MSEC ;
PATCH 6/149 ipv6: don't stop backtracking in fib6_lookup_1 if subtree does not match
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit 3e3be275851bc6fc90bfdcd732cd95563acd982b ]
In case a subtree did not match we currently stop backtracking and return NULL (root table from fib_lookup). This could yield in invalid routing table lookups when using subtrees.
Instead continue to backtrack until a valid subtree or node is found and return this match.
Also remove unneeded NULL check.
--- net/ipv6/ip6_fib.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
net/ipv6/ip6_fib.c +12 -4
@@ -862,14 +862,22 @@ static struct fib6_node * fib6_lookup_1(struct fib6_node *root,if (ipv6_prefix_equal (&key->addr, args->addr, key->plen)) {#ifdef CONFIG_IPV6_SUBTREES -if (fn->subtree) - fn =fib6_lookup_1 (fn->subtree, args +1 ); +if (fn->subtree) { +struct fib6_node *sfn; + sfn =fib6_lookup_1 (fn->subtree, + args +1 ); +if (!sfn) + goto backtrack; + fn = sfn; + }#endif -if (!fn || fn->fn_flags &RTN_RTINFO ) +if (fn->fn_flags &RTN_RTINFO )return fn; } } - +#ifdef CONFIG_IPV6_SUBTREES +backtrack: +#endif if (fn->fn_flags &RTN_ROOT )break ;
PATCH 7/149 8139cp: Add dma_mapping_error checking
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Neil Horman <[email protected]>
[ Upstream commits cf3c4c03060b688cbc389ebc5065ebcce5653e96 and
d06f5187469eee1b2932c02fd093d113cfc60d5e (the latter is a fixup from Dave Jones) ]
Self explanitory dma_mapping_error addition to the 8139 driver, based on this:
https://bugzilla.redhat.com/show_bug.cgi?id=947250
It showed several backtraces arising for dma_map_* usage without checking the return code on the mapping. Add the check and abort the rx/tx operation if its failed. Untested as I have no hardware and the reporter has wandered off, but seems pretty straightforward.
--- drivers/net/ethernet/realtek/8139cp.c | 49 ++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-)
drivers/net/ethernet/realtek/8139cp.c +46 -3
@@ -478,7 +478,7 @@ rx_status_loop:while (1 ) {u32 status, len; -dma_addr_t mapping; +dma_addr_t mapping, new_mapping;struct sk_buff *skb, *new_skb;struct cp_desc *desc;const unsigned buflen = cp->rx_buf_sz;
@@ -520,6 +520,14 @@ rx_status_loop: goto rx_next; } + new_mapping =dma_map_single (&cp->pdev->dev, new_skb->data, buflen, +PCI_DMA_FROMDEVICE ); +if (dma_mapping_error (&cp->pdev->dev, new_mapping)) { + dev->stats.rx_dropped++; +kfree_skb (new_skb); + goto rx_next; + } +dma_unmap_single (&cp->pdev->dev, mapping, buflen,PCI_DMA_FROMDEVICE );
@@ -531,12 +539,11 @@ rx_status_loop:skb_put (skb, len); - mapping =dma_map_single (&cp->pdev->dev, new_skb->data, buflen, -PCI_DMA_FROMDEVICE ); cp->rx_skb[rx_tail] = new_skb;cp_rx_skb (cp, skb, desc); rx++; + mapping = new_mapping; rx_next: cp->rx_ring[rx_tail].opts2 =0 ;
@@ -704,6 +711,22 @@ static inline u32 cp_tx_vlan_tag(struct sk_buff *skb) TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00; } +static void unwind_tx_frag_mapping (struct cp_private *cp,struct sk_buff *skb, +int first,int entry_last) +{ +int frag, index; +struct cp_desc *txd; +skb_frag_t *this_frag; +for (frag =0 ; frag+first < entry_last; frag++) { + index = first+frag; + cp->tx_skb[index] =NULL ; + txd = &cp->tx_ring[index]; + this_frag = &skb_shinfo (skb)->frags[frag]; +dma_unmap_single (&cp->pdev->dev,le64_to_cpu (txd->addr), +skb_frag_size (this_frag),PCI_DMA_TODEVICE ); + } +} +static netdev_tx_t cp_start_xmit (struct sk_buff *skb,struct net_device *dev) {
@@ -737,6 +760,9 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, len = skb->len; mapping =dma_map_single (&cp->pdev->dev, skb->data, len,PCI_DMA_TODEVICE ); +if (dma_mapping_error (&cp->pdev->dev, mapping)) + goto out_dma_error; + txd->opts2 = opts2; txd->addr =cpu_to_le64 (mapping);wmb ();
@@ -774,6 +800,9 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, first_len =skb_headlen (skb); first_mapping =dma_map_single (&cp->pdev->dev, skb->data, first_len,PCI_DMA_TODEVICE ); +if (dma_mapping_error (&cp->pdev->dev, first_mapping)) + goto out_dma_error; + cp->tx_skb[entry] = skb; entry =NEXT_TX (entry);
@@ -787,6 +816,11 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, mapping =dma_map_single (&cp->pdev->dev,skb_frag_address (this_frag), len,PCI_DMA_TODEVICE ); +if (dma_mapping_error (&cp->pdev->dev, mapping)) { +unwind_tx_frag_mapping (cp, skb, first_entry, entry); + goto out_dma_error; + } + eor = (entry == (CP_TX_RING_SIZE -1 )) ? RingEnd :0 ; ctrl = eor | len | DescOwn;
@@ -845,11 +879,16 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb,if (TX_BUFFS_AVAIL (cp) <= (MAX_SKB_FRAGS +1 ))netif_stop_queue (dev); +out_unlock:spin_unlock_irqrestore (&cp->lock, intr_flags);cpw8 (TxPoll, NormalTxPoll);return NETDEV_TX_OK ; +out_dma_error: +kfree_skb (skb); + cp->dev->stats.tx_dropped++; + goto out_unlock; }/* Set or clear the multicast filter for this adaptor.
@@ -1023,6 +1062,10 @@ static int cp_refill_rx(struct cp_private *cp) mapping =dma_map_single (&cp->pdev->dev, skb->data, cp->rx_buf_sz,PCI_DMA_FROMDEVICE ); +if (dma_mapping_error (&cp->pdev->dev, mapping)) { +kfree_skb (skb); + goto err_out; + } cp->rx_skb[i] = skb; cp->rx_ring[i].opts2 =0 ;
PATCH 8/149 tun: signedness bug in tun_get_user()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 15718ea0d844e4816dbd95d57a8a0e3e264ba90e ]
The recent fix d9bf5f1309 "tun: compare with 0 instead of total_len" is not totally correct. Because "len" and "sizeof()" are size_t type, that means they are never less than zero.
--- drivers/net/tun.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/tun.c +4 -2
@@ -614,8 +614,9 @@ static ssize_t tun_get_user(struct tun_struct *tun,int offset =0 ;if (!(tun->flags &TUN_NO_PI )) { -if ((len -=sizeof (pi)) > count) +if (len <sizeof (pi))return -EINVAL ; + len -=sizeof (pi);if (memcpy_fromiovecend ((void *)&pi, iv,0 ,sizeof (pi)))return -EFAULT ;
@@ -623,8 +624,9 @@ static ssize_t tun_get_user(struct tun_struct *tun, }if (tun->flags &TUN_VNET_HDR ) { -if ((len -= tun->vnet_hdr_sz) > count) +if (len < tun->vnet_hdr_sz)return -EINVAL ; + len -= tun->vnet_hdr_sz;if (memcpy_fromiovecend ((void *)&gso, iv, offset,sizeof (gso)))return -EFAULT ;
PATCH 9/149 ipv6: remove max_addresses check from ipv6_create_tempaddr
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit 4b08a8f1bd8cb4541c93ec170027b4d0782dab52 ]
Because of the max_addresses check attackers were able to disable privacy extensions on an interface by creating enough autoconfigured addresses:
<http://seclists.org/oss-sec/2012/q4/292>
But the check is not actually needed: max_addresses protects the kernel to install too many ipv6 addresses on an interface and guards addrconf_prefix_rcv to install further addresses as soon as this limit is reached. We only generate temporary addresses in direct response of a new address showing up. As soon as we filled up the maximum number of addresses of an interface, we stop installing more addresses and thus also stop generating more temp addresses.
Even if the attacker tries to generate a lot of temporary addresses by announcing a prefix and removing it again (lifetime == 0) we won't install more temp addresses, because the temporary addresses do count to the maximum number of addresses, thus we would stop installing new autoconfigured addresses when the limit is reached.
This patch fixes CVE-2013-0343 (but other layer-2 attacks are still possible).
Thanks to Ding Tianhong to bring this topic up again.
--- net/ipv6/addrconf.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
net/ipv6/addrconf.c +4 -6
@@ -913,12 +913,10 @@ retry:if (ifp->flags &IFA_F_OPTIMISTIC ) addr_flags |=IFA_F_OPTIMISTIC ; - ift = !max_addresses || -ipv6_count_addresses (idev) < max_addresses ? -ipv6_add_addr (idev, &addr, tmp_plen, -ipv6_addr_type (&addr)&IPV6_ADDR_SCOPE_MASK , - addr_flags) :NULL ; -if (!ift ||IS_ERR (ift)) { + ift =ipv6_add_addr (idev, &addr, tmp_plen, +ipv6_addr_type (&addr)&IPV6_ADDR_SCOPE_MASK , + addr_flags); +if (IS_ERR (ift)) {in6_ifa_put (ifp);in6_dev_put (idev); printk(KERN_INFO
PATCH 10/149 ipv6: drop packets with multiple fragmentation headers
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit f46078cfcd77fa5165bf849f5e568a7ac5fa569c ]
It is not allowed for an ipv6 packet to contain multiple fragmentation headers. So discard packets which were already reassembled by fragmentation logic and send back a parameter problem icmp.
The updates for RFC 6980 will come in later, I have to do a bit more research here.
--- include/linux/ipv6.h | 1 + net/ipv6/reassembly.c | 5 +++++ 2 files changed, 6 insertions(+)
include/linux/ipv6.h +1 -0
@@ -255,6 +255,7 @@ struct inet6_skb_parm {#define IP6SKB_XFRM_TRANSFORMED 1#define IP6SKB_FORWARDED 2#define IP6SKB_REROUTED 4 +#define IP6SKB_FRAGMENTED 16 };#define IP6CB (skb) ((struct inet6_skb_parm*)((skb)->cb))
net/ipv6/reassembly.c +5 -0
@@ -517,6 +517,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev, head->tstamp = fq->q.stamp;ipv6_hdr (head)->payload_len =htons (payload_len);IP6CB (head)->nhoff = nhoff; +IP6CB (head)->flags |=IP6SKB_FRAGMENTED ;/* Yes, and fold redundant checksum back. 8) */ if (head->ip_summed ==CHECKSUM_COMPLETE )
@@ -552,6 +553,9 @@ static int ipv6_frag_rcv(struct sk_buff *skb)const struct ipv6hdr *hdr =ipv6_hdr (skb);struct net *net =dev_net (skb_dst (skb)->dev); +if (IP6CB (skb)->flags &IP6SKB_FRAGMENTED ) + goto fail_hdr; +IP6_INC_STATS_BH (net,ip6_dst_idev (skb_dst (skb)),IPSTATS_MIB_REASMREQDS );/* Jumbo payload inhibits frag. header */
@@ -572,6 +576,7 @@ static int ipv6_frag_rcv(struct sk_buff *skb) ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_REASMOKS);IP6CB (skb)->nhoff = (u8 *)fhdr -skb_network_header (skb); +IP6CB (skb)->flags |=IP6SKB_FRAGMENTED ;return 1 ; }
PATCH 11/149 ipv6: Don't depend on per socket memory for neighbour discovery messages
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Graf <[email protected]>
[ Upstream commit 25a6e6b84fba601eff7c28d30da8ad7cfbef0d43 ]
Allocating skbs when sending out neighbour discovery messages currently uses sock_alloc_send_skb() based on a per net namespace socket and thus share a socket wmem buffer space.
If a netdevice is temporarily unable to transmit due to carrier loss or for other reasons, the queued up ndisc messages will cosnume all of the wmem space and will thus prevent from any more skbs to be allocated even for netdevices that are able to transmit packets.
The number of neighbour discovery messages sent is very limited, use of alloc_skb() bypasses the socket wmem buffer size enforcement while the manual call to skb_set_owner_w() maintains the socket reference needed for the IPv6 output path.
This patch has orginally been posted by Eric Dumazet in a modified form.
--- net/ipv6/ndisc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
net/ipv6/ndisc.c +9 -7
@@ -447,7 +447,6 @@ struct sk_buff *ndisc_build_skb(struct net_device *dev,struct sk_buff *skb;struct icmp6hdr *hdr;int len; -int err;u8 *opt;if (!dev->addr_len)
@@ -457,14 +456,12 @@ struct sk_buff *ndisc_build_skb(struct net_device *dev,if (llinfo) len +=ndisc_opt_addr_space (dev); - skb =sock_alloc_send_skb (sk, - (MAX_HEADER +sizeof (struct ipv6hdr ) + - len +LL_ALLOCATED_SPACE (dev)), -1 , &err); + skb =alloc_skb ((MAX_HEADER +sizeof (struct ipv6hdr ) + + len +LL_ALLOCATED_SPACE (dev)),GFP_ATOMIC );if (!skb) {ND_PRINTK0 (KERN_ERR -"ICMPv6 ND: %s() failed to allocate an skb, err=%d.\n" , - __func__, err); +"ICMPv6 ND: %s() failed to allocate an skb.\n" , + __func__);return NULL ; }
@@ -492,6 +489,11 @@ struct sk_buff *ndisc_build_skb(struct net_device *dev,csum_partial (hdr, len, 0)); +/* Manually assign socket ownership as we avoid calling +* sock_alloc_send_pskb() to bypass wmem buffer limits +*/ +skb_set_owner_w (skb, sk); +return skb; }
PATCH 12/149 net: bridge: convert MLDv2 Query MRC into msecs_to_jiffies for max_delay
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit 2d98c29b6fb3de44d9eaa73c09f9cf7209346383 ]
While looking into MLDv1/v2 code, I noticed that bridging code does not convert it's max delay into jiffies for MLDv2 messages as we do in core IPv6' multicast code.
RFC3810, 5.1.3. Maximum Response Code says:
The Maximum Response Code field specifies the maximum time allowed before sending a responding Report. The actual time allowed, called the Maximum Response Delay, is represented in units of milliseconds, and is derived from the Maximum Response Code as follows: [...]
As we update timers that work with jiffies, we need to convert it.
--- net/bridge/br_multicast.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/bridge/br_multicast.c +2 -1
@@ -1155,7 +1155,8 @@ static int br_ip6_multicast_query(struct net_bridge *br, mld2q = (struct mld2_query *)icmp6_hdr (skb);if (!mld2q->mld2q_nsrcs) group = &mld2q->mld2q_mca; - max_delay = mld2q->mld2q_mrc ?MLDV2_MRC (mld2q->mld2q_mrc) :1 ; + + max_delay =max (msecs_to_jiffies (MLDV2_MRC (ntohs (mld2q->mld2q_mrc))),1UL ); }if (!group)
PATCH 13/149 ICMPv6: treat dest unreachable codes 5 and 6 as EACCES, not EPROTO
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Bohac <[email protected]>
[ Upstream commit 61e76b178dbe7145e8d6afa84bb4ccea71918994 ]
RFC 4443 has defined two additional codes for ICMPv6 type 1 (destination unreachable) messages:
5 - Source address failed ingress/egress policy
6 - Reject route to destination
Now they are treated as protocol error and icmpv6_err_convert() converts them to EPROTO.
RFC 4443 says:
"Codes 5 and 6 are more informative subsets of code 1."
Treat codes 5 and 6 as code 1 (EACCES)
Btw, connect() returning -EPROTO confuses firefox, so that fallback to other/IPv4 addresses does not work:
https://bugzilla.mozilla.org/show_bug.cgi?id=910773
--- include/linux/icmpv6.h | 2 ++ net/ipv6/icmp.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
include/linux/icmpv6.h +2 -0
@@ -123,6 +123,8 @@ static inline struct icmp6hdr *icmp6_hdr(const struct sk_buff *skb)#define ICMPV6_NOT_NEIGHBOUR 2#define ICMPV6_ADDR_UNREACH 3#define ICMPV6_PORT_UNREACH 4 +#define ICMPV6_POLICY_FAIL 5 +#define ICMPV6_REJECT_ROUTE 6/* * Codes for Time Exceeded
net/ipv6/icmp.c +9 -1
@@ -911,6 +911,14 @@ static const struct icmp6_err { .err = ECONNREFUSED, .fatal = 1, }, + {/* POLICY_FAIL */ + .err = EACCES, + .fatal = 1, + }, + {/* REJECT_ROUTE */ + .err = EACCES, + .fatal = 1, + }, };int icmpv6_err_convert (u8 type,u8 code,int *err)
@@ -922,7 +930,7 @@ int icmpv6_err_convert(u8 type, u8 code, int *err)switch (type) {case ICMPV6_DEST_UNREACH : fatal =1 ; -if (code <=ICMPV6_PORT_UNREACH ) { +if (code <ARRAY_SIZE (tab_unreach)) { *err = tab_unreach[code].err; fatal = tab_unreach[code].fatal; }
PATCH 14/149 tipc: fix lockdep warning during bearer initialization
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ying Xue <[email protected]>
[ Upstream commit 4225a398c1352a7a5c14dc07277cb5cc4473983b ]
When the lockdep validator is enabled, it will report the below warning when we enable a TIPC bearer:
[ INFO: possible irq lock inversion dependency detected ]
---------------------------------------------------------
Possible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(ptype_lock);
local_irq_disable();
lock(tipc_net_lock);
lock(ptype_lock); <Interrupt>
lock(tipc_net_lock);
*** DEADLOCK ***
the shortest dependencies between 2nd lock and 1st lock:
-> (ptype_lock){+.+...} ops: 10 {
[...]
SOFTIRQ-ON-W at:
[<c1089418>] __lock_acquire+0x528/0x13e0
[<c108a360>] lock_acquire+0x90/0x100
[<c1553c38>] _raw_spin_lock+0x38/0x50
[<c14651ca>] dev_add_pack+0x3a/0x60
[<c182da75>] arp_init+0x1a/0x48
[<c182dce5>] inet_init+0x181/0x27e
[<c1001114>] do_one_initcall+0x34/0x170
[<c17f7329>] kernel_init+0x110/0x1b2
[<c155b6a2>] kernel_thread_helper+0x6/0x10
[...]
... key at: [<c17e4b10>] ptype_lock+0x10/0x20
... acquired at:
[<c108a360>] lock_acquire+0x90/0x100
[<c1553c38>] _raw_spin_lock+0x38/0x50
[<c14651ca>] dev_add_pack+0x3a/0x60
[<c8bc18d2>] enable_bearer+0xf2/0x140 [tipc]
[<c8bb283a>] tipc_enable_bearer+0x1ba/0x450 [tipc]
[<c8bb3a04>] tipc_cfg_do_cmd+0x5c4/0x830 [tipc]
[<c8bbc032>] handle_cmd+0x42/0xd0 [tipc]
[<c148e802>] genl_rcv_msg+0x232/0x280
[<c148d3f6>] netlink_rcv_skb+0x86/0xb0
[<c148e5bc>] genl_rcv+0x1c/0x30
[<c148d144>] netlink_unicast+0x174/0x1f0
[<c148ddab>] netlink_sendmsg+0x1eb/0x2d0
[<c1456bc1>] sock_aio_write+0x161/0x170
[<c1135a7c>] do_sync_write+0xac/0xf0
[<c11360f6>] vfs_write+0x156/0x170
[<c11361e2>] sys_write+0x42/0x70
[<c155b0df>] sysenter_do_call+0x12/0x38[...]
}
-> (tipc_net_lock){+..-..} ops: 4 {
[...]
IN-SOFTIRQ-R at:
[<c108953a>] __lock_acquire+0x64a/0x13e0
[<c108a360>] lock_acquire+0x90/0x100
[<c15541cd>] _raw_read_lock_bh+0x3d/0x50
[<c8bb874d>] tipc_recv_msg+0x1d/0x830 [tipc]
[<c8bc195f>] recv_msg+0x3f/0x50 [tipc]
[<c146a5fa>] __netif_receive_skb+0x22a/0x590
[<c146ab0b>] netif_receive_skb+0x2b/0xf0
[<c13c43d2>] pcnet32_poll+0x292/0x780
[<c146b00a>] net_rx_action+0xfa/0x1e0
[<c103a4be>] __do_softirq+0xae/0x1e0[...]
}
Quoted 1 line
Quoted 1 line
From the log, we can see three different call chains between
CPU0 and CPU1:
Time 0 on CPU0:
kernel_init()->inet_init()->dev_add_pack()
At time 0, the ptype_lock is held by CPU0 in dev_add_pack();
Time 1 on CPU1:
tipc_enable_bearer()->enable_bearer()->dev_add_pack()
At time 1, tipc_enable_bearer() first holds tipc_net_lock, and then wants to take ptype_lock to register TIPC protocol handler into the networking stack. But the ptype_lock has been taken by dev_add_pack() on CPU0, so at this time the dev_add_pack() running on CPU1 has to be busy looping.
Time 2 on CPU0:
netif_receive_skb()->recv_msg()->tipc_recv_msg()
At time 2, an incoming TIPC packet arrives at CPU0, hence tipc_recv_msg() will be invoked. In tipc_recv_msg(), it first wants to hold tipc_net_lock. At the moment, below scenario happens:
On CPU0, below is our sequence of taking locks:
lock(ptype_lock)->lock(tipc_net_lock)
On CPU1, our sequence of taking locks looks like:
lock(tipc_net_lock)->lock(ptype_lock)
Obviously deadlock may happen in this case.
But please note the deadlock possibly doesn't occur at all when the first TIPC bearer is enabled. Before enable_bearer() -- running on CPU1 does not hold ptype_lock, so the TIPC receive handler (i.e. recv_msg()) is not registered successfully via dev_add_pack(), so the tipc_recv_msg() cannot be called by recv_msg() even if a TIPC message comes to CPU0. But when the second TIPC bearer is registered, the deadlock can perhaps really happen.
To fix it, we will push the work of registering TIPC protocol handler into workqueue context. After the change, both paths taking ptype_lock are always in process contexts, thus, the deadlock should never occur.
--- net/tipc/eth_media.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
net/tipc/eth_media.c +14 -1
@@ -53,6 +53,7 @@ struct eth_bearer {struct tipc_bearer *bearer;struct net_device *dev;struct packet_type tipc_packet_type; +struct work_struct setup; };static struct eth_bearer eth_bearers[MAX_ETH_BEARERS ];
@@ -121,6 +122,17 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev, }/** +* setup_bearer - setup association between Ethernet bearer and interface +*/ +static void setup_bearer (struct work_struct *work) +{ +struct eth_bearer *eb_ptr = + container_of(work, struct eth_bearer, setup); + +dev_add_pack (&eb_ptr->tipc_packet_type); +} + +/** * enable_bearer - attach TIPC bearer to an Ethernet interface */
@@ -164,7 +176,8 @@ static int enable_bearer(struct tipc_bearer *tb_ptr) eb_ptr->tipc_packet_type.func = recv_msg; eb_ptr->tipc_packet_type.af_packet_priv = eb_ptr;INIT_LIST_HEAD (&(eb_ptr->tipc_packet_type.list)); -dev_add_pack (&eb_ptr->tipc_packet_type); +INIT_WORK (&eb_ptr->setup, setup_bearer); +schedule_work (&eb_ptr->setup);/* Associate TIPC bearer with Ethernet bearer */
PATCH 15/149 inetpeer: Invalidate the inetpeer tree along with the routing cache
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit 5faa5df1fa2024bd750089ff21dcc4191798263d ]
We initialize the routing metrics with the values cached on the inetpeer in rt_init_metrics(). So if we have the metrics cached on the inetpeer, we ignore the user configured fib_metrics.
To fix this issue, we replace the old tree with a fresh initialized inet_peer_base. The old tree is removed later with a delayed work queue.
--- include/net/inetpeer.h | 3 ++ net/ipv4/inetpeer.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++- net/ipv4/route.c | 1 + 3 files changed, 83 insertions(+), 1 deletion(-)
include/net/inetpeer.h +3 -0
@@ -41,6 +41,7 @@ struct inet_peer {u32 pmtu_orig;u32 pmtu_learned;struct inetpeer_addr_base redirect_learned; +struct list_head gc_list;/* * Once inet_peer is queued for deletion (refcnt == -1), following fields * are not available: rid, ip_id_count, tcp_ts, tcp_ts_stamp
@@ -96,6 +97,8 @@ static inline struct inet_peer *inet_getpeer_v6(const struct in6_addr *v6daddr,extern void inet_putpeer (struct inet_peer *p);extern bool inet_peer_xrlim_allow (struct inet_peer *peer,int timeout); +extern void inetpeer_invalidate_tree (int family); +/* * temporary check to make sure we dont access rid, ip_id_count, tcp_ts, * tcp_ts_stamp if no refcount is taken on inet_peer
net/ipv4/inetpeer.c +79 -1
113 lines not on this page · raw message
net/ipv4/route.c +1 -0
@@ -939,6 +939,7 @@ static void rt_cache_invalidate(struct net *net)get_random_bytes (&shuffle,sizeof (shuffle));atomic_add (shuffle +1U , &net->ipv4.rt_genid); redirect_genid++; +inetpeer_invalidate_tree (AF_INET ); }/*
PATCH 16/149 inetpeer: fix a race in inetpeer_gc_worker()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 55432d2b543a4b6dfae54f5c432a566877a85d90 ]
commit 5faa5df1fa2024 (inetpeer: Invalidate the inetpeer tree along with the routing cache) added a race :
Before freeing an inetpeer, we must respect a RCU grace period, and make sure no user will attempt to increase refcnt.
inetpeer_invalidate_tree() waits for a RCU grace period before inserting inetpeer tree into gc_list and waking the worker. At that time, no concurrent lookup can find a inetpeer in this tree.
--- include/net/inetpeer.h | 5 ++++- net/ipv4/inetpeer.c | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-)
include/net/inetpeer.h +4 -1
@@ -41,7 +41,10 @@ struct inet_peer {u32 pmtu_orig;u32 pmtu_learned;struct inetpeer_addr_base redirect_learned; -struct list_head gc_list; +union { +struct list_head gc_list; +struct rcu_head gc_rcu; + };/* * Once inet_peer is queued for deletion (refcnt == -1), following fields * are not available: rid, ip_id_count, tcp_ts, tcp_ts_stamp
net/ipv4/inetpeer.c +12 -4
@@ -560,6 +560,17 @@ bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout) }EXPORT_SYMBOL (inet_peer_xrlim_allow); +static void inetpeer_inval_rcu (struct rcu_head *head) +{ + struct inet_peer *p = container_of(head, struct inet_peer, gc_rcu); + +spin_lock_bh (&gc_lock); +list_add_tail (&p->gc_list, &gc_list); +spin_unlock_bh (&gc_lock); + +schedule_delayed_work (&gc_work, gc_delay); +} +void inetpeer_invalidate_tree (int family) {struct inet_peer *old, *new, *prev;
@@ -576,10 +587,7 @@ void inetpeer_invalidate_tree(int family) prev =cmpxchg (&base->root, old, new);if (prev == old) { base->total =0 ; -spin_lock (&gc_lock); -list_add_tail (&prev->gc_list, &gc_list); -spin_unlock (&gc_lock); -schedule_delayed_work (&gc_work, gc_delay); +call_rcu (&prev->gc_rcu, inetpeer_inval_rcu); } out:
PATCH 17/149 HID: hidraw: put old deallocation mechanism in place
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Kosina <[email protected]>
commit df0cfd6990347c20ae031f3f34137cba274f1972 upstream.
This basically reverts commit 4fe9f8e203fda. It causes multiple problems, namely:
- after rmmod/modprobe cycle of bus driver, the input is not claimed any more. This is likely because of misplaced hid_hw_close()
- it causes memory corruption on hidraw_list
As original patch author is not responding to requests to fix his patch, and the original deallocation mechanism is not exposing any problems, I am reverting back to it.
--- drivers/hid/hidraw.c | 69 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 26 deletions(-)
drivers/hid/hidraw.c +43 -26
@@ -42,7 +42,6 @@ static struct cdev hidraw_cdev;static struct class *hidraw_class;static struct hidraw *hidraw_table[HIDRAW_MAX_DEVICES ];static DEFINE_MUTEX (minors_lock); -static void drop_ref (struct hidraw *hid,int exists_bit);static ssize_t hidraw_read (struct file *file,char __user *buffer,size_t count,loff_t *ppos) {
@@ -114,7 +113,7 @@ static ssize_t hidraw_send_report(struct__u8 *buf;int ret =0 ; -if (!hidraw_table[minor] || !hidraw_table[minor]->exist) { +if (!hidraw_table[minor]) { ret = -ENODEV ; goto out; }
@@ -262,7 +261,7 @@ static int hidraw_open(struct inode *ino }mutex_lock (&minors_lock); -if (!hidraw_table[minor] || !hidraw_table[minor]->exist) { +if (!hidraw_table[minor]) { err = -ENODEV ; goto out_unlock; }
@@ -299,12 +298,36 @@ out:static int hidraw_release (struct inode * inode,struct file * file) {unsigned int minor =iminor (inode); +struct hidraw *dev;struct hidraw_list *list = file->private_data; +int ret; +int i; + +mutex_lock (&minors_lock); +if (!hidraw_table[minor]) { + ret = -ENODEV ; + goto unlock; + } -drop_ref (hidraw_table[minor],0 );list_del (&list->node); + dev = hidraw_table[minor]; +if (!--dev->open) { +if (list->hidraw->exist) { +hid_hw_power (dev->hid,PM_HINT_NORMAL ); +hid_hw_close (dev->hid); + }else { +kfree (list->hidraw); + } + } + +for (i =0 ; i <HIDRAW_BUFFER_SIZE ; ++i) +kfree (list->buffer[i].value);kfree (list); -return 0 ; + ret =0 ; +unlock: +mutex_unlock (&minors_lock); + +return ret; } static long hidraw_ioctl(struct file *file, unsigned int cmd,
@@ -506,7 +529,21 @@ EXPORT_SYMBOL_GPL(hidraw_connect);void hidraw_disconnect (struct hid_device *hid) {struct hidraw *hidraw = hid->hidraw; -drop_ref (hidraw,1 ); + +mutex_lock (&minors_lock); + hidraw->exist =0 ; + +device_destroy (hidraw_class,MKDEV (hidraw_major, hidraw->minor)); + + hidraw_table[hidraw->minor] =NULL ; + +if (hidraw->open) { +hid_hw_close (hid); +wake_up_interruptible (&hidraw->wait); + }else { +kfree (hidraw); + } +mutex_unlock (&minors_lock); }EXPORT_SYMBOL_GPL (hidraw_disconnect);
@@ -555,23 +592,3 @@ void hidraw_exit(void)unregister_chrdev_region (dev_id,HIDRAW_MAX_DEVICES ); } - -static void drop_ref (struct hidraw *hidraw,int exists_bit) -{ -mutex_lock (&minors_lock); -if (exists_bit) { -hid_hw_close (hidraw->hid); - hidraw->exist =0 ; -if (hidraw->open) -wake_up_interruptible (&hidraw->wait); - }else { - --hidraw->open; - } - -if (!hidraw->open && !hidraw->exist) { -device_destroy (hidraw_class,MKDEV (hidraw_major, hidraw->minor)); - hidraw_table[hidraw->minor] =NULL ; -kfree (hidraw); - } -mutex_unlock (&minors_lock); -}
PATCH 18/149 HID: hidraw: correctly deallocate memory on device disconnect
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Manoj Chourasia <[email protected]>
commit 212a871a3934beccf43431608c27ed2e05a476ec upstream.
This changes puts the commit 4fe9f8e203f back in place with the fixes for slab corruption because of the commit.
When a device is unplugged, wait for all processes that have opened the device to close before deallocating the device.
This commit was solving kernel crash because of the corruption in rb tree of vmalloc. The rootcause was the device data pointer was geting excessed after the memory associated with hidraw was freed.
The commit 4fe9f8e203f was buggy as it was also freeing the hidraw first and then calling delete operation on the list associated with that hidraw leading to slab corruption.
--- drivers/hid/hidraw.c | 60 ++++++++++++++++++++++------------------------------ 1 file changed, 25 insertions(+), 35 deletions(-)
drivers/hid/hidraw.c +25 -35
@@ -113,7 +113,7 @@ static ssize_t hidraw_send_report(struct__u8 *buf;int ret =0 ; -if (!hidraw_table[minor]) { +if (!hidraw_table[minor] || !hidraw_table[minor]->exist) { ret = -ENODEV ; goto out; }
@@ -261,7 +261,7 @@ static int hidraw_open(struct inode *ino }mutex_lock (&minors_lock); -if (!hidraw_table[minor]) { +if (!hidraw_table[minor] || !hidraw_table[minor]->exist) { err = -ENODEV ; goto out_unlock; }
@@ -295,39 +295,38 @@ out: } +static void drop_ref (struct hidraw *hidraw,int exists_bit) +{ +if (exists_bit) { +hid_hw_close (hidraw->hid); + hidraw->exist =0 ; +if (hidraw->open) +wake_up_interruptible (&hidraw->wait); + }else { + --hidraw->open; + } + +if (!hidraw->open && !hidraw->exist) { +device_destroy (hidraw_class,MKDEV (hidraw_major, hidraw->minor)); + hidraw_table[hidraw->minor] =NULL ; +kfree (hidraw); + } +} +static int hidraw_release (struct inode * inode,struct file * file) {unsigned int minor =iminor (inode); -struct hidraw *dev;struct hidraw_list *list = file->private_data; -int ret; -int i;mutex_lock (&minors_lock); -if (!hidraw_table[minor]) { - ret = -ENODEV ; - goto unlock; - }list_del (&list->node); - dev = hidraw_table[minor]; -if (!--dev->open) { -if (list->hidraw->exist) { -hid_hw_power (dev->hid,PM_HINT_NORMAL ); -hid_hw_close (dev->hid); - }else { -kfree (list->hidraw); - } - } - -for (i =0 ; i <HIDRAW_BUFFER_SIZE ; ++i) -kfree (list->buffer[i].value);kfree (list); - ret =0 ; -unlock: -mutex_unlock (&minors_lock); -return ret; +drop_ref (hidraw_table[minor],0 ); + +mutex_unlock (&minors_lock); +return 0 ; } static long hidraw_ioctl(struct file *file, unsigned int cmd,
@@ -531,18 +530,9 @@ void hidraw_disconnect(struct hid_devicestruct hidraw *hidraw = hid->hidraw;mutex_lock (&minors_lock); - hidraw->exist =0 ; - -device_destroy (hidraw_class,MKDEV (hidraw_major, hidraw->minor)); - hidraw_table[hidraw->minor] =NULL ; +drop_ref (hidraw,1 ); -if (hidraw->open) { -hid_hw_close (hid); -wake_up_interruptible (&hidraw->wait); - }else { -kfree (hidraw); - }mutex_unlock (&minors_lock); }EXPORT_SYMBOL_GPL (hidraw_disconnect);
PATCH 19/149 xen-gnt: prevent adding duplicate gnt callbacks
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Roger Pau Monne <[email protected]>
commit 5f338d9001094a56cf87bd8a280b4e7ff953bb59 upstream.
With the current implementation, the callback in the tail of the list can be added twice, because the check done in gnttab_request_free_callback is bogus, callback->next can be NULL if it is the last callback in the list. If we add the same callback twice we end up with an infinite loop, were callback == callback->next.
Replace this check with a proper one that iterates over the list to see if the callback has already been added.
--- drivers/xen/grant-table.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/xen/grant-table.c +11 -2
@@ -355,9 +355,18 @@ void gnttab_request_free_callback(struct void (*fn)(void *), void *arg, u16 count) { unsigned long flags; +struct gnttab_free_callback *cb; +spin_lock_irqsave (&gnttab_list_lock, flags); -if (callback->next) - goto out; + +/* Check if the callback is already on the list */ + cb = gnttab_free_callback_list; +while (cb) { +if (cb == callback) + goto out; + cb = cb->next; + } + callback->fn = fn; callback->arg = arg; callback->count = count;
PATCH 20/149 ath9k: always clear ps filter bit on new assoc
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Felix Fietkau <[email protected]>
commit 026d5b07c03458f9c0ccd19c3850564a5409c325 upstream.
Otherwise in some cases, EAPOL frames might be filtered during the initial handshake, causing delays and assoc failures.
--- drivers/net/wireless/ath/ath9k/xmit.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath9k/xmit.c +1 -0
@@ -2423,6 +2423,7 @@ void ath_tx_node_init(struct ath_softc *for (acno =0 , ac = &an->ac[acno]; acno <WME_NUM_AC ; acno++, ac++) { ac->sched = false; + ac->clear_ps_filter = true; ac->txq = sc->tx.txq_map[acno];INIT_LIST_HEAD (&ac->tid_q); }
PATCH 21/149 libceph: unregister request in __map_request failed and nofail == false
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: majianpeng <[email protected]>
commit 73d9f7eef3d98c3920e144797cc1894c6b005a1e upstream.
For nofail == false request, if __map_request failed, the caller does cleanup work, like releasing the relative pages. It doesn't make any sense to retry this request.
--- net/ceph/osd_client.c | 2 ++ 1 file changed, 2 insertions(+)
net/ceph/osd_client.c +2 -0
@@ -1719,6 +1719,8 @@ int ceph_osdc_start_request(struct ceph_dout ("osdc_start_request failed map, " " will retry %lld\n" , req->r_tid); rc =0 ; + }else { +__unregister_request (osdc, req); } goto out_unlock; }
PATCH 22/149 usb: config->desc.bLength may not exceed amount of data returned by the device
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit b4f17a488ae2e09bfcf95c0e0b4219c246f1116a upstream.
While reading the config parsing code I noticed this check is missing, without this check config->desc.wTotalLength can end up with a value larger then the dev->rawdescriptors length for the config, and when userspace then tries to get the rawdescriptors bad things may happen.
--- drivers/usb/core/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/core/config.c +2 -1
@@ -424,7 +424,8 @@ static int usb_parse_configuration(strucmemcpy (&config->desc, buffer,USB_DT_CONFIG_SIZE );if (config->desc.bDescriptorType !=USB_DT_CONFIG || - config->desc.bLength <USB_DT_CONFIG_SIZE ) { + config->desc.bLength <USB_DT_CONFIG_SIZE || + config->desc.bLength > size) {dev_err (ddev,"invalid descriptor for config index %d: " "type = 0x%X, length = %d\n" , cfgidx, config->desc.bDescriptorType, config->desc.bLength);
PATCH 23/149 USB: cdc-wdm: fix race between interrupt handler and tasklet
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 6dd433e6cf2475ce8abec1b467720858c24450eb upstream.
Both could want to submit the same URB. Some checks of the flag intended to prevent that were missing.
--- drivers/usb/class/cdc-wdm.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/usb/class/cdc-wdm.c +9 -4
@@ -187,6 +187,7 @@ skip_error:static void wdm_int_callback (struct urb *urb) {int rv =0 ; +int responding;int status = urb->status;struct wdm_device *desc;struct usb_ctrlrequest *req;
@@ -260,8 +261,8 @@ static void wdm_int_callback(struct urb desc->response->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ;spin_lock (&desc->iuspin);clear_bit (WDM_READ , &desc->flags); -set_bit (WDM_RESPONDING , &desc->flags); -if (!test_bit (WDM_DISCONNECTING , &desc->flags) + responding =test_and_set_bit (WDM_RESPONDING , &desc->flags); +if (!responding && !test_bit (WDM_DISCONNECTING , &desc->flags) && !test_bit (WDM_SUSPENDING , &desc->flags)) { rv =usb_submit_urb (desc->response,GFP_ATOMIC ); dev_dbg(&desc->intf->dev, "%s: usb_submit_urb %d",
@@ -658,16 +659,20 @@ static void wdm_rxwork(struct work_struc { struct wdm_device *desc = container_of(work, struct wdm_device, rxwork);unsigned long flags; -int rv; +int rv =0 ; +int responding;spin_lock_irqsave (&desc->iuspin, flags);if (test_bit (WDM_DISCONNECTING , &desc->flags)) {spin_unlock_irqrestore (&desc->iuspin, flags); }else { + responding =test_and_set_bit (WDM_RESPONDING , &desc->flags);spin_unlock_irqrestore (&desc->iuspin, flags); - rv =usb_submit_urb (desc->response,GFP_KERNEL ); +if (!responding) + rv =usb_submit_urb (desc->response,GFP_KERNEL );if (rv <0 && rv != -EPERM ) {spin_lock_irqsave (&desc->iuspin, flags); +clear_bit (WDM_RESPONDING , &desc->flags);if (!test_bit (WDM_DISCONNECTING , &desc->flags))schedule_work (&desc->rxwork);spin_unlock_irqrestore (&desc->iuspin, flags);
PATCH 24/149 powerpc: Handle unaligned ldbrx/stdbrx
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Anton Blanchard <[email protected]>
commit 230aef7a6a23b6166bd4003bfff5af23c9bd381f upstream.
Normally when we haven't implemented an alignment handler for a load or store instruction the process will be terminated.
The alignment handler uses the DSISR (or a pseudo one) to locate the right handler. Unfortunately ldbrx and stdbrx overlap lfs and stfs so we incorrectly think ldbrx is an lfs and stdbrx is an stfs.
This bug is particularly nasty - instead of terminating the process we apply an incorrect fixup and continue on.
With more and more overlapping instructions we should stop creating a pseudo DSISR and index using the instruction directly, but for now add a special case to catch ldbrx/stdbrx.
--- arch/powerpc/kernel/align.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/powerpc/kernel/align.c +10 -0
@@ -764,6 +764,16 @@ int fix_alignment(struct pt_regs *regs) nb = aligninfo[instr].len; flags = aligninfo[instr].flags; +/* ldbrx/stdbrx overlap lfs/stfs in the DSISR unfortunately */ +if (IS_XFORM (instruction) && ((instruction >>1 ) &0x3ff ) ==532 ) { + nb =8 ; + flags =LD +SW ; + }else if (IS_XFORM (instruction) && + ((instruction >>1 ) &0x3ff ) ==660 ) { + nb =8 ; + flags =ST +SW ; + } +/* Byteswap little endian loads and stores */ swiz =0 ;if (regs->msr &MSR_LE ) {
PATCH 25/149 intel-iommu: Fix leaks in pagetable freeing
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit 3269ee0bd6686baf86630300d528500ac5b516d7 upstream.
At best the current code only seems to free the leaf pagetables and the root. If you're unlucky enough to have a large gap (like any QEMU guest with more than 3G of memory), only the first chunk of leaf pagetables are freed (plus the root). This is a massive memory leak. This patch re-writes the pagetable freeing function to use a recursive algorithm and manages to not only free all the pagetables, but does it without any apparent performance loss versus the current broken version.
--- drivers/iommu/intel-iommu.c | 72 ++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 37 deletions(-)
drivers/iommu/intel-iommu.c +36 -38
@@ -861,56 +861,54 @@ static int dma_pte_clear_range(struct dmreturn order; } +static void dma_pte_free_level (struct dmar_domain *domain,int level, +struct dma_pte *pte,unsigned long pfn, +unsigned long start_pfn,unsigned long last_pfn) +{ + pfn =max (start_pfn, pfn); + pte = &pte[pfn_level_offset (pfn, level)]; + +do { +unsigned long level_pfn; +struct dma_pte *level_pte; + +if (!dma_pte_present (pte) ||dma_pte_superpage (pte)) + goto next; + + level_pfn = pfn &level_mask (level -1 ); + level_pte =phys_to_virt (dma_pte_addr (pte)); + +if (level >2 ) +dma_pte_free_level (domain, level -1 , level_pte, + level_pfn, start_pfn, last_pfn); + +/* If range covers entire pagetable, free it */ +if (!(start_pfn > level_pfn || + last_pfn < level_pfn +level_size (level))) { +dma_clear_pte (pte); +domain_flush_cache (domain, pte,sizeof (*pte)); +free_pgtable_page (level_pte); + } +next: + pfn +=level_size (level); + }while (!first_pte_in_page (++pte) && pfn <= last_pfn); +} +/* free page table pages. last level pte should already be cleared */ static void dma_pte_free_pagetable (struct dmar_domain *domain,unsigned long start_pfn,unsigned long last_pfn) {int addr_width =agaw_to_width (domain->agaw) -VTD_PAGE_SHIFT ; -struct dma_pte *first_pte, *pte; -int total =agaw_to_level (domain->agaw); -int level; -unsigned long tmp; -int large_page =2 ;BUG_ON (addr_width <BITS_PER_LONG && start_pfn >> addr_width);BUG_ON (addr_width <BITS_PER_LONG && last_pfn >> addr_width);BUG_ON (start_pfn > last_pfn);/* We don't need lock here; nobody else touches the iova range */ - level =2 ; -while (level <= total) { - tmp =align_to_level (start_pfn, level); - -/* If we can't even clear one PTE at this level, we're done */ -if (tmp +level_size (level) -1 > last_pfn) -return ; - -do { - large_page = level; - first_pte = pte =dma_pfn_level_pte (domain, tmp, level, &large_page); -if (large_page > level) - level = large_page +1 ; -if (!pte) { - tmp =align_to_level (tmp +1 , level +1 ); -continue ; - } -do { -if (dma_pte_present (pte)) { -free_pgtable_page (phys_to_virt (dma_pte_addr (pte))); -dma_clear_pte (pte); - } - pte++; - tmp +=level_size (level); - }while (!first_pte_in_page (pte) && - tmp +level_size (level) -1 <= last_pfn); - -domain_flush_cache (domain, first_pte, - (void *)pte - (void *)first_pte); - - }while (tmp && tmp +level_size (level) -1 <= last_pfn); - level++; - } +dma_pte_free_level (domain,agaw_to_level (domain->agaw), + domain->pgd,0 , start_pfn, last_pfn); +/* free pgd */ if (start_pfn ==0 && last_pfn ==DOMAIN_MAX_PFN (domain->gaw)) {free_pgtable_page (domain->pgd);
PATCH 26/149 ath9k: fix rx descriptor related race condition
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Felix Fietkau <[email protected]>
commit e96542e55a2aacf4bdeccfe2f17b77c4895b4df2 upstream.
Similar to a race condition that exists in the tx path, the hardware might re-read the 'next' pointer of a descriptor of the last completed frame. This only affects non-EDMA (pre-AR93xx) devices.
To deal with this race, defer clearing and re-linking a completed rx descriptor until the next one has been processed.
--- drivers/net/wireless/ath/ath9k/ath9k.h | 5 +---- drivers/net/wireless/ath/ath9k/recv.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +1 -4
@@ -77,10 +77,6 @@ struct ath_config { sizeof(struct ath_buf_state)); \ }while (0 ) -#define ATH_RXBUF_RESET (_bf) do { \ - (_bf)->bf_stale = false; \ - } while (0) -/** * enum buffer_type - Buffer type flags *
@@ -308,6 +304,7 @@ struct ath_rx {struct ath_buf *rx_bufptr;struct ath_rx_edma rx_edma[ATH9K_RX_QUEUE_MAX ]; +struct ath_buf *buf_hold;struct sk_buff *frag; };
drivers/net/wireless/ath/ath9k/recv.c +13 -4
@@ -78,8 +78,6 @@ static void ath_rx_buf_link(struct ath_sstruct ath_desc *ds;struct sk_buff *skb; -ATH_RXBUF_RESET (bf); - ds = bf->bf_desc; ds->ds_link =0 ;/* link to null */ ds->ds_data = bf->bf_buf_addr;
@@ -106,6 +104,14 @@ static void ath_rx_buf_link(struct ath_s sc->rx.rxlink = &ds->ds_link; } +static void ath_rx_buf_relink (struct ath_softc *sc,struct ath_buf *bf) +{ +if (sc->rx.buf_hold) +ath_rx_buf_link (sc, sc->rx.buf_hold); + + sc->rx.buf_hold = bf; +} +static void ath_setdefantenna (struct ath_softc *sc,u32 antenna) {/* XXX block beacon interrupts */
@@ -153,7 +159,6 @@ static bool ath_rx_edma_buf_link(struct skb = bf->bf_mpdu; -ATH_RXBUF_RESET (bf);memset (skb->data,0 , ah->caps.rx_status_len);dma_sync_single_for_device (sc->dev, bf->bf_buf_addr, ah->caps.rx_status_len,DMA_TO_DEVICE );
@@ -492,6 +497,7 @@ int ath_startrecv(struct ath_softc *sc)if (list_empty (&sc->rx.rxbuf)) goto start_recv; + sc->rx.buf_hold =NULL ; sc->rx.rxlink =NULL ;list_for_each_entry_safe (bf, tbf, &sc->rx.rxbuf, list) {ath_rx_buf_link (sc, bf);
@@ -742,6 +748,9 @@ static struct ath_buf *ath_get_next_rx_b } bf = list_first_entry(&sc->rx.rxbuf, struct ath_buf, list); +if (bf == sc->rx.buf_hold) +return NULL ; + ds = bf->bf_desc;/*
@@ -1974,7 +1983,7 @@ requeue:if (edma) {ath_rx_edma_buf_link (sc, qtype); }else { -ath_rx_buf_link (sc, bf); +ath_rx_buf_relink (sc, bf);ath9k_hw_rxena (ah); } }while (1 );
PATCH 27/149 ath9k: avoid accessing MRC registers on single-chain devices
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Felix Fietkau <[email protected]>
commit a1c781bb20ac1e03280e420abd47a99eb8bbdd3b upstream.
They are not implemented, and accessing them might trigger errors
--- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/ath/ath9k/ar9003_phy.c +4 -0
@@ -1016,6 +1016,10 @@ static bool ar9003_hw_ani_control(struct* is_on == 0 means MRC CCK is OFF (more noise imm) */ bool is_on = param ?1 :0 ; + +if (ah->caps.rx_chainmask ==1 ) +break ; +REG_RMW_FIELD (ah,AR_PHY_MRC_CCK_CTRL ,AR_PHY_MRC_CCK_ENABLE , is_on); REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
PATCH 28/149 ASoC: wm8960: Fix PLL register writes
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Mike Dyer <[email protected]>
commit 85fa532b6ef920b32598df86b194571a7059a77c upstream.
Bit 9 of PLL2,3 and 4 is reserved as '0'. The 24bit fractional part should be split across each register in 8bit chunks.
--- sound/soc/codecs/wm8960.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/wm8960.c +3 -3
@@ -805,9 +805,9 @@ static int wm8960_set_dai_pll(struct sndif (pll_div.k) { reg |=0x20 ; -snd_soc_write (codec,WM8960_PLL2 , (pll_div.k >>18 ) &0x3f ); -snd_soc_write (codec,WM8960_PLL3 , (pll_div.k >>9 ) &0x1ff ); -snd_soc_write (codec,WM8960_PLL4 , pll_div.k &0x1ff ); +snd_soc_write (codec,WM8960_PLL2 , (pll_div.k >>16 ) &0xff ); +snd_soc_write (codec,WM8960_PLL3 , (pll_div.k >>8 ) &0xff ); +snd_soc_write (codec,WM8960_PLL4 , pll_div.k &0xff ); }snd_soc_write (codec,WM8960_PLL1 , reg);
PATCH 29/149 rculist: list_first_or_null_rcu() should use list_entry_rcu()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit c34ac00caefbe49d40058ae7200bd58725cebb45 upstream.
list_first_or_null() should test whether the list is empty and return pointer to the first entry if not in a RCU safe manner. It's broken in several ways.
* It compares __kernel @__ptr with __rcu @__next triggering the following sparse warning.
net/core/dev.c:4331:17: error: incompatible types in comparison expression (different address spaces)
* It doesn't perform rcu_dereference*() and computes the entry address using container_of() directly from the __rcu pointer which is inconsitent with other rculist interface. As a result, all three in-kernel users - net/core/dev.c, macvlan, cgroup - are buggy. They dereference the pointer w/o going through read barrier.
* While ->next dereference passes through list_next_rcu(), the compiler is still free to fetch ->next more than once and thus nullify the "__ptr != __next" condition check.
Fix it by making list_first_or_null_rcu() dereference ->next directly using ACCESS_ONCE() and then use list_entry_rcu() on it like other rculist accessors.
v2: Paul pointed out that the compiler may fetch the pointer more than
once nullifying the condition check. ACCESS_ONCE() added on ->next dereference.
v3: Restored () around macro param which was accidentally removed.
Spotted by Paul.
--- include/linux/rculist.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
include/linux/rculist.h +3 -2
@@ -254,8 +254,9 @@ static inline void list_splice_init_rcu(*/ #define list_first_or_null_rcu (ptr, type, member) \ ({struct list_head *__ptr = (ptr); \ - struct list_head __rcu *__next = list_next_rcu(__ptr); \ - likely(__ptr != __next) ? container_of(__next, type, member) : NULL; \ + struct list_head *__next = ACCESS_ONCE(__ptr->next); \ + likely(__ptr != __next) ? \ + list_entry_rcu(__next, type, member) : NULL; \ })/**
PATCH 30/149 USB: mos7720: use GFP_ATOMIC under spinlock
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit d0bd9a41186e076ea543c397ad8a67a6cf604b55 upstream.
The write_parport_reg_nonblock() function shouldn't sleep because it's called with spinlocks held.
--- drivers/usb/serial/mos7720.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/mos7720.c +1 -1
@@ -383,7 +383,7 @@ static int write_parport_reg_nonblock(stkfree (urbtrack);return -ENOMEM ; } - urbtrack->setup =kmalloc (sizeof (*urbtrack->setup),GFP_KERNEL ); + urbtrack->setup =kmalloc (sizeof (*urbtrack->setup),GFP_ATOMIC );if (!urbtrack->setup) {usb_free_urb (urbtrack->urb);kfree (urbtrack);
PATCH 31/149 USB: mos7720: fix big-endian control requests
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 3b716caf190ccc6f2a09387210e0e6a26c1d81a4 upstream.
Fix endianess bugs in parallel-port code which caused corrupt control-requests to be issued on big-endian machines.
--- drivers/usb/serial/mos7720.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/serial/mos7720.c +2 -2
@@ -391,8 +391,8 @@ static int write_parport_reg_nonblock(st } urbtrack->setup->bRequestType = (__u8 )0x40 ; urbtrack->setup->bRequest = (__u8 )0x0e ; - urbtrack->setup->wValue =get_reg_value (reg, dummy); - urbtrack->setup->wIndex =get_reg_index (reg); + urbtrack->setup->wValue =cpu_to_le16 (get_reg_value (reg, dummy)); + urbtrack->setup->wIndex =cpu_to_le16 (get_reg_index (reg)); urbtrack->setup->wLength =0 ; usb_fill_control_urb(urbtrack->urb, usbdev, usb_sndctrlpipe(usbdev, 0),
PATCH 32/149 staging: comedi: dt282x: dt282x_ai_insn_read() always fails
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 2c4283ca7cdcc6605859c836fc536fcd83a4525f upstream.
In dt282x_ai_insn_read() we call this macro like:wait_for(!mux_busy(), comedi_error(dev, "timeout\n"); return -ETIME;); Because the if statement doesn't have curly braces it means we always return -ETIME and the function never succeeds.
--- drivers/staging/comedi/drivers/dt282x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/comedi/drivers/dt282x.c +2 -1
@@ -407,8 +407,9 @@ struct dt282x_private { } \udelay (5 ); \ } \ -if (_i) \ +if (_i) { \ b \ + } \ }while (0 ) static int dt282x_attach(struct comedi_device *dev,
PATCH 33/149 usb: ehci-mxc: check for pdata before dereferencing
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Mack <[email protected]>
commit f375fc520d4df0cd9fcb570f33c103c6c0311f9e upstream.
Commit 7e8d5cd93fac ("USB: Add EHCI support for MX27 and MX31 based boards") introduced code that could potentially lead to a NULL pointer dereference on driver removal.
Fix this by checking for the value of pdata before dereferencing it.
--- drivers/usb/host/ehci-mxc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/ehci-mxc.c +1 -1
@@ -296,7 +296,7 @@ static int __exit ehci_mxc_drv_remove(stif (pdata && pdata->exit) pdata->exit (pdev); -if (pdata->otg) +if (pdata && pdata->otg)otg_shutdown (pdata->otg);usb_remove_hcd (hcd);
PATCH 34/149 mmc: tmio_mmc_dma: fix PIO fallback on SDHI
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Sergei Shtylyov <[email protected]>
commit f936f9b67b7f8c2eae01dd303a0e90bd777c4679 upstream.
I'm testing SH-Mobile SDHI driver in DMA mode with a new DMA controller using 'bonnie++' and getting DMA error after which the tmio_mmc_dma.c code falls back to PIO but all commands time out after that. It turned out that the fallback code calls tmio_mmc_enable_dma() with RX/TX channels already freed and pointers to them cleared, so that the function bails out early instead of clearing the DMA bit in the CTL_DMA_ENABLE register. The regression was introduced by commit 162f43e31c5a376ec16336e5d0ac973373d54c89 (mmc: tmio: fix a deadlock). Moving tmio_mmc_enable_dma() calls to the top of the PIO fallback code in tmio_mmc_start_dma_{rx|tx}() helps.
--- drivers/mmc/host/tmio_mmc_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/tmio_mmc_dma.c +2 -2
@@ -92,6 +92,7 @@ static void tmio_mmc_start_dma_rx(struct pio:if (!desc) {/* DMA failed, fall back to PIO */ +tmio_mmc_enable_dma (host, false);if (ret >=0 ) ret = -EIO ; host->chan_rx =NULL ;
@@ -104,7 +105,6 @@ pio: }dev_warn (&host->pdev->dev,"DMA failed: %d, falling back to PIO\n" , ret); -tmio_mmc_enable_dma (host, false); } dev_dbg(&host->pdev->dev, "%s(): desc %p, cookie %d, sg[%d]\n", __func__,
@@ -173,6 +173,7 @@ static void tmio_mmc_start_dma_tx(struct pio:if (!desc) {/* DMA failed, fall back to PIO */ +tmio_mmc_enable_dma (host, false);if (ret >=0 ) ret = -EIO ; host->chan_tx =NULL ;
@@ -185,7 +186,6 @@ pio: }dev_warn (&host->pdev->dev,"DMA failed: %d, falling back to PIO\n" , ret); -tmio_mmc_enable_dma (host, false); } dev_dbg(&host->pdev->dev, "%s(): desc %p, cookie %d\n", __func__,
PATCH 35/149 rt2800: fix wrong TX power compensation
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
commit 6e956da2027c767859128b9bfef085cf2a8e233b upstream.
We should not do temperature compensation on devices without EXTERNAL_TX_ALC bit set (called DynamicTxAgcControl on vendor driver). Such devices can have totally bogus TSSI parameters on the EEPROM, but still threaded by us as valid and result doing wrong TX power calculations.
This fix inability to connect to AP on slightly longer distance on some Ralink chips/devices.
--- drivers/net/wireless/rt2x00/rt2800lib.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wireless/rt2x00/rt2800lib.c +7 -0
@@ -2067,6 +2067,13 @@ static int rt2800_get_gain_calibration_dint i;/* +* First check if temperature compensation is supported. +*/ +rt2x00_eeprom_read (rt2x00dev,EEPROM_NIC_CONF1 , &eeprom); +if (!rt2x00_get_field16 (eeprom,EEPROM_NIC_CONF1_EXTERNAL_TX_ALC )) +return 0 ; + +/* * Read TSSI boundaries for temperature compensation from * the EEPROM. *
PATCH 36/149 usb: xhci: Disable runtime PM suspend for quirky controllers
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Shawn Nematbakhsh <[email protected]>
commit c8476fb855434c733099079063990e5bfa7ecad6 upstream.
If a USB controller with XHCI_RESET_ON_RESUME goes to runtime suspend, a reset will be performed upon runtime resume. Any previously suspended devices attached to the controller will be re-enumerated at this time. This will cause problems, for example, if an open system call on the device triggered the resume (the open call will fail).
Note that this change is only relevant when persist_enabled is not set for USB devices.
This patch should be backported to kernels as old as 3.0, that contain the commit c877b3b2ad5cb9d4fe523c5496185cc328ff3ae9 "xhci: Add reset on resume quirk for asrock p67 host".
--- drivers/usb/host/xhci.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
drivers/usb/host/xhci.c +22 -0
@@ -3484,10 +3484,21 @@ void xhci_free_dev(struct usb_hcd *hcd, {struct xhci_hcd *xhci =hcd_to_xhci (hcd);struct xhci_virt_device *virt_dev; +struct device *dev = hcd->self.controller;unsigned long flags;u32 state;int i, ret; +#ifndef CONFIG_USB_DEFAULT_PERSIST +/* +* We called pm_runtime_get_noresume when the device was attached. +* Decrement the counter here to allow controller to runtime suspend +* if no devices remain. +*/ +if (xhci->quirks &XHCI_RESET_ON_RESUME ) +pm_runtime_put_noidle (dev); +#endif + ret =xhci_check_args (hcd, udev,NULL ,0 , true, __func__);/* If the host is halted due to driver unload, we still need to free the * device.
@@ -3559,6 +3570,7 @@ static int xhci_reserve_host_control_ep_int xhci_alloc_dev (struct usb_hcd *hcd,struct usb_device *udev) {struct xhci_hcd *xhci =hcd_to_xhci (hcd); +struct device *dev = hcd->self.controller;unsigned long flags;int timeleft;int ret;
@@ -3611,6 +3623,16 @@ int xhci_alloc_dev(struct usb_hcd *hcd, goto disable_slot; } udev->slot_id = xhci->slot_id; + +#ifndef CONFIG_USB_DEFAULT_PERSIST +/* +* If resetting upon resume, we can't put the controller into runtime +* suspend if there is a device attached. +*/ +if (xhci->quirks &XHCI_RESET_ON_RESUME ) +pm_runtime_get_noresume (dev); +#endif +/* Is this a LS or FS device under a HS hub? */ /* Hub or peripherial? */ return 1 ;
PATCH 37/149 USB: OHCI: Allow runtime PM without system sleep
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 69820e01aa756b8d228143d997f71523c1e97984 upstream.
Since ohci-hcd supports runtime PM, the .pm field in its pci_driver structure should be protected by CONFIG_PM rather than CONFIG_PM_SLEEP.
Without this change, OHCI controllers won't do runtime suspend if system suspend or hibernation isn't enabled.
--- drivers/usb/host/ohci-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/ohci-pci.c +1 -1
@@ -413,7 +413,7 @@ static struct pci_driver ohci_pci_driver .remove = usb_hcd_pci_remove, .shutdown = usb_hcd_pci_shutdown, -#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_PM .driver = { .pm = &usb_hcd_pci_pm_ops },
PATCH 38/149 ACPI / EC: Add ASUSTEK L4R to quirk list in order to validate ECDT
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Lan Tianyu <[email protected]>
commit 524f42fab787a9510be826ce3d736b56d454ac6d upstream.
The ECDT of ASUSTEK L4R doesn't provide correct command and data I/O ports. The DSDT provides the correct information instead.
For this reason, add this machine to quirk list for ECDT validation and use the EC information from the DSDT.
[rjw: Changelog]
References: https://bugzilla.kernel.org/show_bug.cgi?id=60765
--- drivers/acpi/ec.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/acpi/ec.c +4 -0
@@ -964,6 +964,10 @@ static struct dmi_system_id __initdata e ec_enlarge_storm_threshold, "CLEVO hardware", {DMI_MATCH (DMI_SYS_VENDOR ,"CLEVO Co." ), DMI_MATCH(DMI_PRODUCT_NAME, "M720T/M730T"),}, NULL}, + { + ec_validate_ecdt, "ASUS hardware", { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTek Computer Inc." ), + DMI_MATCH(DMI_PRODUCT_NAME, "L4R"),}, NULL}, {}, };
PATCH 39/149 HID: validate HID report id size
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 43622021d2e2b82ea03d883926605bdd0525e1d1 upstream.
The "Report ID" field of a HID report is used to build indexes of reports. The kernel's index of these is limited to 256 entries, so any malicious device that sets a Report ID greater than 255 will trigger memory corruption on the host:
[ 1347.156239] BUG: unable to handle kernel paging request at ffff88094958a878 [ 1347.156261] IP: [<ffffffff813e4da0>] hid_register_report+0x2a/0x8b
CVE-2013-2888
--- drivers/hid/hid-core.c | 10 +++++++--- include/linux/hid.h | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/hid/hid-core.c +7 -3
@@ -59,6 +59,8 @@ struct hid_report *hid_register_report(sstruct hid_report_enum *report_enum = device->report_enum + type;struct hid_report *report; +if (id >=HID_MAX_IDS ) +return NULL ;if (report_enum->report_id_hash[id])return report_enum->report_id_hash[id];
@@ -380,8 +382,10 @@ static int hid_parser_global(struct hid_case HID_GLOBAL_ITEM_TAG_REPORT_ID : parser->global.report_id =item_udata (item); -if (parser->global.report_id ==0 ) { -dbg_hid ("report_id 0 is invalid\n" ); +if (parser->global.report_id ==0 || + parser->global.report_id >=HID_MAX_IDS ) { +dbg_hid ("report_id %u is invalid\n" , + parser->global.report_id);return -1 ; }return 0 ;
@@ -552,7 +556,7 @@ static void hid_device_release(struct defor (i =0 ; i <HID_REPORT_TYPES ; i++) {struct hid_report_enum *report_enum = device->report_enum + i; -for (j =0 ; j <256 ; j++) { +for (j =0 ; j <HID_MAX_IDS ; j++) {struct hid_report *report = report_enum->report_id_hash[j];if (report)hid_free_report (report);
include/linux/hid.h +3 -1
@@ -416,10 +416,12 @@ struct hid_report {struct hid_device *device;/* associated device */ }; +#define HID_MAX_IDS 256 +struct hid_report_enum {unsigned numbered;struct list_head report_list; -struct hid_report *report_id_hash[256 ]; +struct hid_report *report_id_hash[HID_MAX_IDS ]; };#define HID_REPORT_TYPES 3
PATCH 40/149 of: Fix missing memory initialization on FDT unflattening
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Grant Likely <[email protected]>
commit 0640332e073be9207f0784df43595c0c39716e42 upstream.
Any calls to dt_alloc() need to be zeroed. This is a temporary fix, but the allocation function itself needs to zero memory before returning it. This is a follow up to patch 9e4012752, "of: fdt: fix memory initialization for expanded DT" which fixed one call site but missed another.
--- drivers/of/base.c | 1 + 1 file changed, 1 insertion(+)
drivers/of/base.c +1 -0
@@ -1189,6 +1189,7 @@ void of_alias_scan(void * (*dt_alloc)(u6 ap =dt_alloc (sizeof (*ap) + len +1 ,4 );if (!ap)continue ; +memset (ap,0 ,sizeof (*ap) + len +1 ); ap->alias = start;of_alias_add (ap, np, id, start, len); }
PATCH 41/149 USB: fix build error when CONFIG_PM_SLEEP isn't enabled
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 9d8924297cd9c256c23c02abae40202563452453 upstream.
This patch fixes a build error that occurs when CONFIG_PM is enabled and CONFIG_PM_SLEEP isn't:
Quoted 1 line
Quoted 1 line
drivers/usb/host/ohci-pci.c:294:10: error: 'usb_hcd_pci_pm_ops' undeclared here (not in a function)
.pm = &usb_hcd_pci_pm_ops
Since the usb_hcd_pci_pm_ops structure is defined and used when CONFIG_PM is enabled, its declaration should not be protected by CONFIG_PM_SLEEP.
--- include/linux/usb/hcd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/usb/hcd.h +1 -1
@@ -395,7 +395,7 @@ extern int usb_hcd_pci_probe(struct pci_extern void usb_hcd_pci_remove (struct pci_dev *dev);extern void usb_hcd_pci_shutdown (struct pci_dev *dev); -#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_PM extern const struct dev_pm_ops usb_hcd_pci_pm_ops;#endif #endif /* CONFIG_PCI */
PATCH 42/149 drm/edid: add quirk for Medion MD30217PG
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 118bdbd86b39dbb843155054021d2c59058f1e05 upstream.
This LCD monitor (1280x1024 native) has a completely bogus detailed timing (640x350@70hz). User reports that 1280x1024@60 has waves so prefer 1280x1024@75.
Manufacturer: MED Model: 7b8 Serial#: 99188
Year: 2005 Week: 5
EDID Version: 1.3
Analog Display Input, Input Voltage Level: 0.700/0.700 V
Sync: Separate
Max Image Size [cm]: horiz.: 34 vert.: 27
Gamma: 2.50
DPMS capabilities: Off; RGB/Color Display
First detailed timing is preferred mode
redX: 0.645 redY: 0.348 greenX: 0.280 greenY: 0.605
blueX: 0.142 blueY: 0.071 whiteX: 0.313 whiteY: 0.329
Supported established timings:
720x400@70Hz
640x480@60Hz
640x480@72Hz
640x480@75Hz
800x600@56Hz
800x600@60Hz
800x600@72Hz
800x600@75Hz
1024x768@60Hz
1024x768@70Hz
1024x768@75Hz
1280x1024@75Hz
Manufacturer's mask: 0
Supported standard timings:
Supported detailed timing:
clock: 25.2 MHz Image Size: 337 x 270 mmh_active: 640 h_sync: 688 h_sync_end 784 h_blank_end 800 h_border: 0v_active: 350 v_sync: 350 v_sync_end 352 v_blanking: 449 v_border: 0 Monitor name: MD30217PG
Ranges: V min: 56 V max: 76 Hz, H min: 30 H max: 83 kHz, PixClock max 145 MHz Serial No: 501099188
EDID (in hex):
00ffffffffffff0034a4b80774830100
050f010368221b962a0c55a559479b24
125054afcf00310a0101010101018180
000000000000d60980a0205e63103060
0200510e1100001e000000fc004d4433
3032313750470a202020000000fd0038
4c1e530e000a202020202020000000ff
003530313039393138380a2020200078--- drivers/gpu/drm/drm_edid.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/drm_edid.c +3 -0
@@ -125,6 +125,9 @@ static struct edid_quirk {/* ViewSonic VA2026w */ { "VSC", 5020, EDID_QUIRK_FORCE_REDUCED_BLANKING }, + +/* Medion MD 30217 PG */ + { "MED", 0x7b8, EDID_QUIRK_PREFER_LARGE_75 }, };/*** DDC fetch and block validation ***/
PATCH 43/149 drm/radeon: update line buffer allocation for dce4.1/5
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 0b31e02363b0db4e7931561bc6c141436e729d9f upstream.
We need to allocate line buffer to each display when setting up the watermarks. Failure to do so can lead to a blank screen. This fixes blank screen problems on dce4.1/5 asics.
Based on an initial fix from:
Jay Cornwall <[email protected]>
--- drivers/gpu/drm/radeon/evergreen.c | 25 +++++++++++++++++++++---- drivers/gpu/drm/radeon/evergreend.h | 4 ++++ 2 files changed, 25 insertions(+), 4 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +21 -4
@@ -501,7 +501,8 @@ static u32 evergreen_line_buffer_adjust(struct drm_display_mode *mode, struct drm_display_mode *other_mode) { - u32 tmp; + u32 tmp, buffer_alloc, i; +u32 pipe_offset = radeon_crtc->crtc_id *0x20 ;/* * Line Buffer Setup * There are 3 line buffers, each one shared by 2 display controllers.
@@ -524,18 +525,34 @@ static u32 evergreen_line_buffer_adjust(* non-linked crtcs for maximum line buffer allocation. */ if (radeon_crtc->base.enabled && mode) { -if (other_mode) +if (other_mode) { tmp =0 ;/* 1/2 */ -else + buffer_alloc =1 ; + }else { tmp =2 ;/* whole */ - }else + buffer_alloc =2 ; + } + }else { tmp =0 ; + buffer_alloc =0 ; + }/* second controller of the pair uses second half of the lb */ if (radeon_crtc->crtc_id %2 ) tmp +=4 ;WREG32 (DC_LB_MEMORY_SPLIT + radeon_crtc->crtc_offset, tmp); +if (ASIC_IS_DCE41 (rdev) ||ASIC_IS_DCE5 (rdev)) { +WREG32 (PIPE0_DMIF_BUFFER_CONTROL + pipe_offset, +DMIF_BUFFERS_ALLOCATED (buffer_alloc)); +for (i =0 ; i < rdev->usec_timeout; i++) { +if (RREG32 (PIPE0_DMIF_BUFFER_CONTROL + pipe_offset) & +DMIF_BUFFERS_ALLOCATED_COMPLETED ) +break ; +udelay (1 ); + } + } +if (radeon_crtc->base.enabled && mode) {switch (tmp) {case 0 :
drivers/gpu/drm/radeon/evergreend.h +4 -0
@@ -459,6 +459,10 @@# define LATENCY_LOW_WATERMARK (x) ((x) << 0)# define LATENCY_HIGH_WATERMARK (x) ((x) << 16) +#define PIPE0_DMIF_BUFFER_CONTROL 0x0ca0 +# define DMIF_BUFFERS_ALLOCATED (x) ((x) << 0) +# define DMIF_BUFFERS_ALLOCATED_COMPLETED (1 << 4) +#define IH_RB_CNTL 0x3e00# define IH_RB_ENABLE (1 << 0)# define IH_IB_SIZE (x) ((x) << 1)/* log2 */
PATCH 44/149 drm/radeon: fix LCD record parsing
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 95663948ba22a4be8b99acd67fbf83e86ddffba4 upstream.
If the LCD table contains an EDID record, properly account for the edid size when walking through the records.
This should fix error messages about unknown LCD records.
--- drivers/gpu/drm/radeon/radeon_atombios.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_atombios.c +3 -1
@@ -1616,7 +1616,9 @@ struct radeon_encoder_atom_dig *radeon_akfree (edid); } } - record +=sizeof (ATOM_FAKE_EDID_PATCH_RECORD ); + record += fake_edid_record->ucFakeEDIDLength ? + fake_edid_record->ucFakeEDIDLength +2 : +sizeof (ATOM_FAKE_EDID_PATCH_RECORD );break ;case LCD_PANEL_RESOLUTION_RECORD_TYPE : panel_res_record = (ATOM_PANEL_RESOLUTION_PATCH_RECORD *)record;
PATCH 45/149 drm/radeon: fix resume on some rs4xx boards (v2)
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit acf88deb8ddbb73acd1c3fa32fde51af9153227f upstream.
Setting MC_MISC_CNTL.GART_INDEX_REG_EN causes hangs on some boards on resume. The systems seem to work fine without touching this bit so leave it as is.
v2: read-modify-write the GART_INDEX_REG_EN bit. I suspect the problem is that we are losing the other settings in the register.
fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=52952
--- drivers/gpu/drm/radeon/rs400.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/rs400.c +6 -3
@@ -174,10 +174,13 @@ int rs400_gart_enable(struct radeon_devi/* FIXME: according to doc we should set HIDE_MMCFG_BAR=0, * AGPMODE30=0 & AGP30ENHANCED=0 in NB_CNTL */ if ((rdev->family ==CHIP_RS690 ) || (rdev->family ==CHIP_RS740 )) { -WREG32_MC (RS480_MC_MISC_CNTL , - (RS480_GART_INDEX_REG_EN |RS690_BLOCK_GFX_D3_EN )); + tmp =RREG32_MC (RS480_MC_MISC_CNTL ); + tmp |=RS480_GART_INDEX_REG_EN |RS690_BLOCK_GFX_D3_EN ; +WREG32_MC (RS480_MC_MISC_CNTL , tmp); }else { -WREG32_MC (RS480_MC_MISC_CNTL ,RS480_GART_INDEX_REG_EN ); + tmp =RREG32_MC (RS480_MC_MISC_CNTL ); + tmp |=RS480_GART_INDEX_REG_EN ; +WREG32_MC (RS480_MC_MISC_CNTL , tmp); }/* Enable gart */ WREG32_MC (RS480_AGP_ADDRESS_SPACE_SIZE , (RS480_GART_EN | size_reg));
PATCH 46/149 drm/radeon: fix handling of variable sized arrays for router objects
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit fb93df1c2d8b3b1fb16d6ee9e32554e0c038815d upstream.
The table has the following format:
typedef struct _ATOM_SRC_DST_TABLE_FOR_ONE_OBJECT //usSrcDstTableOffset pointing to this structure
{
UCHAR ucNumberOfSrc; USHORT usSrcObjectID[1]; UCHAR ucNumberOfDst; USHORT usDstObjectID[1];
}ATOM_SRC_DST_TABLE_FOR_ONE_OBJECT;
usSrcObjectID[] and usDstObjectID[] are variably sized, so we can't access them directly. Use pointers and update the offset appropriately when accessing the Dst members.
--- drivers/gpu/drm/radeon/radeon_atombios.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/radeon_atombios.c +6 -3
@@ -709,13 +709,16 @@ bool radeon_get_atom_connector_info_from (ATOM_SRC_DST_TABLE_FOR_ONE_OBJECT *) (ctx->bios + data_offset +le16_to_cpu (router_obj->asObjects[k].usSrcDstTableOffset)); +u8 *num_dst_objs = (u8 *) + ((u8 *)router_src_dst_table +1 + + (router_src_dst_table->ucNumberOfSrc *2 )); +u16 *dst_objs = (u16 *)(num_dst_objs +1 );int enum_id; router.router_id = router_obj_id; -for (enum_id =0 ; enum_id < router_src_dst_table->ucNumberOfDst; - enum_id++) { +for (enum_id =0 ; enum_id < (*num_dst_objs); enum_id++) {if (le16_to_cpu (path->usConnObjectId) == -le16_to_cpu (router_src_dst_table->usDstObjectID[enum_id])) +le16_to_cpu (dst_objs[enum_id]))break ; }
PATCH 47/149 ALSA: hda - hdmi: Fallback to ALSA allocation when selecting CA
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Anssi Hannula <[email protected]>
commit 18e391862cceaf43ddb8eb5cca05e1a83abdebaa upstream.
hdmi_channel_allocation() tries to find a HDMI channel allocation that matches the number channels in the playback stream and contains only speakers that the HDMI sink has reported as available via EDID. If no such allocation is found, 0 (stereo audio) is used.
Using CA 0 causes the audio causes the sink to discard everything except the first two channels (front left and front right).
However, the sink may be capable of receiving more channels than it has speakers (and then perform downmix or discard the extra channels), in which case it is preferable to use a CA that contains extra channels than to use CA 0 which discards all the non-stereo channels.
Additionally, it seems that HBR (HD) passthrough output does not work on Intel HDMI codecs when CA is set to 0 (possibly the codec zeroes channels not present in CA). This happens with all receivers that report a 5.1 speaker mask since a HBR stream is carried on 8 channels to the codec.
Add a fallback in the CA selection so that the CA channel count at least matches the stream channel count, even if the stream contains channels not present in the sink speaker descriptor.
Thanks to GrimGriefer at OpenELEC forums for discovering that changing the sink speaker mask allowed HBR output.
--- sound/pci/hda/patch_hdmi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/pci/hda/patch_hdmi.c +11 -0
@@ -512,6 +512,17 @@ static int hdmi_channel_allocation(struc } } +if (!ca) { +/* if there was no match, select the regular ALSA channel +* allocation with the matching number of channels */ +for (i =0 ; i <ARRAY_SIZE (channel_allocations); i++) { +if (channels == channel_allocations[i].channels) { + ca = channel_allocations[i].ca_index; +break ; + } + } + } +snd_print_channel_allocation (eld->spk_alloc, buf,sizeof (buf));snd_printdd ("HDMI: select CA 0x%x for %d-channel allocation: %s\n" , ca, channels, buf);
PATCH 48/149 fuse: postpone end_page_writeback() in fuse_writepage_locked()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Maxim Patlasov <[email protected]>
commit 4a4ac4eba1010ef9a804569058ab29e3450c0315 upstream.
The patch fixes a race between ftruncate(2), mmap-ed write and write(2):
1) An user makes a page dirty via mmap-ed write.
2) The user performs shrinking truncate(2) intended to purge the page.
3) Before fuse_do_setattr calls truncate_pagecache, the page goes to writeback. fuse_writepage_locked fills FUSE_WRITE request and releases the original page by end_page_writeback.
4) fuse_do_setattr() completes and successfully returns. Since now, i_mutex is free.
5) Ordinary write(2) extends i_size back to cover the page. Note that fuse_send_write_pages do wait for fuse writeback, but for another page->index.
6) fuse_writepage_locked proceeds by queueing FUSE_WRITE request. fuse_send_writepage is supposed to crop inarg->size of the request, but it doesn't because i_size has already been extended back.
Moving end_page_writeback to the end of fuse_writepage_locked fixes the race because now the fact that truncate_pagecache is successfully returned infers that fuse_writepage_locked has already called end_page_writeback. And this, in turn, infers that fuse_flush_writepages has already called fuse_send_writepage, and the latter used valid (shrunk) i_size. write(2) could not extend it because of i_mutex held by ftruncate(2).
--- fs/fuse/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/fuse/file.c +2 -1
@@ -1251,7 +1251,6 @@ static int fuse_writepage_locked(structinc_bdi_stat (mapping->backing_dev_info,BDI_WRITEBACK );inc_zone_page_state (tmp_page,NR_WRITEBACK_TEMP ); -end_page_writeback (page);spin_lock (&fc->lock);list_add (&req->writepages_entry, &fi->writepages);
@@ -1259,6 +1258,8 @@ static int fuse_writepage_locked(structfuse_flush_writepages (inode);spin_unlock (&fc->lock); +end_page_writeback (page); +return 0 ; err_free:
PATCH 49/149 fuse: invalidate inode attributes on xattr modification
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Anand Avati <[email protected]>
commit d331a415aef98717393dda0be69b7947da08eba3 upstream.
Calls like setxattr and removexattr result in updation of ctime. Therefore invalidate inode attributes to force a refresh.
--- fs/fuse/dir.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/fuse/dir.c +4 -0
@@ -1439,6 +1439,8 @@ static int fuse_setxattr(struct dentry * fc->no_setxattr =1 ; err = -EOPNOTSUPP ; } +if (!err) +fuse_invalidate_attr (inode);return err; }
@@ -1568,6 +1570,8 @@ static int fuse_removexattr(struct dentr fc->no_removexattr =1 ; err = -EOPNOTSUPP ; } +if (!err) +fuse_invalidate_attr (inode);return err; }
PATCH 50/149 fuse: hotfix truncate_pagecache() issue
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Maxim Patlasov <[email protected]>
commit 06a7c3c2781409af95000c60a5df743fd4e2f8b4 upstream.
The way how fuse calls truncate_pagecache() from fuse_change_attributes() is completely wrong. Because, w/o i_mutex held, we never sure whether 'oldsize' and 'attr->size' are valid by the time of execution of truncate_pagecache(inode, oldsize, attr->size). In fact, as soon as we released fc->lock in the middle of fuse_change_attributes(), we completely loose control of actions which may happen with given inode until we reach truncate_pagecache. The list of potentially dangerous actions includes mmap-ed reads and writes, ftruncate(2) and write(2) extending file size.
The typical outcome of doing truncate_pagecache() with outdated arguments is data corruption from user point of view. This is (in some sense) acceptable in cases when the issue is triggered by a change of the file on the server (i.e. externally wrt fuse operation), but it is absolutely intolerable in scenarios when a single fuse client modifies a file without any external intervention. A real life case I discovered by fsx-linux looked like this:
1. Shrinking ftruncate(2) comes to fuse_do_setattr(). The latter sends FUSE_SETATTR to the server synchronously, but before getting fc->lock ...
2. fuse_dentry_revalidate() is asynchronously called. It sends FUSE_LOOKUP to the server synchronously, then calls fuse_change_attributes(). The latter updates i_size, releases fc->lock, but before comparing oldsize vs attr->size..
3. fuse_do_setattr() from the first step proceeds by acquiring fc->lock and updating attributes and i_size, but now oldsize is equal to outarg.attr.size because i_size has just been updated (step 2). Hence, fuse_do_setattr() returns w/o calling truncate_pagecache().
4. As soon as ftruncate(2) completes, the user extends file size by write(2) making a hole in the middle of file, then reads data from the hole either by read(2) or mmap-ed read. The user expects to get zero data from the hole, but gets stale data because truncate_pagecache() is not executed yet.
The scenario above illustrates one side of the problem: not truncating the page cache even though we should. Another side corresponds to truncating page cache too late, when the state of inode changed significantly. Theoretically, the following is possible:
1. As in the previous scenario fuse_dentry_revalidate() discovered that i_size changed (due to our own fuse_do_setattr()) and is going to call truncate_pagecache() for some 'new_size' it believes valid right now. But by the time that particular truncate_pagecache() is called ...
2. fuse_do_setattr() returns (either having called truncate_pagecache() or not -- it doesn't matter).
3. The file is extended either by write(2) or ftruncate(2) or fallocate(2).
4. mmap-ed write makes a page in the extended region dirty.
The result will be the lost of data user wrote on the fourth step.
The patch is a hotfix resolving the issue in a simplistic way: let's skip dangerous i_size update and truncate_pagecache if an operation changing file size is in progress. This simplistic approach looks correct for the cases w/o external changes. And to handle them properly, more sophisticated and intrusive techniques (e.g. NFS-like one) would be required. I'd like to postpone it until the issue is well discussed on the mailing list(s).
Changed in v2:
- improved patch description to cover both sides of the issue.
--- fs/fuse/dir.c | 7 ++++++- fs/fuse/file.c | 8 +++++++- fs/fuse/fuse_i.h | 2 ++ fs/fuse/inode.c | 3 ++- 4 files changed, 17 insertions(+), 3 deletions(-)
fs/fuse/dir.c +6 -1
@@ -1282,6 +1282,7 @@ static int fuse_do_setattr(struct dentry {struct inode *inode = entry->d_inode;struct fuse_conn *fc =get_fuse_conn (inode); +struct fuse_inode *fi =get_fuse_inode (inode);struct fuse_req *req;struct fuse_setattr_in inarg;struct fuse_attr_out outarg;
@@ -1312,8 +1313,10 @@ static int fuse_do_setattr(struct dentryif (IS_ERR (req))return PTR_ERR (req); -if (is_truncate) +if (is_truncate) {fuse_set_nowrite (inode); +set_bit (FUSE_I_SIZE_UNSTABLE , &fi->state); + }memset (&inarg,0 ,sizeof (inarg));memset (&outarg,0 ,sizeof (outarg));
@@ -1375,12 +1378,14 @@ static int fuse_do_setattr(struct dentryinvalidate_inode_pages2 (inode->i_mapping); } +clear_bit (FUSE_I_SIZE_UNSTABLE , &fi->state);return 0 ; error:if (is_truncate)fuse_release_nowrite (inode); +clear_bit (FUSE_I_SIZE_UNSTABLE , &fi->state);return err; }
fs/fuse/file.c +7 -1
@@ -519,7 +519,8 @@ static void fuse_read_update_size(structstruct fuse_inode *fi =get_fuse_inode (inode);spin_lock (&fc->lock); -if (attr_ver == fi->attr_version && size < inode->i_size) { +if (attr_ver == fi->attr_version && size < inode->i_size && + !test_bit (FUSE_I_SIZE_UNSTABLE , &fi->state)) { fi->attr_version = ++fc->attr_version;i_size_write (inode, size); }
@@ -881,12 +882,16 @@ static ssize_t fuse_perform_write(struct {struct inode *inode = mapping->host;struct fuse_conn *fc =get_fuse_conn (inode); +struct fuse_inode *fi =get_fuse_inode (inode);int err =0 ;ssize_t res =0 ;if (is_bad_inode (inode))return -EIO ; +if (inode->i_size < pos +iov_iter_count (ii)) +set_bit (FUSE_I_SIZE_UNSTABLE , &fi->state); + do { struct fuse_req *req; ssize_t count;
@@ -921,6 +926,7 @@ static ssize_t fuse_perform_write(structif (res >0 )fuse_write_update_size (inode, pos); +clear_bit (FUSE_I_SIZE_UNSTABLE , &fi->state);fuse_invalidate_attr (inode);return res >0 ? res : err;
fs/fuse/fuse_i.h +9 -0
@@ -103,6 +103,15 @@ struct fuse_inode {/** List of writepage requestst (pending or sent) */ struct list_head writepages; + +/** Miscellaneous bits describing inode state */ +unsigned long state; +}; + +/** FUSE inode state bits */ +enum { +/** An operation changing file size is in progress */ +FUSE_I_SIZE_UNSTABLE , };struct fuse_conn ;
fs/fuse/inode.c +3 -1
@@ -92,6 +92,7 @@ static struct inode *fuse_alloc_inode(st fi->attr_version =0 ; fi->writectr =0 ; fi->orig_ino =0 ; + fi->state =0 ;INIT_LIST_HEAD (&fi->write_files);INIT_LIST_HEAD (&fi->queued_writes);INIT_LIST_HEAD (&fi->writepages);
@@ -200,7 +201,8 @@ void fuse_change_attributes(struct inodeloff_t oldsize;spin_lock (&fc->lock); -if (attr_version !=0 && fi->attr_version > attr_version) { +if ((attr_version !=0 && fi->attr_version > attr_version) || +test_bit (FUSE_I_SIZE_UNSTABLE , &fi->state)) {spin_unlock (&fc->lock);return ; }
PATCH 51/149 hdpvr: register the video node at the end of probe
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Hans Verkuil <[email protected]>
commit 280847b532433ffe7a22795f926327805a127162 upstream.
Video nodes can be used at once after registration, so make sure the full initialization is done before registering them.
--- drivers/media/video/hdpvr/hdpvr-core.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/media/video/hdpvr/hdpvr-core.c +7 -6
@@ -373,12 +373,6 @@ static int hdpvr_probe(struct usb_interf }mutex_unlock (&dev->io_mutex); -if (hdpvr_register_videodev (dev, &interface->dev, - video_nr[atomic_inc_return (&dev_nr)])) { -v4l2_err (&dev->v4l2_dev,"registering videodev failed\n" ); - goto error; - } -#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE ) retval =hdpvr_register_i2c_adapter (dev);if (retval <0 ) {
@@ -399,6 +393,13 @@ static int hdpvr_probe(struct usb_interf }#endif + retval =hdpvr_register_videodev (dev, &interface->dev, + video_nr[atomic_inc_return (&dev_nr)]); +if (retval <0 ) { +v4l2_err (&dev->v4l2_dev,"registering videodev failed\n" ); + goto error; + } +/* let the user know what node this device is now attached to */ v4l2_info (&dev->v4l2_dev,"device now attached to %s\n" ,video_device_node_name (dev->video_dev));
PATCH 52/149 hdpvr: fix iteration over uninitialized lists in hdpvr_probe()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Khoroshilov <[email protected]>
commit 2e923a0527ac439e135b9961e58d3acd876bba10 upstream.
free_buff_list and rec_buff_list are initialized in the middle of hdpvr_probe(), but if something bad happens before that, error handling code calls hdpvr_delete(), which contains iteration over the lists (via hdpvr_free_buffers()). The patch moves the lists initialization to the beginning and by the way fixes goto label in error handling of registering videodev.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/video/hdpvr/hdpvr-core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/media/video/hdpvr/hdpvr-core.c +6 -5
@@ -297,6 +297,11 @@ static int hdpvr_probe(struct usb_interf dev->workqueue =0 ; +/* init video transfer queues first of all */ +/* to prevent oops in hdpvr_delete() on error paths */ +INIT_LIST_HEAD (&dev->free_buff_list); +INIT_LIST_HEAD (&dev->rec_buff_list); +/* register v4l2_device early so it can be used for printks */ if (v4l2_device_register (&interface->dev, &dev->v4l2_dev)) {err ("v4l2_device_register failed" );
@@ -319,10 +324,6 @@ static int hdpvr_probe(struct usb_interfif (!dev->workqueue) goto error; -/* init video transfer queues */ -INIT_LIST_HEAD (&dev->free_buff_list); -INIT_LIST_HEAD (&dev->rec_buff_list); - dev->options = hdpvr_default_options;if (default_video_input <HDPVR_VIDEO_INPUTS )
@@ -397,7 +398,7 @@ static int hdpvr_probe(struct usb_interf video_nr[atomic_inc_return(&dev_nr)]);if (retval <0 ) {v4l2_err (&dev->v4l2_dev,"registering videodev failed\n" ); - goto error; + goto reg_fail; }/* let the user know what node this device is now attached to */
PATCH 53/149 fuse: readdir: check for slash in names
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Miklos Szeredi <[email protected]>
commit efeb9e60d48f7778fdcad4a0f3ad9ea9b19e5dfd upstream.
Userspace can add names containing a slash character to the directory listing. Don't allow this as it could cause all sorts of trouble.
[bwh: Backported to 3.2: drop changes to parse_dirplusfile() which we
don't have]
--- fs/fuse/dir.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/fuse/dir.c +2 -0
@@ -1063,6 +1063,8 @@ static int parse_dirfile(char *buf, sizereturn -EIO ;if (reclen > nbytes)break ; +if (memchr (dirent->name,'/' , dirent->namelen) !=NULL ) +return -EIO ; over =filldir (dstbuf, dirent->name, dirent->namelen, file->f_pos, dirent->ino, dirent->type);
PATCH 54/149 HID: pantherlord: validate output report details
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 412f30105ec6735224535791eed5cdc02888ecb4 upstream.
A HID device could send a malicious output report that would cause the pantherlord HID driver to write beyond the output report allocation during initialization, causing a heap overflow:
[ 310.939483] usb 1-1: New USB device found, idVendor=0e8f, idProduct=0003 ... [ 315.980774] BUG kmalloc-192 (Tainted: G W ): Redzone overwritten
CVE-2013-2892
--- drivers/hid/hid-pl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/hid/hid-pl.c +8 -2
@@ -129,8 +129,14 @@ static int plff_init(struct hid_device * strong = &report->field[0 ]->value[2 ]; weak = &report->field[0 ]->value[3 ];debug ("detected single-field device" ); - }else if (report->maxfield >=4 && report->field[0 ]->maxusage ==1 && - report->field[0 ]->usage[0 ].hid == (HID_UP_LED |0x43 )) { + }else if (report->field[0 ]->maxusage ==1 && + report->field[0 ]->usage[0 ].hid == + (HID_UP_LED |0x43 ) && + report->maxfield >=4 && + report->field[0 ]->report_count >=1 && + report->field[1 ]->report_count >=1 && + report->field[2 ]->report_count >=1 && + report->field[3 ]->report_count >=1 ) { report->field[0 ]->value[0 ] =0x00 ; report->field[1 ]->value[0 ] =0x00 ; strong = &report->field[2 ]->value[0 ];
PATCH 55/149 HID: ntrig: validate feature report details
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 875b4e3763dbc941f15143dd1a18d10bb0be303b upstream.
A HID device could send a malicious feature report that would cause the ntrig HID driver to trigger a NULL dereference during initialization:
[57383.031190] usb 3-1: New USB device found, idVendor=1b96, idProduct=0001 ... [57383.315193] BUG: unable to handle kernel NULL pointer dereference at 0000000000000030 [57383.315308] IP: [<ffffffffa08102de>] ntrig_probe+0x25e/0x420 [hid_ntrig]
CVE-2013-2896
--- drivers/hid/hid-ntrig.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/hid/hid-ntrig.c +2 -1
@@ -115,7 +115,8 @@ static inline int ntrig_get_mode(structstruct hid_report *report = hdev->report_enum[HID_FEATURE_REPORT ]. report_id_hash[0x0d ]; -if (!report) +if (!report || report->maxfield <1 || + report->field[0 ]->report_count <1 )return -EINVAL ;usbhid_submit_report (hdev, report,USB_DIR_IN );
PATCH 56/149 HID: picolcd_core: validate output report details
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 1e87a2456b0227ca4ab881e19a11bb99d164e792 upstream.
A HID device could send a malicious output report that would cause the picolcd HID driver to trigger a NULL dereference during attr file writing.
[[email protected]: changed
report->maxfield < 1
to
report->maxfield != 1
as suggested by Bruno].
CVE-2013-2899
--- drivers/hid/hid-picolcd_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hid-picolcd.c +1 -1
@@ -1424,7 +1424,7 @@ static ssize_t picolcd_operation_mode_st buf +=10 ; cnt -=10 ; } -if (!report) +if (!report || report->maxfield !=1 )return -EINVAL ;while (cnt >0 && (buf[cnt-1 ] =='\n' || buf[cnt-1 ] =='\r' ))
PATCH 57/149 HID: check for NULL field when setting values
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit be67b68d52fa28b9b721c47bb42068f0c1214855 upstream.
Defensively check that the field to be worked on is not NULL.
--- drivers/hid/hid-core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/hid/hid-core.c +6 -1
@@ -994,7 +994,12 @@ EXPORT_SYMBOL_GPL(hid_output_report);int hid_set_field (struct hid_field *field,unsigned offset,__s32 value) { -unsigned size = field->report_size; +unsigned size; + +if (!field) +return -1 ; + + size = field->report_size;hid_dump_input (field->report->device, field->usage + offset, value);
PATCH 58/149 ARM: PCI: versatile: Fix SMAP register offsets
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Peter Maydell <[email protected]>
commit 99f2b130370b904ca5300079243fdbcafa2c708b upstream.
The SMAP register offsets in the versatile PCI controller code were all off by four. (This didn't have any observable bad effects because on this board PHYS_OFFSET is zero, and (a) writing zero to the flags register at offset 0x10 has no effect and (b) the reset value of the SMAP register is zero anyway, so failing to write SMAP2 didn't matter.)
--- arch/arm/mach-versatile/pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-versatile/pci.c +3 -3
@@ -43,9 +43,9 @@#define PCI_IMAP0 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x0)#define PCI_IMAP1 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x4)#define PCI_IMAP2 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x8) -#define PCI_SMAP0 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x10) -#define PCI_SMAP1 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x14) -#define PCI_SMAP2 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x18) +#define PCI_SMAP0 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x14) +#define PCI_SMAP1 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x18) +#define PCI_SMAP2 __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x1c)#define PCI_SELFID __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0xc)#define DEVICE_ID_OFFSET 0x00
PATCH 59/149 drm/i915: try not to lose backlight CBLV precision
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
commit cac6a5ae0118832936eb162ec4cedb30f2422bcc upstream.
ACPI has _BCM and _BQC methods to set and query the backlight brightness, respectively. The ACPI opregion has variables BCLP and CBLV to hold the requested and current backlight brightness, respectively.
The BCLP variable has range 0..255 while the others have range 0..100. This means the _BCM method has to scale the brightness for BCLP, and the gfx driver has to scale the requested value back for CBLV. If the _BQC method uses the CBLV variable (apparently some implementations do, some don't) for current backlight level reporting, there's room for rounding errors.
Use DIV_ROUND_UP for scaling back to CBLV to get back to the same values that were passed to _BCM, presuming the _BCM simply uses bclp = (in *
255) / 100 for scaling to BCLP.
Reference: https://gist.github.com/aaronlu/6314920
[bwh: Backported to 3.2:
- Adjust context
- ASLE region is treated as normal memory rather than __iomem]
--- drivers/gpu/drm/i915/intel_opregion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_opregion.c +1 -1
@@ -161,7 +161,7 @@ static u32 asle_set_backlight(struct drm max =intel_panel_get_max_backlight (dev);intel_panel_set_backlight (dev, bclp * max /255 ); - asle->cblv = (bclp*0x64 )/0xff |ASLE_CBLV_VALID ; + asle->cblv =DIV_ROUND_UP (bclp *100 ,255 ) |ASLE_CBLV_VALID ;return 0 ; }
PATCH 60/149 crypto: api - Fix race condition in larval lookup
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
commit 77dbd7a95e4a4f15264c333a9e9ab97ee27dc2aa upstream.
crypto_larval_lookup should only return a larval if it created one. Any larval created by another entity must be processed through crypto_larval_wait before being returned.
Otherwise this will lead to a larval being killed twice, which will most likely lead to a crash.
--- crypto/api.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
crypto/api.c +6 -1
@@ -34,6 +34,8 @@ EXPORT_SYMBOL_GPL(crypto_alg_sem);BLOCKING_NOTIFIER_HEAD (crypto_chain);EXPORT_SYMBOL_GPL (crypto_chain); +static struct crypto_alg *crypto_larval_wait (struct crypto_alg *alg); +static inline struct crypto_alg *crypto_alg_get (struct crypto_alg *alg) {atomic_inc (&alg->cra_refcnt);
@@ -150,8 +152,11 @@ static struct crypto_alg *crypto_larval_ }up_write (&crypto_alg_sem); -if (alg != &larval->alg) +if (alg != &larval->alg) {kfree (larval); +if (crypto_is_larval (alg)) + alg =crypto_larval_wait (alg); + }return alg; }
PATCH 61/149 ALSA: hda - Add Toshiba Satellite C870 to MSI blacklist
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 83f72151352791836a1b9c1542614cc9bf71ac61 upstream.
Toshiba Satellite C870 shows interrupt problems occasionally when certain mixer controls like "Mic Switch" is toggled. This seems worked around by not using MSI.
Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=833585
--- sound/pci/hda/hda_intel.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/hda_intel.c +1 -0
@@ -2621,6 +2621,7 @@ static struct snd_pci_quirk msi_black_liSND_PCI_QUIRK (0x1043 ,0x81f2 ,"ASUS" ,0 ),/* Athlon64 X2 + nvidia */ SND_PCI_QUIRK (0x1043 ,0x81f6 ,"ASUS" ,0 ),/* nvidia */ SND_PCI_QUIRK (0x1043 ,0x822d ,"ASUS" ,0 ),/* Athlon64 X2 + nvidia MCP55 */ +SND_PCI_QUIRK (0x1179 ,0xfb44 ,"Toshiba Satellite C870" ,0 ),/* AMD Hudson */ SND_PCI_QUIRK (0x1849 ,0x0888 ,"ASRock" ,0 ),/* Athlon64 X2 + nvidia */ SND_PCI_QUIRK(0xa0a0, 0x0575, "Aopen MZ915-M", 0), /* ICH6 */ {}
PATCH 62/149 drm/radeon/atom: workaround vbios bug in transmitter table on rs880 (v2)
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 91f3a6aaf280294b07c05dfe606e6c27b7ba3c72 upstream.
The OUTPUT_ENABLE action jumps past the point in the coder where the data_offset is set on certain rs780 cards. This worked previously because the OUTPUT_ENABLE action is always called immediately after the ENABLE action so the data_offset remained set. In 6f8bbaf568c7f2c497558bfd04654c0b9841ad57 (drm/radeon/atom: initialize more atom interpretor elements to 0), we explictly reset data_offset to 0 between atom calls which then caused this to fail. The fix is to just skip calling the OUTPUT_ENABLE action on the problematic chipsets. The ENABLE action does the same thing and more. Ultimately, we could probably drop the OUTPUT_ENABLE action all together on DCE3 asics.
fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=60791
v2: only rs880 seems to be affected
--- drivers/gpu/drm/radeon/atombios_encoders.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/atombios_encoders.c +6 -2
@@ -1385,8 +1385,12 @@ radeon_atom_encoder_dpms_dig(struct drm_atombios_dig_encoder_setup (encoder,ATOM_ENABLE ,0 );atombios_dig_transmitter_setup (encoder,ATOM_TRANSMITTER_ACTION_SETUP ,0 ,0 );atombios_dig_transmitter_setup (encoder,ATOM_TRANSMITTER_ACTION_ENABLE ,0 ,0 ); -/* some early dce3.2 boards have a bug in their transmitter control table */ -if ((rdev->family !=CHIP_RV710 ) && (rdev->family !=CHIP_RV730 )) +/* some dce3.x boards have a bug in their transmitter control table. +* ACTION_ENABLE_OUTPUT can probably be dropped since ACTION_ENABLE +* does the same thing and more. +*/ +if ((rdev->family !=CHIP_RV710 ) && (rdev->family !=CHIP_RV730 ) && + (rdev->family !=CHIP_RS880 ))atombios_dig_transmitter_setup (encoder,ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT ,0 ,0 ); }if (ENCODER_MODE_IS_DP (atombios_get_encoder_mode (encoder)) && connector) {
PATCH 63/149 sd: Fix potential out-of-bounds access
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 984f1733fcee3fbc78d47e26c5096921c5d9946a upstream.
This patch fixes an out-of-bounds error in sd_read_cache_type(), found by Google's AddressSanitizer tool. When the loop ends, we know that "offset" lies beyond the end of the data in the buffer, so no Caching mode page was found. In theory it may be present, but the buffer size is limited to 512 bytes.
--- drivers/scsi/sd.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/scsi/sd.c +3 -8
@@ -2136,14 +2136,9 @@ sd_read_cache_type(struct scsi_disk *sdk } } -if (modepage ==0x3F ) { -sd_printk (KERN_ERR , sdkp,"No Caching mode page " -"present\n" ); - goto defaults; - }else if ((buffer[offset] &0x3f ) != modepage) { -sd_printk (KERN_ERR , sdkp,"Got wrong page\n" ); - goto defaults; - } +sd_printk (KERN_ERR , sdkp,"No Caching mode page found\n" ); + goto defaults; + Page_found:if (modepage ==8 ) { sdkp->WCE = ((buffer[offset +2 ] &0x04 ) !=0 );
PATCH 64/149 ocfs2: fix the end cluster offset of FIEMAP
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jie Liu <[email protected]>
commit 28e8be31803b19d0d8f76216cb11b480b8a98bec upstream.
Call fiemap ioctl(2) with given start offset as well as an desired mapping range should show extents if possible. However, we somehow figure out the end offset of mapping via 'mapping_end -= cpos' before iterating the extent records which would cause problems if the given fiemap length is too small to a cluster size, e.g,
Cluster size 4096:
debugfs.ocfs2 1.6.3
Block Size Bits: 12 Cluster Size Bits: 12
The extended fiemap test utility From David:
https://gist.github.com/anonymous/6172331
# dd if=/dev/urandom of=/ocfs2/test_file bs=1M count=1000 # ./fiemap /ocfs2/test_file 4096 10 start: 4096, length: 10 File /ocfs2/test_file has 0 extents: # Logical Physical Length Flags ^^^^^ <-- No extent is shown
In this case, at ocfs2_fiemap(): cpos == mapping_end == 1. Hence the loop of searching extent records was not executed at all.
This patch remove the in question 'mapping_end -= cpos', and loops until the cpos is larger than the mapping_end as usual.
# ./fiemap /ocfs2/test_file 4096 10 start: 4096, length: 10 File /ocfs2/test_file has 1 extents: # Logical Physical Length Flags 0: 0000000000000000 0000000056a01000 0000000006a00000 0000
--- fs/ocfs2/extent_map.c | 1 - 1 file changed, 1 deletion(-)
fs/ocfs2/extent_map.c +0 -1
@@ -782,7 +782,6 @@ int ocfs2_fiemap(struct inode *inode, st cpos = map_start >> osb->s_clustersize_bits; mapping_end =ocfs2_clusters_for_bytes (inode->i_sb, map_start + map_len); - mapping_end -= cpos; is_last =0 ;while (cpos < mapping_end && !is_last) {u32 fe_flags;
PATCH 65/149 mm/huge_memory.c: fix potential NULL pointer dereference
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Libin <[email protected]>
commit a8f531ebc33052642b4bd7b812eedf397108ce64 upstream.
In collapse_huge_page() there is a race window between releasing the mmap_sem read lock and taking the mmap_sem write lock, so find_vma() may return NULL. So check the return value to avoid NULL pointer dereference.
collapse_huge_page
khugepaged_alloc_page up_read(&mm->mmap_sem) down_write(&mm->mmap_sem) vma = find_vma(mm, address)
--- mm/huge_memory.c | 2 ++ 1 file changed, 2 insertions(+)
mm/huge_memory.c +2 -0
@@ -1882,6 +1882,8 @@ static void collapse_huge_page(struct mm goto out; vma =find_vma (mm, address); +if (!vma) + goto out; hstart = (vma->vm_start + ~HPAGE_PMD_MASK ) &HPAGE_PMD_MASK ; hend = vma->vm_end &HPAGE_PMD_MASK ;if (address < hstart || address +HPAGE_PMD_SIZE > hend)
PATCH 66/149 memcg: fix multiple large threshold notifications
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Greg Thelen <[email protected]>
commit 2bff24a3707093c435ab3241c47dcdb5f16e432b upstream.
A memory cgroup with (1) multiple threshold notifications and (2) at least one threshold >=2G was not reliable. Specifically the notifications would either not fire or would not fire in the proper order.
The __mem_cgroup_threshold() signaling logic depends on keeping 64 bit thresholds in sorted order. mem_cgroup_usage_register_event() sorts them with compare_thresholds(), which returns the difference of two 64 bit thresholds as an int. If the difference is positive but has bit[31] set, then sort() treats the difference as negative and breaks sort order.
This fix compares the two arbitrary 64 bit thresholds returning the classic -1, 0, 1 result.
The test below sets two notifications (at 0x1000 and 0x81001000):
cd /sys/fs/cgroup/memory
mkdir x
for x in 4096 2164264960; do
cgroup_event_listener x/memory.usage_in_bytes $x | sed "s/^/$x listener:/" &
done
echo $$ > x/cgroup.procs
anon_leaker 500M
v3.11-rc7 fails to signal the 4096 event listener:
Leaking...
Done leaking pages.
Patched v3.11-rc7 properly notifies:
Leaking...
4096 listener:2013:8:31:14:13:36
Done leaking pages.
The fixed bug is old. It appears to date back to the introduction of memcg threshold notifications in v2.6.34-rc1-116-g2e72b6347c94 "memcg:
implement memory thresholds"
--- mm/memcontrol.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
mm/memcontrol.c +7 -1
@@ -4385,7 +4385,13 @@ static int compare_thresholds(const voidconst struct mem_cgroup_threshold *_a = a;const struct mem_cgroup_threshold *_b = b; -return _a->threshold - _b->threshold; +if (_a->threshold > _b->threshold) +return 1 ; + +if (_a->threshold < _b->threshold) +return -1 ; + +return 0 ; }static int mem_cgroup_oom_notify_cb (struct mem_cgroup *memcg)
PATCH 67/149 sched/fair: Fix small race where child->se.parent,cfs_rq might point to invalid ones
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Daisuke Nishimura <[email protected]>
commit 6c9a27f5da9609fca46cb2b183724531b48f71ad upstream.
There is a small race between copy_process() and cgroup_attach_task() where child->se.parent,cfs_rq points to invalid (old) ones.
parent doing fork() | someone moving the parent to another cgroup
-------------------------------+---------------------------------------------
copy_process()
+ dup_task_struct()
-> parent->se is copied to child->se.
se.parent,cfs_rq of them point to old ones.
cgroup_attach_task()
+ cgroup_task_migrate()
-> parent->cgroup is updated.
+ cpu_cgroup_attach()
+ sched_move_task()
+ task_move_group_fair() +- set_task_rq()
-> se.parent,cfs_rq of parent
are updated.
+ cgroup_fork()
-> parent->cgroup is copied to child->cgroup. (*1)
+ sched_fork()
+ task_fork_fair()
-> se.parent,cfs_rq of child are accessed
while they point to old ones. (*2)
In the worst case, this bug can lead to "use-after-free" and cause a panic, because it's new cgroup's refcount that is incremented at (*1), so the old cgroup(and related data) can be freed before (*2).
In fact, a panic caused by this bug was originally caught in RHEL6.4.
BUG: unable to handle kernel NULL pointer dereference at (null)
IP: [<ffffffff81051e3e>] sched_slice+0x6e/0xa0
[...]
Call Trace:
[<ffffffff81051f25>] place_entity+0x75/0xa0
[<ffffffff81056a3a>] task_fork_fair+0xaa/0x160
[<ffffffff81063c0b>] sched_fork+0x6b/0x140
[<ffffffff8106c3c2>] copy_process+0x5b2/0x1450
[<ffffffff81063b49>] ? wake_up_new_task+0xd9/0x130
[<ffffffff8106d2f4>] do_fork+0x94/0x460
[<ffffffff81072a9e>] ? sys_wait4+0xae/0x100
[<ffffffff81009598>] sys_clone+0x28/0x30
[<ffffffff8100b393>] stub_clone+0x13/0x20
[<ffffffff8100b072>] ? system_call_fastpath+0x16/0x1b--- kernel/sched_fair.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
kernel/sched_fair.c +9 -5
@@ -4890,11 +4890,15 @@ static void task_fork_fair(struct task_supdate_rq_clock (rq); -if (unlikely (task_cpu (p) != this_cpu)) { -rcu_read_lock (); -__set_task_cpu (p, this_cpu); -rcu_read_unlock (); - } +/* +* Not only the cpu but also the task_group of the parent might have +* been changed after parent->se.parent,cfs_rq were copied to +* child->se.parent,cfs_rq. So call __set_task_cpu() to make those +* of child point to valid ones. +*/ +rcu_read_lock (); +__set_task_cpu (p, this_cpu); +rcu_read_unlock ();update_curr (cfs_rq);
PATCH 68/149 HID: provide a helper for validating hid reports
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 331415ff16a12147d57d5c953f3a961b7ede348b upstream.
Many drivers need to validate the characteristics of their HID report during initialization to avoid misusing the reports. This adds a common helper to perform validation of the report exisitng, the field existing, and the expected number of values within the field.
--- drivers/hid/hid-core.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/hid.h | 4 ++++ 2 files changed, 62 insertions(+)
drivers/hid/hid-core.c +58 -0
@@ -714,6 +714,64 @@ err: }EXPORT_SYMBOL_GPL (hid_parse_report); +static const char *const hid_report_names[] = { +"HID_INPUT_REPORT" , +"HID_OUTPUT_REPORT" , +"HID_FEATURE_REPORT" , +}; +/** +* hid_validate_values - validate existing device report's value indexes +* +* @device: hid device +* @type: which report type to examine +* @id: which report ID to examine (0 for first) +* @field_index: which report field to examine +* @report_counts: expected number of values +* +* Validate the number of values in a given field of a given report, after +* parsing. +*/ +struct hid_report *hid_validate_values (struct hid_device *hid, +unsigned int type,unsigned int id, +unsigned int field_index, +unsigned int report_counts) +{ +struct hid_report *report; + +if (type >HID_FEATURE_REPORT ) { +hid_err (hid,"invalid HID report type %u\n" , type); +return NULL ; + } + +if (id >=HID_MAX_IDS ) { +hid_err (hid,"invalid HID report id %u\n" , id); +return NULL ; + } + +/* +* Explicitly not using hid_get_report() here since it depends on +* ->numbered being checked, which may not always be the case when +* drivers go to access report values. +*/ + report = hid->report_enum[type].report_id_hash[id]; +if (!report) { +hid_err (hid,"missing %s %u\n" , hid_report_names[type], id); +return NULL ; + } +if (report->maxfield <= field_index) { +hid_err (hid,"not enough fields in %s %u\n" , + hid_report_names[type], id); +return NULL ; + } +if (report->field[field_index]->report_count < report_counts) { +hid_err (hid,"not enough values in %s %u field %u\n" , + hid_report_names[type], id, field_index); +return NULL ; + } +return report; +} +EXPORT_SYMBOL_GPL (hid_validate_values); +/* * Convert a signed n-bit integer to signed 32-bit integer. Common * cases are done through the compiler, the screwed things has to be
include/linux/hid.h +4 -0
@@ -718,6 +718,10 @@ void hid_output_report(struct hid_reportstruct hid_device *hid_allocate_device (void );struct hid_report *hid_register_report (struct hid_device *device,unsigned type,unsigned id);int hid_parse_report (struct hid_device *hid,__u8 *start,unsigned size); +struct hid_report *hid_validate_values (struct hid_device *hid, +unsigned int type,unsigned int id, +unsigned int field_index, +unsigned int report_counts);int hid_check_keys_pressed (struct hid_device *hid);int hid_connect (struct hid_device *hid,unsigned int connect_mask);void hid_disconnect (struct hid_device *hid);
PATCH 69/149 HID: zeroplus: validate output report details
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 78214e81a1bf43740ce89bb5efda78eac2f8ef83 upstream.
The zeroplus HID driver was not checking the size of allocated values in fields it used. A HID device could send a malicious output report that would cause the driver to write beyond the output report allocation during initialization, causing a heap overflow:
[ 1442.728680] usb 1-1: New USB device found, idVendor=0c12, idProduct=0005 ... [ 1466.243173] BUG kmalloc-192 (Tainted: G W ): Redzone overwritten
CVE-2013-2889
--- drivers/hid/hid-zpff.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
drivers/hid/hid-zpff.c +5 -13
@@ -70,21 +70,13 @@ static int zpff_init(struct hid_device *struct hid_report *report;struct hid_input *hidinput =list_entry (hid->inputs.next, struct hid_input, list); -struct list_head *report_list = - &hid->report_enum[HID_OUTPUT_REPORT ].report_list;struct input_dev *dev = hidinput->input; -int error; +int i, error; -if (list_empty (report_list)) { -hid_err (hid,"no output report found\n" ); -return -ENODEV ; - } - - report = list_entry(report_list->next, struct hid_report, list); - -if (report->maxfield <4 ) { -hid_err (hid,"not enough fields in report\n" ); -return -ENODEV ; +for (i =0 ; i <4 ; i++) { + report =hid_validate_values (hid,HID_OUTPUT_REPORT ,0 , i,1 ); +if (!report) +return -ENODEV ; } zpff =kzalloc (sizeof (struct zpff_device ),GFP_KERNEL );
PATCH 70/149 HID: LG: validate HID output report details
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 0fb6bd06e06792469acc15bbe427361b56ada528 upstream.
A HID device could send a malicious output report that would cause the lg, lg3, and lg4 HID drivers to write beyond the output report allocation during an event, causing a heap overflow:
[ 325.245240] usb 1-1: New USB device found, idVendor=046d, idProduct=c287 ... [ 414.518960] BUG kmalloc-4096 (Not tainted): Redzone overwritten
Additionally, while lg2 did correctly validate the report details, it was cleaned up and shortened.
CVE-2013-2893
--- drivers/hid/hid-lg2ff.c | 19 +++---------------- drivers/hid/hid-lg3ff.c | 29 ++++++----------------------- drivers/hid/hid-lg4ff.c | 20 +------------------- drivers/hid/hid-lgff.c | 17 ++--------------- 4 files changed, 12 insertions(+), 73 deletions(-)
drivers/hid/hid-lg2ff.c +3 -16
@@ -66,26 +66,13 @@ int lg2ff_init(struct hid_device *hid)struct hid_report *report;struct hid_input *hidinput =list_entry (hid->inputs.next, struct hid_input, list); -struct list_head *report_list = - &hid->report_enum[HID_OUTPUT_REPORT ].report_list;struct input_dev *dev = hidinput->input;int error; -if (list_empty (report_list)) { -hid_err (hid,"no output report found\n" ); +/* Check that the report looks ok */ + report =hid_validate_values (hid,HID_OUTPUT_REPORT ,0 ,0 ,7 ); +if (!report)return -ENODEV ; - } - - report = list_entry(report_list->next, struct hid_report, list); - -if (report->maxfield <1 ) { -hid_err (hid,"output report is empty\n" ); -return -ENODEV ; - } -if (report->field[0 ]->report_count <7 ) { -hid_err (hid,"not enough values in the field\n" ); -return -ENODEV ; - } lg2ff =kmalloc (sizeof (struct lg2ff_device ),GFP_KERNEL );if (!lg2ff)
drivers/hid/hid-lg3ff.c +6 -23
@@ -68,10 +68,11 @@ static int hid_lg3ff_play(struct input_dint x, y;/* -* Maxusage should always be 63 (maximum fields) -* likely a better way to ensure this data is clean +* Available values in the field should always be 63, but we only use up to +* 35. Instead, clear the entire area, however big it is. */ -memset (report->field[0 ]->value,0 ,sizeof (__s32)*report->field[0 ]->maxusage); +memset (report->field[0 ]->value,0 , +sizeof (__s32) * report->field[0 ]->report_count);switch (effect->type) {case FF_CONSTANT :
@@ -131,32 +132,14 @@ static const signed short ff3_joystick_aint lg3ff_init (struct hid_device *hid) { struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list); -struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT ].report_list;struct input_dev *dev = hidinput->input; -struct hid_report *report; -struct hid_field *field;const signed short *ff_bits = ff3_joystick_ac;int error;int i; -/* Find the report to use */ -if (list_empty (report_list)) { -hid_err (hid,"No output report found\n" ); -return -1 ; - } -/* Check that the report looks ok */ - report = list_entry(report_list->next, struct hid_report, list); -if (!report) { -hid_err (hid,"NULL output report\n" ); -return -1 ; - } - - field = report->field[0 ]; -if (!field) { -hid_err (hid,"NULL field\n" ); -return -1 ; - } +if (!hid_validate_values (hid,HID_OUTPUT_REPORT ,0 ,0 ,35 )) +return -ENODEV ;/* Assume single fixed device G940 */ for (i =0 ; ff_bits[i] >=0 ; i++)
drivers/hid/hid-lg4ff.c +1 -19
@@ -339,33 +339,15 @@ static ssize_t lg4ff_range_store(structint lg4ff_init (struct hid_device *hid) { struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list); -struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT ].report_list;struct input_dev *dev = hidinput->input; -struct hid_report *report; -struct hid_field *field;struct lg4ff_device_entry *entry;struct usb_device_descriptor *udesc;int error, i, j;__u16 bcdDevice, rev_maj, rev_min; -/* Find the report to use */ -if (list_empty (report_list)) { -hid_err (hid,"No output report found\n" ); -return -1 ; - } -/* Check that the report looks ok */ - report = list_entry(report_list->next, struct hid_report, list); -if (!report) { -hid_err (hid,"NULL output report\n" ); -return -1 ; - } - - field = report->field[0 ]; -if (!field) { -hid_err (hid,"NULL field\n" ); +if (!hid_validate_values (hid,HID_OUTPUT_REPORT ,0 ,0 ,7 ))return -1 ; - }/* Check what wheel has been connected */ for (i =0 ; i <ARRAY_SIZE (lg4ff_devices); i++) {
drivers/hid/hid-lgff.c +2 -15
@@ -130,27 +130,14 @@ static void hid_lgff_set_autocenter(struint lgff_init (struct hid_device * hid) { struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list); -struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT ].report_list;struct input_dev *dev = hidinput->input; -struct hid_report *report; -struct hid_field *field;const signed short *ff_bits = ff_joystick;int error;int i; -/* Find the report to use */ -if (list_empty (report_list)) { -hid_err (hid,"No output report found\n" ); -return -1 ; - } -/* Check that the report looks ok */ - report = list_entry(report_list->next, struct hid_report, list); - field = report->field[0 ]; -if (!field) { -hid_err (hid,"NULL field\n" ); -return -1 ; - } +if (!hid_validate_values (hid,HID_OUTPUT_REPORT ,0 ,0 ,7 )) +return -ENODEV ;for (i =0 ; i <ARRAY_SIZE (devices); i++) { if (dev->id.vendor == devices[i].idVendor &&
PATCH 71/149 HID: validate feature and input report details
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Tissoires <[email protected]>
commit cc6b54aa54bf40b762cab45a9fc8aa81653146eb upstream.
When dealing with usage_index, be sure to properly use unsigned instead of int to avoid overflows.
When working on report fields, always validate that their report_counts are in bounds.
Without this, a HID device could report a malicious feature report that could trick the driver into a heap overflow:
[ 634.885003] usb 1-1: New USB device found, idVendor=0596, idProduct=0500 ... [ 676.469629] BUG kmalloc-192 (Tainted: G W ): Redzone overwritten
CVE-2013-2897
[bwh: Backported to 3.2:
- Drop inapplicable changes to hid_usage::usage_index initialisation and to hid_report_raw_event()
- Adjust context in report_features()
---
drivers/hid/hid-core.c +5 -4
@@ -218,9 +218,9 @@ static int hid_add_field(struct hid_pars {struct hid_report *report;struct hid_field *field; -int usages; +unsigned usages;unsigned offset; -int i; +unsigned i; report =hid_register_report (parser->device, report_type, parser->global.report_id);if (!report) {
@@ -239,7 +239,8 @@ static int hid_add_field(struct hid_parsif (!parser->local.usage_index)/* Ignore padding fields */ return 0 ; - usages =max_t (int, parser->local.usage_index, parser->global.report_count); + usages =max_t (unsigned, parser->local.usage_index, + parser->global.report_count); field =hid_register_field (report, usages, parser->global.report_count);if (!field)
@@ -250,7 +251,7 @@ static int hid_add_field(struct hid_pars field->application =hid_lookup_collection (parser,HID_COLLECTION_APPLICATION );for (i =0 ; i < usages; i++) { -int j = i; +unsigned j = i;/* Duplicate the last usage we parsed if we have excess values */ if (i >= parser->local.usage_index) j = parser->local.usage_index -1 ;
drivers/hid/hid-input.c +10 -1
@@ -284,6 +284,10 @@ static void hidinput_configure_usage(strif (field->flags &HID_MAIN_ITEM_CONSTANT ) goto ignore; +/* Ignore if report count is out of bounds. */ +if (field->report_count <1 ) + goto ignore; +/* only LED usages are supported in output fields */ if (field->report_type ==HID_OUTPUT_REPORT && (usage->hid &HID_USAGE_PAGE ) !=HID_UP_LED ) {
@@ -887,10 +891,15 @@ static void report_features(struct hid_d rep_enum = &hid->report_enum[HID_FEATURE_REPORT ];list_for_each_entry (rep, &rep_enum->report_list, list) -for (i =0 ; i < rep->maxfield; i++) +for (i =0 ; i < rep->maxfield; i++) { +/* Ignore if report count is out of bounds. */ +if (rep->field[i]->report_count <1 ) +continue ; +for (j =0 ; j < rep->field[i]->maxusage; j++) drv->feature_mapping (hid, rep->field[i], rep->field[i]->usage + j); + } }/*
PATCH 72/149 HID: logitech-dj: validate output report details
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 297502abb32e225fb23801fcdb0e4f6f8e17099a upstream.
A HID device could send a malicious output report that would cause the logitech-dj HID driver to leak kernel memory contents to the device, or trigger a NULL dereference during initialization:
[ 304.424553] usb 1-1: New USB device found, idVendor=046d, idProduct=c52b ... [ 304.780467] BUG: unable to handle kernel NULL pointer dereference at 0000000000000028 [ 304.781409] IP: [<ffffffff815d50aa>] logi_dj_recv_send_report.isra.11+0x1a/0x90
CVE-2013-2895
[bwh: Backported to 3.2: drop inapplicable changes to
logi_dj_recv_send_report()]
--- drivers/hid/hid-logitech-dj.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/hid/hid-logitech-dj.c +6 -0
@@ -791,6 +791,12 @@ static int logi_dj_probe(struct hid_devi goto hid_parse_fail; } +if (!hid_validate_values (hdev,HID_OUTPUT_REPORT ,REPORT_ID_DJ_SHORT , +0 ,DJREPORT_SHORT_LENGTH -1 )) { + retval = -ENODEV ; + goto hid_parse_fail; + } +/* Starts the usb device and connects to upper interfaces hiddev and * hidraw */ retval =hid_hw_start (hdev,HID_CONNECT_DEFAULT );
PATCH 73/149 ASoC: max98095: a couple array underflows
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit f8d7b13e14357ed19d2ca2799539600418dc3939 upstream.
The ->put() function are called from snd_ctl_elem_write() with user supplied data. The limit checks here could underflow leading to a crash.
--- sound/soc/codecs/max98095.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/max98095.c +2 -2
@@ -1861,7 +1861,7 @@ static int max98095_put_eq_enum(struct sstruct max98095_pdata *pdata = max98095->pdata;int channel =max98095_get_eq_channel (kcontrol->id.name);struct max98095_cdata *cdata; -int sel = ucontrol->value.integer.value[0 ]; +unsigned int sel = ucontrol->value.integer.value[0 ];struct max98095_eq_cfg *coef_set;int fs, best, best_val, i;int regmask, regsave;
@@ -2014,7 +2014,7 @@ static int max98095_put_bq_enum(struct sstruct max98095_pdata *pdata = max98095->pdata;int channel =max98095_get_bq_channel (codec, kcontrol->id.name);struct max98095_cdata *cdata; -int sel = ucontrol->value.integer.value[0 ]; +unsigned int sel = ucontrol->value.integer.value[0 ];struct max98095_biquad_cfg *coef_set;int fs, best, best_val, i;int regmask, regsave;
PATCH 74/149 ASoC: 88pm860x: array overflow in snd_soc_put_volsw_2r_st()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit d967967e8d1116fb38bad25e58714b5dddd03cca upstream.
This is called from snd_ctl_elem_write() with user supplied data so we need to add some bounds checking.
--- sound/soc/codecs/88pm860x-codec.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/codecs/88pm860x-codec.c +3 -0
@@ -351,6 +351,9 @@ static int snd_soc_put_volsw_2r_st(struc val = ucontrol->value.integer.value[0 ]; val2 = ucontrol->value.integer.value[1 ]; +if (val >=ARRAY_SIZE (st_table) || val2 >=ARRAY_SIZE (st_table)) +return -EINVAL ; + err =snd_soc_update_bits (codec, reg,0x3f , st_table[val].m);if (err <0 )return err;
PATCH 75/149 drm/radeon: fix panel scaling with eDP and LVDS bridges
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 855f5f1d882a34e4e9dd27b299737cd3508a5624 upstream.
We were using the wrong set_properly callback so we always ended up with Full scaling even if something else (Center or Full aspect) was selected.
--- drivers/gpu/drm/radeon/radeon_connectors.c | 34 +++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/radeon_connectors.c +31 -3
@@ -1387,6 +1387,24 @@ struct drm_connector_funcs radeon_dp_con .force = radeon_dvi_force, }; +static const struct drm_connector_funcs radeon_edp_connector_funcs = { + .dpms = drm_helper_connector_dpms, + .detect = radeon_dp_detect, + .fill_modes = drm_helper_probe_single_connector_modes, + .set_property = radeon_lvds_set_property, + .destroy = radeon_dp_connector_destroy, + .force = radeon_dvi_force, +}; + +static const struct drm_connector_funcs radeon_lvds_bridge_connector_funcs = { + .dpms = drm_helper_connector_dpms, + .detect = radeon_dp_detect, + .fill_modes = drm_helper_probe_single_connector_modes, + .set_property = radeon_lvds_set_property, + .destroy = radeon_dp_connector_destroy, + .force = radeon_dvi_force, +}; + void radeon_add_atom_connector(struct drm_device *dev, uint32_t connector_id,
@@ -1478,8 +1496,6 @@ radeon_add_atom_connector(struct drm_dev goto failed; radeon_dig_connector->igp_lane_info = igp_lane_info; radeon_connector->con_priv = radeon_dig_connector; -drm_connector_init (dev, &radeon_connector->base, &radeon_dp_connector_funcs, connector_type); -drm_connector_helper_add (&radeon_connector->base, &radeon_dp_connector_helper_funcs);if (i2c_bus->valid) {/* add DP i2c bus */ if (connector_type == DRM_MODE_CONNECTOR_eDP)
@@ -1496,6 +1512,10 @@ radeon_add_atom_connector(struct drm_devcase DRM_MODE_CONNECTOR_VGA :case DRM_MODE_CONNECTOR_DVIA :default : +drm_connector_init (dev, &radeon_connector->base, + &radeon_dp_connector_funcs, connector_type); +drm_connector_helper_add (&radeon_connector->base, + &radeon_dp_connector_helper_funcs); connector->interlace_allowed = true; connector->doublescan_allowed = true; radeon_connector->dac_load_detect = true;
@@ -1508,6 +1528,10 @@ radeon_add_atom_connector(struct drm_devcase DRM_MODE_CONNECTOR_HDMIA :case DRM_MODE_CONNECTOR_HDMIB :case DRM_MODE_CONNECTOR_DisplayPort: +drm_connector_init (dev, &radeon_connector->base, + &radeon_dp_connector_funcs, connector_type); +drm_connector_helper_add (&radeon_connector->base, + &radeon_dp_connector_helper_funcs);drm_connector_attach_property (&radeon_connector->base, rdev->mode_info.underscan_property,UNDERSCAN_OFF );
@@ -1532,6 +1556,10 @@ radeon_add_atom_connector(struct drm_devbreak ;case DRM_MODE_CONNECTOR_LVDS :case DRM_MODE_CONNECTOR_eDP: +drm_connector_init (dev, &radeon_connector->base, + &radeon_lvds_bridge_connector_funcs, connector_type); +drm_connector_helper_add (&radeon_connector->base, + &radeon_dp_connector_helper_funcs);drm_connector_attach_property (&radeon_connector->base, dev->mode_config.scaling_mode_property,DRM_MODE_SCALE_FULLSCREEN );
@@ -1695,7 +1723,7 @@ radeon_add_atom_connector(struct drm_dev goto failed; radeon_dig_connector->igp_lane_info = igp_lane_info; radeon_connector->con_priv = radeon_dig_connector; -drm_connector_init (dev, &radeon_connector->base, &radeon_dp_connector_funcs, connector_type); +drm_connector_init (dev, &radeon_connector->base, &radeon_edp_connector_funcs, connector_type);drm_connector_helper_add (&radeon_connector->base, &radeon_dp_connector_helper_funcs);if (i2c_bus->valid) {/* add DP i2c bus */
PATCH 76/149 Bluetooth: Add a new PID/VID 0cf3/e005 for AR3012.
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Peng Chen <[email protected]>
commit 0a3658cccdf5326ea508efeb1879b0e2508bb0c3 upstream.
usb device info:
T: Bus=06 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 15 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0cf3 ProdID=e005 Rev= 0.02 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms
--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -84,6 +84,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x04CA, 0x3008) }, { USB_DEVICE(0x13d3, 0x3362) }, { USB_DEVICE(0x0CF3, 0xE004) }, + { USB_DEVICE(0x0CF3, 0xE005) }, { USB_DEVICE(0x0930, 0x0219) }, { USB_DEVICE(0x0489, 0xe057) }, { USB_DEVICE(0x13d3, 0x3393) },
@@ -125,6 +126,7 @@ static struct usb_device_id ath3k_blist_ { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
@@ -154,6 +154,7 @@ static struct usb_device_id blacklist_ta { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
PATCH 77/149 Bluetooth: Add support for BCM20702A0 [0b05, 17cb]
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Raphael Kubo da Costa <[email protected]>
commit 38a172bef8c93ecbfd69715fd88396988e4073fd upstream.
Yet another vendor specific ID for this chipset; this one for the ASUS USB-BT400 Bluetooth 4.0 adapter.
T: Bus=03 Lev=02 Prnt=02 Port=01 Cnt=01 Dev#= 6 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0b05 ProdID=17cb Rev=01.12 S: Manufacturer=Broadcom Corp S: Product=BCM20702A0 S: SerialNumber=000272C64400 C: #Ifs= 4 Cfg#= 1 Atr=a0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none) I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none) I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
--- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +1 -0
@@ -108,6 +108,7 @@ static struct usb_device_id btusb_table[/* Broadcom BCM20702A0 */ { USB_DEVICE(0x0b05, 0x17b5) }, + { USB_DEVICE(0x0b05, 0x17cb) }, { USB_DEVICE(0x04ca, 0x2003) }, { USB_DEVICE(0x0489, 0xe042) }, { USB_DEVICE(0x413c, 0x8197) },
PATCH 78/149 net: usb: cdc_ether: Use wwan interface for Telit modules
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Porcedda <[email protected]>
commit 0092820407901a0b2c4e343e85f96bb7abfcded1 upstream.
--- drivers/net/usb/cdc_ether.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/usb/cdc_ether.c +5 -0
@@ -615,6 +615,11 @@ static const struct usb_device_id produc .bInterfaceProtocol = USB_CDC_PROTO_NONE, .driver_info = (unsigned long)&wwan_info, }, { +/* Telit modules */ +USB_VENDOR_AND_INTERFACE_INFO (0x1bc7 ,USB_CLASS_COMM , + USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), + .driver_info = (kernel_ulong_t) &wwan_info, +}, {USB_INTERFACE_INFO (USB_CLASS_COMM ,USB_CDC_SUBCLASS_ETHERNET ,USB_CDC_PROTO_NONE ), .driver_info = (unsigned long) &cdc_info,
PATCH 79/149 serial: pch_uart: fix tty-kref leak in rx-error path
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit fc0919c68cb2f75bb1af759315f9d7e2a9443c28 upstream.
Fix tty-kref leak introduced by commit 384e301e ("pch_uart: fix a deadlock when pch_uart as console") which never put its tty reference.
--- drivers/tty/serial/pch_uart.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/serial/pch_uart.c +2 -0
@@ -970,6 +970,8 @@ static void pch_uart_err_ir(struct eg20tif (tty ==NULL ) {for (i =0 ; error_msg[i] !=NULL ; i++)dev_err (&priv->pdev->dev, error_msg[i]); + }else { +tty_kref_put (tty); } }
PATCH 80/149 serial: pch_uart: fix tty-kref leak in dma-rx path
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 19b85cfb190eb9980eaf416bff96aef4159a430e upstream.
Fix tty_kref leak when tty_buffer_request room fails in dma-rx path.
Note that the tty ref isn't really needed anymore, but as the leak has always been there, fixing it before removing should makes it easier to backport the fix.
--- drivers/tty/serial/pch_uart.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/tty/serial/pch_uart.c +2 -1
@@ -552,11 +552,12 @@ static int dma_push_rx(struct eg20t_portdev_warn (port->dev,"Rx overrun: dropping %u bytes\n" , size - room);if (!room) -return room; + goto out;tty_insert_flip_string (tty,sg_virt (&priv->sg_rx), size); port->icount.rx += room; +out:tty_kref_put (tty);return room;
PATCH 81/149 x86, efi: Don't map Boot Services on i386
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Josh Boyer <[email protected]>
commit 700870119f49084da004ab588ea2b799689efaf7 upstream.
Add patch to fix 32bit EFI service mapping (rhbz 726701)
Multiple people are reporting hitting the following WARNING on i386,
WARNING: at arch/x86/mm/ioremap.c:102 __ioremap_caller+0x3d3/0x440() Modules linked in: Pid: 0, comm: swapper Not tainted 3.9.0-rc7+ #95 Call Trace: [<c102b6af>] warn_slowpath_common+0x5f/0x80 [<c1023fb3>] ? __ioremap_caller+0x3d3/0x440 [<c1023fb3>] ? __ioremap_caller+0x3d3/0x440 [<c102b6ed>] warn_slowpath_null+0x1d/0x20 [<c1023fb3>] __ioremap_caller+0x3d3/0x440 [<c106007b>] ? get_usage_chars+0xfb/0x110 [<c102d937>] ? vprintk_emit+0x147/0x480 [<c1418593>] ? efi_enter_virtual_mode+0x1e4/0x3de [<c102406a>] ioremap_cache+0x1a/0x20 [<c1418593>] ? efi_enter_virtual_mode+0x1e4/0x3de [<c1418593>] efi_enter_virtual_mode+0x1e4/0x3de [<c1407984>] start_kernel+0x286/0x2f4 [<c1407535>] ? repair_env_string+0x51/0x51 [<c1407362>] i386_start_kernel+0x12c/0x12f
Due to the workaround described in commit 916f676f8 ("x86, efi: Retain boot service code until after switching to virtual mode") EFI Boot Service regions are mapped for a period during boot. Unfortunately, with the limited size of the i386 direct kernel map it's possible that some of the Boot Service regions will not be directly accessible, which causes them to be ioremap()'d, triggering the above warning as the regions are marked as E820_RAM in the e820 memmap.
There are currently only two situations where we need to map EFI Boot Service regions,
1. To workaround the firmware bug described in 916f676f8
2. To access the ACPI BGRT image
but since we haven't seen an i386 implementation that requires either, this simple fix should suffice for now.
[ Added to changelog - Matt ]
--- arch/x86/platform/efi/efi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
arch/x86/platform/efi/efi.c +7 -4
@@ -703,10 +703,13 @@ void __init efi_enter_virtual_mode(void)for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { md = p; -if (!(md->attribute &EFI_MEMORY_RUNTIME ) && - md->type !=EFI_BOOT_SERVICES_CODE && - md->type !=EFI_BOOT_SERVICES_DATA ) -continue ; +if (!(md->attribute &EFI_MEMORY_RUNTIME )) { +#ifdef CONFIG_X86_64 +if (md->type !=EFI_BOOT_SERVICES_CODE && + md->type != EFI_BOOT_SERVICES_DATA) +#endif +continue ; + } size = md->num_pages <<EFI_PAGE_SHIFT ; end = md->phys_addr + size;
PATCH 82/149 dm-snapshot: fix performance degradation due to small hash size
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit 60e356f381954d79088d0455e357db48cfdd6857 upstream.
LVM2, since version 2.02.96, creates origin with zero size, then loads the snapshot driver and then loads the origin. Consequently, the snapshot driver sees the origin size zero and sets the hash size to the lower bound 64. Such small hash table causes performance degradation.
This patch changes it so that the hash size is determined by the size of snapshot volume, not minimum of origin and snapshot size. It doesn't make sense to set the snapshot size significantly larger than the origin size, so we do not need to take origin size into account when calculating the hash size.
--- drivers/md/dm-snap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/md/dm-snap.c +2 -3
@@ -721,17 +721,16 @@ static int calc_max_buckets(void)*/ static int init_hash_tables (struct dm_snapshot *s) { -sector_t hash_size, cow_dev_size, origin_dev_size, max_buckets; +sector_t hash_size, cow_dev_size, max_buckets;/* * Calculate based on the size of the original volume or * the COW volume... */ cow_dev_size =get_dev_size (s->cow->bdev); - origin_dev_size =get_dev_size (s->origin->bdev); max_buckets =calc_max_buckets (); - hash_size =min (origin_dev_size, cow_dev_size) >> s->store->chunk_shift; + hash_size = cow_dev_size >> s->store->chunk_shift; hash_size =min (hash_size, max_buckets);if (hash_size <64 )
PATCH 83/149 x86/reboot: Add quirk to make Dell C6100 use reboot=pci automatically
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Masoud Sharbiani <[email protected]>
commit 4f0acd31c31f03ba42494c8baf6c0465150e2621 upstream.
Dell PowerEdge C6100 machines fail to completely reboot about 20% of the time.
--- arch/x86/kernel/reboot.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/x86/kernel/reboot.c +16 -0
@@ -468,6 +468,22 @@ static struct dmi_system_id __initdata p DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"), }, }, + { /* Handle problems with rebooting on the Dell PowerEdge C6100. */ + .callback = set_pci_reboot, + .ident = "Dell PowerEdge C6100", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "C6100"), + }, + }, + {/* Some C6100 machines were shipped with vendor being 'Dell'. */ + .callback = set_pci_reboot, + .ident = "Dell PowerEdge C6100", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell"), + DMI_MATCH(DMI_PRODUCT_NAME, "C6100"), + }, + }, { } };
PATCH 84/149 drm/radeon: disable tests/benchmarks if accel is disabled
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 4a1132a023eb48cf10522d84c5908d43b612c041 upstream.
The tests are only usable if the acceleration engines have been successfully initialized.
Based on an initial patch from: Alex Ivanov <[email protected]>
---
drivers/gpu/drm/radeon/radeon_device.c +8 -2
@@ -818,10 +818,16 @@ int radeon_device_init(struct radeon_devreturn r; }if (radeon_testing) { -radeon_test_moves (rdev); +if (rdev->accel_working) +radeon_test_moves (rdev); +else +DRM_INFO ("radeon: acceleration disabled, skipping move tests\n" ); }if (radeon_benchmarking) { -radeon_benchmark (rdev, radeon_benchmarking); +if (rdev->accel_working) +radeon_benchmark (rdev, radeon_benchmarking); +else +DRM_INFO ("radeon: acceleration disabled, skipping benchmarks\n" ); }return 0 ; }
PATCH 85/149 drm/i915/dp: increase i2c-over-aux retry interval on AUX DEFER
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
commit 8d16f258217f2f583af1fd57c5144aa4bbe73e48 upstream.
There is no clear cut rules or specs for the retry interval, as there are many factors that affect overall response time. Increase the interval, and even more so on branch devices which may have limited i2c bit rates.
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=60263
--- drivers/gpu/drm/i915/intel_dp.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +12 -1
@@ -621,7 +621,18 @@ intel_dp_i2c_aux_ch(struct i2c_adapter *DRM_DEBUG_KMS ("aux_ch native nack\n" );return -EREMOTEIO ;case AUX_NATIVE_REPLY_DEFER : -udelay (100 ); +/* +* For now, just give more slack to branch devices. We +* could check the DPCD for I2C bit rate capabilities, +* and if available, adjust the interval. We could also +* be more careful with DP-to-Legacy adapters where a +* long legacy cable may force very low I2C bit rates. +*/ +if (intel_dp->dpcd[DP_DOWNSTREAMPORT_PRESENT ] & +DP_DWN_STRM_PORT_PRESENT ) +usleep_range (500 ,600 ); +else +usleep_range (300 ,400 );continue ;default : DRM_ERROR("aux_ch invalid native reply 0x%02x\n",
PATCH 86/149 staging: vt6656: [BUG] main_usb.c oops on device_close move flag earlier.
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Malcolm Priestley <[email protected]>
commit e3eb270fab7734427dd8171a93e4946fe28674bc upstream.
The vt6656 is prone to resetting on the usb bus.
It seems there is a race condition and wpa supplicant is trying to open the device via iw_handlers before its actually closed at a stage that the buffers are being removed.
The device is longer considered open when the buffers are being removed. So move ~DEVICE_FLAGS_OPENED flag to before freeing the device buffers.
--- drivers/staging/vt6656/main_usb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/vt6656/main_usb.c +2 -1
@@ -1221,6 +1221,8 @@ device_release_WPADEV(pDevice);memset (pMgmt->abyCurrBSSID,0 ,6 ); pMgmt->eCurrState =WMAC_STATE_IDLE ; + pDevice->flags &= ~DEVICE_FLAGS_OPENED ; +device_free_tx_bufs (pDevice);device_free_rx_bufs (pDevice);device_free_int_bufs (pDevice);
@@ -1232,7 +1234,6 @@ device_release_WPADEV(pDevice);usb_free_urb (pDevice->pInterruptURB);BSSvClearNodeDBTable (pDevice,0 ); - pDevice->flags &=(~DEVICE_FLAGS_OPENED );DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "device_close2 \n" );
PATCH 87/149 USB: fix PM config symbol in uhci-hcd, ehci-hcd, and xhci-hcd
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit f875fdbf344b9fde207f66b392c40845dd7e5aa6 upstream.
Since uhci-hcd, ehci-hcd, and xhci-hcd support runtime PM, the .pm field in their pci_driver structures should be protected by CONFIG_PM rather than CONFIG_PM_SLEEP. The corresponding change has already been made for ohci-hcd.
Without this change, controllers won't do runtime suspend if system suspend or hibernation isn't enabled.
--- drivers/usb/host/ehci-pci.c | 2 +- drivers/usb/host/uhci-pci.c | 2 +- drivers/usb/host/xhci-pci.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/usb/host/ehci-pci.c +1 -1
@@ -543,7 +543,7 @@ static struct pci_driver ehci_pci_driver .remove = usb_hcd_pci_remove, .shutdown = usb_hcd_pci_shutdown, -#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_PM .driver = { .pm = &usb_hcd_pci_pm_ops },
drivers/usb/host/uhci-pci.c +1 -1
@@ -293,7 +293,7 @@ static struct pci_driver uhci_pci_driver .remove = usb_hcd_pci_remove, .shutdown = uhci_shutdown, -#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_PM .driver = { .pm = &usb_hcd_pci_pm_ops },
drivers/usb/host/xhci-pci.c +1 -1
@@ -330,7 +330,7 @@ static struct pci_driver xhci_pci_driver/* suspend and resume implemented later */ .shutdown = usb_hcd_pci_shutdown, -#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_PM .driver = { .pm = &usb_hcd_pci_pm_ops },
PATCH 88/149 usb/core/devio.c: Don't reject control message to endpoint with wrong direction bit
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kurt Garloff <[email protected]>
commit 831abf76643555a99b80a3b54adfa7e4fa0a3259 upstream.
Trying to read data from the Pegasus Technologies NoteTaker (0e20:0101)
[1] with the Windows App (EasyNote) works natively but fails when Windows is running under KVM (and the USB device handed to KVM).
The reason is a USB control message
usb 4-2.2: control urb: bRequestType=22 bRequest=09 wValue=0200 wIndex=0001 wLength=0008
This goes to endpoint address 0x01 (wIndex); however, endpoint address0x01 does not exist. There is an endpoint 0x81 though (same number,
but other direction); the app may have meant that endpoint instead.
The kernel thus rejects the IO and thus we see the failure.
Apparently, Linux is more strict here than Windows ... we can't change the Win app easily, so that's a problem.
It seems that the Win app/driver is buggy here and the driver does not behave fully according to the USB HID class spec that it claims to belong to. The device seems to happily deal with that though (and seems to not really care about this value much).
So the question is whether the Linux kernel should filter here. Rejecting has the risk that somewhat non-compliant userspace apps/ drivers (most likely in a virtual machine) are prevented from working. Not rejecting has the risk of confusing an overly sensitive device with such a transfer. Given the fact that Windows does not filter it makes this risk rather small though.
The patch makes the kernel more tolerant: If the endpoint address in wIndex does not exist, but an endpoint with toggled direction bit does, it will let the transfer through. (It does NOT change the message.)
With attached patch, the app in Windows in KVM works.
usb 4-2.2: check_ctrlrecip: process 13073 (qemu-kvm) requesting ep 01 but needs 81
I suspect this will mostly affect apps in virtual environments; as on Linux the apps would have been adapted to the stricter handling of the kernel. I have done that for mine[2].
[1] http://www.pegatech.com/
[2] https://sourceforge.net/projects/notetakerpen/
--- drivers/usb/core/devio.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/usb/core/devio.c +16 -0
@@ -646,6 +646,22 @@ static int check_ctrlrecip(struct dev_stif ((index & ~USB_DIR_IN ) ==0 )return 0 ; ret =findintfep (ps->dev, index); +if (ret <0 ) { +/* +* Some not fully compliant Win apps seem to get +* index wrong and have the endpoint number here +* rather than the endpoint address (with the +* correct direction). Win does let this through, +* so we'll not reject it here but leave it to +* the device to not break KVM. But we warn. +*/ + ret =findintfep (ps->dev, index ^0x80 ); +if (ret >=0 ) +dev_info (&ps->dev->dev, +"%s: process %i (%s) requesting ep %02x but needs %02x\n" , + __func__,task_pid_nr (current), + current->comm, index, index ^0x80 ); + }if (ret >=0 ) ret =checkintf (ps, ret);break ;
PATCH 89/149 hwmon: (applesmc) Check key count before proceeding
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Henrik Rydberg <[email protected]>
commit 5f4513864304672e6ea9eac60583eeac32e679f2 upstream.
After reports from Chris and Josh Boyer of a rare crash in applesmc, Guenter pointed at the initialization problem fixed below. The patch has not been verified to fix the crash, but should be applied regardless.
--- drivers/hwmon/applesmc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/hwmon/applesmc.c +10 -1
@@ -485,16 +485,25 @@ static int applesmc_init_smcreg_try(void {struct applesmc_registers *s = &smcreg;bool left_light_sensor, right_light_sensor; +unsigned int count;u8 tmp[1 ];int ret;if (s->init_complete)return 0 ; - ret =read_register_count (&s->key_count); + ret =read_register_count (&count);if (ret)return ret; +if (s->cache && s->key_count != count) { +pr_warn ("key count changed from %d to %d\n" , + s->key_count, count); +kfree (s->cache); + s->cache =NULL ; + } + s->key_count = count; +if (!s->cache) s->cache =kcalloc (s->key_count,sizeof (*s->cache),GFP_KERNEL );if (!s->cache)
PATCH 90/149 rtlwifi: Align private space in rtl_priv struct
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit 60ce314d1750fef843e9db70050e09e49f838b69 upstream.
The private array at the end of the rtl_priv struct is not aligned. On ARM architecture, this causes an alignment trap and is fixed by aligning that array with __align(sizeof(void *)). That should properly align that space according to the requirements of all architectures.
--- drivers/net/wireless/rtlwifi/wifi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/rtlwifi/wifi.h +1 -1
@@ -1630,7 +1630,7 @@ struct rtl_priv {that it points to the data allocated beyond this structure like: rtl_pci_priv or rtl_usb_priv */ -u8 priv[0 ]; +u8 priv[0 ]__aligned(sizeof(void *)) ; };#define rtl_priv (hw) (((struct rtl_priv *)(hw)->priv))
PATCH 91/149 p54usb: add USB ID for Corega WLUSB2GTST USB adapter
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Christian Lamparter <[email protected]>
commit 1e43692cdb7cc445d6347d8a5207d9cef0c71434 upstream.
Added USB ID for Corega WLUSB2GTST USB adapter.
--- drivers/net/wireless/p54/p54usb.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/p54/p54usb.c +1 -0
@@ -83,6 +83,7 @@ static struct usb_device_id p54u_table[] {USB_DEVICE(0x06a9, 0x000e)}, /* Westell 802.11g USB (A90-211WG-01) */ {USB_DEVICE(0x06b9, 0x0121)}, /* Thomson SpeedTouch 121g */ {USB_DEVICE(0x0707, 0xee13)}, /* SMC 2862W-G version 2 */ + {USB_DEVICE(0x07aa, 0x0020)}, /* Corega WLUSB2GTST USB */ {USB_DEVICE(0x0803, 0x4310)}, /* Zoom 4410a */ {USB_DEVICE(0x083a, 0x4521)}, /* Siemens Gigaset USB Adapter 54 version 2 */ {USB_DEVICE(0x083a, 0x4531)}, /* T-Com Sinus 154 data II */
PATCH 92/149 usb: dwc3: pci: add support for BayTrail
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Heikki Krogerus <[email protected]>
commit b62cd96de3161dfb125a769030eec35a4cab3d3a upstream.
Add PCI id for Intel BayTrail.
--- drivers/usb/dwc3/dwc3-pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/dwc3/dwc3-pci.c +2 -0
@@ -45,6 +45,7 @@/* FIXME define these in <linux/pci_ids.h> */ #define PCI_VENDOR_ID_SYNOPSYS 0x16c3#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd +#define PCI_DEVICE_ID_INTEL_BYT 0x0f37#define DWC3_PCI_DEVS_POSSIBLE 32
@@ -191,6 +192,7 @@ static DEFINE_PCI_DEVICE_TABLE(dwc3_pci_ PCI_DEVICE(PCI_VENDOR_ID_SYNOPSYS, PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3), }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT), }, { }/* Terminating Entry */ };MODULE_DEVICE_TABLE (pci, dwc3_pci_id_table);
PATCH 93/149 usb: dwc3: add support for Merrifield
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: David Cohen <[email protected]>
commit 85601f8cf67c56a561a6dd5e130e65fdc179047d upstream.
Add PCI id for Intel Merrifield
--- drivers/usb/dwc3/dwc3-pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/dwc3/dwc3-pci.c +2 -0
@@ -46,6 +46,7 @@#define PCI_VENDOR_ID_SYNOPSYS 0x16c3#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd#define PCI_DEVICE_ID_INTEL_BYT 0x0f37 +#define PCI_DEVICE_ID_INTEL_MRFLD 0x119e#define DWC3_PCI_DEVS_POSSIBLE 32
@@ -193,6 +194,7 @@ static DEFINE_PCI_DEVICE_TABLE(dwc3_pci_ PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3), }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT), }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MRFLD), }, { }/* Terminating Entry */ };MODULE_DEVICE_TABLE (pci, dwc3_pci_id_table);
PATCH 94/149 can: flexcan: fix flexcan_chip_start() on imx6
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Marc Kleine-Budde <[email protected]>
commit 0d1862ea1a5bb876cf05555a7307080cb75bf379 upstream.
In the flexcan_chip_start() function first the flexcan core is going through the soft reset sequence, then the RX FIFO is enabled.
With the hardware is put into FIFO mode, message buffers 1...7 are reserved by the FIFO engine. The remaining message buffers are in reset default values. This patch removes the bogus initialization of the message buffers, as it causes an imprecise external abort on imx6.
--- drivers/net/can/flexcan.c | 12 ------------ 1 file changed, 12 deletions(-)
drivers/net/can/flexcan.c +0 -12
@@ -666,7 +666,6 @@ static int flexcan_chip_start(struct net {struct flexcan_priv *priv =netdev_priv (dev);struct flexcan_regs __iomem *regs = priv->base; -unsigned int i;int err;u32 reg_mcr, reg_ctrl;
@@ -732,17 +731,6 @@ static int flexcan_chip_start(struct netdev_dbg (dev->dev.parent,"%s: writing ctrl=0x%08x" , __func__, reg_ctrl);flexcan_write (reg_ctrl, ®s->ctrl); -for (i =0 ; i <ARRAY_SIZE (regs->cantxfg); i++) { -flexcan_write (0 , ®s->cantxfg[i].can_ctrl); -flexcan_write (0 , ®s->cantxfg[i].can_id); -flexcan_write (0 , ®s->cantxfg[i].data[0 ]); -flexcan_write (0 , ®s->cantxfg[i].data[1 ]); - -/* put MB into rx queue */ -flexcan_write (FLEXCAN_MB_CNT_CODE (0x4 ), - ®s->cantxfg[i].can_ctrl); - } -/* acceptance mask/acceptance code (accept everything) */ flexcan_write (0x0 , ®s->rxgmask);flexcan_write (0x0 , ®s->rx14mask);
Re: [PATCH 3.2 094/149] can: flexcan: fix flexcan_chip_start() on imx6
Quoted 1 line · Ben Hutchings
3.2.52-rc1 review patch. If anyone has any objections, please let me know.
Please postpone until:
d5a7b40 can: flexcan: flexcan_chip_start: fix regression, mark one MB
for TX and abort pending TX
hits mainline as this patch (fix flexcan_chip_start() on imx6) causes another problem.
As soon as both are mainline, please apply them:
d5a7b40 can: flexcan: flexcan_chip_start: fix regression, mark one MB
for TX and abort pending TX
0d1862e can: flexcan: fix flexcan_chip_start() on imx6
Marc
Quoted 53 lines
------------------
From: Marc Kleine-Budde <[email protected]>
commit
0d1862ea1a5bb876cf05555a7307080cb75bf379upstream.In the
flexcan_chip_start()function first the flexcan core is going through the soft reset sequence, then the RX FIFO is enabled.With the hardware is put into FIFO mode, message buffers 1...7 are reserved by the FIFO engine. The remaining message buffers are in reset default values. This patch removes the bogus initialization of the message buffers, as it causes an imprecise external abort on imx6.
Reported-by Lothar Waßmann <[email protected]>Tested-by Lothar Waßmann <[email protected]>Signed-off-by Marc Kleine-Budde <[email protected]>Signed-off-by Ben Hutchings <[email protected]>--- drivers/net/can/flexcan.c | 12 ------------ 1 file changed, 12 deletions(-)drivers/net/can/flexcan.c +0
-12@@ -666,7 +666,6 @@ static int flexcan_chip_start(struct net {struct flexcan_priv *priv =netdev_priv (dev);struct flexcan_regs __iomem *regs = priv->base; -unsigned int i;int err;u32 reg_mcr, reg_ctrl;@@ -732,17 +731,6 @@ static int flexcan_chip_start(struct netdev_dbg (dev->dev.parent,"%s: writing ctrl=0x%08x" , __func__, reg_ctrl);flexcan_write (reg_ctrl, ®s->ctrl); -for (i =0 ; i <ARRAY_SIZE (regs->cantxfg); i++) { -flexcan_write (0 , ®s->cantxfg[i].can_ctrl); -flexcan_write (0 , ®s->cantxfg[i].can_id); -flexcan_write (0 , ®s->cantxfg[i].data[0 ]); -flexcan_write (0 , ®s->cantxfg[i].data[1 ]); - -/* put MB into rx queue */ -flexcan_write (FLEXCAN_MB_CNT_CODE (0x4 ), - ®s->cantxfg[i].can_ctrl); - } -/* acceptance mask/acceptance code (accept everything) */ flexcan_write (0x0 , ®s->rxgmask);flexcan_write (0x0 , ®s->rx14mask);
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Re: [PATCH 3.2 094/149] can: flexcan: fix flexcan_chip_start() on imx6
Quoted 8 lines · Marc Kleine-Budde
Quoted 1 line · Ben Hutchings
3.2.52-rc1 review patch. If anyone has any objections, please let me know.
Please postpone until:
d5a7b40 can: flexcan:
flexcan_chip_start: fix regression, mark one MB
for TX and abort pending TX
Quoted 8 lines
hits mainline as this patch (fix
flexcan_chip_start()on imx6) causes another problem.As soon as both are mainline, please apply them:
d5a7b40 can: flexcan:
flexcan_chip_start: fix regression, mark one MB
for TX and abort pending TX
0d1862e can: flexcan: fixflexcan_chip_start()on imx6
Damn, probably had too much jummy Scottish food :) The correct patches are of course:
d5a7b40 can: flexcan: flexcan_chip_start: fix regression, mark one MB for TX and abort pending TX 0d1862e can: flexcan: fix flexcan_chip_start() on imx6
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Re: [PATCH 3.2 094/149] can: flexcan: fix flexcan_chip_start() on imx6
In reply to Marc Kleine-BuddeQuoted 10 lines · Marc Kleine-Budde
Quoted 1 line · Ben Hutchings
3.2.52-rc1 review patch. If anyone has any objections, please let me know.
Please postpone until:
d5a7b40 can: flexcan:
flexcan_chip_start: fix regression, mark one MB
for TX and abort pending TXhits mainline as this patch (fix
flexcan_chip_start()on imx6) causes another problem.
[...]
This is in mainline now, so I'll add it. Thanks all.
Ben.
Signature · 2 lines
Ben Hutchings Teamwork is essential - it allows you to blame someone else.
Re: [PATCH 3.2 094/149] can: flexcan: fix flexcan_chip_start() on imx6
In reply to Ben HutchingsQuoted 1 line · Ben Hutchings
3.2.52-rc1 review patch. If anyone has any objections, please let me know.
Looks like this patch introduces a regression. According to Marc, the fix is on its way into mainline ("can: flexcan: flexcan_chip_start:
fix regression, mark one MB for TX and abort pending TX"), although I haven't seen it in netdev git repo.
Cheers,
Signature · 1 line
Luis
Quoted 56 lines
------------------
From: Marc Kleine-Budde <[email protected]>
commit
0d1862ea1a5bb876cf05555a7307080cb75bf379upstream.In the
flexcan_chip_start()function first the flexcan core is going through the soft reset sequence, then the RX FIFO is enabled.With the hardware is put into FIFO mode, message buffers 1...7 are reserved by the FIFO engine. The remaining message buffers are in reset default values. This patch removes the bogus initialization of the message buffers, as it causes an imprecise external abort on imx6.
Reported-by Lothar Waßmann <[email protected]>Tested-by Lothar Waßmann <[email protected]>Signed-off-by Marc Kleine-Budde <[email protected]>Signed-off-by Ben Hutchings <[email protected]>--- drivers/net/can/flexcan.c | 12 ------------ 1 file changed, 12 deletions(-)drivers/net/can/flexcan.c +0
-13@@ -666,7 +666,6 @@ static int flexcan_chip_start(struct net {struct flexcan_priv *priv =netdev_priv (dev);struct flexcan_regs __iomem *regs = priv->base; -unsigned int i;int err;u32 reg_mcr, reg_ctrl;@@ -732,17 +731,6 @@ static int flexcan_chip_start(struct netdev_dbg (dev->dev.parent,"%s: writing ctrl=0x%08x" , __func__, reg_ctrl);flexcan_write (reg_ctrl, ®s->ctrl); -for (i =0 ; i <ARRAY_SIZE (regs->cantxfg); i++) { -flexcan_write (0 , ®s->cantxfg[i].can_ctrl); -flexcan_write (0 , ®s->cantxfg[i].can_id); -flexcan_write (0 , ®s->cantxfg[i].data[0 ]); -flexcan_write (0 , ®s->cantxfg[i].data[1 ]); - -/* put MB into rx queue */ -flexcan_write (FLEXCAN_MB_CNT_CODE (0x4 ), - ®s->cantxfg[i].can_ctrl); - } -/* acceptance mask/acceptance code (accept everything) */ flexcan_write (0x0 , ®s->rxgmask);flexcan_write (0x0 , ®s->rx14mask); --To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3.2 094/149] can: flexcan: fix flexcan_chip_start() on imx6
Quoted 5 lines · Luis Henriques
Quoted 1 line · Ben Hutchings
3.2.52-rc1 review patch. If anyone has any objections, please let me know.
Looks like this patch introduces a regression. According to Marc, the
yes
Quoted 3 lines
fix is on its way into mainline ("can: flexcan:
flexcan_chip_start:
fix regression, mark one MB for TX and abort pending TX"), although I haven't seen it in netdev git repo.
I see it on "net/master", though.
d5a7b40 can: flexcan: flexcan_chip_start: fix regression, mark one MB
for TX and abort pending TX
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
PATCH 95/149 nilfs2: fix issue with race condition of competition between segments for dirty blocks
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Vyacheslav Dubeyko <[email protected]>
commit 7f42ec3941560f0902fe3671e36f2c20ffd3af0a upstream.
Many NILFS2 users were reported about strange file system corruption (for example):
NILFS: bad btree node (blocknr=185027): level = 0, flags = 0x0, nchildren = 768 NILFS error (device sda4): nilfs_bmap_last_key: broken bmap (inode number=11540)
But such error messages are consequence of file system's issue that takes place more earlier. Fortunately, Jerome Poulin <[email protected]> and Anton Eliasson <[email protected]> were reported about another issue not so recently. These reports describe the issue with segctor thread's crash:
BUG: unable to handle kernel paging request at 0000000000004c83 IP: nilfs_end_page_io+0x12/0xd0 [nilfs2] Call Trace: nilfs_segctor_do_construct+0xf25/0x1b20 [nilfs2] nilfs_segctor_construct+0x17b/0x290 [nilfs2] nilfs_segctor_thread+0x122/0x3b0 [nilfs2] kthread+0xc0/0xd0 ret_from_fork+0x7c/0xb0
These two issues have one reason. This reason can raise third issue too. Third issue results in hanging of segctor thread with eating of 100% CPU.
REPRODUCING PATH:
One of the possible way or the issue reproducing was described by Jermoe me Poulin <[email protected]>:
1. init S to get to single user mode.
2. sysrq+E to make sure only my shell is running
3. start network-manager to get my wifi connection up
4. login as root and launch "screen"
5. cd /boot/log/nilfs which is a ext3 mount point and can log when NILFS dies.
6. lscp | xz -9e > lscp.txt.xz
7. mount my snapshot using mount -o cp=3360839,ro /dev/vgUbuntu/root /mnt/nilfs
8. start a screen to dump /proc/kmsg to text file since rsyslog is killed
9. start a screen and launch strace -f -o find-cat.log -t find /mnt/nilfs -type f -exec cat {} > /dev/null \;
10. start a screen and launch strace -f -o apt-get.log -t apt-get update
11. launch the last command again as it did not crash the first time
12. apt-get crashes
13. ps aux > ps-aux-crashed.log
13. sysrq+W
14. sysrq+E wait for everything to terminate
15. sysrq+SUSB
Simplified way of the issue reproducing is starting kernel compilation task and "apt-get update" in parallel.
REPRODUCIBILITY:
The issue is reproduced not stable [60% - 80%]. It is very important to have proper environment for the issue reproducing. The critical conditions for successful reproducing:
(1) It should have big modified file by mmap() way.
(2) This file should have the count of dirty blocks are greater that several segments in size (for example, two or three) from time to time during processing.
(3) It should be intensive background activity of files modification in another thread.
INVESTIGATION:
First of all, it is possible to see that the reason of crash is not valid page address:
NILFS [nilfs_segctor_complete_write]:2100 bh->b_count 0, bh->b_blocknr 13895680, bh->b_size 13897727, bh->b_page 0000000000001a82 NILFS [nilfs_segctor_complete_write]:2101 segbuf->sb_segnum 6783
Moreover, value of b_page (0x1a82) is 6786. This value looks like segment number. And b_blocknr with b_size values look like block numbers. So, buffer_head's pointer points on not proper address value.
Detailed investigation of the issue is discovered such picture:
[-----------------------------SEGMENT 6783-------------------------------] NILFS [nilfs_segctor_do_construct]:2310 nilfs_segctor_begin_construction NILFS [nilfs_segctor_do_construct]:2321 nilfs_segctor_collect
NILFS [nilfs_segctor_do_construct]:2336 nilfs_segctor_assign
NILFS [nilfs_segctor_do_construct]:2367 nilfs_segctor_update_segusage NILFS [nilfs_segctor_do_construct]:2371 nilfs_segctor_prepare_write NILFS [nilfs_segctor_do_construct]:2376 nilfs_add_checksums_on_logs NILFS [nilfs_segctor_do_construct]:2381 nilfs_segctor_write
NILFS [nilfs_segbuf_submit_bio]:464 bio->bi_sector 111149024, segbuf->sb_segnum 6783
[-----------------------------SEGMENT 6784-------------------------------]
NILFS [nilfs_segctor_do_construct]:2310 nilfs_segctor_begin_construction
NILFS [nilfs_segctor_do_construct]:2321 nilfs_segctor_collect
NILFS [nilfs_lookup_dirty_data_buffers]:782 bh->b_count 1, bh->b_page ffffea000709b000, page->index 0, i_ino 1033103, i_size 25165824 NILFS [nilfs_lookup_dirty_data_buffers]:783 bh->b_assoc_buffers.next ffff8802174a6798, bh->b_assoc_buffers.prev ffff880221cffee8 NILFS [nilfs_segctor_do_construct]:2336 nilfs_segctor_assign
NILFS [nilfs_segctor_do_construct]:2367 nilfs_segctor_update_segusage
NILFS [nilfs_segctor_do_construct]:2371 nilfs_segctor_prepare_write
NILFS [nilfs_segctor_do_construct]:2376 nilfs_add_checksums_on_logs
NILFS [nilfs_segctor_do_construct]:2381 nilfs_segctor_write
NILFS [nilfs_segbuf_submit_bh]:575 bh->b_count 1, bh->b_page ffffea000709b000, page->index 0, i_ino 1033103, i_size 25165824 NILFS [nilfs_segbuf_submit_bh]:576 segbuf->sb_segnum 6784
NILFS [nilfs_segbuf_submit_bh]:577 bh->b_assoc_buffers.next ffff880218a0d5f8, bh->b_assoc_buffers.prev ffff880218bcdf50 NILFS [nilfs_segbuf_submit_bio]:464 bio->bi_sector 111150080, segbuf->sb_segnum 6784, segbuf->sb_nbio 0 [----------] ditto
NILFS [nilfs_segbuf_submit_bio]:464 bio->bi_sector 111164416, segbuf->sb_segnum 6784, segbuf->sb_nbio 15
[-----------------------------SEGMENT 6785-------------------------------]
NILFS [nilfs_segctor_do_construct]:2310 nilfs_segctor_begin_construction
NILFS [nilfs_segctor_do_construct]:2321 nilfs_segctor_collect
NILFS [nilfs_lookup_dirty_data_buffers]:782 bh->b_count 2, bh->b_page ffffea000709b000, page->index 0, i_ino 1033103, i_size 25165824 NILFS [nilfs_lookup_dirty_data_buffers]:783 bh->b_assoc_buffers.next ffff880219277e80, bh->b_assoc_buffers.prev ffff880221cffc88 NILFS [nilfs_segctor_do_construct]:2367 nilfs_segctor_update_segusage
NILFS [nilfs_segctor_do_construct]:2371 nilfs_segctor_prepare_write
NILFS [nilfs_segctor_do_construct]:2376 nilfs_add_checksums_on_logs
NILFS [nilfs_segctor_do_construct]:2381 nilfs_segctor_write
NILFS [nilfs_segbuf_submit_bh]:575 bh->b_count 2, bh->b_page ffffea000709b000, page->index 0, i_ino 1033103, i_size 25165824 NILFS [nilfs_segbuf_submit_bh]:576 segbuf->sb_segnum 6785
NILFS [nilfs_segbuf_submit_bh]:577 bh->b_assoc_buffers.next ffff880218a0d5f8, bh->b_assoc_buffers.prev ffff880222cc7ee8 NILFS [nilfs_segbuf_submit_bio]:464 bio->bi_sector 111165440, segbuf->sb_segnum 6785, segbuf->sb_nbio 0 [----------] ditto
NILFS [nilfs_segbuf_submit_bio]:464 bio->bi_sector 111177728, segbuf->sb_segnum 6785, segbuf->sb_nbio 12
NILFS [nilfs_segctor_do_construct]:2399 nilfs_segctor_wait NILFS [nilfs_segbuf_wait]:676 segbuf->sb_segnum 6783 NILFS [nilfs_segbuf_wait]:676 segbuf->sb_segnum 6784 NILFS [nilfs_segbuf_wait]:676 segbuf->sb_segnum 6785
NILFS [nilfs_segctor_complete_write]:2100 bh->b_count 0, bh->b_blocknr 13895680, bh->b_size 13897727, bh->b_page 0000000000001a82
BUG: unable to handle kernel paging request at 0000000000001a82 IP: [<ffffffffa024d0f2>] nilfs_end_page_io+0x12/0xd0 [nilfs2]
Usually, for every segment we collect dirty files in list. Then, dirty blocks are gathered for every dirty file, prepared for write and submitted by means of nilfs_segbuf_submit_bh() call. Finally, it takes place complete write phase after calling nilfs_end_bio_write() on the block layer. Buffers/pages are marked as not dirty on final phase and processed files removed from the list of dirty files.
It is possible to see that we had three prepare_write and submit_bio phases before segbuf_wait and complete_write phase. Moreover, segments compete between each other for dirty blocks because on every iteration of segments processing dirty buffer_heads are added in several lists of payload_buffers:
[SEGMENT 6784]: bh->b_assoc_buffers.next ffff880218a0d5f8, bh->b_assoc_buffers.prev ffff880218bcdf50 [SEGMENT 6785]: bh->b_assoc_buffers.next ffff880218a0d5f8, bh->b_assoc_buffers.prev ffff880222cc7ee8
The next pointer is the same but prev pointer has changed. It means that buffer_head has next pointer from one list but prev pointer from another. Such modification can be made several times. And, finally, it can be resulted in various issues: (1) segctor hanging, (2) segctor crashing, (3) file system metadata corruption.
FIX:
This patch adds:
(1) setting of BH_Async_Write flag in nilfs_segctor_prepare_write()
for every proccessed dirty block;
(2) checking of BH_Async_Write flag in
nilfs_lookup_dirty_data_buffers() and
nilfs_lookup_dirty_node_buffers();(3) clearing of BH_Async_Write flag in nilfs_segctor_complete_write(), nilfs_abort_logs(), nilfs_forget_buffer(), nilfs_clear_dirty_page().
[bwh: Backported to 3.2: nilfs_clear_dirty_page() has not been separated
from nilfs_clear_dirty_pages()]
--- fs/nilfs2/page.c | 2 ++ fs/nilfs2/segment.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)
fs/nilfs2/page.c +2 -0
@@ -94,6 +94,7 @@ void nilfs_forget_buffer(struct buffer_hclear_buffer_nilfs_volatile (bh);clear_buffer_nilfs_checked (bh);clear_buffer_nilfs_redirected (bh); +clear_buffer_async_write (bh);clear_buffer_dirty (bh);if (nilfs_page_buffers_clean (page))__nilfs_clear_page_dirty (page);
@@ -390,6 +391,7 @@ void nilfs_clear_dirty_pages(struct addr bh = head =page_buffers (page); do { lock_buffer(bh); + clear_buffer_async_write(bh); clear_buffer_dirty(bh); clear_buffer_nilfs_volatile(bh); clear_buffer_nilfs_checked(bh);
fs/nilfs2/segment.c +9 -2
@@ -662,7 +662,7 @@ static size_t nilfs_lookup_dirty_data_bu bh = head =page_buffers (page); do { - if (!buffer_dirty(bh)) + if (!buffer_dirty(bh) || buffer_async_write(bh)) continue; get_bh(bh); list_add_tail(&bh->b_assoc_buffers, listp);
@@ -696,7 +696,8 @@ static void nilfs_lookup_dirty_node_bufffor (i =0 ; i <pagevec_count (&pvec); i++) { bh = head =page_buffers (pvec.pages[i]); do { - if (buffer_dirty(bh)) { + if (buffer_dirty(bh) && + !buffer_async_write(bh)) { get_bh(bh); list_add_tail(&bh->b_assoc_buffers, listp);
@@ -1576,6 +1577,7 @@ static void nilfs_segctor_prepare_write(list_for_each_entry (bh, &segbuf->sb_segsum_buffers, b_assoc_buffers) { +set_buffer_async_write (bh);if (bh->b_page != bd_page) {if (bd_page) {lock_page (bd_page);
@@ -1589,6 +1591,7 @@ static void nilfs_segctor_prepare_write(list_for_each_entry (bh, &segbuf->sb_payload_buffers, b_assoc_buffers) { +set_buffer_async_write (bh);if (bh == segbuf->sb_super_root) {if (bh->b_page != bd_page) {lock_page (bd_page);
@@ -1674,6 +1677,7 @@ static void nilfs_abort_logs(struct listlist_for_each_entry (segbuf, logs, sb_list) {list_for_each_entry (bh, &segbuf->sb_segsum_buffers, b_assoc_buffers) { +clear_buffer_async_write (bh);if (bh->b_page != bd_page) {if (bd_page)end_page_writeback (bd_page);
@@ -1683,6 +1687,7 @@ static void nilfs_abort_logs(struct listlist_for_each_entry (bh, &segbuf->sb_payload_buffers, b_assoc_buffers) { +clear_buffer_async_write (bh);if (bh == segbuf->sb_super_root) {if (bh->b_page != bd_page) {end_page_writeback (bd_page);
@@ -1752,6 +1757,7 @@ static void nilfs_segctor_complete_write b_assoc_buffers) {set_buffer_uptodate (bh);clear_buffer_dirty (bh); +clear_buffer_async_write (bh);if (bh->b_page != bd_page) {if (bd_page)end_page_writeback (bd_page);
@@ -1773,6 +1779,7 @@ static void nilfs_segctor_complete_write b_assoc_buffers) {set_buffer_uptodate (bh);clear_buffer_dirty (bh); +clear_buffer_async_write (bh);clear_buffer_delay (bh);clear_buffer_nilfs_volatile (bh);clear_buffer_nilfs_redirected (bh);
PATCH 96/149 USB: serial: option: Ignore card reader interface on Huawei E1750
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Michal Malý <[email protected]>
commit eb2addd4044b4b2ce77693bde5bc810536dd96ee upstream.
Hi,
my Huawei 3G modem has an embedded Smart Card reader which causes trouble when the modem is being detected (a bunch of "<warn> (ttyUSBx):
open blocked by driver for more than 7 seconds!" in messages.log). This trivial patch corrects the problem for me. The modem identifies itself as "12d1:1406 Huawei Technologies Co., Ltd. E1750" in lsusb although the description on the body says "Model E173u-1"
--- drivers/usb/serial/option.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/serial/option.c +3 -0
@@ -81,6 +81,7 @@ static void option_instat_callback(struc#define HUAWEI_VENDOR_ID 0x12D1#define HUAWEI_PRODUCT_E173 0x140C +#define HUAWEI_PRODUCT_E1750 0x1406#define HUAWEI_PRODUCT_K4505 0x1464#define HUAWEI_PRODUCT_K3765 0x1465#define HUAWEI_PRODUCT_K4605 0x14C6
@@ -581,6 +582,8 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1750, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t) &net_intf2_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1442, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),
PATCH 97/149 powerpc: Fix parameter clobber in csum_partial_copy_generic()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "Paul E. McKenney" <[email protected]>
commit d9813c3681a36774b254c0cdc9cce53c9e22c756 upstream.
The csum_partial_copy_generic() uses register r7 to adjust the remaining bytes to process. Unfortunately, r7 also holds a parameter, namely the address of the flag to set in case of access exceptions while reading the source buffer. Lacking a quantum implementation of PowerPC, this commit instead uses register r9 to do the adjusting, leaving r7's pointer uncorrupted.
--- arch/powerpc/lib/checksum_64.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/lib/checksum_64.S +2 -2
@@ -272,8 +272,8 @@ _GLOBAL(csum_partial_copy_generic) rldicl. r6,r3,64-1,64-2 /* r6 = (r3 & 0x3) >> 1 */ beq .Lcopy_aligned - li r7,4 - sub r6,r7,r6 + li r9,4 + sub r6,r9,r6 mtctr r6 1:
PATCH 98/149 powerpc: Restore registers on error exit from csum_partial_copy_generic()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "Paul E. McKenney" <[email protected]>
commit 8f21bd0090052e740944f9397e2be5ac7957ded7 upstream.
The csum_partial_copy_generic() function saves the PowerPC non-volatile r14, r15, and r16 registers for the main checksum-and-copy loop. Unfortunately, it fails to restore them upon error exit from this loop, which results in silent corruption of these registers in the presumably rare event of an access exception within that loop.
This commit therefore restores these register on error exit from the loop.
--- arch/powerpc/lib/checksum_64.S | 54 +++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 14 deletions(-)
arch/powerpc/lib/checksum_64.S +40 -14
@@ -229,19 +229,35 @@ _GLOBAL(csum_partial) blr - .macro source + .macro srcnr 100: .section __ex_table,"a" .align 3 - .llong 100b,.Lsrc_error + .llong 100b,.Lsrc_error_nr .previous .endm - .macro dest + .macro source +150: + .section __ex_table,"a" + .align 3 + .llong 150b,.Lsrc_error + .previous + .endm + + .macro dstnr 200: .section __ex_table,"a" .align 3 - .llong 200b,.Ldest_error + .llong 200b,.Ldest_error_nr + .previous + .endm + + .macro dest +250: + .section __ex_table,"a" + .align 3 + .llong 250b,.Ldest_error .previous .endm
@@ -277,11 +293,11 @@ _GLOBAL(csum_partial_copy_generic) mtctr r6 1: -source; lhz r6,0(r3) /* align to doubleword */ +srcnr; lhz r6,0(r3) /* align to doubleword */ subi r5,r5,2 addi r3,r3,2 adde r0,r0,r6 -dest; sth r6,0(r4) +dstnr; sth r6,0(r4) addi r4,r4,2 bdnz 1b
@@ -395,10 +411,10 @@ dest; std r16,56(r4) mtctr r6 3: -source; ld r6,0(r3) +srcnr; ld r6,0(r3) addi r3,r3,8 adde r0,r0,r6 -dest; std r6,0(r4) +dstnr; std r6,0(r4) addi r4,r4,8 bdnz 3b
@@ -408,10 +424,10 @@ dest; std r6,0(r4) srdi. r6,r5,2 beq .Lcopy_tail_halfword -source; lwz r6,0(r3) +srcnr; lwz r6,0(r3) addi r3,r3,4 adde r0,r0,r6 -dest; stw r6,0(r4) +dstnr; stw r6,0(r4) addi r4,r4,4 subi r5,r5,4
@@ -419,10 +435,10 @@ dest; stw r6,0(r4) srdi. r6,r5,1 beq .Lcopy_tail_byte -source; lhz r6,0(r3) +srcnr; lhz r6,0(r3) addi r3,r3,2 adde r0,r0,r6 -dest; sth r6,0(r4) +dstnr; sth r6,0(r4) addi r4,r4,2 subi r5,r5,2
@@ -430,10 +446,10 @@ dest; sth r6,0(r4) andi. r6,r5,1 beq .Lcopy_finish -source; lbz r6,0(r3) +srcnr; lbz r6,0(r3) sldi r9,r6,8 /* Pad the byte out to 16 bits */ adde r0,r0,r9 -dest; stb r6,0(r4) +dstnr; stb r6,0(r4) .Lcopy_finish: addze r0,r0 /* add in final carry */
@@ -443,6 +459,11 @@ dest; stb r6,0(r4) blr .Lsrc_error: + ld r14,STK_REG(r14)(r1) + ld r15,STK_REG(r15)(r1) + ld r16,STK_REG(r16)(r1) + addi r1,r1,STACKFRAMESIZE +.Lsrc_error_nr: cmpdi 0,r7,0 beqlr li r6,-EFAULT
@@ -450,6 +471,11 @@ dest; stb r6,0(r4) blr .Ldest_error: + ld r14,STK_REG(r14)(r1) + ld r15,STK_REG(r15)(r1) + ld r16,STK_REG(r16)(r1) + addi r1,r1,STACKFRAMESIZE +.Ldest_error_nr: cmpdi 0,r8,0 beqlr li r6,-EFAULT
PATCH 99/149 powerpc/sysfs: Disable writing to PURR in guest mode
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Madhavan Srinivasan <[email protected]>
commit d1211af3049f4c9c1d8d4eb8f8098cc4f4f0d0c7 upstream.
arch/powerpc/kernel/sysfs.c exports PURR with write permission. This may be valid for kernel in phyp mode. But writing to the file in guest mode causes crash due to a priviledge violation
[bwh: Backported to 3.2:
- Adjust context
- CPUs are sysdev and we must use the sysdev API]
--- arch/powerpc/kernel/sysfs.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
arch/powerpc/kernel/sysfs.c +16 -2
@@ -18,6 +18,7 @@#include <asm/machdep.h> #include <asm/smp.h> #include <asm/pmc.h> +#include <asm/firmware.h> #include "cacheinfo.h"
@@ -178,14 +179,24 @@ SYSFS_PMCSETUP(purr, SPRN_PURR);SYSFS_PMCSETUP (spurr,SPRN_SPURR );SYSFS_PMCSETUP (dscr,SPRN_DSCR ); +/* +Lets only enable read for phyp resources and +enable write when needed with a separate function. +Lets be conservative and default to pseries. +*/ static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra); static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL); static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr); -static SYSDEV_ATTR(purr, 0600, show_purr, store_purr); +static SYSDEV_ATTR(purr, 0400, show_purr, store_purr);unsigned long dscr_default =0 ;EXPORT_SYMBOL (dscr_default); +static void add_write_permission_dev_attr (struct sysdev_attribute *attr) +{ + attr->attr.mode |=0200 ; +} +static ssize_t show_dscr_default (struct sysdev_class *class,struct sysdev_class_attribute *attr,char *buf) {
@@ -394,8 +405,11 @@ static void __cpuinit register_cpu_onlinif (cpu_has_feature (CPU_FTR_MMCRA ))sysdev_create_file (s, &attr_mmcra); -if (cpu_has_feature (CPU_FTR_PURR )) +if (cpu_has_feature (CPU_FTR_PURR )) { +if (!firmware_has_feature (FW_FEATURE_LPAR )) +add_write_permission_dev_attr (&attr_purr);sysdev_create_file (s, &attr_purr); + }if (cpu_has_feature (CPU_FTR_SPURR ))sysdev_create_file (s, &attr_spurr);
PATCH 100/149 powerpc/iommu: Use GFP_KERNEL instead of GFP_ATOMIC in iommu_init_table()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Nishanth Aravamudan <[email protected]>
commit 1cf389df090194a0976dc867b7fffe99d9d490cb upstream.
Under heavy (DLPAR?) stress, we tripped this panic() in arch/powerpc/kernel/iommu.c::iommu_init_table():
page = alloc_pages_node(nid, GFP_ATOMIC, get_order(sz));
if (!page)
panic("iommu_init_table: Can't allocate %ld bytes\n", sz);Before the panic() we got a page allocation failure for an order-2 allocation. There appears to be memory free, but perhaps not in the ATOMIC context. I looked through all the call-sites of iommu_init_table() and didn't see any obvious reason to need an ATOMIC allocation. Most call-sites in fact have an explicit GFP_KERNEL allocation shortly before the call to iommu_init_table(), indicating we are not in an atomic context. There is some indirection for some paths, but I didn't see any locks indicating that GFP_KERNEL is inappropriate.
With this change under the same conditions, we have not been able to reproduce the panic.
--- arch/powerpc/kernel/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/iommu.c +1 -1
@@ -495,7 +495,7 @@ struct iommu_table *iommu_init_table(str/* number of bytes needed for the bitmap */ sz = (tbl->it_size +7 ) >>3 ; - page =alloc_pages_node (nid,GFP_ATOMIC ,get_order (sz)); + page =alloc_pages_node (nid,GFP_KERNEL ,get_order (sz));if (!page)panic ("iommu_init_table: Can't allocate %ld bytes\n" , sz); tbl->it_map =page_address (page);
PATCH 101/149 caif: Add missing braces to multiline if in cfctrl_linkup_request
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jones <[email protected]>
[ Upstream commit 0c1db731bfcf3a9fd6c58132134f8b0f423552f0 ]
The indentation here implies this was meant to be a multi-line if.
Introduced several years back in commit c85c2951d4da1236e32f1858db418221e624aba5 ("caif: Handle dev_queue_xmit errors.")
--- net/caif/cfctrl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/caif/cfctrl.c +2 -1
@@ -288,9 +288,10 @@ int cfctrl_linkup_request(struct cflayer *layer, count =cfctrl_cancel_req (&cfctrl->serv.layer, user_layer); -if (count !=1 ) +if (count !=1 ) {pr_err ("Could not remove request (%d)" , count);return -ENODEV ; + } }return 0 ; }
PATCH 102/149 net: sctp: fix smatch warning in sctp_send_asconf_del_ip
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit 88362ad8f9a6cea787420b57cc27ccacef000dbe ]
This was originally reported in [1] and posted by Neil Horman [2], he said:
Fix up a missed null pointer check in the asconf code. If we don't find a local address, but we pass in an address length of more than 1, we may dereference a NULL laddr pointer. Currently this can't happen, as the only users of the function pass in the value 1 as the addrcnt parameter, but its not hot path, and it doesn't hurt to check for NULL should that ever be the case.
The callpath from sctp_asconf_mgmt() looks okay. But this could be triggered from sctp_setsockopt_bindx() call with SCTP_BINDX_REM_ADDR and addrcnt > 1 while passing all possible addresses from the bind list to SCTP_BINDX_REM_ADDR so that we do *not* find a single address in the association's bind address list that is not in the packed array of addresses. If this happens when we have an established association with ASCONF-capable peers, then we could get a NULL pointer dereference as we only check for laddr == NULL && addrcnt == 1 and call later sctp_make_asconf_update_ip() with NULL laddr.
BUT: this actually won't happen as sctp_bindx_rem() will catch such a case and return with an error earlier. As this is incredably unintuitive and error prone, add a check to catch at least future bugs here. As Neil says, its not hot path. Introduced by 8a07eb0a5 ("sctp: Add ASCONF operation on the single-homed host").
[1] http://www.spinics.net/lists/linux-sctp/msg02132.html
[2] http://www.spinics.net/lists/linux-sctp/msg02133.html
--- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+)
net/sctp/socket.c +3 -0
@@ -814,6 +814,9 @@ static int sctp_send_asconf_del_ip(struct sock *sk, goto skip_mkasconf; } +if (laddr ==NULL ) +return -EINVAL ; +/* We do not need RCU protection throughout this loop * because this is done under a socket lock from the * setsockopt call.
PATCH 103/149 netpoll: fix NULL pointer dereference in netpoll_cleanup
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Aleksandrov <[email protected]>
[ Upstream commit d0fe8c888b1fd1a2f84b9962cabcb98a70988aec ]
I've been hitting a NULL ptr deref while using netconsole because the np->dev check and the pointer manipulation in netpoll_cleanup are done without rtnl and the following sequence happens when having a netconsole over a vlan and we remove the vlan while disabling the netconsole:
CPU 1 CPU2 removes vlan and calls the notifier enters store_enabled(), calls netdev_cleanup which checks np->dev and then waits for rtnl executes the netconsole netdev release notifier making np->dev == NULL and releases rtnl
continues to dereference a member ofnp->dev which at this point is == NULL
--- net/core/netpoll.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
net/core/netpoll.c +4 -5
@@ -923,15 +923,14 @@ EXPORT_SYMBOL_GPL(__netpoll_cleanup);void netpoll_cleanup (struct netpoll *np) { -if (!np->dev) -return ; -rtnl_lock (); +if (!np->dev) + goto out;__netpoll_cleanup (np); -rtnl_unlock (); -dev_put (np->dev); np->dev =NULL ; +out: +rtnl_unlock (); }EXPORT_SYMBOL (netpoll_cleanup);
PATCH 104/149 net: sctp: fix ipv6 ipsec encryption bug in sctp_v6_xmit
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit 95ee62083cb6453e056562d91f597552021e6ae7 ]
Alan Chester reported an issue with IPv6 on SCTP that IPsec traffic is not being encrypted, whereas on IPv4 it is. Setting up an AH + ESP transport does not seem to have the desired effect:
SCTP + IPv4:
22:14:20.809645 IP (tos 0x2,ECT(0), ttl 64, id 0, offset 0, flags [DF], proto AH (51), length 116)
192.168.0.2 > 192.168.0.5: AH(spi=0x00000042,sumlen=16,seq=0x1): ESP(spi=0x00000044,seq=0x1), length 72
22:14:20.813270 IP (tos 0x2,ECT(0), ttl 64, id 0, offset 0, flags [DF], proto AH (51), length 340)
192.168.0.5 > 192.168.0.2: AH(spi=0x00000043,sumlen=16,seq=0x1):SCTP + IPv6:
22:31:19.215029 IP6 (class 0x02, hlim 64, next-header SCTP (132) payload length: 364)
fe80::222:15ff:fe87:7fc.3333 > fe80::92e6:baff:fe0d:5a54.36767: sctp
1) [INIT ACK] [init tag: 747759530] [rwnd: 62464] [OS: 10] [MIS: 10]
Moreover, Alan says:
This problem was seen with both Racoon and Racoon2. Other people have seen this with OpenSwan. When IPsec is configured to encrypt all upper layer protocols the SCTP connection does not initialize. After using Wireshark to follow packets, this is because the SCTP packet leaves Box A unencrypted and Box B believes all upper layer protocols are to be encrypted so it drops this packet, causing the SCTP connection to fail to initialize. When IPsec is configured to encrypt just SCTP, the SCTP packets are observed unencrypted.
In fact, using socat sctp6-listen:3333 - on one end and transferring "plaintext" string on the other end, results in cleartext on the wire where SCTP eventually does not report any errors, thus in the latter case that Alan reports, the non-paranoid user might think he's communicating over an encrypted transport on SCTP although he's not (tcpdump ... -X):
...
0x0030: 5d70 8e1a 0003 001a 177d eb6c 0000 0000 ]p.......}.l.... 0x0040: 0000 0000 706c 6169 6e74 6578 740a 0000 ....plaintext...
Only in /proc/net/xfrm_stat we can see XfrmInTmplMismatch increasing on the receiver side. Initial follow-up analysis from Alan's bug report was done by Alexey Dobriyan. Also thanks to Vlad Yasevich for feedback on this.
SCTP has its own implementation of sctp_v6_xmit() not calling inet6_csk_xmit(). This has the implication that it probably never really got updated along with changes in inet6_csk_xmit() and therefore does not seem to invoke xfrm handlers.
SCTP's IPv4 xmit however, properly calls ip_queue_xmit() to do the work. Since a call to inet6_csk_xmit() would solve this problem, but result in unecessary route lookups, let us just use the cached flowi6 instead that we got through sctp_v6_get_dst(). Since all SCTP packets are being sent through sctp_packet_transmit(), we do the route lookup / flow caching in sctp_transport_route(), hold it in tp->dst and skb_dst_set() right after that. If we would alter fl6->daddr in sctp_v6_xmit() to np->opt->srcrt, we possibly could run into the same effect of not having xfrm layer pick it up, hence, use fl6_update_dst() in sctp_v6_get_dst() instead to get the correct source routed dst entry, which we assign to the skb.
Also source address routing example from 625034113 ("sctp: fix sctp to work with ipv6 source address routing") still works with this patch! Nevertheless, in RFC5095 it is actually 'recommended' to not use that anyway due to traffic amplification [1]. So it seems we're not supposed to do that anyway in sctp_v6_xmit(). Moreover, if we overwrite the flow destination here, the lower IPv6 layer will be unable to put the correct destination address into IP header, as routing header is added in ipv6_push_nfrag_opts() but then probably with wrong final destination. Things aside, result of this patch is that we do not have any XfrmInTmplMismatch increase plus on the wire with this patch it now looks like:
SCTP + IPv6:
08:17:47.074080 IP6 2620:52:0:102f:7a2b:cbff:fe27:1b0a > 2620:52:0:102f:213:72ff:fe32:7eba:
AH(spi=0x00005fb4,seq=0x1): ESP(spi=0x00005fb5,seq=0x1), length 72
08:17:47.074264 IP6 2620:52:0:102f:213:72ff:fe32:7eba > 2620:52:0:102f:7a2b:cbff:fe27:1b0a:
AH(spi=0x00003d54,seq=0x1): ESP(spi=0x00003d55,seq=0x1), length 296This fixes Kernel Bugzilla 24412. This security issue seems to be present since 2.6.18 kernels. Lets just hope some big passive adversary in the wild didn't have its fun with that. lksctp-tools IPv6 regression test suite passes as well with this patch.
[1] http://www.secdev.org/conf/IPv6_RH_security-csw07.pdf
--- net/sctp/ipv6.c | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-)
net/sctp/ipv6.c +13 -29
@@ -205,45 +205,24 @@ out:in6_dev_put (idev); } -/* Based on tcp_v6_xmit() in tcp_ipv6.c. */ static int sctp_v6_xmit (struct sk_buff *skb,struct sctp_transport *transport) {struct sock *sk = skb->sk;struct ipv6_pinfo *np =inet6_sk (sk); -struct flowi6 fl6; - -memset (&fl6,0 ,sizeof (fl6)); - - fl6.flowi6_proto = sk->sk_protocol; - -/* Fill in the dest address from the route entry passed with the skb -* and the source address from the transport. -*/ -ipv6_addr_copy (&fl6.daddr, &transport->ipaddr.v6.sin6_addr); -ipv6_addr_copy (&fl6.saddr, &transport->saddr.v6.sin6_addr); - - fl6.flowlabel = np->flow_label; -IP6_ECN_flow_xmit (sk, fl6.flowlabel); -if (ipv6_addr_type (&fl6.saddr) &IPV6_ADDR_LINKLOCAL ) - fl6.flowi6_oif = transport->saddr.v6.sin6_scope_id; -else - fl6.flowi6_oif = sk->sk_bound_dev_if; - -if (np->opt && np->opt->srcrt) { -struct rt0_hdr *rt0 = (struct rt0_hdr *) np->opt->srcrt; -ipv6_addr_copy (&fl6.daddr, rt0->addr); - } +struct flowi6 *fl6 = &transport->fl.u.ip6;SCTP_DEBUG_PRINTK ("%s: skb:%p, len:%d, src:%pI6 dst:%pI6\n" , __func__, skb, skb->len, - &fl6.saddr, &fl6.daddr); + &fl6->saddr, &fl6->daddr); -SCTP_INC_STATS (SCTP_MIB_OUTSCTPPACKS ); +IP6_ECN_flow_xmit (sk, fl6->flowlabel);if (!(transport->param_flags &SPP_PMTUD_ENABLE )) skb->local_df =1 ; -return ip6_xmit (sk, skb, &fl6, np->opt, np->tclass); +SCTP_INC_STATS (SCTP_MIB_OUTSCTPPACKS ); + +return ip6_xmit (sk, skb, fl6, np->opt, np->tclass); }/* Returns the dst cache entry for the given source and destination ip
@@ -256,10 +235,12 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr,struct dst_entry *dst =NULL ;struct flowi6 *fl6 = &fl->u.ip6;struct sctp_bind_addr *bp; +struct ipv6_pinfo *np =inet6_sk (sk);struct sctp_sockaddr_entry *laddr;union sctp_addr *baddr =NULL ;union sctp_addr *daddr = &t->ipaddr;union sctp_addr dst_saddr; +struct in6_addr *final_p, final;__u8 matchlen =0 ;__u8 bmatchlen;sctp_scope_t scope;
@@ -282,7 +263,8 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr,SCTP_DEBUG_PRINTK ("SRC=%pI6 - " , &fl6->saddr); } - dst =ip6_dst_lookup_flow (sk, fl6,NULL , false); + final_p =fl6_update_dst (fl6, np->opt, &final); + dst =ip6_dst_lookup_flow (sk, fl6, final_p, false);if (!asoc || saddr) goto out;
@@ -333,10 +315,12 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, } }rcu_read_unlock (); +if (baddr) {ipv6_addr_copy (&fl6->saddr, &baddr->v6.sin6_addr); fl6->fl6_sport = baddr->v6.sin6_port; - dst =ip6_dst_lookup_flow (sk, fl6,NULL , false); + final_p =fl6_update_dst (fl6, np->opt, &final); + dst =ip6_dst_lookup_flow (sk, fl6, final_p, false); } out:
PATCH 105/149 resubmit bridge: fix message_age_timer calculation
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Chris Healy <[email protected]>
[ Upstream commit 9a0620133ccce9dd35c00a96405c8d80938c2cc0 ]
This changes the message_age_timer calculation to use the BPDU's max age as opposed to the local bridge's max age. This is in accordance with section 8.6.2.3.2 Step 2 of the 802.1D-1998 sprecification.
With the current implementation, when running with very large bridge diameters, convergance will not always occur even if a root bridge is configured to have a longer max age.
Tested successfully on bridge diameters of ~200.
--- net/bridge/br_stp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bridge/br_stp.c +1 -1
@@ -189,7 +189,7 @@ static void br_record_config_information(struct net_bridge_port *p, p->designated_age = jiffies + bpdu->message_age;mod_timer (&p->message_age_timer, jiffies - + (p->br->max_age - bpdu->message_age)); + + (bpdu->max_age - bpdu->message_age)); }/* called under bridge lock */
PATCH 106/149 ip: generate unique IP identificator if local fragmentation is allowed
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ansis Atteka <[email protected]>
[ Upstream commit 703133de331a7a7df47f31fb9de51dc6f68a9de8 ]
If local fragmentation is allowed, then ip_select_ident() and ip_select_ident_more() need to generate unique IDs to ensure correct defragmentation on the peer.
For example, if IPsec (tunnel mode) has to encrypt large skbs that have local_df bit set, then all IP fragments that belonged to different ESP datagrams would have used the same identificator. If one of these IP fragments would get lost or reordered, then peer could possibly stitch together wrong IP fragments that did not belong to the same datagram. This would lead to a packet loss or data corruption.
--- drivers/net/ppp/pptp.c | 2 +- include/net/ip.h | 12 ++++++++---- include/net/ipip.h | 2 +- net/ipv4/igmp.c | 4 ++-- net/ipv4/inetpeer.c | 4 ++-- net/ipv4/ip_output.c | 6 +++--- net/ipv4/ipmr.c | 2 +- net/ipv4/raw.c | 2 +- net/ipv4/xfrm4_mode_tunnel.c | 2 +- net/netfilter/ipvs/ip_vs_xmit.c | 2 +- 10 files changed, 21 insertions(+), 17 deletions(-)
drivers/net/ppp/pptp.c +1 -1
@@ -281,7 +281,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)nf_reset (skb); skb->ip_summed =CHECKSUM_NONE ; -ip_select_ident (iph, &rt->dst,NULL ); +ip_select_ident (skb, &rt->dst,NULL );ip_send_check (iph);ip_local_out (skb);
include/net/ip.h +8 -4
@@ -266,9 +266,11 @@ int ip_dont_fragment(struct sock *sk, struct dst_entry *dst)extern void __ip_select_ident (struct iphdr *iph,struct dst_entry *dst,int more); -static inline void ip_select_ident (struct iphdr *iph,struct dst_entry *dst,struct sock *sk) +static inline void ip_select_ident (struct sk_buff *skb,struct dst_entry *dst,struct sock *sk) { -if (iph->frag_off &htons (IP_DF )) { +struct iphdr *iph =ip_hdr (skb); + +if ((iph->frag_off &htons (IP_DF )) && !skb->local_df) {/* This is only to work around buggy Windows95/2000 * VJ compression implementations. If the ID field * does not change, they drop every other packet in
@@ -280,9 +282,11 @@ static inline void ip_select_ident(struct iphdr *iph, struct dst_entry *dst, str__ip_select_ident (iph, dst,0 ); } -static inline void ip_select_ident_more (struct iphdr *iph,struct dst_entry *dst,struct sock *sk,int more) +static inline void ip_select_ident_more (struct sk_buff *skb,struct dst_entry *dst,struct sock *sk,int more) { -if (iph->frag_off &htons (IP_DF )) { +struct iphdr *iph =ip_hdr (skb); + +if ((iph->frag_off &htons (IP_DF )) && !skb->local_df) {if (sk &&inet_sk (sk)->inet_daddr) { iph->id =htons (inet_sk (sk)->inet_id);inet_sk (sk)->inet_id +=1 + more;
include/net/ipip.h +1 -1
@@ -50,7 +50,7 @@ struct ip_tunnel_prl_entry {int pkt_len = skb->len -skb_transport_offset (skb); \ \ skb->ip_summed =CHECKSUM_NONE ; \ -ip_select_ident (iph, &rt->dst,NULL ); \ +ip_select_ident (skb, &rt->dst,NULL ); \ \ err =ip_local_out (skb); \if (likely (net_xmit_eval (err) ==0 )) { \
net/ipv4/igmp.c +2 -2
@@ -342,7 +342,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size) pip->saddr = fl4.saddr; pip->protocol =IPPROTO_IGMP ; pip->tot_len =0 ;/* filled in later */ -ip_select_ident (pip, &rt->dst,NULL ); +ip_select_ident (skb, &rt->dst,NULL ); ((u8 *)&pip[1 ])[0 ] =IPOPT_RA ; ((u8 *)&pip[1 ])[1 ] =4 ; ((u8 *)&pip[1 ])[2 ] =0 ;
@@ -683,7 +683,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc, iph->daddr = dst; iph->saddr = fl4.saddr; iph->protocol =IPPROTO_IGMP ; -ip_select_ident (iph, &rt->dst,NULL ); +ip_select_ident (skb, &rt->dst,NULL ); ((u8 *)&iph[1 ])[0 ] =IPOPT_RA ; ((u8 *)&iph[1 ])[1 ] =4 ; ((u8 *)&iph[1 ])[2 ] =0 ;
net/ipv4/inetpeer.c +2 -2
@@ -31,8 +31,8 @@* At the moment of writing this notes identifier of IP packets is generated * to be unpredictable using this code only for packets subjected * (actually or potentially) to defragmentation. I.e. DF packets less than -* PMTU in size uses a constant ID and do not use this code (see -* ip_select_ident() in include/net/ip.h). +* PMTU in size when local fragmentation is disabled use a constant ID and do +* not use this code (see ip_select_ident() in include/net/ip.h). * * Route cache entries hold references to our nodes. * New cache entries get references via lookup by destination IP address in
net/ipv4/ip_output.c +3 -3
@@ -162,7 +162,7 @@ int ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk, iph->daddr = (opt && opt->opt.srr ? opt->opt.faddr : daddr); iph->saddr = saddr; iph->protocol = sk->sk_protocol; -ip_select_ident (iph, &rt->dst, sk); +ip_select_ident (skb, &rt->dst, sk);if (opt && opt->opt.optlen) { iph->ihl += opt->opt.optlen>>2 ;
@@ -390,7 +390,7 @@ packet_routed:ip_options_build (skb, &inet_opt->opt, inet->inet_daddr, rt,0 ); } -ip_select_ident_more (iph, &rt->dst, sk, +ip_select_ident_more (skb, &rt->dst, sk, (skb_shinfo (skb)->gso_segs ?:1 ) -1 ); skb->priority = sk->sk_priority;
@@ -1334,7 +1334,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk, iph->ihl =5 ; iph->tos = inet->tos; iph->frag_off = df; -ip_select_ident (iph, &rt->dst, sk); +ip_select_ident (skb, &rt->dst, sk); iph->ttl = ttl; iph->protocol = sk->sk_protocol; iph->saddr = fl4->saddr;
net/ipv4/ipmr.c +1 -1
@@ -1576,7 +1576,7 @@ static void ip_encap(struct sk_buff *skb, __be32 saddr, __be32 daddr) iph->protocol =IPPROTO_IPIP ; iph->ihl =5 ; iph->tot_len =htons (skb->len); -ip_select_ident (iph,skb_dst (skb),NULL ); +ip_select_ident (skb,skb_dst (skb),NULL );ip_send_check (iph);memset (&(IPCB (skb)->opt),0 ,sizeof (IPCB (skb)->opt));
net/ipv4/raw.c +1 -1
@@ -380,7 +380,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4, iph->check =0 ; iph->tot_len =htons (length);if (!iph->id) -ip_select_ident (iph, &rt->dst,NULL ); +ip_select_ident (skb, &rt->dst,NULL ); iph->check =ip_fast_csum ((unsigned char *)iph, iph->ihl); }
net/ipv4/xfrm4_mode_tunnel.c +1 -1
@@ -54,7 +54,7 @@ static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) top_iph->frag_off = (flags &XFRM_STATE_NOPMTUDISC ) ?0 : (XFRM_MODE_SKB_CB (skb)->frag_off &htons (IP_DF )); -ip_select_ident (top_iph, dst->child,NULL ); +ip_select_ident (skb, dst->child,NULL ); top_iph->ttl =ip4_dst_hoplimit (dst->child);
net/netfilter/ipvs/ip_vs_xmit.c +1 -1
@@ -853,7 +853,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, iph->daddr = cp->daddr.ip; iph->saddr = saddr; iph->ttl = old_iph->ttl; -ip_select_ident (iph, &rt->dst,NULL ); +ip_select_ident (skb, &rt->dst,NULL );/* Another hack: avoid icmp_send in ip_fragment */ skb->local_df =1 ;
PATCH 107/149 ipv6: udp packets following an UFO enqueued packet need also be handled by UFO
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit 2811ebac2521ceac84f2bdae402455baa6a7fb47 ]
In the following scenario the socket is corked:
If the first UDP packet is larger then the mtu we try to append it to the write queue via ip6_ufo_append_data. A following packet, which is smaller than the mtu would be appended to the already queued up gso-skb via plain ip6_append_data. This causes random memory corruptions.
In ip6_ufo_append_data we also have to be careful to not queue up the same skb multiple times. So setup the gso frame only when no first skb is available.
This also fixes a shortcoming where we add the current packet's length to cork->length but return early because of a packet > mtu with dontfrag set (instead of sutracting it again).
Found with trinity.
--- net/ipv6/ip6_output.c | 53 +++++++++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 31 deletions(-)
net/ipv6/ip6_output.c +22 -31
@@ -1125,6 +1125,8 @@ static inline int ip6_ufo_append_data(struct sock *sk,* udp datagram */ if ((skb =skb_peek_tail (&sk->sk_write_queue)) ==NULL ) { +struct frag_hdr fhdr; + skb =sock_alloc_send_skb (sk, hh_len + fragheaderlen + transhdrlen +20 , (flags &MSG_DONTWAIT ), &err);
@@ -1145,12 +1147,6 @@ static inline int ip6_ufo_append_data(struct sock *sk, skb->ip_summed =CHECKSUM_PARTIAL ; skb->csum =0 ; - } - - err =skb_append_datato_frags (sk,skb, getfrag, from, - (length - transhdrlen)); -if (!err) { -struct frag_hdr fhdr;/* Specify the length of each IPv6 datagram fragment. * It has to be a multiple of 8.
@@ -1161,15 +1157,10 @@ static inline int ip6_ufo_append_data(struct sock *sk,ipv6_select_ident (&fhdr, rt);skb_shinfo (skb)->ip6_frag_id = fhdr.identification;__skb_queue_tail (&sk->sk_write_queue, skb); - -return 0 ; } -/* There is not enough support do UPD LSO, -* so follow normal path -*/ -kfree_skb (skb); -return err; +return skb_append_datato_frags (sk, skb, getfrag, from, + (length - transhdrlen)); } static inline struct ipv6_opt_hdr *ip6_opt_dup(struct ipv6_opt_hdr *src,
@@ -1342,27 +1333,27 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,* --yoshfuji */ - cork->length += length; -if (length > mtu) { -int proto = sk->sk_protocol; -if (dontfrag && (proto ==IPPROTO_UDP || proto ==IPPROTO_RAW )){ -ipv6_local_rxpmtu (sk, fl6, mtu-exthdrlen); -return -EMSGSIZE ; - } - -if (proto ==IPPROTO_UDP && - (rt->dst.dev->features &NETIF_F_UFO )) { +if ((length > mtu) && dontfrag && (sk->sk_protocol ==IPPROTO_UDP || + sk->sk_protocol ==IPPROTO_RAW )) { +ipv6_local_rxpmtu (sk, fl6, mtu-exthdrlen); +return -EMSGSIZE ; + } - err =ip6_ufo_append_data (sk, getfrag, from, length, - hh_len, fragheaderlen, - transhdrlen, mtu, flags, rt); -if (err) - goto error; -return 0 ; - } + skb =skb_peek_tail (&sk->sk_write_queue); + cork->length += length; +if (((length > mtu) || + (skb &&skb_is_gso (skb))) && + (sk->sk_protocol ==IPPROTO_UDP ) && + (rt->dst.dev->features &NETIF_F_UFO )) { + err =ip6_ufo_append_data (sk, getfrag, from, length, + hh_len, fragheaderlen, + transhdrlen, mtu, flags, rt); +if (err) + goto error; +return 0 ; } -if ((skb =skb_peek_tail (&sk->sk_write_queue)) ==NULL ) +if (!skb) goto alloc_new_skb;while (length >0 ) {
PATCH 108/149 via-rhine: fix VLAN priority field (PCP, IEEE 802.1p)
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Roger Luethi <[email protected]>
[ Upstream commit 207070f5221e2a901d56a49df9cde47d9b716cd7 ]
Outgoing packets sent by via-rhine have their VLAN PCP field off by one (when hardware acceleration is enabled). The TX descriptor expects only VID and PCP (without a CFI/DEI bit).
Peter Boström noticed and reported the bug.
--- drivers/net/ethernet/via/via-rhine.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/ethernet/via/via-rhine.c +7 -2
@@ -32,7 +32,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#define DRV_NAME "via-rhine" -#define DRV_VERSION "1.5.0" +#define DRV_VERSION "1.5.1"#define DRV_RELDATE "2010-10-09"
@@ -1518,7 +1518,12 @@ static netdev_tx_t rhine_start_tx(struct sk_buff *skb,cpu_to_le32 (TXDESC | (skb->len >=ETH_ZLEN ? skb->len :ETH_ZLEN ));if (unlikely (vlan_tx_tag_present (skb))) { - rp->tx_ring[entry].tx_status =cpu_to_le32 ((vlan_tx_tag_get (skb)) <<16 ); +u16 vid_pcp =vlan_tx_tag_get (skb); + +/* drop CFI/DEI bit, register needs VID and PCP */ + vid_pcp = (vid_pcp &VLAN_VID_MASK ) | + ((vid_pcp &VLAN_PRIO_MASK ) >>1 ); + rp->tx_ring[entry].tx_status =cpu_to_le32 ((vid_pcp) <<16 );/* request tagging */ rp->tx_ring[entry].desc_length |=cpu_to_le32 (0x020000 ); }
PATCH 109/149 dm9601: fix IFF_ALLMULTI handling
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Peter Korsgaard <[email protected]>
[ Upstream commit bf0ea6380724beb64f27a722dfc4b0edabff816e ]
Pass-all-multicast is controlled by bit 3 in RX control, not bit 2 (pass undersized frames).
--- drivers/net/usb/dm9601.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/dm9601.c +1 -1
@@ -384,7 +384,7 @@ static void dm9601_set_multicast(struct net_device *net) rx_ctl |=0x02 ; }else if (net->flags &IFF_ALLMULTI ||netdev_mc_count (net) >DM_MAX_MCAST ) { - rx_ctl |=0x04 ; + rx_ctl |=0x08 ; }else if (!netdev_mc_empty (net)) {struct netdev_hw_addr *ha;
PATCH 110/149 bonding: Fix broken promiscuity reference counting issue
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Neil Horman <[email protected]>
[ Upstream commit 5a0068deb611109c5ba77358be533f763f395ee4 ]
Recently grabbed this report:
https://bugzilla.redhat.com/show_bug.cgi?id=1005567
Of an issue in which the bonding driver, with an attached vlan encountered the following errors when bond0 was taken down and back up:
dummy1: promiscuity touches roof, set promiscuity failed. promiscuity feature of device might be broken.
The error occurs because, during __bond_release_one, if we release our last slave, we take on a random mac address and issue a NETDEV_CHANGEADDR notification. With an attached vlan, the vlan may see that the vlan and bond mac address were in sync, but no longer are. This triggers a call to dev_uc_add and dev_set_rx_mode, which enables IFF_PROMISC on the bond device. Then, when we complete __bond_release_one, we use the current state of the bond flags to determine if we should decrement the promiscuity of the releasing slave. But since the bond changed promiscuity state during the release operation, we incorrectly decrement the slave promisc count when it wasn't in promiscuous mode to begin with, causing the above error
Fix is pretty simple, just cache the bonding flags at the start of the function and use those when determining the need to set promiscuity.
This is also needed for the ALLMULTI flag
--- drivers/net/bonding/bond_main.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/net/bonding/bond_main.c +10 -3
@@ -1911,6 +1911,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)struct bonding *bond =netdev_priv (bond_dev);struct slave *slave, *oldcurrent;struct sockaddr addr; +int old_flags = bond_dev->flags;u32 old_features = bond_dev->features;/* slave is not a slave or master is not master of this slave */
@@ -2041,12 +2042,18 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)* already taken care of above when we detached the slave */ if (!USES_PRIMARY (bond->params.mode)) { -/* unset promiscuity level from slave */ -if (bond_dev->flags &IFF_PROMISC ) +/* unset promiscuity level from slave +* NOTE: The NETDEV_CHANGEADDR call above may change the value +* of the IFF_PROMISC flag in the bond_dev, but we need the +* value of that flag before that change, as that was the value +* when this slave was attached, so we cache at the start of the +* function and use it here. Same goes for ALLMULTI below +*/ +if (old_flags &IFF_PROMISC )dev_set_promiscuity (slave_dev,-1 );/* unset allmulti level from slave */ -if (bond_dev->flags &IFF_ALLMULTI ) +if (old_flags &IFF_ALLMULTI )dev_set_allmulti (slave_dev,-1 );/* flush master's mc_list from slave */
PATCH 111/149 ipv4 igmp: use in_dev_put in timer handlers instead of __in_dev_put
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Salam Noureddine <[email protected]>
[ Upstream commit e2401654dd0f5f3fb7a8d80dad9554d73d7ca394 ]
It is possible for the timer handlers to run after the call to ip_mc_down so use in_dev_put instead of __in_dev_put in the handler function in order to do proper cleanup when the refcnt reaches 0. Otherwise, the refcnt can reach zero without the in_device being destroyed and we end up leaking a reference to the net_device and see messages like the following,
unregister_netdevice: waiting for eth0 to become free. Usage count = 1
Tested on linux-3.4.43.
--- net/ipv4/igmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/igmp.c +2 -2
@@ -705,7 +705,7 @@ static void igmp_gq_timer_expire(unsigned long data) in_dev->mr_gq_running =0 ;igmpv3_send_report (in_dev,NULL ); -__in_dev_put (in_dev); +in_dev_put (in_dev); }static void igmp_ifc_timer_expire (unsigned long data)
@@ -717,7 +717,7 @@ static void igmp_ifc_timer_expire(unsigned long data) in_dev->mr_ifc_count--;igmp_ifc_start_timer (in_dev, IGMP_Unsolicited_Report_Interval); } -__in_dev_put (in_dev); +in_dev_put (in_dev); }static void igmp_ifc_event (struct in_device *in_dev)
PATCH 112/149 ipv6 mcast: use in6_dev_put in timer handlers instead of __in6_dev_put
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Salam Noureddine <[email protected]>
[ Upstream commit 9260d3e1013701aa814d10c8fc6a9f92bd17d643 ]
It is possible for the timer handlers to run after the call to ipv6_mc_down so use in6_dev_put instead of __in6_dev_put in the handler function in order to do proper cleanup when the refcnt reaches 0. Otherwise, the refcnt can reach zero without the inet6_dev being destroyed and we end up leaking a reference to the net_device and see messages like the following,
unregister_netdevice: waiting for eth0 to become free. Usage count = 1
Tested on linux-3.4.43.
--- net/ipv6/mcast.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv6/mcast.c +2 -2
@@ -2159,7 +2159,7 @@ static void mld_gq_timer_expire(unsigned long data) idev->mc_gq_running =0 ;mld_send_report (idev,NULL ); -__in6_dev_put (idev); +in6_dev_put (idev); }static void mld_ifc_timer_expire (unsigned long data)
@@ -2172,7 +2172,7 @@ static void mld_ifc_timer_expire(unsigned long data)if (idev->mc_ifc_count)mld_ifc_start_timer (idev, idev->mc_maxdelay); } -__in6_dev_put (idev); +in6_dev_put (idev); }static void mld_ifc_event (struct inet6_dev *idev)
PATCH 113/149 ll_temac: Reset dma descriptors indexes on ndo_open
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit 7167cf0e8cd10287b7912b9ffcccd9616f382922 ]
The dma descriptors indexes are only initialized on the probe function.
If a packet is on the buffer when temac_stop is called, the dma descriptors indexes can be left on a incorrect state where no other package can be sent.
So an interface could be left in an usable state after ifdow/ifup.
This patch makes sure that the descriptors indexes are in a proper status when the device is open.
--- drivers/net/ethernet/xilinx/ll_temac_main.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/xilinx/ll_temac_main.c +6 -0
@@ -308,6 +308,12 @@ static int temac_dma_bd_init(struct net_device *ndev) lp->rx_bd_p + (sizeof(*lp->rx_bd_v) * (RX_BD_NUM - 1))); lp->dma_out (lp,TX_CURDESC_PTR , lp->tx_bd_p); +/* Init descriptor indexes */ + lp->tx_bd_ci =0 ; + lp->tx_bd_next =0 ; + lp->tx_bd_tail =0 ; + lp->rx_bd_ci =0 ; +return 0 ; out:
PATCH 114/149 esp_scsi: Fix tag state corruption when autosensing.
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit 21af8107f27878813d0364733c0b08813c2c192a ]
Meelis Roos reports a crash in esp_free_lun_tag() in the presense of a disk which has died.
The issue is that when we issue an autosense command, we do so by hijacking the original command that caused the check-condition.
When we do so we clear out the ent->tag[] array when we issue it via find_and_prep_issuable_command(). This is so that the autosense command is forced to be issued non-tagged.
That is problematic, because it is the value of ent->tag[] which determines whether we issued the original scsi command as tagged vs. non-tagged (see esp_alloc_lun_tag()).
And that, in turn, is what trips up the sanity checks in esp_free_lun_tag(). That function needs the original ->tag[] values in order to free up the tag slot properly.
Fix this by remembering the original command's tag values, and having esp_alloc_lun_tag() and esp_free_lun_tag() use them.
--- drivers/scsi/esp_scsi.c | 14 ++++++++------ drivers/scsi/esp_scsi.h | 1 + 2 files changed, 9 insertions(+), 6 deletions(-)
drivers/scsi/esp_scsi.c +8 -6
@@ -530,7 +530,7 @@ static int esp_need_to_nego_sync(struct esp_target_data *tp)static int esp_alloc_lun_tag (struct esp_cmd_entry *ent,struct esp_lun_data *lp) { -if (!ent->tag[0 ]) { +if (!ent->orig_tag[0 ]) {/* Non-tagged, slot already taken? */ if (lp->non_tagged_cmd)return -EBUSY ;
@@ -564,9 +564,9 @@ static int esp_alloc_lun_tag(struct esp_cmd_entry *ent,return -EBUSY ; } -BUG_ON (lp->tagged_cmds[ent->tag[1 ]]); +BUG_ON (lp->tagged_cmds[ent->orig_tag[1 ]]); - lp->tagged_cmds[ent->tag[1 ]] = ent; + lp->tagged_cmds[ent->orig_tag[1 ]] = ent; lp->num_tagged++;return 0 ;
@@ -575,9 +575,9 @@ static int esp_alloc_lun_tag(struct esp_cmd_entry *ent,static void esp_free_lun_tag (struct esp_cmd_entry *ent,struct esp_lun_data *lp) { -if (ent->tag[0 ]) { -BUG_ON (lp->tagged_cmds[ent->tag[1 ]] != ent); - lp->tagged_cmds[ent->tag[1 ]] =NULL ; +if (ent->orig_tag[0 ]) { +BUG_ON (lp->tagged_cmds[ent->orig_tag[1 ]] != ent); + lp->tagged_cmds[ent->orig_tag[1 ]] =NULL ; lp->num_tagged--; }else {BUG_ON (lp->non_tagged_cmd != ent);
@@ -667,6 +667,8 @@ static struct esp_cmd_entry *find_and_prep_issuable_command(struct esp *esp) ent->tag[0 ] =0 ; ent->tag[1 ] =0 ; } + ent->orig_tag[0 ] = ent->tag[0 ]; + ent->orig_tag[1 ] = ent->tag[1 ];if (esp_alloc_lun_tag (ent, lp) <0 )continue ;
drivers/scsi/esp_scsi.h +1 -0
@@ -271,6 +271,7 @@ struct esp_cmd_entry {#define ESP_CMD_FLAG_AUTOSENSE 0x04/* Doing automatic REQUEST_SENSE */ u8 tag[2 ]; +u8 orig_tag[2 ];u8 status;u8 message;
PATCH 115/149 sparc64: Fix ITLB handler of null page
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kirill Tkhai <[email protected]>
[ Upstream commit 1c2696cdaad84580545a2e9c0879ff597880b1a9 ]
1)Use kvmap_itlb_longpath instead of kvmap_dtlb_longpath.
2)Handle page #0 only, don't handle page #1: bleu -> blu
(KERNBASE is 0x400000, so #1 does not exist too. But everything
is possible in the future. Fix to not to have problems later.)
3)Remove unused kvmap_itlb_nonlinear.
--- arch/sparc/kernel/ktlb.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/sparc/kernel/ktlb.S +1 -2
@@ -25,11 +25,10 @@ kvmap_itlb: */ kvmap_itlb_4v: -kvmap_itlb_nonlinear: /* Catch kernel NULL pointer calls. */ sethi %hi(PAGE_SIZE), %g5 cmp %g4, %g5 - bleu,pn %xcc, kvmap_dtlb_longpath + blu,pn %xcc, kvmap_itlb_longpath nop KERN_TSB_LOOKUP_TL1(%g4, %g6, %g5, %g1, %g2, %g3, kvmap_itlb_load)
PATCH 116/149 sparc64: Remove RWSEM export leftovers
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kirill Tkhai <[email protected]>
[ Upstream commit 61d9b9355b0d427bd1e732bd54628ff9103e496f ]
The functions
__down_read __down_read_trylock __down_write __down_write_trylock __up_read __up_write __downgrade_write
are implemented inline, so remove corresponding EXPORT_SYMBOLs (They lead to compile errors on RT kernel).
--- arch/sparc/lib/ksyms.c | 9 --------- 1 file changed, 9 deletions(-)
arch/sparc/lib/ksyms.c +0 -9
@@ -131,15 +131,6 @@ EXPORT_SYMBOL(___copy_from_user);EXPORT_SYMBOL (___copy_in_user);EXPORT_SYMBOL (__clear_user); -/* RW semaphores */ -EXPORT_SYMBOL (__down_read); -EXPORT_SYMBOL (__down_read_trylock); -EXPORT_SYMBOL (__down_write); -EXPORT_SYMBOL (__down_write_trylock); -EXPORT_SYMBOL (__up_read); -EXPORT_SYMBOL (__up_write); -EXPORT_SYMBOL (__downgrade_write); -/* Atomic counter implementation. */ EXPORT_SYMBOL (atomic_add);EXPORT_SYMBOL (atomic_add_ret);
PATCH 117/149 sparc64: Fix off by one in trampoline TLB mapping installation loop.
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit 63d499662aeec1864ec36d042aca8184ea6a938e ]
--- arch/sparc/kernel/trampoline_64.S | 2 -- 1 file changed, 2 deletions(-)
arch/sparc/kernel/trampoline_64.S +0 -2
@@ -131,7 +131,6 @@ startup_continue: clr %l5 sethi %hi(num_kernel_image_mappings), %l6 lduw [%l6 + %lo(num_kernel_image_mappings)], %l6 - add %l6, 1, %l6 mov 15, %l7 BRANCH_IF_ANY_CHEETAH(g1,g5,2f)
@@ -224,7 +223,6 @@ niagara_lock_tlb: clr %l5 sethi %hi(num_kernel_image_mappings), %l6 lduw [%l6 + %lo(num_kernel_image_mappings)], %l6 - add %l6, 1, %l6 1: mov HV_FAST_MMU_MAP_PERM_ADDR, %o5
PATCH 118/149 sparc64: Fix not SRA'ed %o5 in 32-bit traced syscall
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kirill Tkhai <[email protected]>
[ Upstream commit ab2abda6377723e0d5fbbfe5f5aa16a5523344d1 ]
(From v1 to v2: changed comment)
On the way linux_sparc_syscall32->linux_syscall_trace32->goto 2f, register %o5 doesn't clear its second 32-bit.
Fix that.
--- arch/sparc/kernel/syscalls.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/sparc/kernel/syscalls.S +4 -4
@@ -147,7 +147,7 @@ linux_syscall_trace32: srl %i4, 0, %o4 srl %i1, 0, %o1 srl %i2, 0, %o2 - ba,pt %xcc, 2f + ba,pt %xcc, 5f srl %i3, 0, %o3 linux_syscall_trace:
@@ -177,13 +177,13 @@ linux_sparc_syscall32: srl %i1, 0, %o1 ! IEU0 Group ldx [%g6 + TI_FLAGS], %l0 ! Load - srl %i5, 0, %o5 ! IEU1 + srl %i3, 0, %o3 ! IEU0 srl %i2, 0, %o2 ! IEU0 Group andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0 bne,pn %icc, linux_syscall_trace32 ! CTI mov %i0, %l5 ! IEU1 - call %l7 ! CTI Group brk forced - srl %i3, 0, %o3 ! IEU0 +5: call %l7 ! CTI Group brk forced + srl %i5, 0, %o5 ! IEU1 ba,a,pt %xcc, 3f /* Linux native system calls enter here... */
PATCH 119/149 sparc32: Fix exit flag passed from traced sys_sigreturn
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kirill Tkhai <[email protected]>
[ Upstream commit 7a3b0f89e3fea680f93932691ca41a68eee7ab5e ]
Pass 1 in %o1 to indicate that syscall_trace accounts exit.
--- arch/sparc/kernel/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sparc/kernel/entry.S +1 -1
@@ -1177,7 +1177,7 @@ sys_sigreturn: nop call syscall_trace - nop + mov 1, %o1 1: /* We don't want to muck with user registers like a
PATCH 120/149 kernel-doc: bugfix - multi-line macros
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Santos <[email protected]>
commit 654784284430bf2739985914b65e09c7c35a7273 upstream.
Prior to this patch the following code breaks:
/**
* multiline_example - this breaks kernel-doc
*/
#define multiline_example( \
myparam)
Producing this error:
Error(somefile.h:983): cannot understand prototype: 'multiline_example( \ '
This patch fixes the issue by appending all lines ending in a blackslash (optionally followed by whitespace), removing the backslash and any whitespace after it prior to appending (just like the C pre-processor would).
This fixes a break in kerel-doc introduced by the additions to rbtree.h.
--- scripts/kernel-doc | 3 +++ 1 file changed, 3 insertions(+)
scripts/kernel-doc +3 -0
@@ -2044,6 +2044,9 @@ sub process_file($) { $section_counter = 0; while (<IN>) { + while (s/\\\s*$//) { + $_ .= <IN>; + } if ($state == 0) { if (/$doc_start/o) { $state = 1; # next line is always the function name
PATCH 121/149 perf: Use css_tryget() to avoid propping up css refcount
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Salman Qazi <[email protected]>
commit 9c5da09d266ca9b32eb16cf940f8161d949c2fe5 upstream.
An rmdir pushes css's ref count to zero. However, if the associated directory is open at the time, the dentry ref count is non-zero. If the fd for this directory is then passed into perf_event_open, it does a css_get(). This bounces the ref count back up from zero. This is a problem by itself. But what makes it turn into a crash is the fact that we end up doing an extra dput, since we perform a dput when css_put sees the ref count go down to zero.
css_tryget() does not fall into that trap. So, we use that instead.
Reproduction test-case for the bug:
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <linux/unistd.h>
#include <linux/perf_event.h>
#include <string.h>
#include <errno.h>
#include <stdio.h>
#define PERF_FLAG_PID_CGROUP (1U << 2)
int perf_event_open(struct perf_event_attr *hw_event_uptr,
pid_t pid, int cpu, int group_fd, unsigned long flags) {
return syscall(__NR_perf_event_open,hw_event_uptr, pid, cpu,
group_fd, flags);}
/*
* Directly poke at the perf_event bug, since it's proving hard to repro
* depending on where in the kernel tree. what moved?
*/
int main(int argc, char **argv)
{
int fd;
struct perf_event_attr attr;
memset(&attr, 0, sizeof(attr));
attr.exclude_kernel = 1;
attr.size = sizeof(attr);
mkdir("/dev/cgroup/perf_event/blah", 0777);
fd = open("/dev/cgroup/perf_event/blah", O_RDONLY);
perror("open");
rmdir("/dev/cgroup/perf_event/blah");
sleep(2);
perf_event_open(&attr, fd, 0, -1, PERF_FLAG_PID_CGROUP);
perror("perf_event_open");
close(fd);
return 0;}
--- kernel/events/core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
kernel/events/core.c +7 -3
@@ -242,9 +242,9 @@ perf_cgroup_match(struct perf_event *evereturn !event->cgrp || event->cgrp == cpuctx->cgrp; } -static inline void perf_get_cgroup (struct perf_event *event) +static inline bool perf_tryget_cgroup (struct perf_event *event) { -css_get (&event->cgrp->css); +return css_tryget (&event->cgrp->css); }static inline void perf_put_cgroup (struct perf_event *event)
@@ -473,7 +473,11 @@ static inline int perf_cgroup_connect(in event->cgrp = cgrp;/* must be done before we fput() the file */ -perf_get_cgroup (event); +if (!perf_tryget_cgroup (event)) { + event->cgrp =NULL ; + ret = -ENOENT ; + goto out; + }/* * all events in a group must monitor
PATCH 122/149 debugfs: debugfs_remove_recursive() must not rely on list_empty(d_subdirs)
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
commit 776164c1faac4966ab14418bb0922e1820da1d19 upstream.
debugfs_remove_recursive() is wrong,
1. it wrongly assumes that !list_empty(d_subdirs) means that this dir should be removed.
This is not that bad by itself, but:
2. if d_subdirs does not becomes empty after __debugfs_remove() it gives up and silently fails, it doesn't even try to remove other entries.
However ->d_subdirs can be non-empty because it still has the already deleted !debugfs_positive() entries.
3. simple_release_fs() is called even if __debugfs_remove() fails.
Suppose we have
dir1/ dir2/ file2 file1
and someone opens dir1/dir2/file2.
Now, debugfs_remove_recursive(dir1/dir2) succeeds, and dir1/dir2 goes away.
But debugfs_remove_recursive(dir1) silently fails and doesn't remove this directory. Because it tries to delete (the already deleted) dir1/dir2/file2 again and then fails due to "Avoid infinite loop" logic.
Test-case:
#!/bin/sh
cd /sys/kernel/debug/tracing
echo 'p:probe/sigprocmask sigprocmask' >> kprobe_events sleep 1000 < events/probe/sigprocmask/id & echo -n >| kprobe_events
[ -d events/probe ] && echo "ERR!! failed to rm probe"
And after that it is not possible to create another probe entry.
With this patch debugfs_remove_recursive() skips !debugfs_positive() files although this is not strictly needed. The most important change is that it does not try to make ->d_subdirs empty, it simply scans the whole list(s) recursively and removes as much as possible.
--- fs/debugfs/inode.c | 69 +++++++++++++++++------------------------------------- 1 file changed, 22 insertions(+), 47 deletions(-)
fs/debugfs/inode.c +22 -47
@@ -380,8 +380,7 @@ EXPORT_SYMBOL_GPL(debugfs_remove);*/ void debugfs_remove_recursive (struct dentry *dentry) { -struct dentry *child; -struct dentry *parent; +struct dentry *child, *next, *parent;if (!dentry)return ;
@@ -391,61 +390,37 @@ void debugfs_remove_recursive(struct denreturn ; parent = dentry; + down:mutex_lock (&parent->d_inode->i_mutex); +list_for_each_entry_safe (child, next, &parent->d_subdirs, d_u.d_child) { +if (!debugfs_positive (child)) +continue ; -while (1 ) { -/* -* When all dentries under "parent" has been removed, -* walk up the tree until we reach our starting point. -*/ -if (list_empty (&parent->d_subdirs)) { -mutex_unlock (&parent->d_inode->i_mutex); -if (parent == dentry) -break ; - parent = parent->d_parent; -mutex_lock (&parent->d_inode->i_mutex); - } - child = list_entry(parent->d_subdirs.next, struct dentry, - d_u.d_child); - next_sibling: - -/* -* If "child" isn't empty, walk down the tree and -* remove all its descendants first. -*/ +/* perhaps simple_empty(child) makes more sense */ if (!list_empty (&child->d_subdirs)) {mutex_unlock (&parent->d_inode->i_mutex); parent = child; -mutex_lock (&parent->d_inode->i_mutex); -continue ; + goto down; } -__debugfs_remove (child, parent); -if (parent->d_subdirs.next == &child->d_u.d_child) { -/* -* Try the next sibling. -*/ -if (child->d_u.d_child.next != &parent->d_subdirs) { - child =list_entry (child->d_u.d_child.next, - struct dentry, - d_u.d_child); - goto next_sibling; - } - -/* -* Avoid infinite loop if we fail to remove -* one dentry. -*/ -mutex_unlock (&parent->d_inode->i_mutex); -break ; - } -simple_release_fs (&debugfs_mount, &debugfs_mount_count); + up: +if (!__debugfs_remove (child, parent)) +simple_release_fs (&debugfs_mount, &debugfs_mount_count); } - parent = dentry->d_parent; +mutex_unlock (&parent->d_inode->i_mutex); + child = parent; + parent = parent->d_parent;mutex_lock (&parent->d_inode->i_mutex); -__debugfs_remove (dentry, parent); + +if (child != dentry) { + next = list_entry(child->d_u.d_child.next, struct dentry, + d_u.d_child); + goto up; + } + +if (!__debugfs_remove (child, parent)) +simple_release_fs (&debugfs_mount, &debugfs_mount_count);mutex_unlock (&parent->d_inode->i_mutex); -simple_release_fs (&debugfs_mount, &debugfs_mount_count); }EXPORT_SYMBOL_GPL (debugfs_remove_recursive);
PATCH 123/149 usb: core: don't try to reset_device() a port that got just disconnected
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Julius Werner <[email protected]>
commit 481f2d4f89f87a0baa26147f323380e31cfa7c44 upstream.
The USB hub driver's event handler contains a check to catch SuperSpeed devices that transitioned into the SS.Inactive state and tries to fix them with a reset. It decides whether to do a plain hub port reset or call the usb_reset_device() function based on whether there was a device attached to the port.
However, there are device/hub combinations (found with a JetFlash Transcend mass storage stick (8564:1000) on the root hub of an Intel LynxPoint PCH) which can transition to the SS.Inactive state on disconnect (and stay there long enough for the host to notice). In this case, above-mentioned reset check will call usb_reset_device() on the stale device data structure. The kernel will send pointless LPM control messages to the no longer connected device address and can even cause several 5 second khubd stalls on some (buggy?) host controllers, before finally accepting the device's fate amongst a flurry of error messages.
This patch makes the choice of reset dependent on the port status that has just been read from the hub in addition to the existence of an in-kernel data structure for the device, and only proceeds with the more extensive reset if both are valid.
--- drivers/usb/core/hub.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/core/hub.c +3 -2
@@ -3749,7 +3749,8 @@ static void hub_events(void) hub->hdev->children[i -1 ];dev_dbg (hub_dev,"warm reset port %d\n" , i); -if (!udev) { +if (!udev || !(portstatus & +USB_PORT_STAT_CONNECTION )) { status =hub_port_reset (hub, i,NULL ,HUB_BH_RESET_TIME , true);
@@ -3759,8 +3760,8 @@ static void hub_events(void)usb_lock_device (udev); status =usb_reset_device (udev);usb_unlock_device (udev); + connect_change =0 ; } - connect_change =0 ; }if (connect_change)
PATCH 124/149 m68k: consolidate the vmlinux.lds linker scripts
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Greg Ungerer <[email protected]>
commit 40c1b9cfeedf79b909c961e0e00a13497e80bc82 upstream.
The merge of m68knommu left the linker scripts a little disorganized. Some consistent naming and squashing two of scripts that just include others can simplify things a lot.
So merge the two simple including scripts, and rename the nommu script to be consistent with the existing m68k linker scripts.
--- arch/m68k/kernel/vmlinux-nommu.lds | 187 +++++++++++++++++++++++++++++++++++++ arch/m68k/kernel/vmlinux.lds.S | 13 ++- arch/m68k/kernel/vmlinux.lds_mm.S | 10 -- arch/m68k/kernel/vmlinux.lds_no.S | 187 ------------------------------------- 4 files changed, 198 insertions(+), 199 deletions(-) create mode 100644 arch/m68k/kernel/vmlinux-nommu.lds delete mode 100644 arch/m68k/kernel/vmlinux.lds_mm.S delete mode 100644 arch/m68k/kernel/vmlinux.lds_no.S
arch/m68k/kernel/vmlinux-nommu.lds new file +187 -0
@@ -0,0 +1,187 @@ +/* + * vmlinux.lds.S -- master linker script for m68knommu arch + * + * (C) Copyright 2002-2006, Greg Ungerer <[email protected]> + * + * This linker script is equipped to build either ROM loaded or RAM + * run kernels. + */ + +#include <asm-generic/vmlinux.lds.h> +#include <asm/page.h> +#include <asm/thread_info.h> + +#if defined(CONFIG_RAMKERNEL) +#define RAM_START CONFIG_KERNELBASE +#define RAM_LENGTH (CONFIG_RAMBASE + CONFIG_RAMSIZE - CONFIG_KERNELBASE) +#define TEXT ram +#define DATA ram +#define INIT ram +#define BSSS ram +#endif +#if defined(CONFIG_ROMKERNEL) || defined(CONFIG_HIMEMKERNEL) +#define RAM_START CONFIG_RAMBASE +#define RAM_LENGTH CONFIG_RAMSIZE +#define ROMVEC_START CONFIG_ROMVEC +#define ROMVEC_LENGTH CONFIG_ROMVECSIZE +#define ROM_START CONFIG_ROMSTART +#define ROM_LENGTH CONFIG_ROMSIZE +#define TEXT rom +#define DATA ram +#define INIT ram +#define BSSS ram +#endif + +#ifndef DATA_ADDR +#define DATA_ADDR +#endif + + +OUTPUT_ARCH(m68k) +ENTRY(_start) + +MEMORY { + ram : ORIGIN = RAM_START, LENGTH = RAM_LENGTH +#ifdef ROM_START + romvec : ORIGIN = ROMVEC_START, LENGTH = ROMVEC_LENGTH + rom : ORIGIN = ROM_START, LENGTH = ROM_LENGTH +#endif +} + +jiffies = jiffies_64 + 4; + +SECTIONS { + +#ifdef ROMVEC_START + . = ROMVEC_START ; + .romvec : { + __rom_start = . ; + _romvec = .; + *(.data..initvect) + } > romvec +#endif + + .text : { + _text = .; + _stext = . ; + HEAD_TEXT + TEXT_TEXT + SCHED_TEXT + LOCK_TEXT + *(.text..lock) + + . = ALIGN(16); /* Exception table */ + __start___ex_table = .; + *(__ex_table) + __stop___ex_table = .; + + *(.rodata) *(.rodata.*) + *(__vermagic) /* Kernel version magic */ + *(.rodata1) + *(.rodata.str1.1) + + /* Kernel symbol table: Normal symbols */ + . = ALIGN(4); + __start___ksymtab = .; + *(SORT(___ksymtab+*)) + __stop___ksymtab = .; + + /* Kernel symbol table: GPL-only symbols */ + __start___ksymtab_gpl = .; + *(SORT(___ksymtab_gpl+*)) + __stop___ksymtab_gpl = .; + + /* Kernel symbol table: Normal unused symbols */ + __start___ksymtab_unused = .; + *(SORT(___ksymtab_unused+*)) + __stop___ksymtab_unused = .; + + /* Kernel symbol table: GPL-only unused symbols */ + __start___ksymtab_unused_gpl = .; + *(SORT(___ksymtab_unused_gpl+*)) + __stop___ksymtab_unused_gpl = .; + + /* Kernel symbol table: GPL-future symbols */ + __start___ksymtab_gpl_future = .; + *(SORT(___ksymtab_gpl_future+*)) + __stop___ksymtab_gpl_future = .; + + /* Kernel symbol table: Normal symbols */ + __start___kcrctab = .; + *(SORT(___kcrctab+*)) + __stop___kcrctab = .; + + /* Kernel symbol table: GPL-only symbols */ + __start___kcrctab_gpl = .; + *(SORT(___kcrctab_gpl+*)) + __stop___kcrctab_gpl = .; + + /* Kernel symbol table: Normal unused symbols */ + __start___kcrctab_unused = .; + *(SORT(___kcrctab_unused+*)) + __stop___kcrctab_unused = .; + + /* Kernel symbol table: GPL-only unused symbols */ + __start___kcrctab_unused_gpl = .; + *(SORT(___kcrctab_unused_gpl+*)) + __stop___kcrctab_unused_gpl = .; + + /* Kernel symbol table: GPL-future symbols */ + __start___kcrctab_gpl_future = .; + *(SORT(___kcrctab_gpl_future+*)) + __stop___kcrctab_gpl_future = .; + + /* Kernel symbol table: strings */ + *(__ksymtab_strings) + + /* Built-in module parameters */ + . = ALIGN(4) ; + __start___param = .; + *(__param) + __stop___param = .; + + /* Built-in module versions */ + . = ALIGN(4) ; + __start___modver = .; + *(__modver) + __stop___modver = .; + + . = ALIGN(4) ; + _etext = . ; + } > TEXT + + .data DATA_ADDR : { + . = ALIGN(4); + _sdata = . ; + DATA_DATA + CACHELINE_ALIGNED_DATA(32) + PAGE_ALIGNED_DATA(PAGE_SIZE) + *(.data..shared_aligned) + INIT_TASK_DATA(THREAD_SIZE) + _edata = . ; + } > DATA + + .init.text : { + . = ALIGN(PAGE_SIZE); + __init_begin = .; + } > INIT + INIT_TEXT_SECTION(PAGE_SIZE) > INIT + INIT_DATA_SECTION(16) > INIT + .init.data : { + . = ALIGN(PAGE_SIZE); + __init_end = .; + } > INIT + + .bss : { + . = ALIGN(4); + _sbss = . ; + *(.bss) + *(COMMON) + . = ALIGN(4) ; + _ebss = . ; + _end = . ; + } > BSSS + + DISCARDS +} +
arch/m68k/kernel/vmlinux.lds.S +11 -2
@@ -1,5 +1,14 @@ #ifdef CONFIG_MMU -#include "vmlinux.lds_mm.S" +PHDRS +{ + text PT_LOAD FILEHDR PHDRS FLAGS (7); + data PT_LOAD FLAGS (7); +} +#ifdef CONFIG_SUN3 +#include "vmlinux-sun3.lds" #else -#include "vmlinux.lds_no.S" +#include "vmlinux-std.lds" +#endif +#else +#include "vmlinux-nommu.lds" #endif
arch/m68k/kernel/vmlinux.lds_mm.S deleted +0 -10
@@ -1,10 +0,0 @@ -PHDRS -{ - text PT_LOAD FILEHDR PHDRS FLAGS (7); - data PT_LOAD FLAGS (7); -} -#ifdef CONFIG_SUN3 -#include "vmlinux-sun3.lds" -#else -#include "vmlinux-std.lds" -#endif
arch/m68k/kernel/vmlinux.lds_no.S deleted +0 -187
187 lines not on this page · raw message
PATCH 125/149 m68k: use non-MMU linker script for ColdFire MMU builds
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Greg Ungerer <[email protected]>
commit ed865e31a8273be200db9ddcdb6b844e48777abd upstream.
Use the non-MMU linker script for ColdFire builds when we are building for MMU enabled. The image layout is correct for loading on existing ColdFire dev boards. The only addition required to the current non-MMU linker script is to add support for the fixup section.
--- arch/m68k/kernel/vmlinux-nommu.lds | 8 ++++++++ arch/m68k/kernel/vmlinux.lds.S | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)
arch/m68k/kernel/vmlinux-nommu.lds +8 -0
@@ -69,6 +69,7 @@ SECTIONS { SCHED_TEXT LOCK_TEXT *(.text..lock) + *(.fixup) . = ALIGN(16); /* Exception table */ __start___ex_table = .;
@@ -161,6 +162,13 @@ SECTIONS { _edata = . ; } > DATA + .m68k_fixup : { + __start_fixup = .; + *(.m68k_fixup) + __stop_fixup = .; + } > DATA + NOTES > DATA + .init.text : { . = ALIGN(PAGE_SIZE); __init_begin = .;
arch/m68k/kernel/vmlinux.lds.S +1 -1
@@ -1,4 +1,4 @@ -#ifdef CONFIG_MMU +#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE) PHDRS { text PT_LOAD FILEHDR PHDRS FLAGS (7);
PATCH 126/149 m68knommu: clean up linker script
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Greg Ungerer <[email protected]>
commit f84f52a5c15db7d14a534815f27253b001735183 upstream.
There is a lot of years of collected cruft in the m68knommu linker script. Clean it all up and use the well defined linker script support macros.
Support is maintained for building both ROM/FLASH based and RAM based setups. No major changes to section layouts, though the rodata section is now lumped in with the read/write data section.
--- arch/m68k/kernel/vmlinux-nommu.lds | 200 +++++++++---------------------------- 1 file changed, 49 insertions(+), 151 deletions(-)
arch/m68k/kernel/vmlinux-nommu.lds +49 -151
@@ -1,195 +1,93 @@ /* * vmlinux.lds.S -- master linker script for m68knommu arch * - * (C) Copyright 2002-2006, Greg Ungerer <[email protected]> + * (C) Copyright 2002-2012, Greg Ungerer <[email protected]> * * This linker script is equipped to build either ROM loaded or RAM * run kernels. */ -#include <asm-generic/vmlinux.lds.h> -#include <asm/page.h> -#include <asm/thread_info.h> - #if defined(CONFIG_RAMKERNEL) -#define RAM_START CONFIG_KERNELBASE -#define RAM_LENGTH (CONFIG_RAMBASE + CONFIG_RAMSIZE - CONFIG_KERNELBASE) -#define TEXT ram -#define DATA ram -#define INIT ram -#define BSSS ram -#endif -#if defined(CONFIG_ROMKERNEL) || defined(CONFIG_HIMEMKERNEL) -#define RAM_START CONFIG_RAMBASE -#define RAM_LENGTH CONFIG_RAMSIZE -#define ROMVEC_START CONFIG_ROMVEC -#define ROMVEC_LENGTH CONFIG_ROMVECSIZE -#define ROM_START CONFIG_ROMSTART -#define ROM_LENGTH CONFIG_ROMSIZE -#define TEXT rom -#define DATA ram -#define INIT ram -#define BSSS ram +#define KTEXT_ADDR CONFIG_KERNELBASE #endif - -#ifndef DATA_ADDR -#define DATA_ADDR +#if defined(CONFIG_ROMKERNEL) +#define KTEXT_ADDR CONFIG_ROMSTART +#define KDATA_ADDR CONFIG_KERNELBASE +#define LOAD_OFFSET KDATA_ADDR + (ADDR(.text) + SIZEOF(.text)) #endif +#include <asm/page.h> +#include <asm/thread_info.h> +#include <asm-generic/vmlinux.lds.h> OUTPUT_ARCH(m68k) ENTRY(_start) -MEMORY { - ram : ORIGIN = RAM_START, LENGTH = RAM_LENGTH -#ifdef ROM_START - romvec : ORIGIN = ROMVEC_START, LENGTH = ROMVEC_LENGTH - rom : ORIGIN = ROM_START, LENGTH = ROM_LENGTH -#endif -} - jiffies = jiffies_64 + 4; SECTIONS { -#ifdef ROMVEC_START - . = ROMVEC_START ; +#ifdef CONFIG_ROMVEC + . = CONFIG_ROMVEC; .romvec : { - __rom_start = . ; + __rom_start = .; _romvec = .; + *(.romvec) *(.data..initvect) - } > romvec + } #endif + . = KTEXT_ADDR; + + _text = .; + _stext = .; .text : { - _text = .; - _stext = . ; HEAD_TEXT TEXT_TEXT SCHED_TEXT LOCK_TEXT - *(.text..lock) *(.fixup) + . = ALIGN(16); + } + _etext = .; + +#ifdef KDATA_ADDR + . = KDATA_ADDR; +#endif + + _sdata = .; + RO_DATA_SECTION(PAGE_SIZE) + RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE) + _edata = .; - . = ALIGN(16); /* Exception table */ - __start___ex_table = .; - *(__ex_table) - __stop___ex_table = .; - - *(.rodata) *(.rodata.*) - *(__vermagic) /* Kernel version magic */ - *(.rodata1) - *(.rodata.str1.1) - - /* Kernel symbol table: Normal symbols */ - . = ALIGN(4); - __start___ksymtab = .; - *(SORT(___ksymtab+*)) - __stop___ksymtab = .; - - /* Kernel symbol table: GPL-only symbols */ - __start___ksymtab_gpl = .; - *(SORT(___ksymtab_gpl+*)) - __stop___ksymtab_gpl = .; - - /* Kernel symbol table: Normal unused symbols */ - __start___ksymtab_unused = .; - *(SORT(___ksymtab_unused+*)) - __stop___ksymtab_unused = .; - - /* Kernel symbol table: GPL-only unused symbols */ - __start___ksymtab_unused_gpl = .; - *(SORT(___ksymtab_unused_gpl+*)) - __stop___ksymtab_unused_gpl = .; - - /* Kernel symbol table: GPL-future symbols */ - __start___ksymtab_gpl_future = .; - *(SORT(___ksymtab_gpl_future+*)) - __stop___ksymtab_gpl_future = .; - - /* Kernel symbol table: Normal symbols */ - __start___kcrctab = .; - *(SORT(___kcrctab+*)) - __stop___kcrctab = .; - - /* Kernel symbol table: GPL-only symbols */ - __start___kcrctab_gpl = .; - *(SORT(___kcrctab_gpl+*)) - __stop___kcrctab_gpl = .; - - /* Kernel symbol table: Normal unused symbols */ - __start___kcrctab_unused = .; - *(SORT(___kcrctab_unused+*)) - __stop___kcrctab_unused = .; - - /* Kernel symbol table: GPL-only unused symbols */ - __start___kcrctab_unused_gpl = .; - *(SORT(___kcrctab_unused_gpl+*)) - __stop___kcrctab_unused_gpl = .; - - /* Kernel symbol table: GPL-future symbols */ - __start___kcrctab_gpl_future = .; - *(SORT(___kcrctab_gpl_future+*)) - __stop___kcrctab_gpl_future = .; - - /* Kernel symbol table: strings */ - *(__ksymtab_strings) - - /* Built-in module parameters */ - . = ALIGN(4) ; - __start___param = .; - *(__param) - __stop___param = .; - - /* Built-in module versions */ - . = ALIGN(4) ; - __start___modver = .; - *(__modver) - __stop___modver = .; - - . = ALIGN(4) ; - _etext = . ; - } > TEXT - - .data DATA_ADDR : { - . = ALIGN(4); - _sdata = . ; - DATA_DATA - CACHELINE_ALIGNED_DATA(32) - PAGE_ALIGNED_DATA(PAGE_SIZE) - *(.data..shared_aligned) - INIT_TASK_DATA(THREAD_SIZE) - _edata = . ; - } > DATA + EXCEPTION_TABLE(16) + NOTES + . = ALIGN(PAGE_SIZE); + __init_begin = .; + INIT_TEXT_SECTION(PAGE_SIZE) + INIT_DATA_SECTION(16) + PERCPU_SECTION(16) .m68k_fixup : { __start_fixup = .; *(.m68k_fixup) __stop_fixup = .; - } > DATA - NOTES > DATA - - .init.text : { - . = ALIGN(PAGE_SIZE); - __init_begin = .; - } > INIT - INIT_TEXT_SECTION(PAGE_SIZE) > INIT - INIT_DATA_SECTION(16) > INIT + } .init.data : { . = ALIGN(PAGE_SIZE); __init_end = .; - } > INIT - - .bss : { - . = ALIGN(4); - _sbss = . ; - *(.bss) - *(COMMON) - . = ALIGN(4) ; - _ebss = . ; - _end = . ; - } > BSSS + } + + _sbss = .; + BSS_SECTION(0, 0, 0) + _ebss = .; + + _end = .; + + STABS_DEBUG + .comment 0 : { *(.comment) } + /* Sections to be discarded */ DISCARDS }
PATCH 127/149 powerpc/pseries/lparcfg: Fix possible overflow are more than 1026
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Chen Gang <[email protected]>
commit 5676005acf26ab7e924a8438ea4746e47d405762 upstream.
need set '\0' for 'local_buffer'.
SPLPAR_MAXLENGTH is 1026, RTAS_DATA_BUF_SIZE is 4096. so the contents of rtas_data_buf may truncated in memcpy.
if contents are really truncated.
the splpar_strlen is more than 1026. the next while loop checking will not find the end of buffer. that will cause memory access violation.
--- arch/powerpc/kernel/lparcfg.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/kernel/lparcfg.c +1 -0
@@ -375,6 +375,7 @@ static void parse_system_parameter_strin__pa (rtas_data_buf), RTAS_DATA_BUF_SIZE);memcpy (local_buffer, rtas_data_buf,SPLPAR_MAXLENGTH ); + local_buffer[SPLPAR_MAXLENGTH -1 ] ='\0' ;spin_unlock (&rtas_data_buf_lock);if (call_status !=0 ) {
PATCH 128/149 Revert "zram: use zram->lock to protect zram_free_page() in swap free notify path"
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
This reverts commit 9e443904906ca2b5b3ae71f34ac4a4fa6905623e, which was commit 57ab048532c0d975538cebd4456491b5c34248f4 upstream.
Taking the semaphore here leads to sleeping in atomic context. This was fixed in mainline commit a0c516cbfc74 ("zram: don't grab mutex in zram_slot_free_noity") but that is too difficult to backport.
---
drivers/staging/zram/zram_drv.c +0 -2
@@ -709,9 +709,7 @@ static void zram_slot_free_notify(structstruct zram *zram; zram = bdev->bd_disk->private_data; -down_write (&zram->lock);zram_free_page (zram, index); -up_write (&zram->lock);zram_stat64_inc (zram, &zram->stats.notify_free); }
drivers/staging/zram/zram_drv.h +2 -3
@@ -107,9 +107,8 @@ struct zram {void *compress_buffer;struct table *table;spinlock_t stat64_lock;/* protect 64-bit stats */ -struct rw_semaphore lock;/* protect compression buffers, table, -* 32bit stat counters against concurrent -* notifications, reads and writes */ +struct rw_semaphore lock;/* protect compression buffers and table +* against concurrent read and writes */ struct request_queue *queue;struct gendisk *disk;int init_done;
PATCH 129/149 macvtap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jason Wang <[email protected]>
commit ece793fcfc417b3925844be88a6a6dc82ae8f7c6 upstream.
We try to linearize part of the skb when the number of iov is greater than MAX_SKB_FRAGS. This is not enough since each single vector may occupy more than one pages, so zerocopy_sg_fromiovec() may still fail and may break the guest network.
Solve this problem by calculate the pages needed for iov before trying to do zerocopy and switch to use copy instead of zerocopy if it needs more than MAX_SKB_FRAGS.
This is done through introducing a new helper to count the pages for iov, and call uarg->callback() manually when switching from zerocopy to copy to notify vhost.
We can do further optimization on top.
This bug were introduced from b92946e2919134ebe2a4083e4302236295ea2a73 (macvtap: zerocopy: validate vectors before building skb).
--- drivers/net/macvtap.c | 62 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 25 deletions(-)
drivers/net/macvtap.c +37 -25
@@ -641,6 +641,28 @@ static int macvtap_skb_to_vnet_hdr(constreturn 0 ; } +static unsigned long iov_pages (const struct iovec *iv,int offset, +unsigned long nr_segs) +{ +unsigned long seg, base; +int pages =0 , len, size; + +while (nr_segs && (offset >= iv->iov_len)) { + offset -= iv->iov_len; + ++iv; + --nr_segs; + } + +for (seg =0 ; seg < nr_segs; seg++) { + base = (unsigned long )iv[seg].iov_base + offset; + len = iv[seg].iov_len - offset; + size = ((base & ~PAGE_MASK ) + len + ~PAGE_MASK ) >>PAGE_SHIFT ; + pages += size; + offset =0 ; + } + +return pages; +}/* Get packet from user space buffer */ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
@@ -687,31 +709,15 @@ static ssize_t macvtap_get_user(struct mif (unlikely (count >UIO_MAXIOV )) goto err; -if (m && m->msg_control &&sock_flag (&q->sk,SOCK_ZEROCOPY )) - zerocopy = true; - -if (zerocopy) { -/* Userspace may produce vectors with count greater than -* MAX_SKB_FRAGS, so we need to linearize parts of the skb -* to let the rest of data to be fit in the frags. -*/ -if (count >MAX_SKB_FRAGS ) { - copylen =iov_length (iv, count -MAX_SKB_FRAGS ); -if (copylen < vnet_hdr_len) - copylen =0 ; -else - copylen -= vnet_hdr_len; - } -/* There are 256 bytes to be copied in skb, so there is enough -* room for skb expand head in case it is used. -* The rest buffer is mapped from userspace. -*/ -if (copylen < vnet_hdr.hdr_len) - copylen = vnet_hdr.hdr_len; -if (!copylen) - copylen =GOODCOPY_LEN ; +if (m && m->msg_control &&sock_flag (&q->sk,SOCK_ZEROCOPY )) { + copylen = vnet_hdr.hdr_len ? vnet_hdr.hdr_len :GOODCOPY_LEN ; linear = copylen; - }else { +if (iov_pages (iv, vnet_hdr_len + copylen, count) + <=MAX_SKB_FRAGS ) + zerocopy = true; + } + +if (!zerocopy) { copylen = len; linear = vnet_hdr.hdr_len; }
@@ -723,9 +729,15 @@ static ssize_t macvtap_get_user(struct mif (zerocopy) err =zerocopy_sg_from_iovec (skb, iv, vnet_hdr_len, count); -else +else { err =skb_copy_datagram_from_iovec (skb,0 , iv, vnet_hdr_len, len); +if (!err && m && m->msg_control) { +struct ubuf_info *uarg = m->msg_control; + uarg->callback (uarg); + } + } +if (err) goto err_kfree;
PATCH 130/149 sfc: Fix efx_rx_buf_offset() for recycled pages
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
This bug fix is only for stable branches older than 3.10. The bug was fixed upstream by commit 2768935a4660 ('sfc: reuse pages to avoid DMA mapping/unmapping costs'), but that change is totally unsuitable for stable.
Commit b590ace09d51 ('sfc: Fix efx_rx_buf_offset() in the presence of swiotlb') added an explicit page_offset member to struct efx_rx_buffer, which must be set consistently with the u.page and dma_addr fields. However, it failed to add the necessary assignment in efx_resurrect_rx_buffer(). It also did not correct the calculation of efx_rx_buffer::dma_addr in efx_resurrect_rx_buffer(), which assumes that DMA-mapping a page will result in a page-aligned DMA address (exactly what swiotlb violates).
Add the assignment of efx_rx_buffer::page_offset and change the calculation of dma_addr to make use of it.
--- drivers/net/ethernet/sfc/rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/sfc/rx.c +2 -1
@@ -312,8 +312,9 @@ static void efx_resurrect_rx_buffer(struct efx_rx_queue *rx_queue, index = rx_queue->added_count & rx_queue->ptr_mask; new_buf =efx_rx_buffer (rx_queue, index); - new_buf->dma_addr = rx_buf->dma_addr ^ (PAGE_SIZE >>1 ); new_buf->u.page = rx_buf->u.page; + new_buf->page_offset = rx_buf->page_offset ^ (PAGE_SIZE >>1 ); + new_buf->dma_addr = state->dma_addr + new_buf->page_offset; new_buf->len = rx_buf->len; new_buf->is_page = true; ++rx_queue->added_count;
Signature · 1 line
1.8.1.4
PATCH 131/149 cgroup: fail if monitored file and event_control are in different cgroup
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Li Zefan <[email protected]>
commit f169007b2773f285e098cb84c74aac0154d65ff7 upstream.
If we pass fd of memory.usage_in_bytes of cgroup A to cgroup.event_control of cgroup B, then we won't get memory usage notification from A but B!
What's worse, if A and B are in different mount hierarchy, we'll end up accessing NULL pointer!
Disallow this kind of invalid usage.
--- kernel/cgroup.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
kernel/cgroup.c +11 -0
@@ -3504,6 +3504,7 @@ static int cgroup_write_event_control(st const char *buffer) {struct cgroup_event *event =NULL ; +struct cgroup *cgrp_cfile;unsigned int efd, cfd;struct file *efile =NULL ;struct file *cfile =NULL ;
@@ -3559,6 +3560,16 @@ static int cgroup_write_event_control(st goto fail; } +/* +* The file to be monitored must be in the same cgroup as +* cgroup.event_control is. +*/ + cgrp_cfile =__d_cgrp (cfile->f_dentry->d_parent); +if (cgrp_cfile != cgrp) { + ret = -EINVAL ; + goto fail; + } +if (!event->cft->register_event || !event->cft->unregister_event) { ret = -EINVAL ; goto fail;
PATCH 132/149 perf: Clarify perf_cpu_context::active_pmu usage by renaming it to ::unique_pmu
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 3f1f33206c16c7b3839d71372bc2ac3f305aa802 upstream.
Stephane thought the perf_cpu_context::active_pmu name confusing and suggested using 'unique_pmu' instead.
This pointer is a pointer to a 'random' pmu sharing the cpuctx instance, therefore limiting a for_each_pmu loop to those where cpuctx->unique_pmu matches the pmu we get a loop over unique cpuctx instances.
--- include/linux/perf_event.h | 2 +- kernel/events/core.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
include/linux/perf_event.h +1 -1
@@ -927,7 +927,7 @@ struct perf_cpu_context {int exclusive;struct list_head rotation_list;int jiffies_interval; -struct pmu *active_pmu; +struct pmu *unique_pmu;struct perf_cgroup *cgrp; };
kernel/events/core.c +6 -6
@@ -4381,7 +4381,7 @@ static void perf_event_task_event(structrcu_read_lock ();list_for_each_entry_rcu (pmu, &pmus, entry) { cpuctx =get_cpu_ptr (pmu->pmu_cpu_context); -if (cpuctx->active_pmu != pmu) +if (cpuctx->unique_pmu != pmu) goto next;perf_event_task_ctx (&cpuctx->ctx, task_event);
@@ -4527,7 +4527,7 @@ static void perf_event_comm_event(structrcu_read_lock ();list_for_each_entry_rcu (pmu, &pmus, entry) { cpuctx =get_cpu_ptr (pmu->pmu_cpu_context); -if (cpuctx->active_pmu != pmu) +if (cpuctx->unique_pmu != pmu) goto next;perf_event_comm_ctx (&cpuctx->ctx, comm_event);
@@ -4723,7 +4723,7 @@ got_name:rcu_read_lock ();list_for_each_entry_rcu (pmu, &pmus, entry) { cpuctx =get_cpu_ptr (pmu->pmu_cpu_context); -if (cpuctx->active_pmu != pmu) +if (cpuctx->unique_pmu != pmu) goto next;perf_event_mmap_ctx (&cpuctx->ctx, mmap_event, vma->vm_flags &VM_EXEC );
@@ -5745,8 +5745,8 @@ static void update_pmu_context(struct pm cpuctx =per_cpu_ptr (pmu->pmu_cpu_context, cpu); -if (cpuctx->active_pmu == old_pmu) - cpuctx->active_pmu = pmu; +if (cpuctx->unique_pmu == old_pmu) + cpuctx->unique_pmu = pmu; } }
@@ -5881,7 +5881,7 @@ skip_type: cpuctx->ctx.pmu = pmu; cpuctx->jiffies_interval =1 ;INIT_LIST_HEAD (&cpuctx->rotation_list); - cpuctx->active_pmu = pmu; + cpuctx->unique_pmu = pmu; } got_cpu_context:
PATCH 133/149 perf: Fix perf_cgroup_switch for sw-events
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 95cf59ea72331d0093010543b8951bb43f262cac upstream.
Jiri reported that he could trigger the WARN_ON_ONCE() in perf_cgroup_switch() using sw-events. This is because sw-events share a cpuctx with multiple PMUs.
Use the ->unique_pmu pointer to limit the pmu iteration to unique cpuctx instances.
--- kernel/events/core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
kernel/events/core.c +6 -3
@@ -360,6 +360,8 @@ void perf_cgroup_switch(struct task_strulist_for_each_entry_rcu (pmu, &pmus, entry) { cpuctx =this_cpu_ptr (pmu->pmu_cpu_context); +if (cpuctx->unique_pmu != pmu) +continue ;/* ensure we process each cpuctx once */ /* * perf_cgroup_events says at least one
@@ -383,9 +385,10 @@ void perf_cgroup_switch(struct task_struif (mode &PERF_CGROUP_SWIN ) {WARN_ON_ONCE (cpuctx->cgrp); -/* set cgrp before ctxsw in to -* allow event_filter_match() to not -* have to pass task around +/* +* set cgrp before ctxsw in to allow +* event_filter_match() to not have to pass +* task around */ cpuctx->cgrp =perf_cgroup_from_task (task);cpu_ctx_sched_in (cpuctx,EVENT_ALL , task);
PATCH 134/149 perf tools: Handle JITed code in shared memory
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andi Kleen <[email protected]>
commit 89365e6c9ad4c0e090e4c6a4b67a3ce319381d89 upstream.
Need to check for /dev/zero.
Most likely more strings are missing too.
--- tools/perf/util/map.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/map.c +1 -0
@@ -16,6 +16,7 @@ const char *map_type__name[MAP__NR_TYPESstatic inline int is_anon_memory (const char *filename) {return !strcmp (filename,"//anon" ) || + !strcmp (filename,"/dev/zero (deleted)" ) || !strcmp (filename,"/anon_hugepage (deleted)" ); }
PATCH 135/149 fanotify: dont merge permission events
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Lino Sanfilippo <[email protected]>
commit 03a1cec1f17ac1a6041996b3e40f96b5a2f90e1b upstream.
Boyd Yang reported a problem for the case that multiple threads of the same thread group are waiting for a reponse for a permission event.
In this case it is possible that some of the threads are never woken up, even if the response for the event has been received
(see http://marc.info/?l=linux-kernel&m=131822913806350&w=2).
The reason is that we are currently merging permission events if they belong to the same thread group. But we are not prepared to wake up more than one waiter for each event. We do
wait_event(group->fanotify_data.access_waitq, event->response ||
atomic_read(&group->fanotify_data.bypass_perm));
and after that
event->response = 0;
which is the reason that even if we woke up all waiters for the same event some of them may see event->response being already set 0 again, then go back to sleep and block forever.
With this patch we avoid that more than one thread is waiting for a response by not merging permission events for the same thread group any more.
--- fs/notify/fanotify/fanotify.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/notify/fanotify/fanotify.c +6 -0
@@ -18,6 +18,12 @@ static bool should_merge(struct fsnotify_event *old, struct fsnotify_event *new) old->tgid == new->tgid) {switch (old->data_type) {case (FSNOTIFY_EVENT_PATH ): +#ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS +/* dont merge two permission events */ +if ((old->mask &FAN_ALL_PERM_EVENTS ) && + (new->mask &FAN_ALL_PERM_EVENTS )) +return false; +#endif if ((old->path.mnt == new->path.mnt) && (old->path.dentry == new->path.dentry))return true;
PATCH 136/149 HID: Fix Speedlink VAD Cezanne support for some devices
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Kriwanek <[email protected]>
commit 06bb5219118fb098f4b0c7dcb484b28a52bf1c14 upstream.
Some devices of the "Speedlink VAD Cezanne" model need more aggressive fixing than already done.
I made sure through testing that this patch would not interfere with the proper working of a device that is bug-free. (The driver drops EV_REL events with abs(val) >= 256, which are not achievable even on the highest laser resolution hardware setting.)
--- drivers/hid/hid-speedlink.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/hid/hid-speedlink.c +8 -3
@@ -3,7 +3,7 @@* Fixes "jumpy" cursor and removes nonexistent keyboard LEDS from * the HID descriptor. * -* Copyright (c) 2011 Stefan Kriwanek <[email protected]> +* Copyright (c) 2011, 2013 Stefan Kriwanek <[email protected]> */ /*
@@ -48,8 +48,13 @@ static int speedlink_event(struct hid_de struct hid_usage *usage, __s32 value) {/* No other conditions due to usage_table. */ -/* Fix "jumpy" cursor (invalid events sent by device). */ -if (value ==256 ) + +/* This fixes the "jumpy" cursor occuring due to invalid events sent +* by the device. Some devices only send them with value==+256, others +* don't. However, catching abs(value)>=256 is restrictive enough not +* to interfere with devices that were bug-free (has been tested). +*/ +if (abs (value) >=256 )return 1 ;/* Drop useless distance 0 events (on button clicks etc.) as well */ if (value ==0 )
PATCH 137/149 HID: usbhid: quirk for N-Trig DuoSense Touch Screen
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Vasily Titskiy <[email protected]>
commit 9e0bf92c223dabe0789714f8f85f6e26f8f9cda4 upstream.
The DuoSense touchscreen device causes a 10 second timeout. This fix removes the delay.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/usbhid/hid-quirks.c | 2 ++ 2 files changed, 3 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -581,6 +581,7 @@#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16 0x0012#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17 0x0013#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18 0x0014 +#define USB_DEVICE_ID_NTRIG_DUOSENSE 0x1500#define USB_VENDOR_ID_ONTRAK 0x0a07#define USB_DEVICE_ID_ONTRAK_ADU100 0x0064
drivers/hid/usbhid/hid-quirks.c +2 -0
@@ -99,6 +99,8 @@ static const struct hid_blacklist { { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD, HID_QUIRK_NO_INIT_REPORTS }, + { USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_DUOSENSE, HID_QUIRK_NO_INIT_REPORTS }, + { 0, 0 } };
PATCH 138/149 isofs: Refuse RW mount of the filesystem instead of making it RO
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 17b7f7cf58926844e1dd40f5eb5348d481deca6a upstream.
Refuse RW mount of isofs filesystem. So far we just silently changed it to RO mount but when the media is writeable, block layer won't notice this change and thus will think device is used RW and will block eject button of the drive. That is unexpected by users because for non-writeable media eject button works just fine.
Userspace mount(8) command handles this just fine and retries mounting with MS_RDONLY set so userspace shouldn't see any regression. Plus any tool mounting isofs is likely confronted with the case of read-only media where block layer already refuses to mount the filesystem without MS_RDONLY set so our behavior shouldn't be anything new for it.
--- fs/isofs/inode.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
fs/isofs/inode.c +5 -11
@@ -120,8 +120,8 @@ static void destroy_inodecache(void)static int isofs_remount (struct super_block *sb,int *flags,char *data) { -/* we probably want a lot more here */ - *flags |=MS_RDONLY ; +if (!(*flags &MS_RDONLY )) +return -EROFS ;return 0 ; }
@@ -770,15 +770,6 @@ root_found:*/ s->s_maxbytes =0x80000000000LL ; -/* -* The CDROM is read-only, has no nodes (devices) on it, and since -* all of the files appear to be owned by root, we really do not want -* to allow suid. (suid or devices will not show up unless we have -* Rock Ridge extensions) -*/ - - s->s_flags |=MS_RDONLY /* | MS_NODEV | MS_NOSUID */ ; -/* Set this for reference. Its not currently used except on write which we don't have .. */
@@ -1535,6 +1526,9 @@ struct inode *isofs_iget(struct super_blstatic struct dentry *isofs_mount (struct file_system_type *fs_type,int flags,const char *dev_name,void *data) { +/* We don't support read-write mounts */ +if (!(flags &MS_RDONLY )) +return ERR_PTR (-EACCES );return mount_bdev (fs_type, flags, dev_name, data, isofs_fill_super); }
PATCH 139/149 Revert "sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()"
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
This reverts commit de77b7955c3985ca95f64af3cb10557eb17eacee, which was commit f6e80abeab928b7c47cc1fbf53df13b4398a2bec upstream.
This fix was only appropriate for Linux 3.7 onward, and introduced a regression when applied to earlier versions.
---
net/sctp/sm_sideeffect.c +1 -2
@@ -1604,9 +1604,8 @@ static int sctp_cmd_interpreter(sctp_eve asoc->outqueue.outstanding_bytes; sackh.num_gap_ack_blocks =0 ; sackh.num_dup_tsns =0 ; - chunk->subh.sack_hdr = &sackh;sctp_add_cmd_sf (commands,SCTP_CMD_PROCESS_SACK , -SCTP_CHUNK (chunk)); +SCTP_SACKH (&sackh));break ;case SCTP_CMD_DISCARD_PACKET :
PATCH 140/149 iscsi: don't hang in endless loop if no targets present
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Sasha Levin <[email protected]>
commit 46a7c17d26967922092f3a8291815ffb20f6cabe upstream.
iscsi_if_send_reply() may return -ESRCH if there were no targets to send data to. Currently we're ignoring this value and looping in attempt to do it over and over, which will usually lead in a hung task like this one:
[ 4920.817298] INFO: task trinity:9074 blocked for more than 120 seconds.
[ 4920.818527] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
[ 4920.819982] trinity D 0000000000000000 5504 9074 2756 0x00000004
[ 4920.825374] ffff880003961a98 0000000000000086 ffff8800001aa000 ffff8800001aa000
[ 4920.826791] 00000000001d4340 ffff880003961fd8 ffff880003960000 00000000001d4340
[ 4920.828241] 00000000001d4340 00000000001d4340 ffff880003961fd8 00000000001d4340
[ 4920.833231]
[ 4920.833519] Call Trace:
[ 4920.834010] [<ffffffff826363fa>] schedule+0x3a/0x50
[ 4920.834953] [<ffffffff82634ac9>] __mutex_lock_common+0x209/0x5b0
[ 4920.836226] [<ffffffff81af805d>] ? iscsi_if_rx+0x2d/0x990
[ 4920.837281] [<ffffffff81053943>] ? sched_clock+0x13/0x20
[ 4920.838305] [<ffffffff81af805d>] ? iscsi_if_rx+0x2d/0x990
[ 4920.839336] [<ffffffff82634eb0>] mutex_lock_nested+0x40/0x50
[ 4920.840423] [<ffffffff81af805d>] iscsi_if_rx+0x2d/0x990
[ 4920.841434] [<ffffffff810dffed>] ? sub_preempt_count+0x9d/0xd0
[ 4920.842548] [<ffffffff82637bb0>] ? _raw_read_unlock+0x30/0x60
[ 4920.843666] [<ffffffff821f71de>] netlink_unicast+0x1ae/0x1f0
[ 4920.844751] [<ffffffff821f7997>] netlink_sendmsg+0x227/0x350
[ 4920.845850] [<ffffffff821857bd>] ? sock_update_netprioidx+0xdd/0x1b0
[ 4920.847060] [<ffffffff82185732>] ? sock_update_netprioidx+0x52/0x1b0
[ 4920.848276] [<ffffffff8217f226>] sock_aio_write+0x166/0x180
[ 4920.849348] [<ffffffff810dfe41>] ? get_parent_ip+0x11/0x50
[ 4920.850428] [<ffffffff811d0d9a>] do_sync_write+0xda/0x120
[ 4920.851465] [<ffffffff810dffed>] ? sub_preempt_count+0x9d/0xd0
[ 4920.852579] [<ffffffff810dfe41>] ? get_parent_ip+0x11/0x50
[ 4920.853608] [<ffffffff81791887>] ? security_file_permission+0x27/0xb0
[ 4920.854821] [<ffffffff811d0f4c>] vfs_write+0x16c/0x180
[ 4920.855781] [<ffffffff811d104f>] sys_write+0x4f/0xa0
[ 4920.856798] [<ffffffff82638e79>] system_call_fastpath+0x16/0x1b
[ 4920.877487] 1 lock held by trinity/9074:
[ 4920.878239] #0: (rx_queue_mutex){+.+...}, at: [<ffffffff81af805d>] iscsi_if_rx+0x2d/0x990
[ 4920.880005] Kernel panic - not syncing: hung_task: blocked tasks--- drivers/scsi/scsi_transport_iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/scsi_transport_iscsi.c +1 -1
@@ -2105,7 +2105,7 @@ iscsi_if_rx(struct sk_buff *skb)break ; err =iscsi_if_send_reply (group, nlh->nlmsg_seq, nlh->nlmsg_type,0 ,0 , ev,sizeof (*ev)); - }while (err <0 && err != -ECONNREFUSED ); + }while (err <0 && err != -ECONNREFUSED && err != -ESRCH );skb_pull (skb, rlen); }mutex_unlock (&rx_queue_mutex);
PATCH 141/149 cpqarray: fix info leak in ida_locked_ioctl()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 627aad1c01da6f881e7f98d71fd928ca0c316b1a upstream.
The pciinfo struct has a two byte hole after ->dev_fn so stack information could be leaked to the user.
This was assigned CVE-2013-2147.
--- drivers/block/cpqarray.c | 1 + 1 file changed, 1 insertion(+)
drivers/block/cpqarray.c +1 -0
@@ -1195,6 +1195,7 @@ out_passthru:ida_pci_info_struct pciinfo;if (!arg)return -EINVAL ; +memset (&pciinfo,0 ,sizeof (pciinfo)); pciinfo.bus = host->pci_dev->bus->number; pciinfo.dev_fn = host->pci_dev->devfn; pciinfo.board_id = host->board_id;
PATCH 142/149 cciss: fix info leak in cciss_ioctl32_passthru()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 58f09e00ae095e46ef9edfcf3a5fd9ccdfad065e upstream.
The arg64 struct has a hole after ->buf_size which isn't cleared. Or if any of the calls to copy_from_user() fail then that would cause an information leak as well.
This was assigned CVE-2013-2147.
--- drivers/block/cciss.c | 1 + 1 file changed, 1 insertion(+)
drivers/block/cciss.c +1 -0
@@ -1186,6 +1186,7 @@ static int cciss_ioctl32_passthru(structint err;u32 cp; +memset (&arg64,0 ,sizeof (arg64)); err =0 ; err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
PATCH 143/149 xhci: Fix race between ep halt and URB cancellation
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Florian Wolter <[email protected]>
commit 526867c3ca0caa2e3e846cb993b0f961c33c2abb upstream.
The halted state of a endpoint cannot be cleared over CLEAR_HALT from a user process, because the stopped_td variable was overwritten in the handle_stopped_endpoint() function. So the xhci_endpoint_reset() function will refuse the reset and communication with device can not run over this endpoint.
https://bugzilla.kernel.org/show_bug.cgi?id=60699
--- drivers/usb/host/xhci-ring.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-ring.c +6 -2
@@ -879,8 +879,12 @@ remove_finished_td:/* Otherwise ring the doorbell(s) to restart queued transfers */ ring_doorbell_for_active_rings (xhci, slot_id, ep_index); } - ep->stopped_td =NULL ; - ep->stopped_trb =NULL ; + +/* Clear stopped_td and stopped_trb if endpoint is not halted */ +if (!(ep->ep_state &EP_HALTED )) { + ep->stopped_td =NULL ; + ep->stopped_trb =NULL ; + }/* * Drop the lock and complete the URBs in the cancelled TD list.
PATCH 144/149 hwmon: (applesmc) Silence uninitialized warnings
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Henrik Rydberg <[email protected]>
commit 0fc86eca1b338d06ec500b34ef7def79c32b602b upstream.
Some error paths do not set a result, leading to the (false) assumption that the value may be used uninitialized. Set results for those paths as well.
--- drivers/hwmon/applesmc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/hwmon/applesmc.c +6 -2
@@ -344,8 +344,10 @@ static int applesmc_get_lower_bound(unsigned int *lo, const char *key)while (begin != end) {int middle = begin + (end - begin) /2 ; entry =applesmc_get_entry_by_index (middle); -if (IS_ERR (entry)) +if (IS_ERR (entry)) { + *lo =0 ;return PTR_ERR (entry); + }if (strcmp (entry->key, key) <0 ) begin = middle +1 ;else
@@ -364,8 +366,10 @@ static int applesmc_get_upper_bound(unsigned int *hi, const char *key)while (begin != end) {int middle = begin + (end - begin) /2 ; entry =applesmc_get_entry_by_index (middle); -if (IS_ERR (entry)) +if (IS_ERR (entry)) { + *hi = smcreg.key_count;return PTR_ERR (entry); + }if (strcmp (key, entry->key) <0 ) end = middle;else
PATCH 145/149 ext4: avoid hang when mounting non-journal filesystems with orphan list
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit 0e9a9a1ad619e7e987815d20262d36a2f95717ca upstream.
When trying to mount a file system which does not contain a journal, but which does have a orphan list containing an inode which needs to be truncated, the mount call with hang forever in ext4_orphan_cleanup() because ext4_orphan_del() will return immediately without removing the inode from the orphan list, leading to an uninterruptible loop in kernel code which will busy out one of the CPU's on the system.
This can be trivially reproduced by trying to mount the file system found in tests/f_orphan_extents_inode/image.gz from the e2fsprogs source tree. If a malicious user were to put this on a USB stick, and mount it on a Linux desktop which has automatic mounts enabled, this could be considered a potential denial of service attack. (Not a big deal in practice, but professional paranoids worry about such things, and have even been known to allocate CVE numbers for such problems.)
-js: This is a fix for CVE-2013-2015.
--- fs/ext4/namei.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ext4/namei.c +2 -1
@@ -2054,7 +2054,8 @@ int ext4_orphan_del(handle_t *handle, stint err =0 ;/* ext4_handle_valid() assumes a valid handle_t pointer */ -if (handle && !ext4_handle_valid (handle)) +if (handle && !ext4_handle_valid (handle) && + !(EXT4_SB (inode->i_sb)->s_mount_state &EXT4_ORPHAN_FS ))return 0 ;mutex_lock (&EXT4_SB (inode->i_sb)->s_orphan_lock);
PATCH 146/149 staging: comedi: ni_65xx: (bug fix) confine insn_bits to one subdevice
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 677a31565692d596ef42ea589b53ba289abf4713 upstream.
The insn_bits handler ni_65xx_dio_insn_bits() has a for loop that currently writes (optionally) and reads back up to 5 "ports" consisting of 8 channels each. It reads up to 32 1-bit channels but can only read and write a whole port at once - it needs to handle up to 5 ports as the first channel it reads might not be aligned on a port boundary. It breaks out of the loop early if the next port it handles is beyond the final port on the card. It also breaks out early on the 5th port in the loop if the first channel was aligned. Unfortunately, it doesn't check that the current port it is dealing with belongs to the comedi subdevice the insn_bits handler is acting on. That's a bug.
Redo the for loop to terminate after the final port belonging to the subdevice, changing the loop variable in the process to simplify things a bit. The for loop could now try and handle more than 5 ports if the subdevice has more than 40 channels, but the test if (bitshift >= 32) ensures it will break out early after 4 or 5 ports (depending on whether the first channel is aligned on a port boundary). (bitshift will be between -7 and 7 inclusive on the first iteration, increasing by 8 for each subsequent operation.)
[Ian Abbott: This patch applies to kernels 2.6.34.y through to 3.5.y
inclusive.]
--- drivers/staging/comedi/drivers/ni_65xx.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-)
drivers/staging/comedi/drivers/ni_65xx.c +11 -15
@@ -411,29 +411,25 @@ static int ni_65xx_dio_insn_bits(structstruct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - unsigned base_bitfield_channel; -const unsigned max_ports_per_bitfield =5 ; + int base_bitfield_channel;unsigned read_bits =0 ; -unsigned j; +int last_port_offset =ni_65xx_port_by_channel (s->n_chan -1 ); +int port_offset; +if (insn->n !=2 )return -EINVAL ; base_bitfield_channel =CR_CHAN (insn->chanspec); -for (j =0 ; j < max_ports_per_bitfield; ++j) { -const unsigned port_offset = -ni_65xx_port_by_channel (base_bitfield_channel) + j; -const unsigned port = -sprivate (s)->base_port + port_offset; -unsigned base_port_channel; +for (port_offset =ni_65xx_port_by_channel (base_bitfield_channel); + port_offset <= last_port_offset; port_offset++) { +unsigned port =sprivate (s)->base_port + port_offset; +int base_port_channel = port_offset * ni_65xx_channels_per_port;unsigned port_mask, port_data, port_read_bits; -int bitshift; -if (port >=ni_65xx_total_num_ports (board (dev))) +int bitshift = base_port_channel - base_bitfield_channel; + +if (bitshift >=32 )break ; - base_port_channel = port_offset * ni_65xx_channels_per_port; port_mask = data[0 ]; port_data = data[1 ]; - bitshift = base_port_channel - base_bitfield_channel; -if (bitshift >=32 || bitshift <=-32 ) -break ;if (bitshift >0 ) { port_mask >>= bitshift; port_data >>= bitshift;
PATCH 147/149 ACPI / IPMI: Fix atomic context requirement of ipmi_msg_handler()
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Lv Zheng <[email protected]>
commit 06a8566bcf5cf7db9843a82cde7a33c7bf3947d9 upstream.
This patch fixes the issues indicated by the test results that ipmi_msg_handler() is invoked in atomic context.
BUG: scheduling while atomic: kipmi0/18933/0x10000100 Modules linked in: ipmi_si acpi_ipmi ... CPU: 3 PID: 18933 Comm: kipmi0 Tainted: G AW 3.10.0-rc7+ #2 Hardware name: QCI QSSC-S4R/QSSC-S4R, BIOS QSSC-S4R.QCI.01.00.0027.070120100606 07/01/2010 ffff8838245eea00 ffff88103fc63c98 ffffffff814c4a1e ffff88103fc63ca8 ffffffff814bfbab ffff88103fc63d28 ffffffff814c73e0 ffff88103933cbd4 0000000000000096 ffff88103fc63ce8 ffff88102f618000 ffff881035c01fd8 Call Trace: <IRQ> [<ffffffff814c4a1e>] dump_stack+0x19/0x1b [<ffffffff814bfbab>] __schedule_bug+0x46/0x54 [<ffffffff814c73e0>] __schedule+0x83/0x59c [<ffffffff81058853>] __cond_resched+0x22/0x2d [<ffffffff814c794b>] _cond_resched+0x14/0x1d [<ffffffff814c6d82>] mutex_lock+0x11/0x32 [<ffffffff8101e1e9>] ? __default_send_IPI_dest_field.constprop.0+0x53/0x58 [<ffffffffa09e3f9c>] ipmi_msg_handler+0x23/0x166 [ipmi_si] [<ffffffff812bf6e4>] deliver_response+0x55/0x5a [<ffffffff812c0fd4>] handle_new_recv_msgs+0xb67/0xc65 [<ffffffff81007ad1>] ? read_tsc+0x9/0x19 [<ffffffff814c8620>] ? _raw_spin_lock_irq+0xa/0xc [<ffffffffa09e1128>] ipmi_thread+0x5c/0x146 [ipmi_si] ...
Also Tony Camuso says:
We were getting occasional "Scheduling while atomic" call traces during boot on some systems. Problem was first seen on a Cisco C210 but we were able to reproduce it on a Cisco c220m3. Setting CONFIG_LOCKDEP and LOCKDEP_SUPPORT to 'y' exposed a lockdep around tx_msg_lock in acpi_ipmi.c struct acpi_ipmi_device.
=================================
[ INFO: inconsistent lock state ]
2.6.32-415.el6.x86_64-debug-splck #1
---------------------------------
inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
ksoftirqd/3/17 [HC0[0]:SC1[1]:HE1:SE0] takes:
(&ipmi_device->tx_msg_lock){+.?...}, at: [<ffffffff81337a27>] ipmi_msg_handler+0x71/0x126
{SOFTIRQ-ON-W} state was registered at:
[<ffffffff810ba11c>] __lock_acquire+0x63c/0x1570 [<ffffffff810bb0f4>] lock_acquire+0xa4/0x120 [<ffffffff815581cc>] __mutex_lock_common+0x4c/0x400 [<ffffffff815586ea>] mutex_lock_nested+0x4a/0x60 [<ffffffff8133789d>] acpi_ipmi_space_handler+0x11b/0x234 [<ffffffff81321c62>] acpi_ev_address_space_dispatch+0x170/0x1be
The fix implemented by this change has been tested by Tony:
Tested the patch in a boot loop with lockdep debug enabled and never saw the problem in over 400 reboots.
--- drivers/acpi/acpi_ipmi.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
drivers/acpi/acpi_ipmi.c +14 -10
@@ -39,6 +39,7 @@#include <linux/ipmi.h> #include <linux/device.h> #include <linux/pnp.h> +#include <linux/spinlock.h> MODULE_AUTHOR ("Zhao Yakui" );MODULE_DESCRIPTION ("ACPI IPMI Opregion driver" );
@@ -57,7 +58,7 @@ struct acpi_ipmi_device {struct list_head head;/* the IPMI request message list */ struct list_head tx_msg_list; -struct mutex tx_msg_lock; +spinlock_t tx_msg_lock;acpi_handle handle;struct pnp_dev *pnp_dev;ipmi_user_t user_interface;
@@ -147,6 +148,7 @@ static void acpi_format_ipmi_msg(struct acpi_ipmi_msg *tx_msg,struct kernel_ipmi_msg *msg;struct acpi_ipmi_buffer *buffer;struct acpi_ipmi_device *device; +unsigned long flags; msg = &tx_msg->tx_message;/*
@@ -177,10 +179,10 @@ static void acpi_format_ipmi_msg(struct acpi_ipmi_msg *tx_msg,/* Get the msgid */ device = tx_msg->device; -mutex_lock (&device->tx_msg_lock); +spin_lock_irqsave (&device->tx_msg_lock, flags); device->curr_msgid++; tx_msg->tx_msgid = device->curr_msgid; -mutex_unlock (&device->tx_msg_lock); +spin_unlock_irqrestore (&device->tx_msg_lock, flags); } static void acpi_format_ipmi_response(struct acpi_ipmi_msg *msg,
@@ -242,6 +244,7 @@ static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)int msg_found =0 ;struct acpi_ipmi_msg *tx_msg;struct pnp_dev *pnp_dev = ipmi_device->pnp_dev; +unsigned long flags;if (msg->user != ipmi_device->user_interface) { dev_warn(&pnp_dev->dev, "Unexpected response is returned. "
@@ -250,7 +253,7 @@ static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)ipmi_free_recv_msg (msg);return ; } -mutex_lock (&ipmi_device->tx_msg_lock); +spin_lock_irqsave (&ipmi_device->tx_msg_lock, flags);list_for_each_entry (tx_msg, &ipmi_device->tx_msg_list, head) {if (msg->msgid == tx_msg->tx_msgid) { msg_found =1 ;
@@ -258,7 +261,7 @@ static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data) } } -mutex_unlock (&ipmi_device->tx_msg_lock); +spin_unlock_irqrestore (&ipmi_device->tx_msg_lock, flags);if (!msg_found) {dev_warn (&pnp_dev->dev,"Unexpected response (msg id %ld) is " "returned.\n" , msg->msgid);
@@ -378,6 +381,7 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address,struct acpi_ipmi_device *ipmi_device = handler_context;int err, rem_time;acpi_status status; +unsigned long flags;/* * IPMI opregion message. * IPMI message is firstly written to the BMC and system software
@@ -395,9 +399,9 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address,return AE_NO_MEMORY ;acpi_format_ipmi_msg (tx_msg, address, value); -mutex_lock (&ipmi_device->tx_msg_lock); +spin_lock_irqsave (&ipmi_device->tx_msg_lock, flags);list_add_tail (&tx_msg->head, &ipmi_device->tx_msg_list); -mutex_unlock (&ipmi_device->tx_msg_lock); +spin_unlock_irqrestore (&ipmi_device->tx_msg_lock, flags); err = ipmi_request_settime(ipmi_device->user_interface, &tx_msg->addr, tx_msg->tx_msgid,
@@ -413,9 +417,9 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address, status =AE_OK ; end_label: -mutex_lock (&ipmi_device->tx_msg_lock); +spin_lock_irqsave (&ipmi_device->tx_msg_lock, flags);list_del (&tx_msg->head); -mutex_unlock (&ipmi_device->tx_msg_lock); +spin_unlock_irqrestore (&ipmi_device->tx_msg_lock, flags);kfree (tx_msg);return status; }
@@ -457,7 +461,7 @@ static void acpi_add_ipmi_device(struct acpi_ipmi_device *ipmi_device)INIT_LIST_HEAD (&ipmi_device->head); -mutex_init (&ipmi_device->tx_msg_lock); +spin_lock_init (&ipmi_device->tx_msg_lock);INIT_LIST_HEAD (&ipmi_device->tx_msg_list);ipmi_install_space_handler (ipmi_device);
PATCH 148/149 mm, show_mem: suppress page counts in non-blockable contexts
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: David Rientjes <[email protected]>
commit 4b59e6c4730978679b414a8da61514a2518da512 upstream.
On large systems with a lot of memory, walking all RAM to determine page types may take a half second or even more.
In non-blockable contexts, the page allocator will emit a page allocation failure warning unless __GFP_NOWARN is specified. In such contexts, irqs are typically disabled and such a lengthy delay may even result in NMI watchdog timeouts.
To fix this, suppress the page walk in such contexts when printing the page allocation failure warning.
--- arch/arm/mm/init.c | 3 +++ arch/ia64/mm/contig.c | 2 ++ arch/ia64/mm/discontig.c | 2 ++ arch/parisc/mm/init.c | 2 ++ arch/unicore32/mm/init.c | 3 +++ include/linux/mm.h | 3 ++- lib/show_mem.c | 3 +++ mm/page_alloc.c | 7 +++++++ 8 files changed, 24 insertions(+), 1 deletion(-)
arch/arm/mm/init.c +3 -0
@@ -98,6 +98,9 @@ void show_mem(unsigned int filter)printk ("Mem-info:\n" );show_free_areas (filter); +if (filter &SHOW_MEM_FILTER_PAGE_COUNT ) +return ; + for_each_bank (i, mi) {struct membank *bank = &mi->bank[i];unsigned int pfn1, pfn2;
arch/ia64/mm/contig.c +2 -0
@@ -46,6 +46,8 @@ void show_mem(unsigned int filter)printk (KERN_INFO "Mem-info:\n" );show_free_areas (filter);printk (KERN_INFO "Node memory in pages:\n" ); +if (filter &SHOW_MEM_FILTER_PAGE_COUNT ) +return ;for_each_online_pgdat (pgdat) {unsigned long present;unsigned long flags;
arch/ia64/mm/discontig.c +2 -0
@@ -623,6 +623,8 @@ void show_mem(unsigned int filter)printk (KERN_INFO "Mem-info:\n" );show_free_areas (filter); +if (filter &SHOW_MEM_FILTER_PAGE_COUNT ) +return ;printk (KERN_INFO "Node memory in pages:\n" );for_each_online_pgdat (pgdat) {unsigned long present;
arch/parisc/mm/init.c +2 -0
@@ -685,6 +685,8 @@ void show_mem(unsigned int filter)printk (KERN_INFO "Mem-info:\n" );show_free_areas (filter); +if (filter &SHOW_MEM_FILTER_PAGE_COUNT ) +return ;#ifndef CONFIG_DISCONTIGMEM i = max_mapnr;while (i-- >0 ) {
arch/unicore32/mm/init.c +3 -0
@@ -65,6 +65,9 @@ void show_mem(unsigned int filter)printk (KERN_DEFAULT "Mem-info:\n" );show_free_areas (filter); +if (filter &SHOW_MEM_FILTER_PAGE_COUNT ) +return ; +for_each_bank (i, mi) {struct membank *bank = &mi->bank[i];unsigned int pfn1, pfn2;
include/linux/mm.h +2 -1
@@ -865,7 +865,8 @@ extern void pagefault_out_of_memory(void* Flags passed to show_mem() and show_free_areas() to suppress output in * various contexts. */ -#define SHOW_MEM_FILTER_NODES (0x0001u)/* filter disallowed nodes */ +#define SHOW_MEM_FILTER_NODES (0x0001u)/* disallowed nodes */ +#define SHOW_MEM_FILTER_PAGE_COUNT (0x0002u)/* page type count */ extern void show_free_areas (unsigned int flags);extern bool skip_free_areas_node (unsigned int flags,int nid);
lib/show_mem.c +3 -0
@@ -18,6 +18,9 @@ void show_mem(unsigned int filter)printk ("Mem-Info:\n" );show_free_areas (filter); +if (filter &SHOW_MEM_FILTER_PAGE_COUNT ) +return ; +for_each_online_pgdat (pgdat) {unsigned long i, flags;
mm/page_alloc.c +7 -0
@@ -1760,6 +1760,13 @@ void warn_alloc_failed(gfp_t gfp_mask, ireturn ;/* +* Walking all memory to count page types is very expensive and should +* be inhibited in non-blockable contexts. +*/ +if (!(gfp_mask & __GFP_WAIT)) + filter |=SHOW_MEM_FILTER_PAGE_COUNT ; + +/* * This documents exceptions given to allocations in certain * contexts that are allowed to allocate outside current's set * of allowed nodes.
PATCH 149/149 gianfar: Change default HW Tx queue scheduling mode
In reply to Ben Hutchings3.2.52-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Manoil <[email protected]>
commit b98b8babd6e3370fadb7c6eaacb00eb2f6344a6c upstream.
This is primarily to address transmission timeout occurrences, when multiple H/W Tx queues are being used concurrently. Because in the priority scheduling mode the controller does not service the Tx queues equally (but in ascending index order), Tx timeouts are being triggered rightaway for a basic test with multiple simultaneous connections like:
iperf -c <server_ip> -n 100M -P 8
resulting in kernel trace:
NETDEV WATCHDOG: eth1 (fsl-gianfar): transmit queue <X> timed out
------------[ cut here ]------------ WARNING: at net/sched/sch_generic.c:255
...
and controller reset during intense traffic, and possibly further complications.
This patch changes the default H/W Tx scheduling setting (TXSCHED) for multi-queue devices, from priority scheduling mode to a weighted round robin mode with equal weights for all H/W Tx queues, and addresses the issue above.
--- drivers/net/ethernet/freescale/gianfar.c | 11 ++++++++++- drivers/net/ethernet/freescale/gianfar.h | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/gianfar.c +10 -1
@@ -397,7 +397,13 @@ static void gfar_init_mac(struct net_devif (ndev->features &NETIF_F_IP_CSUM ) tctrl |=TCTRL_INIT_CSUM ; - tctrl |=TCTRL_TXSCHED_PRIO ; +if (priv->prio_sched_en) + tctrl |=TCTRL_TXSCHED_PRIO ; +else { + tctrl |=TCTRL_TXSCHED_WRRS ; +gfar_write (®s->tr03wt,DEFAULT_WRRS_WEIGHT ); +gfar_write (®s->tr47wt,DEFAULT_WRRS_WEIGHT ); + }gfar_write (®s->tctrl, tctrl);
@@ -1157,6 +1163,9 @@ static int gfar_probe(struct platform_de priv->rx_filer_enable =1 ;/* Enable most messages by default */ priv->msg_enable = (NETIF_MSG_IFUP <<1 ) -1 ; +/* use pritority h/w tx queue scheduling for single queue devices */ +if (priv->num_tx_queues ==1 ) + priv->prio_sched_en =1 ;/* Carrier starts down, phylib will bring it up */ netif_carrier_off (dev);
drivers/net/ethernet/freescale/gianfar.h +10 -1
@@ -304,8 +304,16 @@ extern const char gfar_driver_version[];#define TCTRL_TFCPAUSE 0x00000008#define TCTRL_TXSCHED_MASK 0x00000006#define TCTRL_TXSCHED_INIT 0x00000000 +/* priority scheduling */ #define TCTRL_TXSCHED_PRIO 0x00000002 +/* weighted round-robin scheduling (WRRS) */ #define TCTRL_TXSCHED_WRRS 0x00000004 +/* default WRRS weight and policy setting, +* tailored to the tr03wt and tr47wt registers: +* equal weight for all Tx Qs, measured in 64byte units +*/ +#define DEFAULT_WRRS_WEIGHT 0x18181818 +#define TCTRL_INIT_CSUM (TCTRL_TUCSEN | TCTRL_IPCSEN)#define IEVENT_INIT_CLEAR 0xffffffff
@@ -1101,7 +1109,8 @@ struct gfar_private { extended_hash:1, bd_stash_en:1, rx_filer_enable:1, - wol_en:1; /* Wake-on-LAN enabled */ + wol_en:1, /* Wake-on-LAN enabled */ + prio_sched_en:1; /* Enable priorty based Tx scheduling in Hw */unsigned short padding;/* PHY stuff */