3.2.67-rc1 review
cover 3.2.67-rc1 review
This is the start of the stable review cycle for the 3.2.67 release. There are 152 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 Thu Feb 19 02:00:00 UTC 2015. Anything received after that time might be too late.
A combined patch relative to 3.2.66 will be posted as an additional response to this. A shortlog and diffstat can be found below.
Ben.
-------------
Alex Williamson (1):
driver core: Fix unbalanced device reference in drivers_probe
[0372ffb35d00288802265586a29c117911d02fb8]
Alexander Duyck (1):
fib_trie: Fix /proc/net/fib_trie when CONFIG_IP_MULTIPLE_TABLES is not defined
[a5a519b2710be43fce3cf9ce7bd8de8db3f2a9de]
Anantha Krishnan (2):
Bluetooth: Add support for Acer [0489:e078]
[4b552bc9edfdc947862af225a0e2521edb5d37a0]
Bluetooth: Add support for Acer [13D3:3432]
[fa2f1394fe9c1a217213f02df77812701de6362f]Andreas Müller (1):
mac80211: fix multicast LED blinking and counter
[d025933e29872cb1fe19fc54d80e4dfa4ee5779c]
Andy Lutomirski (6):
x86, tls, ldt: Stop checking lm in LDT_empty
[e30ab185c490e9a9381385529e0fd32f0a399495]
x86, tls: Interpret an all-zero struct user_desc as "no segment"
[3669ef9fa7d35f573ec9c0e0341b29251c2734a7]
x86/tls: Disallow unusual TLS segments
[0e58af4e1d2166e9e33375a0f121e4867010d4f8]
x86/tls: Don't validate lm in set_thread_area() after all
[3fb2f4237bb452eb4e98f6a5dbd5a445b4fed9d0]
x86_64, switch_to(): Load TLS descriptors before switching DS and ES
[f647d7c155f069c1a068030255c300663516420e]
x86_64, vdso: Fix the vdso address randomization algorithm
[394f56fe480140877304d342dec46d50dc823d46]
Andy Shevchenko (4):
Bluetooth: append new supported device to the list [0b05:17d0]
[a735f9e22432899cee188d167966782c29246390]
Bluetooth: sort the list of IDs in the source code
[0b8800623d3f12dd40a039aa191d52bfa4eef5b4]
sata_dwc_460ex: fix resource leak on error path
[4aaa71873ddb9faf4b0c4826579e2f6d18ff9ab4]
spi: dw-mid: fix FIFO size
[67bf9cda4b498b8cea4a40be67a470afe57d2e88]
Arseny Solokha (1):
OHCI: add a quirk for ULi M5237 blocking on reset
[56abcab833fafcfaeb2f5b25e0364c1dec45f53e]
Ashay Jaiswal (1):
regulator: core: fix race condition in regulator_put()
[83b0302d347a49f951e904184afe57ac3723476e]
Avi Kivity (1):
KVM: x86 emulator: reject SYSENTER in compatibility mode on AMD guests
[1a18a69b762374c423305772500f36eb8984ca52]
Axel Lin (1):
spi: dw: Fix detecting FIFO depth
[d297933cc7fcfbaaf2d37570baac73287bf0357d]
Ben Hutchings (6):
Revert "tcp: Apply device TSO segment limit earlier"
[843925f33fcc293d80acf2c5c8a78adf3344d49b]
Revert "x86, 64bit, mm: Mark data/bss/brk to nx"
[not upstream; regression is specific to 3.2]
Revert "x86, mm: Set NX across entire PMD at boot"
[not upstream; regression is specific to 3.2]
dcache: Fix locking bugs in backported "deal with deadlock in d_walk()"
[not upstream; regression is specific to 3.2]
splice: Apply generic position and size checks to each write
[8d0207652cbe27d1f962050737848e5ad4671958]
vfs: Fix vfsmount_lock imbalance in path_init()
[not upstream; regression is specific to 3.2]
Bo Shen (2):
usb: gadget: udc: atmel: change setting for DMA
[f40afdddeb6c54ffd1e2920a5e93e363d6748db6]
usb: gadget: udc: atmel: fix possible IN hang issue
[6785a1034461c2d2c205215f63a50a740896e55b]
Bob Paauwe (1):
drm/i915: Only fence tiled region of object.
[af1a7301c7cf8912dca03065d448c4437c5c239f]
Borislav Petkov (1):
x86, cpu, amd: Add workaround for family 16h, erratum 793
[3b56496865f9f7d9bcb2f93b44c63f274f08e3b6]
Christian Borntraeger (1):
KVM: s390: flush CPU on load control
[2dca485f8740208604543c3960be31a5dd3ea603]
Clemens Ladisch (1):
ALSA: seq-dummy: remove deadlock-causing events on close
[0767e95bb96d7fdddcd590fb809e6975d93aebc5]
Dan Carpenter (6):
ALSA: hda - using uninitialized data
[69eba10e606a80665f8573221fec589430d9d1cb]
HID: roccat: potential out of bounds in pyra_sysfs_write_settings()
[606185b20caf4c57d7e41e5a5ea4aff460aef2ab]
USB: adutux: NULL dereferences on disconnect
[fc625960edecfb57e62c2975d1f155155e28e6ba]
decompress_bunzip2: off by one in get_next_block()
[b5c8afe5be51078a979d86ae5ae78c4ac948063d]
dm space map metadata: fix sm_bootstrap_get_nr_blocks()
[c1c6156fe4d4577444b769d7edd5dd503e57bbc9]
netfilter: ipset: small potential read beyond the end of buffer
[2196937e12b1b4ba139806d132647e1651d655df]
Dan Williams (1):
libata: allow sata_sil24 to opt-out of tag ordered submission
[72dd299d5039a336493993dcc63413cf31d0e662]
Daniel Borkmann (3):
ipv6: mld: fix add_grhead skb_over_panic for devs with large MTUs
[4c672e4b42bc8046d63a6eb0a2c6a450a501af32]
net: sctp: fix race for one-to-many sockets in sendmsg's auto associate
[2061dcd6bff8b774b4fac8b0739b6be3f87bc9f2]
net: sctp: fix slab corruption from use after free on INIT collisions
[600ddd6825543962fb807884169e57b580dba208]
David Jeffery (1):
libata: prevent HSM state change race between ISR and PIO
[ce7514526742c0898b837d4395f515b79dfb5a12]
David Peterson (1):
USB: cp210x: add IDs for CEL USB sticks and MeshWorks devices
[1ae78a4870989a354028cb17dabf819b595e70e3]Dmitry Eremin-Solenikov (1):
mfd: tc6393xb: Fail ohci suspend if full state restore is required
[1a5fb99de4850cba710d91becfa2c65653048589]
Dmitry Nezhevenko (1):
usb-storage/SCSI: blacklist FUA on JMicron 152d:2566 USB-SATA controller
[bf5c4136fa5ce471bdbf4cf59a813e32755fd014]
Dmitry Torokhov (1):
Input: I8042 - add Acer Aspire 7738 to the nomux list
[9333caeaeae4f831054e0e127a6ed3948b604d3e]
Dmitry Tunin (1):
Bluetooth: ath3k: Add support of MCI 13d3:3408 bt device
[3bb30a7cdf9242aca90d49aa41baebf9458f96f0]
Dominique Leuenberger (1):
hp_accel: Add support for HP ZBook 15
[6583659e0f92e38079a8dd081e0a1181a0f37747]
Felix Fietkau (3):
ath5k: fix hardware queue index assignment
[9e4982f6a51a2442f1bb588fee42521b44b4531c]
ath9k: fix BE/BK queue order
[78063d81d353e10cbdd279c490593113b8fdae1c]
ath9k_hw: fix hardware queue allocation
[ad8fdccf9c197a89e2d2fa78c453283dcc2c343f]
Filipe Manana (1):
Btrfs: fix fs corruption on transaction abort if device supports discard
[678886bdc6378c1cbd5072da2c5a3035000214e3]
Florian Westphal (1):
netfilter: conntrack: disable generic tracking for known protocols
[db29a9508a9246e77087c5531e45b2c88ec6988b]
Frank Schaefer (1):
[media] af9005: fix kernel panic on init if compiled without IR
[2279948735609d0d17d7384e776b674619f792ef]
Govindarajulu Varadarajan (1):
enic: fix rx skb checksum
[17e96834fd35997ca7cdfbf15413bcd5a36ad448]
Greg Kroah-Hartman (2):
USB: cdc-acm: check for valid interfaces
[403dff4e2c94f275e24fd85f40b2732ffec268a1]
sysfs.h: add ATTRIBUTE_GROUPS() macro
[f2f37f58b1b933b06d6d84e80a31a1b500fb0db2]
Guenter Roeck (1):
driver core: Introduce device_create_groups
[39ef311204941ddd01ea2950d6220c8ccc710d15]
Hannes Reinecke (1):
scsi: correct return values for .eh_abort_handler implementations
[b6c92b7e0af575e2b8b05bdf33633cf9e1661cbf]
Herbert Xu (2):
ipv4: Remove all uses of LL_ALLOCATED_SPACE
[660882432909dbe611f1792eda158188065cb9f1]
ipv6: Remove all uses of LL_ALLOCATED_SPACE
[a7ae1992248e5cf9dc5bd35695ab846d27efe15f]
James P Michels III (1):
usb-core bInterval quirk
[cd83ce9e6195aa3ea15ab4db92892802c20df5d0]
Jan Kara (9):
isofs: Fix infinite looping over CE entries
[f54e18f1b831c92f6512d2eedb224cd63d607d3d]
isofs: Fix unchecked printing of ER records
[4e2024624e678f0ebb916e6192bd23c1f9fdf696]
ncpfs: return proper error from NCP_IOC_SETROOT ioctl
[a682e9c28cac152e6e54c39efcf046e0c8cfcf63]
udf: Check component length before reading it
[e237ec37ec154564f8690c5bd1795339955eeef9]
udf: Check path length when reading symlink
[0e5cc9a40ada6046e6bc3bdfcd0c0d7e4b706b14]
udf: Treat symlink component of type 2 as /
[fef2e9f3301934773e4f1b3cc5c7bffb119346b8]
udf: Verify i_size when loading inode
[e159332b9af4b04d882dbcfe1bb0117f0a6d4b58]
udf: Verify symlink size before loading it
[a1d47b262952a45aae62bd49cfaf33dd76c11a2c]
writeback: Move I_DIRTY_PAGES handling
[6290be1c1dc6589eeda213aa40946b27fa4faac8]
Janne Heikkinen (1):
Bluetooth: Add USB device 04ca:3010 as Atheros AR3012
[134d3b3550f050b9bec37111824452064d1ed928]
Jason Lee Cragg (1):
ALSA: usb-audio: Add mic volume fix quirk for Logitech Webcam C210
[6455931186bff407493135e74c5f32efd30860e2]
Jay Vosburgh (1):
net/core: Handle csum for CHECKSUM_COMPLETE VXLAN forwarding
[2c26d34bbcc0b3f30385d5587aa232289e2eed8e]
Jens Axboe (1):
genhd: check for int overflow in disk_expand_part_tbl()
[5fabcb4c33fe11c7e3afdf805fde26c1a54d0953]
Jerry Hoemann (1):
fsnotify: next_i is freed during fsnotify_unmount_inodes.
[6424babfd68dd8a83d9c60a5242d27038856599f]
Jiang Liu (1):
iommu/vt-d: Fix an off-by-one bug in __domain_mapping()
[cc4f14aa170d895c9a43bdb56f62070c8a6da908]
Jiri Jaburek (1):
ALSA: usb-audio: extend KEF X300A FU 10 tweak to Arcam rPAC
[d70a1b9893f820fdbcdffac408c909c50f2e6b43]
Jochen Hein (1):
Input: i8042 - add noloop quirk for Medion Akoya E7225 (MD98857)
[1d90d6d5522befa8efa1a7ea406be65cf865ded4]Johan Hovold (5):
USB: console: fix potential use after free
[32a4bf2e81ec378e5925d4e069e0677a6c86a6ad]
gpio: fix memory and reference leaks in gpiochip_add error path
[5539b3c938d64a60cb1fc442ac3ce9263d52de0c]
gpio: sysfs: fix gpio attribute-creation race
[ebbeba120ab2ec6ac5f3afc1425ec6ff0b77ad6f]
gpio: sysfs: fix gpio device-attribute leak
[0915e6feb38de8d3601819992a5bd050201a56fa]
gpio: sysfs: fix gpio-chip device-attribute leak
[121b6a79955a3a3fd7bbb9b8cb88d5b9dad6283d]
Johannes Berg (1):
nl80211: fix per-station group key get/del and memory leak
[0fa7b39131576dd1baa6ca17fca53c65d7f62249]
Johannes Weiner (1):
mm: protect set_page_dirty() from ongoing truncation
[2d6d7f98284648c5ed113fe22a132148950b140f]
Junxiao Bi (1):
ocfs2: fix journal commit deadlock
[136f49b9171074872f2a14ad0ab10486d1ba13ca]
Jurgen Kramer (1):
Bluetooth: btusb: Add IMC Networks (Broadcom based)
[9113bfd82dc8ece9cbb898df8794f58a78a36e97]
K. Y. Srinivasan (1):
x86, hyperv: Mark the Hyper-V clocksource as being continuous
[32c6590d126836a062b3140ed52d898507987017]
Kazuya Mizuguchi (1):
usb: renesas_usbhs: gadget: fix NULL pointer dereference in ep_disable()
[11432050f070810ba139d0226344eef120c3a559]
Keerthy (1):
bus: omap_l3_noc: Correct returning IRQ_HANDLED unconditionally in the irq handler
[c4cf0935a2d8fe6d186bf4253ea3c4b4a8a8a710]
Kees Cook (2):
crypto: include crypto- module prefix in template
[4943ba16bbc2db05115707b3ff7b4874e9e3c560]
crypto: prefix module autoloading with "crypto-"
[5d26a105b5a73e5635eae0629b42fa0a90e07b7b]
Ken O'Brien (1):
Bluetooth: btusb: Add support for Belkin F8065bf
[5bcecf325378218a8e248bb6bcae96ec7362f8ef]
Konstantin Khlebnikov (2):
mm: fix corner case in anon_vma endless growing prevention
[b800c91a0517071156e772d4fb329ad33590da62]
mm: prevent endless growth of anon_vma hierarchy
[7a3ef208e662f4b63d43a23f61a64a129c525bbc]
Lars Ellenberg (1):
drbd: merge_bvec_fn: properly remap bvm->bi_bdev
[3b9d35d744bb5139f9fed57f38c019bb8c7d351c]Linus Torvalds (4):
mm: Don't count the stack guard page towards RLIMIT_STACK
[690eac53daff34169a4d74fc7bfbd388c4896abb]
mm: propagate error from stack expansion even for guard page
[fee7e49d45149fba60156f5b59014f764d3e3728]
vm: add VM_FAULT_SIGSEGV handling support
[33692f27597fcab536d7cbbcc8f52905133e4aa7]
vm: make stack guard page errors return VM_FAULT_SIGSEGV rather than SIGBUS
[9c145c56d0c8a0b62e48c8d71e055ad0fb2012ba]
Lv Zheng (1):
ACPI / EC: Fix regression due to conflicting firmware behavior between Samsung and Acer.
[79149001105f18bd2285ada109f9229ea24a7571]
Macpaul Lin (1):
USB: Add OTG PET device to TPL
[e5dff0e80463cc3fa236e898ef1491b40be70b19]
Marcel Holtmann (3):
Bluetooth: Add support for Broadcom device of Asus Z97-DELUXE motherboard
[c2aef6e8cbebd60f79555baeb9266e220f135a44]
Bluetooth: Add support for Intel bootloader devices
[40df783d1ef1989ac454e3dfcda017270b8950e6]
Bluetooth: Ignore isochronous endpoints for Intel USB bootloader
[d92f2df0565ea04101d6ac04bdc10feeb1d93c94]
Marco Piazza (1):
Bluetooth: Add support for Toshiba Bluetooth device [0930:0220]
[bd0976dd3379e790b031cef7f477c58b82a65fc2]
Martin Schwidefsky (1):
s390/3215: fix tty output containing tabs
[e512d56c799517f33b301d81e9a5e0ebf30c2d1e]
Mathias Krause (1):
crypto: add missing crypto module aliases
[3e14dcf7cb80b34a1f38b55bc96f02d23fdaaaaf]
Mauro Carvalho Chehab (2):
[media] sound: Update au0828 quirks table
[678fa12fb8e75c6dc1e781a02e3ddbbba7e1a904]
[media] sound: simplify au0828 quirk table
[5d1f00a20d2d56ed480e64e938a2391353ee565b]
Michael Halcrow (1):
eCryptfs: Remove buggy and unnecessary write in file name decode routine
[942080643bce061c3dd9d5718d3b745dcb39a8bc]
Michael Karcher (1):
scripts/recordmcount.pl: There is no -m32 gcc option on Super-H anymore
[1caf6aaaa47471831d77c75f094d4e00ad1ec808]
Michael S. Tsirkin (1):
virtio_pci: document why we defer kfree
[a1eb03f546d651a8f39c7d0692b1f7f5b4e7e3cd]
Miklos Szeredi (1):
mm: remove unused arg of set_page_dirty_balance()
[ed6d7c8e578331cad594ee70d60e2e146b5dce7b]
Ming Lei (1):
Fix circular locking dependency (3.3-rc2)
[864533ceb6db336dead389577c102a8b792a121a]
Myron Stowe (1):
PCI: Restore detection of read-only BARs
[36e8164882ca6d3c41cb91e6f09a3ed236841f80]
Nadav Amit (1):
KVM: x86: SYSENTER emulation is broken
[f3747379accba8e95d70cec0eae0582c8c182050]
Nicholas Bellinger (1):
iscsi-target: Fail connection on short sendmsg writes
[6bf6ca7515c1df06f5c03737537f5e0eb191e29e]
Oliver Hartkopp (1):
can: dev: fix crtlmode_supported check
[9b1087aa5e86448fe6ad40a58964e35f3ba423d5]
Oliver Neukum (2):
Bluetooth: Add firmware update for Atheros 0cf3:311f
[1e56f1eb2bbeab0ddc3a1e536d2a0065cfe4c131]
Bluetooth: Enable Atheros 0cf3:311e for firmware upload
[b131237ca3995edad9efc162d0bc959c3b1dddc2]
Prashant Sreedharan (1):
tg3: tg3_disable_ints using uninitialized mailbox value to disable interrupts
[05b0aa579397b734f127af58e401a30784a1e315]
Preston Fick (1):
USB: cp210x: fix ID for production CEL MeshConnect USB Stick
[90441b4dbe90ba0c38111ea89fa093a8c9627801]Rabin Vincent (1):
crypto: af_alg - fix backlog handling
[7e77bdebff5cb1e9876c561f69710b9ab8fa1f7e]
Richard Weinberger (1):
UBI: Fix invalid vfree()
[f38aed975c0c3645bbdfc5ebe35726e64caaf588]
Robert Baldyga (1):
serial: samsung: wait for transfer completion before clock disable
[1ff383a4c3eda8893ec61b02831826e1b1f46b41]
Ryan Mallon (1):
gpiolib: Refactor gpio_export
[fc4e2514995d9cd7f3e1a67098ce65d72acf8ec7]
Sasha Levin (4):
KEYS: close race between key lookup and freeing
[a3a8784454692dd72e5d5d34dcdab17b4420e74c]
time: adjtimex: Validate the ADJ_FREQUENCY values
[5e5aeb4367b450a28f447f6d5ab57d8f2ab16a5f]
time: settimeofday: Validate the values of tv from user
[6ada1fc0e1c4775de0e043e1bd3ae9d065491aa5]
virtio_pci: defer kfree until release callback
[63bd62a08ca45a0c804c3c89777edc7f76a2d6da]
Songjun Wu (1):
usb: gadget: udc: atmel: fix possible oops when unloading module
[5fb694f96e7c19e66b1c55124b98812e32e3efa5]
Srihari Vijayaraghavan (1):
Input: i8042 - reset keyboard to fix Elantech touchpad detection
[148e9a711e034e06310a8c36b64957934ebe30f2]
Steven Rostedt (1):
ftrace/jprobes/x86: Fix conflict between jprobes and function graph tracing
[237d28db036e411f22c03cfd5b0f6dc2aa9bf3bc]
Sujith Manoharan (2):
Bluetooth: ath3k: Add support for a new AR3012 device
[35580d223b6b04d9a570e4fe377c46a102413fe8]
Bluetooth: ath3k: Add support for another AR3012 card
[bd0fca1b2be8c96dfc391a2bc2ee4ce6970ae6af]
Takashi Iwai (4):
ALSA: hda - Fix wrong gpio_dir & gpio_mask hint setups for IDT/STAC codecs
[c507de88f6a336bd7296c9ec0073b2d4af8b4f5e]
ALSA: usb-audio: Don't resubmit pending URBs at MIDI error recovery
[66139a48cee1530c91f37c145384b4ee7043f0b7]
KEYS: Fix stale key registration at error path
[b26bdde5bb27f3f900e25a95e33a0c476c8c2c48]
[media] uvcvideo: Fix destruction order in uvc_delete()
[2228d80dd05a4fc5a410fde847677b8fb3eb23d7]
Tejun Heo (1):
writeback: fix a subtle race condition in I_DIRTY clearing
[9c6ac78eb3521c5937b2dd8a7d1b300f41092f45]
Thomas Gleixner (1):
genirq: Prevent proc race against freeing of irq descriptors
[c291ee622165cb2c8d4e7af63fffd499354a23be]
Thomas Hellstrom (1):
drm/vmwgfx: Don't use memory accounting for kernel-side fence objects
[1f563a6a46544602183e7493b6ef69769d3d76d9]
Tomi Valkeinen (2):
video/fbdev: fix defio's fsync
[30ea9c5218651bc11cbdba7820be78f04e2d83bc]
video/logo: prevent use of logos after they have been freed
[92b004d1aa9f367c372511ca0330f58216b25703]
Toshiaki Makita (1):
net: Fix stacked vlan offload features computation
[796f2da81bead71ffc91ef70912cd8d1827bf756]
Tyler Hicks (1):
eCryptfs: Force RO mount when encrypted view is enabled
[332b122d39c9cbff8b799007a825d94b2e7c12f2]
Vincent Zwanenburg (1):
Add a new PID/VID 0227/0930 for AR3012.
[89d2975fa06e66ea0d3665d91f799fb1ce4b8bad]Wanlong Gao (1):
virtio: use dev_to_virtio wrapper in virtio
[9bffdca8c64a72ac54c47a552734ab457bc720d4]
Zheng Yan (1):
ceph: introduce global empty snap context
[97c85a828f36bbfffe9d77b977b65a5872b6cad4]
Zidan Wang (1):
ASoC: wm8960: Fix capture sample rate from 11250 to 11025
[22ee76daddb87f88d2336d1b4737ef27c4f307ac]Documentation/kernel-parameters.txt | 1 + Makefile | 4 +- arch/alpha/mm/fault.c | 2 + arch/arm/mach-omap2/omap_l3_noc.c | 10 +- arch/avr32/mm/fault.c | 2 + arch/cris/mm/fault.c | 2 + arch/frv/mm/fault.c | 2 + arch/ia64/mm/fault.c | 2 + arch/m32r/mm/fault.c | 2 + arch/m68k/mm/fault.c | 2 + arch/microblaze/mm/fault.c | 2 + arch/mips/mm/fault.c | 2 + arch/mn10300/mm/fault.c | 2 + arch/openrisc/mm/fault.c | 2 + arch/parisc/mm/fault.c | 2 + arch/powerpc/mm/fault.c | 2 + arch/powerpc/platforms/cell/spu_fault.c | 2 +- arch/s390/crypto/aes_s390.c | 2 +- arch/s390/crypto/des_s390.c | 4 +- arch/s390/crypto/ghash_s390.c | 2 +- arch/s390/crypto/sha1_s390.c | 2 +- arch/s390/crypto/sha256_s390.c | 4 +- arch/s390/crypto/sha512_s390.c | 4 +- arch/s390/kvm/intercept.c | 2 + arch/s390/mm/fault.c | 7 + arch/score/mm/fault.c | 2 + arch/sh/mm/fault_32.c | 2 + arch/sh/mm/tlbflush_64.c | 2 + arch/sparc/mm/fault_32.c | 2 + arch/sparc/mm/fault_64.c | 2 + arch/tile/mm/fault.c | 2 + arch/um/kernel/trap.c | 2 + arch/x86/crypto/aes_glue.c | 4 +- arch/x86/crypto/aesni-intel_glue.c | 2 +- arch/x86/crypto/blowfish_glue.c | 4 +- arch/x86/crypto/crc32c-intel.c | 4 +- arch/x86/crypto/fpu.c | 3 + arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 +- arch/x86/crypto/salsa20_glue.c | 4 +- arch/x86/crypto/sha1_ssse3_glue.c | 2 +- arch/x86/crypto/twofish_glue.c | 4 +- arch/x86/crypto/twofish_glue_3way.c | 4 +- arch/x86/include/asm/desc.h | 20 ++- arch/x86/include/asm/ldt.h | 7 + arch/x86/include/asm/msr-index.h | 1 + arch/x86/kernel/cpu/amd.c | 10 ++ arch/x86/kernel/cpu/mshyperv.c | 1 + arch/x86/kernel/kprobes.c | 20 ++- arch/x86/kernel/process_64.c | 101 +++++++++---- arch/x86/kernel/tls.c | 41 ++++- arch/x86/kvm/emulate.c | 42 ++++-- arch/x86/mm/fault.c | 2 + arch/x86/mm/init_64.c | 16 +- arch/x86/vdso/vma.c | 41 +++-- arch/xtensa/mm/fault.c | 2 + block/genhd.c | 11 +- crypto/aes_generic.c | 3 +- crypto/af_alg.c | 3 + crypto/algapi.c | 4 +- crypto/ansi_cprng.c | 3 +- crypto/anubis.c | 1 + crypto/api.c | 4 +- crypto/arc4.c | 1 + crypto/authenc.c | 1 + crypto/authencesn.c | 1 + crypto/blowfish_generic.c | 3 +- crypto/camellia.c | 1 + crypto/cast5.c | 1 + crypto/cast6.c | 1 + crypto/cbc.c | 1 + crypto/ccm.c | 5 +- crypto/chainiv.c | 1 + crypto/crc32c.c | 1 + crypto/cryptd.c | 1 + crypto/crypto_null.c | 6 +- crypto/ctr.c | 3 +- crypto/cts.c | 1 + crypto/deflate.c | 2 +- crypto/des_generic.c | 7 +- crypto/ecb.c | 1 + crypto/eseqiv.c | 1 + crypto/fcrypt.c | 1 + crypto/gcm.c | 7 +- crypto/ghash-generic.c | 3 +- crypto/hmac.c | 1 + crypto/khazad.c | 1 + crypto/krng.c | 3 +- crypto/lrw.c | 1 + crypto/lzo.c | 1 + crypto/md4.c | 2 +- crypto/md5.c | 1 + crypto/michael_mic.c | 1 + crypto/pcbc.c | 1 + crypto/pcrypt.c | 1 + crypto/rmd128.c | 1 + crypto/rmd160.c | 1 + crypto/rmd256.c | 1 + crypto/rmd320.c | 1 + crypto/salsa20_generic.c | 3 +- crypto/seed.c | 1 + crypto/seqiv.c | 1 + crypto/serpent.c | 3 +- crypto/sha1_generic.c | 3 +- crypto/sha256_generic.c | 6 +- crypto/sha512_generic.c | 6 +- crypto/tea.c | 5 +- crypto/tgr192.c | 5 +- crypto/twofish_generic.c | 3 +- crypto/vmac.c | 1 + crypto/wp512.c | 5 +- crypto/xcbc.c | 1 + crypto/xts.c | 1 + crypto/zlib.c | 1 + drivers/acpi/ec.c | 25 +++- drivers/ata/libata-core.c | 5 +- drivers/ata/libata-sff.c | 12 ++ drivers/ata/sata_dwc_460ex.c | 26 ++-- drivers/ata/sata_sil24.c | 2 +- drivers/base/bus.c | 8 +- drivers/base/core.c | 111 ++++++++++---- drivers/block/drbd/drbd_req.c | 1 + drivers/bluetooth/ath3k.c | 92 +++++++----- drivers/bluetooth/btusb.c | 76 +++++++--- drivers/crypto/padlock-aes.c | 2 +- drivers/crypto/padlock-sha.c | 8 +- drivers/gpio/gpiolib.c | 147 ++++++++++-------- drivers/gpu/drm/i915/i915_gem.c | 14 ++ drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 21 +-- drivers/hid/hid-roccat-pyra.c | 6 + drivers/input/serio/i8042-x86ia64io.h | 47 ++++++ drivers/input/serio/i8042.c | 14 ++ drivers/iommu/intel-iommu.c | 8 +- drivers/md/persistent-data/dm-space-map-metadata.c | 4 +- drivers/media/dvb/dvb-usb/af9005.c | 3 + drivers/media/video/au0828/au0828-cards.c | 5 + drivers/media/video/uvc/uvc_driver.c | 6 +- drivers/mfd/tc6393xb.c | 13 +- drivers/mtd/ubi/upd.c | 10 +- drivers/net/can/dev.c | 8 +- drivers/net/ethernet/broadcom/tg3.c | 34 ++--- drivers/net/ethernet/cisco/enic/enic_main.c | 12 +- drivers/net/wireless/ath/ath5k/qcu.c | 8 +- drivers/net/wireless/ath/ath9k/hw.h | 4 +- drivers/net/wireless/ath/ath9k/mac.c | 9 +- drivers/pci/probe.c | 3 + drivers/platform/x86/hp_accel.c | 1 + drivers/regulator/core.c | 2 + drivers/s390/char/con3215.c | 20 ++- drivers/scsi/NCR5380.c | 12 +- drivers/scsi/aha1740.c | 2 +- drivers/scsi/atari_NCR5380.c | 2 +- drivers/scsi/megaraid.c | 8 +- drivers/scsi/sun3_NCR5380.c | 10 +- drivers/spi/spi-dw-mid.c | 1 - drivers/spi/spi-dw.c | 4 +- drivers/target/iscsi/iscsi_target_util.c | 26 ++-- drivers/tty/serial/samsung.c | 4 + drivers/usb/class/cdc-acm.c | 9 +- drivers/usb/core/config.c | 11 ++ drivers/usb/core/otg_whitelist.h | 5 + drivers/usb/core/quirks.c | 8 + drivers/usb/gadget/atmel_usba_udc.c | 19 ++- drivers/usb/host/pci-quirks.c | 18 ++- drivers/usb/misc/adutux.c | 4 - drivers/usb/renesas_usbhs/mod_gadget.c | 4 + drivers/usb/serial/console.c | 15 +- drivers/usb/serial/cp210x.c | 4 +- drivers/usb/storage/unusual_devs.h | 7 + drivers/video/fb_defio.c | 5 +- drivers/video/logo/logo.c | 17 ++- drivers/virtio/virtio.c | 19 ++- drivers/virtio/virtio_pci.c | 13 +- fs/btrfs/disk-io.c | 6 - fs/btrfs/extent-tree.c | 10 +- fs/ceph/snap.c | 27 +++- fs/ceph/super.c | 9 +- fs/ceph/super.h | 2 + fs/dcache.c | 4 +- fs/ecryptfs/crypto.c | 1 - fs/ecryptfs/file.c | 12 -- fs/ecryptfs/main.c | 16 +- fs/fs-writeback.c | 28 +++- fs/isofs/rock.c | 9 ++ fs/namei.c | 1 + fs/ncpfs/ioctl.c | 1 - fs/notify/inode_mark.c | 17 ++- fs/ocfs2/aops.c | 16 +- fs/ocfs2/file.c | 8 +- fs/proc/stat.c | 2 +- fs/splice.c | 8 +- fs/udf/dir.c | 3 +- fs/udf/inode.c | 18 +++ fs/udf/namei.c | 3 +- fs/udf/symlink.c | 67 +++++++-- fs/udf/udfdecl.h | 3 +- fs/udf/unicode.c | 28 ++-- include/linux/crypto.h | 13 ++ include/linux/device.h | 5 + include/linux/kernel_stat.h | 5 + include/linux/libata.h | 1 + include/linux/mm.h | 7 +- include/linux/rmap.h | 10 ++ include/linux/sysfs.h | 9 ++ include/linux/time.h | 13 ++ include/linux/usb/quirks.h | 11 ++ include/linux/virtio.h | 6 +- include/linux/writeback.h | 1 - include/net/ip_fib.h | 4 +- include/net/sock.h | 2 - kernel/irq/internals.h | 7 + kernel/irq/irqdesc.c | 52 +++++++ kernel/irq/proc.c | 22 ++- kernel/time.c | 4 + kernel/time/ntp.c | 7 + lib/decompress_bunzip2.c | 2 +- mm/ksm.c | 2 +- mm/memory.c | 37 +++-- mm/mmap.c | 16 +- mm/page-writeback.c | 43 ++---- mm/rmap.c | 42 +++++- net/core/dev.c | 13 +- net/core/sock.c | 1 - net/ipv4/arp.c | 6 +- net/ipv4/igmp.c | 24 +-- net/ipv4/ipconfig.c | 6 +- net/ipv4/raw.c | 7 +- net/ipv4/tcp.c | 4 +- net/ipv4/tcp_cong.c | 3 +- net/ipv4/tcp_output.c | 21 ++- net/ipv6/ip6_output.c | 8 +- net/ipv6/mcast.c | 19 ++- net/ipv6/ndisc.c | 13 +- net/ipv6/raw.c | 6 +- net/mac80211/rx.c | 11 +- net/netfilter/ipset/ip_set_core.c | 6 + net/netfilter/nf_conntrack_proto_generic.c | 26 +++- net/sctp/associola.c | 1 - net/sctp/socket.c | 7 + net/wireless/nl80211.c | 9 +- scripts/recordmcount.pl | 1 - security/keys/encrypted-keys/encrypted.c | 5 +- security/keys/gc.c | 4 +- sound/core/seq/seq_dummy.c | 31 ---- sound/pci/hda/hda_codec.c | 4 +- sound/pci/hda/patch_sigmatel.c | 4 +- sound/soc/codecs/wm8960.c | 2 +- sound/usb/midi.c | 2 + sound/usb/mixer.c | 1 + sound/usb/mixer_maps.c | 15 +- sound/usb/quirks-table.h | 166 +++++---------------- 250 files changed, 1743 insertions(+), 859 deletions(-)
Signature · 2 lines
Ben Hutchings Never attribute to conspiracy what can adequately be explained by stupidity.
PATCH 1/152 eCryptfs: Force RO mount when encrypted view is enabled
3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Tyler Hicks <[email protected]>
commit 332b122d39c9cbff8b799007a825d94b2e7c12f2 upstream.
The ecryptfs_encrypted_view mount option greatly changes the functionality of an eCryptfs mount. Instead of encrypting and decrypting lower files, it provides a unified view of the encrypted files in the lower filesystem. The presence of the ecryptfs_encrypted_view mount option is intended to force a read-only mount and modifying files is not supported when the feature is in use. See the following commit for more information:
e77a56d [PATCH] eCryptfs: Encrypted passthrough
This patch forces the mount to be read-only when the ecryptfs_encrypted_view mount option is specified by setting the MS_RDONLY flag on the superblock. Additionally, this patch removes some broken logic in ecryptfs_open() that attempted to prevent modifications of files when the encrypted view feature was in use. The check in ecryptfs_open() was not sufficient to prevent file modifications using system calls that do not operate on a file descriptor.
--- fs/ecryptfs/file.c | 12 ------------ fs/ecryptfs/main.c | 16 +++++++++++++--- 2 files changed, 13 insertions(+), 15 deletions(-)
fs/ecryptfs/file.c +0 -12
@@ -196,24 +196,12 @@ static int ecryptfs_open(struct inode *i {int rc =0 ;struct ecryptfs_crypt_stat *crypt_stat =NULL ; -struct ecryptfs_mount_crypt_stat *mount_crypt_stat;struct dentry *ecryptfs_dentry = file->f_path.dentry;/* Private value of ecryptfs_dentry allocated in * ecryptfs_lookup() */ struct dentry *lower_dentry;struct ecryptfs_file_info *file_info; - mount_crypt_stat = &ecryptfs_superblock_to_private ( - ecryptfs_dentry->d_sb)->mount_crypt_stat; -if ((mount_crypt_stat->flags &ECRYPTFS_ENCRYPTED_VIEW_ENABLED ) - && ((file->f_flags &O_WRONLY ) || (file->f_flags &O_RDWR ) - || (file->f_flags &O_CREAT ) || (file->f_flags &O_TRUNC ) - || (file->f_flags &O_APPEND ))) { -printk (KERN_WARNING "Mount has encrypted view enabled; " -"files may only be read\n" ); - rc = -EPERM ; - goto out; - }/* Released in ecryptfs_release or end of function if failure */ file_info =kmem_cache_zalloc (ecryptfs_file_info_cache,GFP_KERNEL );ecryptfs_set_file_private (file, file_info);
fs/ecryptfs/main.c +13 -3
@@ -494,6 +494,7 @@ static struct dentry *ecryptfs_mount(str {struct super_block *s;struct ecryptfs_sb_info *sbi; +struct ecryptfs_mount_crypt_stat *mount_crypt_stat;struct ecryptfs_dentry_info *root_info;const char *err ="Getting sb failed" ;struct inode *inode;
@@ -512,6 +513,7 @@ static struct dentry *ecryptfs_mount(str err ="Error parsing options" ; goto out; } + mount_crypt_stat = &sbi->mount_crypt_stat; s =sget (fs_type,NULL , set_anon_super,NULL );if (IS_ERR (s)) {
@@ -557,11 +559,19 @@ static struct dentry *ecryptfs_mount(str/** * Set the POSIX ACL flag based on whether they're enabled in the lower -* mount. Force a read-only eCryptfs mount if the lower mount is ro. -* Allow a ro eCryptfs mount even when the lower mount is rw. +* mount. */ s->s_flags = flags & ~MS_POSIXACL ; - s->s_flags |= path.dentry->d_sb->s_flags & (MS_RDONLY |MS_POSIXACL ); + s->s_flags |= path.dentry->d_sb->s_flags &MS_POSIXACL ; + +/** +* Force a read-only eCryptfs mount when: +* 1) The lower mount is ro +* 2) The ecryptfs_encrypted_view mount option is specified +*/ +if (path.dentry->d_sb->s_flags &MS_RDONLY || + mount_crypt_stat->flags &ECRYPTFS_ENCRYPTED_VIEW_ENABLED ) + s->s_flags |=MS_RDONLY ; s->s_maxbytes = path.dentry->d_sb->s_maxbytes; s->s_blocksize = path.dentry->d_sb->s_blocksize;
PATCH 2/152 sound: simplify au0828 quirk table
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 5d1f00a20d2d56ed480e64e938a2391353ee565b upstream.
Add a macro to simplify au0828 quirk table. That makes easier to check it against the USB IDs at drivers/media/usb/au0828/au0828-cards.c.
[bwh: Backported to 3.2:
- Adjust filename
- Quirks were in a different order]
---
drivers/media/video/au0828/au0828-cards.c +5 -0
@@ -36,6 +36,11 @@ void hvr950q_cs5340_audio(void *priv, inau0828_clear (dev,REG_000 ,0x10 ); } +/* +* WARNING: There's a quirks table at sound/usb/quirks-table.h +* that should also be updated every time a new device with V4L2 support +* is added here. +*/ struct au0828_board au0828_boards[] = { [AU0828_BOARD_UNKNOWN ] = { .name ="Unknown board" ,
sound/usb/quirks-table.h +31 -127
164 lines not on this page · raw message
PATCH 3/152 sound: Update au0828 quirks table
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 678fa12fb8e75c6dc1e781a02e3ddbbba7e1a904 upstream.
The au0828 quirks table is currently not in sync with the au0828 media driver.
Syncronize it and put them on the same order as found at au0828 driver, as all the au0828 devices with analog TV need the same quirks.
--- sound/usb/quirks-table.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
sound/usb/quirks-table.h +9 -1
@@ -2563,14 +2563,22 @@ YAMAHA_DEVICE(0x7010, "UB99"), }AU0828_DEVICE (0x2040 ,0x7200 ,"Hauppauge" ,"HVR-950Q" ), +AU0828_DEVICE (0x2040 ,0x7240 ,"Hauppauge" ,"HVR-850" ),AU0828_DEVICE (0x2040 ,0x7210 ,"Hauppauge" ,"HVR-950Q" ),AU0828_DEVICE (0x2040 ,0x7217 ,"Hauppauge" ,"HVR-950Q" ),AU0828_DEVICE (0x2040 ,0x721b ,"Hauppauge" ,"HVR-950Q" ),AU0828_DEVICE (0x2040 ,0x721e ,"Hauppauge" ,"HVR-950Q" ),AU0828_DEVICE (0x2040 ,0x721f ,"Hauppauge" ,"HVR-950Q" ), -AU0828_DEVICE (0x2040 ,0x7240 ,"Hauppauge" ,"HVR-850" ),AU0828_DEVICE (0x2040 ,0x7280 ,"Hauppauge" ,"HVR-950Q" ),AU0828_DEVICE (0x0fd9 ,0x0008 ,"Hauppauge" ,"HVR-950Q" ), +AU0828_DEVICE (0x2040 ,0x7201 ,"Hauppauge" ,"HVR-950Q-MXL" ), +AU0828_DEVICE (0x2040 ,0x7211 ,"Hauppauge" ,"HVR-950Q-MXL" ), +AU0828_DEVICE (0x2040 ,0x7281 ,"Hauppauge" ,"HVR-950Q-MXL" ), +AU0828_DEVICE (0x05e1 ,0x0480 ,"Hauppauge" ,"Woodbury" ), +AU0828_DEVICE (0x2040 ,0x8200 ,"Hauppauge" ,"Woodbury" ), +AU0828_DEVICE (0x2040 ,0x7260 ,"Hauppauge" ,"HVR-950Q" ), +AU0828_DEVICE (0x2040 ,0x7213 ,"Hauppauge" ,"HVR-950Q" ), +AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), /* Digidesign Mbox */ {
PATCH 4/152 af9005: fix kernel panic on init if compiled without IR
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Frank Schaefer <[email protected]>
commit 2279948735609d0d17d7384e776b674619f792ef upstream.
This patches fixes an ancient bug in the dvb_usb_af9005 driver, which has been reported at least in the following threads:
https://lkml.org/lkml/2009/2/4/350
https://lkml.org/lkml/2014/9/18/558
If the driver is compiled in without any IR support (neither DVB_USB_AF9005_REMOTE nor custom symbols), the symbol_request calls in af9005_usb_module_init() return pointers != NULL although the IR symbols are not available.
This leads to the following oops:
...
[ 8.529751] usbcore: registered new interface driver dvb_usb_af9005 [ 8.531584] BUG: unable to handle kernel paging request at 02e00000 [ 8.533385] IP: [<7d9d67c6>] af9005_usb_module_init+0x6b/0x9d [ 8.535613] *pde = 00000000 [ 8.536416] Oops: 0000 [#1] PREEMPT PREEMPT DEBUG_PAGEALLOCDEBUG_PAGEALLOC [ 8.537863] CPU: 0 PID: 1 Comm: swapper Not tainted 3.15.0-rc6-00151-ga5c075c #1 [ 8.539827] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014 [ 8.541519] task: 89c9a670 ti: 89c9c000 task.ti: 89c9c000 [ 8.541519] EIP: 0060:[<7d9d67c6>] EFLAGS: 00010206 CPU: 0 [ 8.541519] EIP is at af9005_usb_module_init+0x6b/0x9d [ 8.541519] EAX: 02e00000 EBX: 00000000 ECX: 00000006 EDX: 00000000 [ 8.541519] ESI: 00000000 EDI: 7da33ec8 EBP: 89c9df30 ESP: 89c9df2c [ 8.541519] DS: 007b ES: 007b FS: 0000 GS: 00e0 SS: 0068 [ 8.541519] CR0: 8005003b CR2: 02e00000 CR3: 05a54000 CR4: 00000690 [ 8.541519] Stack: [ 8.541519] 7d9d675b 89c9df90 7d992a49 7d7d5914 89c9df4c 7be3a800 7d08c58c 8a4c3968 [ 8.541519] 89c9df80 7be3a966 00000192 00000006 00000006 7d7d3ff4 8a4c397a 00000200 [ 8.541519] 7d6b1280 8a4c3979 00000006 000009a6 7da32db8 b13eec81 00000006 000009a6 [ 8.541519] Call Trace: [ 8.541519] [<7d9d675b>] ? ttusb2_driver_init+0x16/0x16 [ 8.541519] [<7d992a49>] do_one_initcall+0x77/0x106 [ 8.541519] [<7be3a800>] ? parameqn+0x2/0x35 [ 8.541519] [<7be3a966>] ? parse_args+0x113/0x25c [ 8.541519] [<7d992bc2>] kernel_init_freeable+0xea/0x167 [ 8.541519] [<7cf01070>] kernel_init+0x8/0xb8 [ 8.541519] [<7cf27ec0>] ret_from_kernel_thread+0x20/0x30 [ 8.541519] [<7cf01068>] ? rest_init+0x10c/0x10c [ 8.541519] Code: 08 c2 c7 05 44 ed f9 7d 00 00 e0 02 c7 05 40 ed f9 7d 00 00 e0 02 c7 05 3c ed f9 7d 00 00 e0 02 75 1f b8 00 00 e0 02 85 c0 74 16 <a1> 00 00 e0 02 c7 05 54 84 8e 7d 00 00 e0 02 a3 58 84 8e 7d eb [ 8.541519] EIP: [<7d9d67c6>] af9005_usb_module_init+0x6b/0x9d SS:ESP 0068:89c9df2c [ 8.541519] CR2: 0000000002e00000 [ 8.541519] ---[ end trace 768b6faf51370fc7 ]---
The prefered fix would be to convert the whole IR code to use the kernel IR infrastructure (which wasn't available at the time this driver had been created).
Until anyone who still has this old hardware steps up an does the conversion, fix it by not calling the symbol_request calls if the driver is compiled in without the default IR symbols (CONFIG_DVB_USB_AF9005_REMOTE).
Due to the IR related pointers beeing NULL by default, IR support will then be disabled.
The downside of this solution is, that it will no longer be possible to compile custom IR symbols (not using CONFIG_DVB_USB_AF9005_REMOTE) in.
Please note that this patch has NOT been tested with all possible cases. I don't have the hardware and could only verify that it fixes the reported bug.
--- drivers/media/dvb/dvb-usb/af9005.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/dvb/dvb-usb/af9005.c +3 -0
@@ -1072,9 +1072,12 @@ static int __init af9005_usb_module_initerr ("usb_register failed. (%d)" , result);return result; } +#if IS_MODULE (CONFIG_DVB_USB_AF9005 ) || defined(CONFIG_DVB_USB_AF9005_REMOTE ) +/* FIXME: convert to todays kernel IR infrastructure */ rc_decode =symbol_request (af9005_rc_decode); rc_keys =symbol_request (rc_map_af9005_table); rc_keys_size =symbol_request (rc_map_af9005_table_size); +#endif if (rc_decode ==NULL || rc_keys ==NULL || rc_keys_size ==NULL ) {err ("af9005_rc_decode function not found, disabling remote" ); af9005_properties.rc.legacy.rc_query =NULL ;
PATCH 5/152 writeback: Move I_DIRTY_PAGES handling
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 6290be1c1dc6589eeda213aa40946b27fa4faac8 upstream.
Instead of clearing I_DIRTY_PAGES and resetting it when we didn't succeed in writing them all, just clear the bit only when we succeeded writing all the pages. We also move the clearing of the bit close to other i_state handling to separate it from writeback list handling. This is desirable because list handling will differ for flusher thread and other writeback_single_inode() callers in future. No filesystem plays any tricks with I_DIRTY_PAGES (like checking it in ->writepages or ->write_inode implementation) so this movement is safe.
--- fs/fs-writeback.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/fs-writeback.c +3 -2
@@ -396,7 +396,6 @@ writeback_single_inode(struct inode *ino/* Set I_SYNC, reset I_DIRTY_PAGES */ inode->i_state |=I_SYNC ; - inode->i_state &= ~I_DIRTY_PAGES ;spin_unlock (&inode->i_lock);spin_unlock (&wb->list_lock);
@@ -419,6 +418,9 @@ writeback_single_inode(struct inode *ino* write_inode() */ spin_lock (&inode->i_lock); +/* Clear I_DIRTY_PAGES if we've written out all dirty pages */ +if (!mapping_tagged (mapping,PAGECACHE_TAG_DIRTY )) + inode->i_state &= ~I_DIRTY_PAGES ; dirty = inode->i_state &I_DIRTY ; inode->i_state &= ~(I_DIRTY_SYNC |I_DIRTY_DATASYNC );spin_unlock (&inode->i_lock);
@@ -447,7 +449,6 @@ writeback_single_inode(struct inode *ino* We didn't write back all the pages. nfs_writepages() * sometimes bales out without doing anything. */ - inode->i_state |=I_DIRTY_PAGES ;if (wbc->nr_to_write <=0 ) {/* * slice used up: queue for next turn
PATCH 6/152 writeback: fix a subtle race condition in I_DIRTY clearing
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit 9c6ac78eb3521c5937b2dd8a7d1b300f41092f45 upstream.
After invoking ->dirty_inode(), __mark_inode_dirty() does smp_mb() and tests inode->i_state locklessly to see whether it already has all the necessary I_DIRTY bits set. The comment above the barrier doesn't contain any useful information - memory barriers can't ensure "changes are seen by all cpus" by itself.
And it sure enough was broken. Please consider the following scenario.
CPU 0 CPU 1
-------------------------------------------------------------------------------
enters __writeback_single_inode() grabs inode->i_lock tests PAGECACHE_TAG_DIRTY which is clear
enters __set_page_dirty()
grabs mapping->tree_lock
sets PAGECACHE_TAG_DIRTY
releases mapping->tree_lock
leaves __set_page_dirty()
enters __mark_inode_dirty()
smp_mb()
sees I_DIRTY_PAGES set
leaves __mark_inode_dirty()
clears I_DIRTY_PAGES releases inode->i_lock
Now @inode has dirty pages w/ I_DIRTY_PAGES clear. This doesn't seem to lead to an immediately critical problem because requeue_inode() later checks PAGECACHE_TAG_DIRTY instead of I_DIRTY_PAGES when deciding whether the inode needs to be requeued for IO and there are enough unintentional memory barriers inbetween, so while the inode ends up with inconsistent I_DIRTY_PAGES flag, it doesn't fall off the IO list.
The lack of explicit barrier may also theoretically affect the other I_DIRTY bits which deal with metadata dirtiness. There is no guarantee that a strong enough barrier exists between I_DIRTY_[DATA]SYNC clearing and write_inode() writing out the dirtied inode. Filesystem inode writeout path likely has enough stuff which can behave as full barrier but it's theoretically possible that the writeout may not see all the updates from ->dirty_inode().
Fix it by adding an explicit smp_mb() after I_DIRTY clearing. Note that I_DIRTY_PAGES needs a special treatment as it always needs to be cleared to be interlocked with the lockless test on __mark_inode_dirty() side. It's cleared unconditionally and reinstated after smp_mb() if the mapping still has dirty pages.
Also add comments explaining how and why the barriers are paired.
Lightly tested.
--- fs/fs-writeback.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-)
fs/fs-writeback.c +22 -7
@@ -418,12 +418,28 @@ writeback_single_inode(struct inode *ino* write_inode() */ spin_lock (&inode->i_lock); -/* Clear I_DIRTY_PAGES if we've written out all dirty pages */ -if (!mapping_tagged (mapping,PAGECACHE_TAG_DIRTY )) - inode->i_state &= ~I_DIRTY_PAGES ; + dirty = inode->i_state &I_DIRTY ; - inode->i_state &= ~(I_DIRTY_SYNC |I_DIRTY_DATASYNC ); + inode->i_state &= ~I_DIRTY ; + +/* +* Paired with smp_mb() in __mark_inode_dirty(). This allows +* __mark_inode_dirty() to test i_state without grabbing i_lock - +* either they see the I_DIRTY bits cleared or we see the dirtied +* inode. +* +* I_DIRTY_PAGES is always cleared together above even if @mapping +* still has dirty pages. The flag is reinstated after smp_mb() if +* necessary. This guarantees that either __mark_inode_dirty() +* sees clear I_DIRTY_PAGES or we see PAGECACHE_TAG_DIRTY. +*/ +smp_mb (); + +if (mapping_tagged (mapping,PAGECACHE_TAG_DIRTY )) + inode->i_state |=I_DIRTY_PAGES ; +spin_unlock (&inode->i_lock); +/* Don't write the inode if only I_DIRTY_PAGES was set */ if (dirty & (I_DIRTY_SYNC |I_DIRTY_DATASYNC )) {int err =write_inode (inode, wbc);
@@ -1065,12 +1081,11 @@ void __mark_inode_dirty(struct inode *in }/* -* make sure that changes are seen by all cpus before we test i_state -* -- mikulas +* Paired with smp_mb() in __writeback_single_inode() for the +* following lockless i_state test. See there for details. */ smp_mb (); -/* avoid the locking if we can */ if ((inode->i_state & flags) == flags)return ;
PATCH 7/152 usb: renesas_usbhs: gadget: fix NULL pointer dereference in ep_disable()
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kazuya Mizuguchi <[email protected]>
commit 11432050f070810ba139d0226344eef120c3a559 upstream.
This patch fixes an issue that the NULL pointer dereference happens when we uses g_audio driver. Since the g_audio driver will call usb_ep_disable() in afunc_set_alt() before it calls usb_ep_enable(), the uep->pipe of renesas usbhs driver will be NULL. So, this patch adds a condition to avoid the oops.
--- drivers/usb/renesas_usbhs/mod_gadget.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/renesas_usbhs/mod_gadget.c +4 -0
@@ -514,6 +514,10 @@ static int usbhsg_ep_enable(struct usb_estatic int usbhsg_ep_disable (struct usb_ep *ep) {struct usbhsg_uep *uep =usbhsg_ep_to_uep (ep); +struct usbhs_pipe *pipe =usbhsg_uep_to_pipe (uep); + +if (!pipe) +return -EINVAL ;return usbhsg_pipe_disable (uep); }
PATCH 8/152 ipv4: Remove all uses of LL_ALLOCATED_SPACE
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
commit 660882432909dbe611f1792eda158188065cb9f1 upstream.
ipv4: Remove all uses of LL_ALLOCATED_SPACE
The macro LL_ALLOCATED_SPACE was ill-conceived. It applies the alignment to the sum of needed_headroom and needed_tailroom. As the amount that is then reserved for head room is needed_headroom with alignment, this means that the tail room left may be too small.
This patch replaces all uses of LL_ALLOCATED_SPACE in net/ipv4 with the macro LL_RESERVED_SPACE and direct reference to needed_tailroom.
This also fixes the problem with needed_headroom changing between allocating the skb and reserving the head room.
--- net/ipv4/arp.c | 6 ++++-- net/ipv4/igmp.c | 13 +++++++++---- net/ipv4/ipconfig.c | 6 ++++-- net/ipv4/raw.c | 7 +++++-- 4 files changed, 22 insertions(+), 10 deletions(-)
net/ipv4/arp.c +4 -2
@@ -592,16 +592,18 @@ struct sk_buff *arp_create(int type, intstruct sk_buff *skb;struct arphdr *arp;unsigned char *arp_ptr; +int hlen =LL_RESERVED_SPACE (dev); +int tlen = dev->needed_tailroom;/* * Allocate a buffer */ - skb =alloc_skb (arp_hdr_len (dev) +LL_ALLOCATED_SPACE (dev),GFP_ATOMIC ); + skb =alloc_skb (arp_hdr_len (dev) + hlen + tlen,GFP_ATOMIC );if (skb ==NULL )return NULL ; -skb_reserve (skb,LL_RESERVED_SPACE (dev)); +skb_reserve (skb, hlen);skb_reset_network_header (skb); arp = (struct arphdr *)skb_put (skb,arp_hdr_len (dev)); skb->dev = dev;
net/ipv4/igmp.c +9 -4
@@ -304,9 +304,11 @@ static struct sk_buff *igmpv3_newpack(ststruct igmpv3_report *pig;struct net *net =dev_net (dev);struct flowi4 fl4; +int hlen =LL_RESERVED_SPACE (dev); +int tlen = dev->needed_tailroom;while (1 ) { - skb =alloc_skb (size +LL_ALLOCATED_SPACE (dev), + skb =alloc_skb (size + hlen + tlen,GFP_ATOMIC | __GFP_NOWARN);if (skb)break ;
@@ -327,7 +329,7 @@ static struct sk_buff *igmpv3_newpack(stskb_dst_set (skb, &rt->dst); skb->dev = dev; -skb_reserve (skb,LL_RESERVED_SPACE (dev)); +skb_reserve (skb, hlen);skb_reset_network_header (skb); pip =ip_hdr (skb);
@@ -647,6 +649,7 @@ static int igmp_send_report(struct in_de__be32 group = pmc ? pmc->multiaddr :0 ;struct flowi4 fl4;__be32 dst; +int hlen, tlen;if (type ==IGMPV3_HOST_MEMBERSHIP_REPORT )return igmpv3_send_report (in_dev, pmc);
@@ -661,7 +664,9 @@ static int igmp_send_report(struct in_deif (IS_ERR (rt))return -1 ; - skb =alloc_skb (IGMP_SIZE +LL_ALLOCATED_SPACE (dev),GFP_ATOMIC ); + hlen =LL_RESERVED_SPACE (dev); + tlen = dev->needed_tailroom; + skb =alloc_skb (IGMP_SIZE + hlen + tlen,GFP_ATOMIC );if (skb ==NULL ) {ip_rt_put (rt);return -1 ;
@@ -669,7 +674,7 @@ static int igmp_send_report(struct in_deskb_dst_set (skb, &rt->dst); -skb_reserve (skb,LL_RESERVED_SPACE (dev)); +skb_reserve (skb, hlen);skb_reset_network_header (skb); iph =ip_hdr (skb);
net/ipv4/ipconfig.c +4 -2
@@ -767,13 +767,15 @@ static void __init ic_bootp_send_if(strustruct sk_buff *skb;struct bootp_pkt *b;struct iphdr *h; +int hlen =LL_RESERVED_SPACE (dev); +int tlen = dev->needed_tailroom;/* Allocate packet */ - skb =alloc_skb (sizeof (struct bootp_pkt ) +LL_ALLOCATED_SPACE (dev) +15 , + skb =alloc_skb (sizeof (struct bootp_pkt ) + hlen + tlen +15 ,GFP_KERNEL );if (!skb)return ; -skb_reserve (skb,LL_RESERVED_SPACE (dev)); +skb_reserve (skb, hlen); b = (struct bootp_pkt *)skb_put (skb,sizeof (struct bootp_pkt ));memset (b,0 ,sizeof (struct bootp_pkt ));
net/ipv4/raw.c +5 -2
@@ -329,6 +329,7 @@ static int raw_send_hdrinc(struct sock *unsigned int iphlen;int err;struct rtable *rt = *rtp; +int hlen, tlen;if (length > rt->dst.dev->mtu) { ip_local_error(sk, EMSGSIZE, fl4->daddr, inet->inet_dport,
@@ -338,12 +339,14 @@ static int raw_send_hdrinc(struct sock *if (flags&MSG_PROBE ) goto out; + hlen =LL_RESERVED_SPACE (rt->dst.dev); + tlen = rt->dst.dev->needed_tailroom; skb =sock_alloc_send_skb (sk, - length +LL_ALLOCATED_SPACE (rt->dst.dev) +15 , + length + hlen + tlen +15 , flags &MSG_DONTWAIT , &err);if (skb ==NULL ) goto error; -skb_reserve (skb,LL_RESERVED_SPACE (rt->dst.dev)); +skb_reserve (skb, hlen); skb->priority = sk->sk_priority; skb->mark = sk->sk_mark;
PATCH 9/152 ipv6: Remove all uses of LL_ALLOCATED_SPACE
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
commit a7ae1992248e5cf9dc5bd35695ab846d27efe15f upstream.
ipv6: Remove all uses of LL_ALLOCATED_SPACE
The macro LL_ALLOCATED_SPACE was ill-conceived. It applies the alignment to the sum of needed_headroom and needed_tailroom. As the amount that is then reserved for head room is needed_headroom with alignment, this means that the tail room left may be too small.
This patch replaces all uses of LL_ALLOCATED_SPACE in net/ipv6 with the macro LL_RESERVED_SPACE and direct reference to needed_tailroom.
This also fixes the problem with needed_headroom changing between allocating the skb and reserving the head room.
--- net/ipv6/ip6_output.c | 8 ++++++-- net/ipv6/mcast.c | 12 ++++++++---- net/ipv6/ndisc.c | 13 +++++++++---- net/ipv6/raw.c | 6 ++++-- 4 files changed, 27 insertions(+), 12 deletions(-)
net/ipv6/ip6_output.c +6 -2
@@ -623,6 +623,7 @@ int ip6_fragment(struct sk_buff *skb, instruct ipv6hdr *tmp_hdr;struct frag_hdr *fh;unsigned int mtu, hlen, left, len; +int hroom, troom;__be32 frag_id =0 ;int ptr, offset =0 , err=0 ;u8 *prevhdr, nexthdr =0 ;
@@ -789,6 +790,8 @@ slow_path:*/ *prevhdr =NEXTHDR_FRAGMENT ; + hroom =LL_RESERVED_SPACE (rt->dst.dev); + troom = rt->dst.dev->needed_tailroom;/* * Keep copying data until we run out.
@@ -807,7 +810,8 @@ slow_path:* Allocate buffer. */ -if ((frag =alloc_skb (len+hlen+sizeof (struct frag_hdr )+LL_ALLOCATED_SPACE (rt->dst.dev),GFP_ATOMIC )) ==NULL ) { +if ((frag =alloc_skb (len + hlen +sizeof (struct frag_hdr ) + + hroom + troom,GFP_ATOMIC )) ==NULL ) {NETDEBUG (KERN_INFO "IPv6: frag: no memory for new fragment!\n" );IP6_INC_STATS (net,ip6_dst_idev (skb_dst (skb)),IPSTATS_MIB_FRAGFAILS );
@@ -820,7 +824,7 @@ slow_path:*/ ip6_copy_metadata (frag, skb); -skb_reserve (frag,LL_RESERVED_SPACE (rt->dst.dev)); +skb_reserve (frag, hroom);skb_put (frag, len + hlen +sizeof (struct frag_hdr ));skb_reset_network_header (frag); fh = (struct frag_hdr *)(skb_network_header (frag) + hlen);
net/ipv6/mcast.c +8 -4
@@ -1343,13 +1343,15 @@ static struct sk_buff *mld_newpack(strucstruct mld2_report *pmr;struct in6_addr addr_buf;const struct in6_addr *saddr; +int hlen =LL_RESERVED_SPACE (dev); +int tlen = dev->needed_tailroom;int err;u8 ra[8 ] = {IPPROTO_ICMPV6 ,0 ,IPV6_TLV_ROUTERALERT ,2 ,0 ,0 ,IPV6_TLV_PADN ,0 };/* we assume size > sizeof(ra) here */ - size +=LL_ALLOCATED_SPACE (dev); + size += hlen + tlen;/* limit our allocations to order-0 page */ size =min_t (int, size,SKB_MAX_ORDER (0 ,0 )); skb =sock_alloc_send_skb (sk, size,1 , &err);
@@ -1357,7 +1359,7 @@ static struct sk_buff *mld_newpack(strucif (!skb)return NULL ; -skb_reserve (skb,LL_RESERVED_SPACE (dev)); +skb_reserve (skb, hlen);if (__ipv6_get_lladdr (idev, &addr_buf,IFA_F_TENTATIVE )) {/* <draft-ietf-magma-mld-source-05.txt>:
@@ -1725,6 +1727,8 @@ static void igmp6_send(struct in6_addr *struct mld_msg *hdr;const struct in6_addr *snd_addr, *saddr;struct in6_addr addr_buf; +int hlen =LL_RESERVED_SPACE (dev); +int tlen = dev->needed_tailroom;int err, len, payload_len, full_len;u8 ra[8 ] = {IPPROTO_ICMPV6 ,0 ,IPV6_TLV_ROUTERALERT ,2 ,0 ,0 ,
@@ -1746,7 +1750,7 @@ static void igmp6_send(struct in6_addr * IPSTATS_MIB_OUT, full_len);rcu_read_unlock (); - skb =sock_alloc_send_skb (sk,LL_ALLOCATED_SPACE (dev) + full_len,1 , &err); + skb =sock_alloc_send_skb (sk, hlen + tlen + full_len,1 , &err);if (skb ==NULL ) {rcu_read_lock ();
@@ -1756,7 +1760,7 @@ static void igmp6_send(struct in6_addr *return ; } -skb_reserve (skb,LL_RESERVED_SPACE (dev)); +skb_reserve (skb, hlen);if (ipv6_get_lladdr (dev, &addr_buf,IFA_F_TENTATIVE )) {/* <draft-ietf-magma-mld-source-05.txt>:
net/ipv6/ndisc.c +9 -4
@@ -446,6 +446,8 @@ struct sk_buff *ndisc_build_skb(struct nstruct sock *sk = net->ipv6.ndisc_sk;struct sk_buff *skb;struct icmp6hdr *hdr; +int hlen =LL_RESERVED_SPACE (dev); +int tlen = dev->needed_tailroom;int len;u8 *opt;
@@ -457,7 +459,7 @@ struct sk_buff *ndisc_build_skb(struct n len +=ndisc_opt_addr_space (dev); skb =alloc_skb ((MAX_HEADER +sizeof (struct ipv6hdr ) + - len +LL_ALLOCATED_SPACE (dev)),GFP_ATOMIC ); + len + hlen + tlen),GFP_ATOMIC );if (!skb) { ND_PRINTK0(KERN_ERR "ICMPv6 ND: %s() failed to allocate an skb.\n",
@@ -465,7 +467,7 @@ struct sk_buff *ndisc_build_skb(struct nreturn NULL ; } -skb_reserve (skb,LL_RESERVED_SPACE (dev)); +skb_reserve (skb, hlen);ip6_nd_hdr (sk, skb, dev, saddr, daddr,IPPROTO_ICMPV6 , len); skb->transport_header = skb->tail;
@@ -1534,6 +1536,7 @@ void ndisc_send_redirect(struct sk_buffstruct inet6_dev *idev;struct flowi6 fl6;u8 *opt; +int hlen, tlen;int rd_len;int err;u8 ha_buf[MAX_ADDR_LEN ], *ha =NULL ;
@@ -1591,9 +1594,11 @@ void ndisc_send_redirect(struct sk_buff rd_len &= ~0x7 ; len += rd_len; + hlen =LL_RESERVED_SPACE (dev); + tlen = dev->needed_tailroom; buff =sock_alloc_send_skb (sk, (MAX_HEADER +sizeof (struct ipv6hdr ) + - len +LL_ALLOCATED_SPACE (dev)), + len + hlen + tlen),1 , &err);if (buff ==NULL ) { ND_PRINTK0(KERN_ERR
@@ -1602,7 +1607,7 @@ void ndisc_send_redirect(struct sk_buff goto release; } -skb_reserve (buff,LL_RESERVED_SPACE (dev)); +skb_reserve (buff, hlen);ip6_nd_hdr (sk, buff, dev, &saddr_buf, &ipv6_hdr (skb)->saddr,IPPROTO_ICMPV6 , len);
net/ipv6/raw.c +4 -2
@@ -607,6 +607,8 @@ static int rawv6_send_hdrinc(struct sockstruct sk_buff *skb;int err;struct rt6_info *rt = (struct rt6_info *)*dstp; +int hlen =LL_RESERVED_SPACE (rt->dst.dev); +int tlen = rt->dst.dev->needed_tailroom;if (length > rt->dst.dev->mtu) {ipv6_local_error (sk,EMSGSIZE , fl6, rt->dst.dev->mtu);
@@ -616,11 +618,11 @@ static int rawv6_send_hdrinc(struct sock goto out; skb =sock_alloc_send_skb (sk, - length +LL_ALLOCATED_SPACE (rt->dst.dev) +15 , + length + hlen + tlen +15 , flags &MSG_DONTWAIT , &err);if (skb ==NULL ) goto error; -skb_reserve (skb,LL_RESERVED_SPACE (rt->dst.dev)); +skb_reserve (skb, hlen); skb->priority = sk->sk_priority; skb->mark = sk->sk_mark;
PATCH 10/152 ipv6: mld: fix add_grhead skb_over_panic for devs with large MTUs
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
commit 4c672e4b42bc8046d63a6eb0a2c6a450a501af32 upstream.
It has been reported that generating an MLD listener report on devices with large MTUs (e.g. 9000) and a high number of IPv6 addresses can trigger a skb_over_panic():
skbuff: skb_over_panic: text:ffffffff80612a5d len:3776 put:20 head:ffff88046d751000 data:ffff88046d751010 tail:0xed0 end:0xec0 dev:port1
------------[ cut here ]------------ kernel BUG at net/core/skbuff.c:100! invalid opcode: 0000 [#1] SMP Modules linked in: ixgbe(O) CPU: 3 PID: 0 Comm: swapper/3 Tainted: G O 3.14.23+ #4 [...] Call Trace: <IRQ> [<ffffffff80578226>] ? skb_put+0x3a/0x3b [<ffffffff80612a5d>] ? add_grhead+0x45/0x8e [<ffffffff80612e3a>] ? add_grec+0x394/0x3d4 [<ffffffff80613222>] ? mld_ifc_timer_expire+0x195/0x20d [<ffffffff8061308d>] ? mld_dad_timer_expire+0x45/0x45 [<ffffffff80255b5d>] ? call_timer_fn.isra.29+0x12/0x68 [<ffffffff80255d16>] ? run_timer_softirq+0x163/0x182 [<ffffffff80250e6f>] ? __do_softirq+0xe0/0x21d [<ffffffff8025112b>] ? irq_exit+0x4e/0xd3 [<ffffffff802214bb>] ? smp_apic_timer_interrupt+0x3b/0x46 [<ffffffff8063f10a>] ? apic_timer_interrupt+0x6a/0x70
mld_newpack() skb allocations are usually requested with dev->mtu in size, since commit 72e09ad107e7 ("ipv6: avoid high order allocations") we have changed the limit in order to be less likely to fail.
However, in MLD/IGMP code, we have some rather ugly AVAILABLE(skb) macros, which determine if we may end up doing an skb_put() for adding another record. To avoid possible fragmentation, we check the skb's tailroom as skb->dev->mtu - skb->len, which is a wrong assumption as the actual max allocation size can be much smaller.
The IGMP case doesn't have this issue as commit 57e1ab6eaddc ("igmp: refine skb allocations") stores the allocation size in the cb[].
Set a reserved_tailroom to make it fit into the MTU and use skb_availroom() helper instead. This also allows to get rid of igmp_skb_size().
--- net/ipv4/igmp.c | 11 +++++------ net/ipv6/mcast.c | 9 +++++---- 2 files changed, 10 insertions(+), 10 deletions(-)
net/ipv4/igmp.c +5 -6
@@ -294,9 +294,7 @@ igmp_scount(struct ip_mc_list *pmc, intreturn scount; } -#define igmp_skb_size (skb) (*(unsigned int *)((skb)->cb)) - -static struct sk_buff *igmpv3_newpack (struct net_device *dev,int size) +static struct sk_buff *igmpv3_newpack (struct net_device *dev,unsigned int mtu) {struct sk_buff *skb;struct rtable *rt;
@@ -306,6 +304,7 @@ static struct sk_buff *igmpv3_newpack(ststruct flowi4 fl4;int hlen =LL_RESERVED_SPACE (dev);int tlen = dev->needed_tailroom; +unsigned int size = mtu;while (1 ) { skb = alloc_skb(size + hlen + tlen,
@@ -316,7 +315,6 @@ static struct sk_buff *igmpv3_newpack(stif (size <256 )return NULL ; } -igmp_skb_size (skb) = size; rt = ip_route_output_ports(net, &fl4, NULL, IGMPV3_ALL_MCR, 0, 0, 0,
@@ -329,6 +327,8 @@ static struct sk_buff *igmpv3_newpack(stskb_dst_set (skb, &rt->dst); skb->dev = dev; + skb->reserved_tailroom =skb_end_offset (skb) - +min (mtu,skb_end_offset (skb));skb_reserve (skb, hlen);skb_reset_network_header (skb);
@@ -398,8 +398,7 @@ static struct sk_buff *add_grhead(structreturn skb; } -#define AVAILABLE (skb) ((skb) ? ((skb)->dev ? igmp_skb_size(skb) - (skb)->len : \ - skb_tailroom(skb)) : 0) +#define AVAILABLE (skb) ((skb) ? skb_availroom(skb) : 0)static struct sk_buff *add_grec (struct sk_buff *skb,struct ip_mc_list *pmc,int type,int gdeleted,int sdeleted)
net/ipv6/mcast.c +5 -4
@@ -1334,7 +1334,7 @@ mld_scount(struct ifmcaddr6 *pmc, int tyreturn scount; } -static struct sk_buff *mld_newpack (struct inet6_dev *idev,int size) +static struct sk_buff *mld_newpack (struct inet6_dev *idev,unsigned int mtu) {struct net_device *dev = idev->dev;struct net *net =dev_net (dev);
@@ -1345,13 +1345,13 @@ static struct sk_buff *mld_newpack(strucconst struct in6_addr *saddr;int hlen =LL_RESERVED_SPACE (dev);int tlen = dev->needed_tailroom; +unsigned int size = mtu + hlen + tlen;int err;u8 ra[8 ] = {IPPROTO_ICMPV6 ,0 ,IPV6_TLV_ROUTERALERT ,2 ,0 ,0 ,IPV6_TLV_PADN ,0 };/* we assume size > sizeof(ra) here */ - size += hlen + tlen;/* limit our allocations to order-0 page */ size =min_t (int, size,SKB_MAX_ORDER (0 ,0 )); skb =sock_alloc_send_skb (sk, size,1 , &err);
@@ -1359,6 +1359,8 @@ static struct sk_buff *mld_newpack(strucif (!skb)return NULL ; + skb->reserved_tailroom =skb_end_offset (skb) - +min (mtu,skb_end_offset (skb));skb_reserve (skb, hlen);if (__ipv6_get_lladdr (idev, &addr_buf,IFA_F_TENTATIVE )) {
@@ -1479,8 +1481,7 @@ static struct sk_buff *add_grhead(structreturn skb; } -#define AVAILABLE (skb) ((skb) ? ((skb)->dev ? (skb)->dev->mtu - (skb)->len : \ - skb_tailroom(skb)) : 0) +#define AVAILABLE (skb) ((skb) ? skb_availroom(skb) : 0)static struct sk_buff *add_grec (struct sk_buff *skb,struct ifmcaddr6 *pmc,int type,int gdeleted,int sdeleted)
PATCH 11/152 KVM: s390: flush CPU on load control
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Christian Borntraeger <[email protected]>
commit 2dca485f8740208604543c3960be31a5dd3ea603 upstream.
some control register changes will flush some aspects of the CPU, e.g. POP explicitely mentions that for CR9-CR11 "TLBs may be cleared". Instead of trying to be clever and only flush on specific CRs, let play safe and flush on all lctl(g) as future machines might define new bits in CRs. Load control intercept should not happen that often.
--- arch/s390/kvm/intercept.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/kvm/intercept.c +2 -0
@@ -58,6 +58,7 @@ static int handle_lctlg(struct kvm_vcpubreak ; reg = (reg +1 ) %16 ; }while (1 ); +kvm_make_request (KVM_REQ_TLB_FLUSH , vcpu);return 0 ; }
@@ -97,6 +98,7 @@ static int handle_lctl(struct kvm_vcpu *break ; reg = (reg +1 ) %16 ; }while (1 ); +kvm_make_request (KVM_REQ_TLB_FLUSH , vcpu);return 0 ; }
PATCH 12/152 UBI: Fix invalid vfree()
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Richard Weinberger <[email protected]>
commit f38aed975c0c3645bbdfc5ebe35726e64caaf588 upstream.
The logic of vfree()'ing vol->upd_buf is tied to vol->updating. In ubi_start_update() vol->updating is set long before vmalloc()'ing vol->upd_buf. If we encounter a write failure in ubi_start_update() before vmalloc() the UBI device release function will try to vfree() vol->upd_buf because vol->updating is set.
Fix this by allocating vol->upd_buf directly after setting vol->updating.
Fixes:
[ 31.559338] UBI warning: vol_cdev_release: update of volume 2 not finished, volume is damaged [ 31.559340] ------------[ cut here ]------------ [ 31.559343] WARNING: CPU: 1 PID: 2747 at mm/vmalloc.c:1446 __vunmap+0xe3/0x110() [ 31.559344] Trying to vfree() nonexistent vm area (ffffc90001f2b000) [ 31.559345] Modules linked in: [ 31.565620] 0000000000000bba ffff88002a0cbdb0 ffffffff818f0497 ffff88003b9ba148 [ 31.566347] ffff88002a0cbde0 ffffffff8156f515 ffff88003b9ba148 0000000000000bba [ 31.567073] 0000000000000000 0000000000000000 ffff88002a0cbe88 ffffffff8156c10a [ 31.567793] Call Trace: [ 31.568034] [<ffffffff818f0497>] dump_stack+0x4e/0x7a [ 31.568510] [<ffffffff8156f515>] ubi_io_write_vid_hdr+0x155/0x160 [ 31.569084] [<ffffffff8156c10a>] ubi_eba_write_leb+0x23a/0x870 [ 31.569628] [<ffffffff81569b36>] vol_cdev_write+0x226/0x380 [ 31.570155] [<ffffffff81179265>] vfs_write+0xb5/0x1f0 [ 31.570627] [<ffffffff81179f8a>] SyS_pwrite64+0x6a/0xa0 [ 31.571123] [<ffffffff818fde12>] system_call_fastpath+0x16/0x1b
--- drivers/mtd/ubi/upd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/mtd/ubi/upd.c +6 -4
@@ -135,6 +135,10 @@ int ubi_start_update(struct ubi_device *ubi_assert (!vol->updating && !vol->changing_leb); vol->updating =1 ; + vol->upd_buf =vmalloc (ubi->leb_size); +if (!vol->upd_buf) +return -ENOMEM ; + err =set_update_marker (ubi, vol);if (err)return err;
@@ -154,14 +158,12 @@ int ubi_start_update(struct ubi_device * err =clear_update_marker (ubi, vol,0 );if (err)return err; + +vfree (vol->upd_buf); vol->updating =0 ;return 0 ; } - vol->upd_buf =vmalloc (ubi->leb_size); -if (!vol->upd_buf) -return -ENOMEM ; - vol->upd_ebs =div_u64 (bytes + vol->usable_leb_size -1 , vol->usable_leb_size); vol->upd_bytes = bytes;
PATCH 13/152 driver core: Fix unbalanced device reference in drivers_probe
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit 0372ffb35d00288802265586a29c117911d02fb8 upstream.
bus_find_device_by_name() acquires a device reference which is never released. This results in an object leak, which on older kernels results in failure to release all resources of PCI devices. libvirt uses drivers_probe to re-attach devices to the host after assignment and is therefore a common trigger for this leak.
Example:
# cd /sys/bus/pci/ # dmesg -C # echo 1 > devices/0000\:01\:00.0/sriov_numvfs # echo 0 > devices/0000\:01\:00.0/sriov_numvfs # dmesg | grep 01:10 pci 0000:01:10.0: [8086:10ca] type 00 class 0x020000 kobject: '0000:01:10.0' (ffff8801d79cd0a8): kobject_add_internal: parent: '0000:00:01.0', set: 'devices' kobject: '0000:01:10.0' (ffff8801d79cd0a8): kobject_uevent_env kobject: '0000:01:10.0' (ffff8801d79cd0a8): fill_kobj_path: path = '/devices/pci0000:00/0000:00:01.0/0000:01:10.0' kobject: '0000:01:10.0' (ffff8801d79cd0a8): kobject_uevent_env kobject: '0000:01:10.0' (ffff8801d79cd0a8): fill_kobj_path: path = '/devices/pci0000:00/0000:00:01.0/0000:01:10.0' kobject: '0000:01:10.0' (ffff8801d79cd0a8): kobject_uevent_env kobject: '0000:01:10.0' (ffff8801d79cd0a8): fill_kobj_path: path = '/devices/pci0000:00/0000:00:01.0/0000:01:10.0' kobject: '0000:01:10.0' (ffff8801d79cd0a8): kobject_cleanup, parent (null) kobject: '0000:01:10.0' (ffff8801d79cd0a8): calling ktype release kobject: '0000:01:10.0': free name
[kobject freed as expected]
# dmesg -C # echo 1 > devices/0000\:01\:00.0/sriov_numvfs # echo 0000:01:10.0 > drivers_probe # echo 0 > devices/0000\:01\:00.0/sriov_numvfs # dmesg | grep 01:10 pci 0000:01:10.0: [8086:10ca] type 00 class 0x020000 kobject: '0000:01:10.0' (ffff8801d79ce0a8): kobject_add_internal: parent: '0000:00:01.0', set: 'devices' kobject: '0000:01:10.0' (ffff8801d79ce0a8): kobject_uevent_env kobject: '0000:01:10.0' (ffff8801d79ce0a8): fill_kobj_path: path = '/devices/pci0000:00/0000:00:01.0/0000:01:10.0' kobject: '0000:01:10.0' (ffff8801d79ce0a8): kobject_uevent_env kobject: '0000:01:10.0' (ffff8801d79ce0a8): fill_kobj_path: path = '/devices/pci0000:00/0000:00:01.0/0000:01:10.0' kobject: '0000:01:10.0' (ffff8801d79ce0a8): kobject_uevent_env kobject: '0000:01:10.0' (ffff8801d79ce0a8): fill_kobj_path: path = '/devices/pci0000:00/0000:00:01.0/0000:01:10.0'
[no free]
--- drivers/base/bus.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/base/bus.c +5 -3
@@ -240,13 +240,15 @@ static ssize_t store_drivers_probe(struc const char *buf, size_t count) { struct device *dev; +int err = -EINVAL ; dev =bus_find_device_by_name (bus,NULL , buf);if (!dev)return -ENODEV ; -if (bus_rescan_devices_helper (dev,NULL ) !=0 ) -return -EINVAL ; -return count; +if (bus_rescan_devices_helper (dev,NULL ) ==0 ) + err = count; +put_device (dev); +return err; }#endif
PATCH 14/152 drbd: merge_bvec_fn: properly remap bvm->bi_bdev
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Lars Ellenberg <[email protected]>
commit 3b9d35d744bb5139f9fed57f38c019bb8c7d351c upstream.
This was not noticed for many years. Affects operation if md raid is used a backing device for DRBD.
--- drivers/block/drbd/drbd_req.c | 1 + 1 file changed, 1 insertion(+)
drivers/block/drbd/drbd_req.c +1 -0
@@ -1184,6 +1184,7 @@ int drbd_merge_bvec(struct request_queuestruct request_queue *const b = mdev->ldev->backing_bdev->bd_disk->queue;if (b->merge_bvec_fn) { + bvm->bi_bdev = mdev->ldev->backing_bdev; backing_limit = b->merge_bvec_fn (b, bvm, bvec); limit =min (limit, backing_limit); }
PATCH 15/152 PCI: Restore detection of read-only BARs
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Myron Stowe <[email protected]>
commit 36e8164882ca6d3c41cb91e6f09a3ed236841f80 upstream.
Commit 6ac665c63dca ("PCI: rewrite PCI BAR reading code") masked off low-order bits from 'l', but not from 'sz'. Both are passed to pci_size(), which compares 'base == maxbase' to check for read-only BARs. The masking of 'l' means that comparison will never be 'true', so the check for read-only BARs no longer works.
Resolve this by also masking off the low-order bits of 'sz' before passing it into pci_size() as 'maxbase'. With this change, pci_size() will once again catch the problems that have been encountered to date:
- AGP aperture BAR of AMD-7xx host bridges: if the AGP window is
disabled, this BAR is read-only and read as 0x00000008 [1]
- BARs 0-4 of ALi IDE controllers can be non-zero and read-only [1]
- Intel Sandy Bridge - Thermal Management Controller [8086:0103];
BAR 0 returning 0xfed98004 [2]
- Intel Xeon E5 v3/Core i7 Power Control Unit [8086:2fc0];
Bar 0 returning 0x00001a [3]--- drivers/pci/probe.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pci/probe.c +3 -0
@@ -175,14 +175,17 @@ int __pci_read_base(struct pci_dev *dev, res->flags |=IORESOURCE_SIZEALIGN ;if (res->flags &IORESOURCE_IO ) { l &=PCI_BASE_ADDRESS_IO_MASK ; + sz &=PCI_BASE_ADDRESS_IO_MASK ; mask =PCI_BASE_ADDRESS_IO_MASK & (u32 )IO_SPACE_LIMIT ; }else { l &=PCI_BASE_ADDRESS_MEM_MASK ; + sz &=PCI_BASE_ADDRESS_MEM_MASK ; mask = (u32 )PCI_BASE_ADDRESS_MEM_MASK ; } }else { res->flags |= (l &IORESOURCE_ROM_ENABLE ); l &=PCI_ROM_ADDRESS_MASK ; + sz &=PCI_ROM_ADDRESS_MASK ; mask = (u32 )PCI_ROM_ADDRESS_MASK ; }
Re: [PATCH 3.2 015/152] PCI: Restore detection of read-only BARs
Quoted 1 line · Ben Hutchings
3.2.67-rc1 review patch. If anyone has any objections, please let me know.
No objections, but I think you want 06cf35f903aa ("PCI: Handle read-only BARs on AMD CS553x devices") at the same time.
Quoted 61 lines
------------------
From: Myron Stowe <[email protected]>
commit
36e8164882ca6d3c41cb91e6f09a3ed236841f80upstream.Commit
6ac665c63dca("PCI: rewrite PCI BAR reading code") masked off low-order bits from 'l', but not from 'sz'. Both are passed topci_size(), which compares 'base == maxbase' to check for read-only BARs. The masking of 'l' means that comparison will never be 'true', so the check for read-only BARs no longer works.Resolve this by also masking off the low-order bits of 'sz' before passing it into
pci_size()as 'maxbase'. With this change,pci_size()will once again catch the problems that have been encountered to date:- AGP aperture BAR of AMD-7xx host bridges: if the AGP window is
disabled, this BAR is read-only and read as 0x00000008 [1]- BARs 0-4 of ALi IDE controllers can be non-zero and read-only [1]
- Intel Sandy Bridge - Thermal Management Controller [8086:0103];
BAR 0 returning 0xfed98004 [2]- Intel Xeon E5 v3/Core i7 Power Control Unit [8086:2fc0]; Bar 0 returning 0x00001a [3]Link [1] https://git.kernel.org/cgit/linux/kernel/git/tglx/history.git/commit/drivers/pci/probe.c?id=1307ef6621991f1c4bc3cec1b5a4ebd6fd3d66b9 ("PCI: probing read-only BARs" (pre-git))Reported-by William Unruh <[email protected]>Reported-by Martin Lucina <[email protected]>Signed-off-by Myron Stowe <[email protected]>Signed-off-by Bjorn Helgaas <[email protected]>CC Matthew Wilcox <[email protected]>Signed-off-by Ben Hutchings <[email protected]>--- drivers/pci/probe.c | 3 +++ 1 file changed, 3 insertions(+)drivers/pci/probe.c +3
-0@@ -175,14 +175,17 @@ int __pci_read_base(struct pci_dev *dev, res->flags |=IORESOURCE_SIZEALIGN ;if (res->flags &IORESOURCE_IO ) { l &=PCI_BASE_ADDRESS_IO_MASK ; + sz &=PCI_BASE_ADDRESS_IO_MASK ; mask =PCI_BASE_ADDRESS_IO_MASK & (u32 )IO_SPACE_LIMIT ; }else { l &=PCI_BASE_ADDRESS_MEM_MASK ; + sz &=PCI_BASE_ADDRESS_MEM_MASK ; mask = (u32 )PCI_BASE_ADDRESS_MEM_MASK ; } }else { res->flags |= (l &IORESOURCE_ROM_ENABLE ); l &=PCI_ROM_ADDRESS_MASK ; + sz &=PCI_ROM_ADDRESS_MASK ; mask = (u32 )PCI_ROM_ADDRESS_MASK ; }
Re: [PATCH 3.2 015/152] PCI: Restore detection of read-only BARs
Quoted 5 lines · Bjorn Helgaas
Quoted 1 line · Ben Hutchings
3.2.67-rc1 review patch. If anyone has any objections, please let me know.
No objections, but I think you want
06cf35f903aa("PCI: Handle read-only BARs on AMD CS553x devices") at the same time.
Thanks, I've added that as well. For the pending stable update, I only checked 'cc: stable' commits in mainline up to 3.19-rc7 so I hadn't yet seen that.
Ben.
Quoted 61 lines
Quoted 61 lines
------------------
From: Myron Stowe <[email protected]>
commit
36e8164882ca6d3c41cb91e6f09a3ed236841f80upstream.Commit
6ac665c63dca("PCI: rewrite PCI BAR reading code") masked off low-order bits from 'l', but not from 'sz'. Both are passed topci_size(), which compares 'base == maxbase' to check for read-only BARs. The masking of 'l' means that comparison will never be 'true', so the check for read-only BARs no longer works.Resolve this by also masking off the low-order bits of 'sz' before passing it into
pci_size()as 'maxbase'. With this change,pci_size()will once again catch the problems that have been encountered to date:- AGP aperture BAR of AMD-7xx host bridges: if the AGP window is
disabled, this BAR is read-only and read as 0x00000008 [1]- BARs 0-4 of ALi IDE controllers can be non-zero and read-only [1]
- Intel Sandy Bridge - Thermal Management Controller [8086:0103];
BAR 0 returning 0xfed98004 [2]- Intel Xeon E5 v3/Core i7 Power Control Unit [8086:2fc0]; Bar 0 returning 0x00001a [3]Link [1] https://git.kernel.org/cgit/linux/kernel/git/tglx/history.git/commit/drivers/pci/probe.c?id=1307ef6621991f1c4bc3cec1b5a4ebd6fd3d66b9 ("PCI: probing read-only BARs" (pre-git))Reported-by William Unruh <[email protected]>Reported-by Martin Lucina <[email protected]>Signed-off-by Myron Stowe <[email protected]>Signed-off-by Bjorn Helgaas <[email protected]>CC Matthew Wilcox <[email protected]>Signed-off-by Ben Hutchings <[email protected]>--- drivers/pci/probe.c | 3 +++ 1 file changed, 3 insertions(+)drivers/pci/probe.c +3
-0@@ -175,14 +175,17 @@ int __pci_read_base(struct pci_dev *dev, res->flags |=IORESOURCE_SIZEALIGN ;if (res->flags &IORESOURCE_IO ) { l &=PCI_BASE_ADDRESS_IO_MASK ; + sz &=PCI_BASE_ADDRESS_IO_MASK ; mask =PCI_BASE_ADDRESS_IO_MASK & (u32 )IO_SPACE_LIMIT ; }else { l &=PCI_BASE_ADDRESS_MEM_MASK ; + sz &=PCI_BASE_ADDRESS_MEM_MASK ; mask = (u32 )PCI_BASE_ADDRESS_MEM_MASK ; } }else { res->flags |= (l &IORESOURCE_ROM_ENABLE ); l &=PCI_ROM_ADDRESS_MASK ; + sz &=PCI_ROM_ADDRESS_MASK ; mask = (u32 )PCI_ROM_ADDRESS_MASK ; }
Signature · 2 lines
Ben Hutchings To err is human; to really foul things up requires a computer.
PATCH 16/152 scsi: correct return values for .eh_abort_handler implementations
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Reinecke <[email protected]>
commit b6c92b7e0af575e2b8b05bdf33633cf9e1661cbf upstream.
The .eh_abort_handler needs to return SUCCESS, FAILED, or FAST_IO_FAIL. So fixup all callers to adhere to this requirement.
---
drivers/scsi/NCR5380.c +6 -6
@@ -2662,14 +2662,14 @@ static void NCR5380_dma_complete(NCR5380* * Purpose : abort a command * -* Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the -* host byte of the result field to, if zero DID_ABORTED is +* Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the +* host byte of the result field to, if zero DID_ABORTED is * used. * -* Returns : 0 - success, -1 on failure. +* Returns : SUCCESS - success, FAILED on failure. * -* XXX - there is no way to abort the command that is currently -* connected, you have to wait for it to complete. If this is +* XXX - there is no way to abort the command that is currently +* connected, you have to wait for it to complete. If this is * a problem, we could implement longjmp() / setjmp(), setjmp() * called where the loop started in NCR5380_main(). *
@@ -2719,7 +2719,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd* aborted flag and get back into our main loop. */ - return 0; + return SUCCESS; }#endif
drivers/scsi/aha1740.c +1 -1
@@ -551,7 +551,7 @@ static int aha1740_eh_abort_handler (Scs* quiet as possible... */ -return 0 ; +return SUCCESS ; }static struct scsi_host_template aha1740_template = {
drivers/scsi/atari_NCR5380.c +1 -1
@@ -2638,7 +2638,7 @@ static void NCR5380_reselect(struct Scsi* host byte of the result field to, if zero DID_ABORTED is * used. * -* Returns : 0 - success, -1 on failure. +* Returns : SUCCESS - success, FAILED on failure. * * XXX - there is no way to abort the command that is currently * connected, you have to wait for it to complete. If this is
drivers/scsi/megaraid.c +4 -4
@@ -1964,7 +1964,7 @@ megaraid_abort_and_reset(adapter_t *adap cmd->device->id, cmd->device->lun);if (list_empty (&adapter->pending_list)) -return FALSE; +return FAILED ;list_for_each_safe (pos, next, &adapter->pending_list) {
@@ -1987,7 +1987,7 @@ megaraid_abort_and_reset(adapter_t *adap (aor==SCB_ABORT ) ?"ABORTING" :"RESET" , scb->idx); -return FALSE; +return FAILED ; }else {
@@ -2012,12 +2012,12 @@ megaraid_abort_and_reset(adapter_t *adaplist_add_tail (SCSI_LIST (cmd), &adapter->completed_list); -return TRUE; +return SUCCESS ; } } } -return FALSE; +return FAILED ; } static inline int
drivers/scsi/sun3_NCR5380.c +5 -5
@@ -2624,15 +2624,15 @@ static void NCR5380_reselect (struct Scs* Purpose : abort a command * * Inputs : cmd - the struct scsi_cmnd to abort, code - code to set the -* host byte of the result field to, if zero DID_ABORTED is +* host byte of the result field to, if zero DID_ABORTED is * used. * -* Returns : 0 - success, -1 on failure. +* Returns : SUCCESS - success, FAILED on failure. * -* XXX - there is no way to abort the command that is currently -* connected, you have to wait for it to complete. If this is +* XXX - there is no way to abort the command that is currently +* connected, you have to wait for it to complete. If this is * a problem, we could implement longjmp() / setjmp(), setjmp() -* called where the loop started in NCR5380_main(). +* called where the loop started in NCR5380_main(). */ static int NCR5380_abort (struct scsi_cmnd *cmd)
PATCH 17/152 bus: omap_l3_noc: Correct returning IRQ_HANDLED unconditionally in the irq handler
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Keerthy <[email protected]>
commit c4cf0935a2d8fe6d186bf4253ea3c4b4a8a8a710 upstream.
Correct returning IRQ_HANDLED unconditionally in the irq handler. Return IRQ_NONE for some interrupt which we do not expect to be handled in this handler. This prevents kernel stalling with back to back spurious interrupts.
---
arch/arm/mach-omap2/omap_l3_noc.c +7 -3
@@ -121,11 +121,15 @@ static irqreturn_t l3_interrupt_handler(/* Nothing to be handled here as of now */ break ; } -/* Error found so break the for loop */ -break ; +/* Error found so break the for loop */ +return IRQ_HANDLED ; } } -return IRQ_HANDLED ; + +dev_err (l3->dev,"L3 %s IRQ not handled!!\n" , + inttype ?"debug" :"application" ); + +return IRQ_NONE ; }static int __devinit omap4_l3_probe (struct platform_device *pdev)
PATCH 18/152 genhd: check for int overflow in disk_expand_part_tbl()
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit 5fabcb4c33fe11c7e3afdf805fde26c1a54d0953 upstream.
We can get here from blkdev_ioctl() -> blkpg_ioctl() -> add_partition() with a user passed in partno value. If we pass in 0x7fffffff, the new target in disk_expand_part_tbl() overflows the 'int' and we access beyond the end of ptbl->part[] and even write to it when we do the rcu_assign_pointer() to assign the new partition.
--- block/genhd.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
block/genhd.c +9 -2
@@ -1070,9 +1070,16 @@ int disk_expand_part_tbl(struct gendiskstruct disk_part_tbl *old_ptbl = disk->part_tbl;struct disk_part_tbl *new_ptbl;int len = old_ptbl ? old_ptbl->len :0 ; -int target = partno +1 ; +int i, target;size_t size; -int i; + +/* +* check for int overflow, since we can get here from blkpg_ioctl() +* with a user passed 'partno'. +*/ + target = partno +1 ; +if (target <0 ) +return -EINVAL ;/* disk_max_parts() is zero during initialization, ignore if so */ if (disk_max_parts (disk) && target >disk_max_parts (disk))
PATCH 19/152 USB: cdc-acm: check for valid interfaces
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 403dff4e2c94f275e24fd85f40b2732ffec268a1 upstream.
We need to check that we have both a valid data and control inteface for both types of headers (union and not union.)
References: https://bugzilla.kernel.org/show_bug.cgi?id=83551
--- drivers/usb/class/cdc-acm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/usb/class/cdc-acm.c +5 -4
@@ -1011,10 +1011,11 @@ next_desc: }else { control_interface =usb_ifnum_to_if (usb_dev, union_header->bMasterInterface0); data_interface =usb_ifnum_to_if (usb_dev, (data_interface_num = union_header->bSlaveInterface0)); -if (!control_interface || !data_interface) { -dev_dbg (&intf->dev,"no interfaces\n" ); -return -ENODEV ; - } + } + +if (!control_interface || !data_interface) { +dev_dbg (&intf->dev,"no interfaces\n" ); +return -ENODEV ; }if (data_interface_num != call_interface_num)
PATCH 20/152 uvcvideo: Fix destruction order in uvc_delete()
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 2228d80dd05a4fc5a410fde847677b8fb3eb23d7 upstream.
We've got a bug report at disconnecting a Webcam, where the kernel spews warnings like below:
WARNING: CPU: 0 PID: 8385 at ../fs/sysfs/group.c:219 sysfs_remove_group+0x87/0x90()
sysfs group c0b2350c not found for kobject 'event3'
CPU: 0 PID: 8385 Comm: queue2:src Not tainted 3.16.2-1.gdcee397-default #1
Hardware name: ASUSTeK Computer INC. A7N8X-E/A7N8X-E, BIOS ASUS A7N8X-E Deluxe ACPI BIOS Rev 1013 11/12/2004
c08d0705 ddc75cbc c0718c5b ddc75ccc c024b654 c08c6d44 ddc75ce8 000020c1
c08d0705 000000db c03d1ec7 c03d1ec7 00000009 00000000 c0b2350c d62c9064
ddc75cd4 c024b6a3 00000009 ddc75ccc c08c6d44 ddc75ce8 ddc75cfc c03d1ec7
Call Trace:
[<c0205ba6>] try_stack_unwind+0x156/0x170
[<c02046f3>] dump_trace+0x53/0x180
[<c0205c06>] show_trace_log_lvl+0x46/0x50
[<c0204871>] show_stack_log_lvl+0x51/0xe0
[<c0205c67>] show_stack+0x27/0x50
[<c0718c5b>] dump_stack+0x3e/0x4e
[<c024b654>] warn_slowpath_common+0x84/0xa0
[<c024b6a3>] warn_slowpath_fmt+0x33/0x40
[<c03d1ec7>] sysfs_remove_group+0x87/0x90
[<c05a2c54>] device_del+0x34/0x180
[<c05e3989>] evdev_disconnect+0x19/0x50
[<c05e06fa>] __input_unregister_device+0x9a/0x140
[<c05e0845>] input_unregister_device+0x45/0x80
[<f854b1d6>] uvc_delete+0x26/0x110 [uvcvideo]
[<f84d66f8>] v4l2_device_release+0x98/0xc0 [videodev]
[<c05a25bb>] device_release+0x2b/0x90
[<c04ad8bf>] kobject_cleanup+0x6f/0x1a0
[<f84d5453>] v4l2_release+0x43/0x70 [videodev]
[<c0372f31>] __fput+0xb1/0x1b0
[<c02650c1>] task_work_run+0x91/0xb0
[<c024d845>] do_exit+0x265/0x910
[<c024df64>] do_group_exit+0x34/0xa0
[<c025a76f>] get_signal_to_deliver+0x17f/0x590
[<c0201b6a>] do_signal+0x3a/0x960
[<c02024f7>] do_notify_resume+0x67/0x90
[<c071ebb5>] work_notifysig+0x30/0x3b
[<b7739e60>] 0xb7739e5f
---[ end trace b1e56095a485b631 ]---The cause is that uvc_status_cleanup() is called after usb_put_*() in uvc_delete(). usb_put_*() removes the sysfs parent and eventually removes the children recursively, so the later device_del() can't find its sysfs. The fix is simply rearrange the call orders in uvc_delete() so that the child is removed before the parent.
Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=897736
--- drivers/media/video/uvc/uvc_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/video/uvc/uvc_driver.c +3 -3
@@ -1597,12 +1597,12 @@ static void uvc_delete(struct uvc_device {struct list_head *p, *n; -usb_put_intf (dev->intf); -usb_put_dev (dev->udev); -uvc_status_cleanup (dev);uvc_ctrl_cleanup_device (dev); +usb_put_intf (dev->intf); +usb_put_dev (dev->udev); +if (dev->vdev.dev)v4l2_device_unregister (&dev->vdev);#ifdef CONFIG_MEDIA_CONTROLLER
PATCH 21/152 mfd: tc6393xb: Fail ohci suspend if full state restore is required
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Eremin-Solenikov <[email protected]>
commit 1a5fb99de4850cba710d91becfa2c65653048589 upstream.
Some boards with TC6393XB chip require full state restore during system resume thanks to chip's VCC being cut off during suspend (Sharp SL-6000 tosa is one of them). Failing to do so would result in ohci Oops on resume due to internal memory contentes being changed. Fail ohci suspend on tc6393xb is full state restore is required.
Recommended workaround is to unbind tmio-ohci driver before suspend and rebind it after resume.
--- drivers/mfd/tc6393xb.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/mfd/tc6393xb.c +12 -1
@@ -263,6 +263,17 @@ static int tc6393xb_ohci_disable(structreturn 0 ; } +static int tc6393xb_ohci_suspend (struct platform_device *dev) +{ +struct tc6393xb_platform_data *tcpd =dev_get_platdata (dev->dev.parent); + +/* We can't properly store/restore OHCI state, so fail here */ +if (tcpd->resume_restore) +return -EBUSY ; + +return tc6393xb_ohci_disable (dev); +} +static int tc6393xb_fb_enable (struct platform_device *dev) {struct tc6393xb *tc6393xb =dev_get_drvdata (dev->dev.parent);
@@ -403,7 +414,7 @@ static struct mfd_cell __devinitdata tc6 .num_resources = ARRAY_SIZE(tc6393xb_ohci_resources), .resources = tc6393xb_ohci_resources, .enable = tc6393xb_ohci_enable, - .suspend = tc6393xb_ohci_disable, + .suspend = tc6393xb_ohci_suspend, .resume = tc6393xb_ohci_enable, .disable = tc6393xb_ohci_disable, },
PATCH 22/152 serial: samsung: wait for transfer completion before clock disable
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Robert Baldyga <[email protected]>
commit 1ff383a4c3eda8893ec61b02831826e1b1f46b41 upstream.
This patch adds waiting until transmit buffer and shifter will be empty before clock disabling.
Without this fix it's possible to have clock disabled while data was not transmited yet, which causes unproper state of TX line and problems in following data transfers.
--- drivers/tty/serial/samsung.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/samsung.c +4 -0
@@ -519,11 +519,15 @@ static void s3c24xx_serial_pm(struct uar unsigned int old) {struct s3c24xx_uart_port *ourport =to_ourport (port); +int timeout =10000 ; ourport->pm_level = level;switch (level) {case 3 : +while (--timeout && !s3c24xx_serial_txempty_nofifo (port)) +udelay (100 ); +if (!IS_ERR (ourport->baudclk) && ourport->baudclk !=NULL )clk_disable (ourport->baudclk);
PATCH 23/152 Bluetooth: btusb: Add support for Belkin F8065bf
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ken O'Brien <[email protected]>
commit 5bcecf325378218a8e248bb6bcae96ec7362f8ef upstream.
Add generic rule on encountering Belkin bluetooth usb device F8065bf.
Relevant section from /sys/kernel/debug/usb/devices:
T: Bus=03 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=050d ProdID=065a Rev= 1.12 S: Manufacturer=Broadcom Corp S: Product=BCM20702A0 S: SerialNumber=0002723E2D29 C:* #Ifs= 4 Cfg#= 1 Atr=a0 MxPwr=100mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) 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=ff(vend.) 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 I: If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms
--- drivers/bluetooth/btusb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/bluetooth/btusb.c +3 -0
@@ -119,6 +119,9 @@ static struct usb_device_id btusb_table[/*Broadcom devices with vendor specific id */ { USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) }, +/* Belkin F8065bf - Broadcom based */ + { USB_VENDOR_AND_INTERFACE_INFO(0x050d, 0xff, 0x01, 0x01) }, + { } /* Terminating entry */ };
PATCH 24/152 Bluetooth: ath3k: Add support for a new AR3012 device
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Sujith Manoharan <[email protected]>
commit 35580d223b6b04d9a570e4fe377c46a102413fe8 upstream.
T: Bus=02 Lev=01 Prnt=01 Port=04 Cnt=01 Dev#= 9 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0489 ProdID=e05f Rev= 0.02
C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
A: FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=01 I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -96,6 +96,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x13d3, 0x3402) }, { USB_DEVICE(0x0cf3, 0x3121) }, { USB_DEVICE(0x0cf3, 0xe003) }, + { USB_DEVICE(0x0489, 0xe05f) },/* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xE02C) },
@@ -139,6 +140,7 @@ static struct usb_device_id ath3k_blist_ { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 }, /* Atheros AR5BBU22 with sflash firmware */ { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
@@ -170,6 +170,7 @@ static struct usb_device_id blacklist_ta { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 }, /* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
PATCH 25/152 Bluetooth: ath3k: Add support for another AR3012 card
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Sujith Manoharan <[email protected]>
commit bd0fca1b2be8c96dfc391a2bc2ee4ce6970ae6af upstream.
T: Bus=03 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=04ca ProdID=300b Rev= 0.01
C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
A: FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=01 I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -83,6 +83,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x04CA, 0x3006) }, { USB_DEVICE(0x04CA, 0x3007) }, { USB_DEVICE(0x04CA, 0x3008) }, + { USB_DEVICE(0x04CA, 0x300b) }, { USB_DEVICE(0x13d3, 0x3362) }, { USB_DEVICE(0x0CF3, 0xE004) }, { USB_DEVICE(0x0CF3, 0xE005) },
@@ -127,6 +128,7 @@ static struct usb_device_id ath3k_blist_ { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04ca, 0x300b), .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 },
drivers/bluetooth/btusb.c +1 -0
@@ -157,6 +157,7 @@ static struct usb_device_id blacklist_ta { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04ca, 0x300b), .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 },
PATCH 26/152 Bluetooth: Add support for Toshiba Bluetooth device [0930:0220]
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Marco Piazza <[email protected]>
commit bd0976dd3379e790b031cef7f477c58b82a65fc2 upstream.
This patch adds support for new Toshiba Bluetooth device.
T: Bus=05 Lev=01 Prnt=01 Port=02 Cnt=02 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0930 ProdID=0220 Rev=00.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 I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -88,6 +88,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x0CF3, 0xE004) }, { USB_DEVICE(0x0CF3, 0xE005) }, { USB_DEVICE(0x0930, 0x0219) }, + { USB_DEVICE(0x0930, 0x0220) }, { USB_DEVICE(0x0489, 0xe057) }, { USB_DEVICE(0x13d3, 0x3393) }, { USB_DEVICE(0x0489, 0xe04e) },
@@ -133,6 +134,7 @@ static struct usb_device_id ath3k_blist_ { 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(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
@@ -162,6 +162,7 @@ static struct usb_device_id blacklist_ta { 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(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
PATCH 27/152 Bluetooth: Enable Atheros 0cf3:311e for firmware upload
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit b131237ca3995edad9efc162d0bc959c3b1dddc2 upstream.
The device will bind to btusb without firmware, but with the original buggy firmware device discovery does not work. No devices are detected.
Device descriptor without firmware:
T: Bus=03 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0cf3 ProdID=311e Rev= 0.01 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 I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms
with firmware:
T: Bus=03 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0cf3 ProdID=311e 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 I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms
--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -76,6 +76,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x0CF3, 0x3004) }, { USB_DEVICE(0x0CF3, 0x3008) }, { USB_DEVICE(0x0CF3, 0x311D) }, + { USB_DEVICE(0x0CF3, 0x311E) }, { USB_DEVICE(0x0CF3, 0x817a) }, { USB_DEVICE(0x13d3, 0x3375) }, { USB_DEVICE(0x04CA, 0x3004) },
@@ -122,6 +123,7 @@ static struct usb_device_id ath3k_blist_ { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0cf3, 0x311E), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
@@ -150,6 +150,7 @@ static struct usb_device_id blacklist_ta { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0cf3, 0x311e), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
PATCH 28/152 Bluetooth: Add firmware update for Atheros 0cf3:311f
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 1e56f1eb2bbeab0ddc3a1e536d2a0065cfe4c131 upstream.
The device is not functional without firmware.
The device without firmware:
T: Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0cf3 ProdID=311f Rev=00.01 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 I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
The device with firmware:
T: Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0cf3 ProdID=3007 Rev=00.01 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 I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -77,6 +77,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x0CF3, 0x3008) }, { USB_DEVICE(0x0CF3, 0x311D) }, { USB_DEVICE(0x0CF3, 0x311E) }, + { USB_DEVICE(0x0CF3, 0x311F) }, { USB_DEVICE(0x0CF3, 0x817a) }, { USB_DEVICE(0x13d3, 0x3375) }, { USB_DEVICE(0x04CA, 0x3004) },
@@ -124,6 +125,7 @@ static struct usb_device_id ath3k_blist_ { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x311E), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0cf3, 0x311F), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
@@ -151,6 +151,7 @@ static struct usb_device_id blacklist_ta { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x311e), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0cf3, 0x311f), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
PATCH 29/152 Bluetooth: btusb: Add IMC Networks (Broadcom based)
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jurgen Kramer <[email protected]>
commit 9113bfd82dc8ece9cbb898df8794f58a78a36e97 upstream.
Add support for IMC Networks (Broadcom based) to btusb driver.
Below the output of /sys/kernel/debug/usb/devices for this device:
T: Bus=01 Lev=02 Prnt=02 Port=04 Cnt=01 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3404 Rev= 1.12 S: Manufacturer=Broadcom Corp S: Product=BCM20702A0 S: SerialNumber=240A649F8246 C:* #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr= 0mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) 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=ff(vend.) 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 I: If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=84(I) Atr=02(Bulk) MxPS= 32 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 32 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
--- drivers/bluetooth/btusb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/bluetooth/btusb.c +3 -0
@@ -122,6 +122,9 @@ static struct usb_device_id btusb_table[/* Belkin F8065bf - Broadcom based */ { USB_VENDOR_AND_INTERFACE_INFO(0x050d, 0xff, 0x01, 0x01) }, +/* IMC Networks - Broadcom based */ + { USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01) }, + { } /* Terminating entry */ };
PATCH 30/152 Bluetooth: sort the list of IDs in the source code
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
commit 0b8800623d3f12dd40a039aa191d52bfa4eef5b4 upstream.
This will help to manage table of supported IDs.
There is no functional change.
[bwh: Backported to 3.2: sort 04ca:3007 which was added after this upstream
but already added here]
--- drivers/bluetooth/ath3k.c | 78 +++++++++++++++++++++++------------------------ drivers/bluetooth/btusb.c | 52 +++++++++++++++---------------- 2 files changed, 65 insertions(+), 65 deletions(-)
drivers/bluetooth/ath3k.c +41 -41
@@ -61,53 +61,53 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x0CF3, 0x3000) },/* Atheros AR3011 with sflash firmware*/ + { USB_DEVICE(0x0489, 0xE027) }, + { USB_DEVICE(0x0489, 0xE03D) }, + { USB_DEVICE(0x0930, 0x0215) }, { USB_DEVICE(0x0CF3, 0x3002) }, { USB_DEVICE(0x0CF3, 0xE019) }, { USB_DEVICE(0x13d3, 0x3304) }, - { USB_DEVICE(0x0930, 0x0215) }, - { USB_DEVICE(0x0489, 0xE03D) }, - { USB_DEVICE(0x0489, 0xE027) },/* Atheros AR9285 Malbec with sflash firmware */ { USB_DEVICE(0x03F0, 0x311D) },/* Atheros AR3012 with sflash firmware*/ + { USB_DEVICE(0x0489, 0xe04d) }, + { USB_DEVICE(0x0489, 0xe04e) }, + { USB_DEVICE(0x0489, 0xe057) }, + { USB_DEVICE(0x0489, 0xe056) }, + { USB_DEVICE(0x0489, 0xe05f) }, + { USB_DEVICE(0x04c5, 0x1330) }, + { USB_DEVICE(0x04CA, 0x3004) }, + { USB_DEVICE(0x04CA, 0x3005) }, + { USB_DEVICE(0x04CA, 0x3006) }, + { USB_DEVICE(0x04CA, 0x3007) }, + { USB_DEVICE(0x04CA, 0x3008) }, + { USB_DEVICE(0x04CA, 0x300b) }, + { USB_DEVICE(0x0930, 0x0219) }, + { USB_DEVICE(0x0930, 0x0220) }, { USB_DEVICE(0x0CF3, 0x0036) }, { USB_DEVICE(0x0CF3, 0x3004) }, { USB_DEVICE(0x0CF3, 0x3008) }, { USB_DEVICE(0x0CF3, 0x311D) }, { USB_DEVICE(0x0CF3, 0x311E) }, { USB_DEVICE(0x0CF3, 0x311F) }, + { USB_DEVICE(0x0cf3, 0x3121) }, { USB_DEVICE(0x0CF3, 0x817a) }, - { USB_DEVICE(0x13d3, 0x3375) }, - { USB_DEVICE(0x04CA, 0x3004) }, - { USB_DEVICE(0x04CA, 0x3005) }, - { USB_DEVICE(0x04CA, 0x3006) }, - { USB_DEVICE(0x04CA, 0x3007) }, - { USB_DEVICE(0x04CA, 0x3008) }, - { USB_DEVICE(0x04CA, 0x300b) }, - { USB_DEVICE(0x13d3, 0x3362) }, + { USB_DEVICE(0x0cf3, 0xe003) }, { USB_DEVICE(0x0CF3, 0xE004) }, { USB_DEVICE(0x0CF3, 0xE005) }, - { USB_DEVICE(0x0930, 0x0219) }, - { USB_DEVICE(0x0930, 0x0220) }, - { USB_DEVICE(0x0489, 0xe057) }, + { USB_DEVICE(0x13d3, 0x3362) }, + { USB_DEVICE(0x13d3, 0x3375) }, { USB_DEVICE(0x13d3, 0x3393) }, - { USB_DEVICE(0x0489, 0xe04e) }, - { USB_DEVICE(0x0489, 0xe056) }, - { USB_DEVICE(0x0489, 0xe04d) }, - { USB_DEVICE(0x04c5, 0x1330) }, { USB_DEVICE(0x13d3, 0x3402) }, - { USB_DEVICE(0x0cf3, 0x3121) }, - { USB_DEVICE(0x0cf3, 0xe003) }, - { USB_DEVICE(0x0489, 0xe05f) },/* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xE02C) },/* Atheros AR5BBU22 with sflash firmware */ - { USB_DEVICE(0x0489, 0xE03C) }, { USB_DEVICE(0x0489, 0xE036) }, + { USB_DEVICE(0x0489, 0xE03C) }, { } /* Terminating entry */ };
@@ -120,39 +120,39 @@ MODULE_DEVICE_TABLE(usb, ath3k_table);static struct usb_device_id ath3k_blist_tbl[] = {/* Atheros AR3012 with sflash firmware*/ + {USB_DEVICE (0x0489 ,0xe04e ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0489 ,0xe04d ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0489 ,0xe056 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0489 ,0xe057 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0489 ,0xe05f ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x04c5 ,0x1330 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x04ca ,0x3004 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x04ca ,0x3005 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x04ca ,0x3006 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x04ca ,0x3007 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x04ca ,0x3008 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x04ca ,0x300b ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0930 ,0x0219 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0930 ,0x0220 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0CF3 ,0x0036 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0x3004 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0x3008 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0x311D ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0x311E ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0x311F ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0cf3 ,0x3121 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0CF3 ,0x817a ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x13d3 ,0x3375 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x04ca ,0x3004 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x04ca ,0x3005 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x04ca ,0x3006 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x04ca ,0x3007 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x04ca ,0x3008 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x04ca ,0x300b ), .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 (0x0930 ,0x0220 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x0489 ,0xe057 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0cf3 ,0xe003 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x13d3 ,0x3362 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x13d3 ,0x3375 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x13d3 ,0x3393 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x0489 ,0xe04e ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x0489 ,0xe056 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x0489 ,0xe04d ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x04c5 ,0x1330 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x13d3 ,0x3402 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x0cf3 ,0x3121 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x0cf3 ,0xe003 ), .driver_info =BTUSB_ATH3012 }, - {USB_DEVICE (0x0489 ,0xe05f ), .driver_info =BTUSB_ATH3012 },/* Atheros AR5BBU22 with sflash firmware */ - {USB_DEVICE (0x0489 ,0xE03C ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0489 ,0xE036 ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0489 ,0xE03C ), .driver_info =BTUSB_ATH3012 }, { }/* Terminating entry */ };
drivers/bluetooth/btusb.c +27 -27
101 lines not on this page · raw message
PATCH 31/152 Bluetooth: append new supported device to the list [0b05:17d0]
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
commit a735f9e22432899cee188d167966782c29246390 upstream.
The device found on Asus Z87 Expert motherboard requires firmware to work correctly.
T: Bus=03 Lev=01 Prnt=01 Port=03 Cnt=02 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0b05 ProdID=17d0 Rev=00.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 I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -86,6 +86,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x04CA, 0x300b) }, { USB_DEVICE(0x0930, 0x0219) }, { USB_DEVICE(0x0930, 0x0220) }, + { USB_DEVICE(0x0b05, 0x17d0) }, { USB_DEVICE(0x0CF3, 0x0036) }, { USB_DEVICE(0x0CF3, 0x3004) }, { USB_DEVICE(0x0CF3, 0x3008) },
@@ -134,6 +135,7 @@ static struct usb_device_id ath3k_blist_ { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
@@ -163,6 +163,7 @@ static struct usb_device_id blacklist_ta { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
PATCH 32/152 Bluetooth: Add support for Intel bootloader devices
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Marcel Holtmann <[email protected]>
commit 40df783d1ef1989ac454e3dfcda017270b8950e6 upstream.
Intel Bluetooth devices that boot up in bootloader mode can not be used as generic HCI devices, but their HCI transport is still valuable and so bring that up as raw-only devices.
T: Bus=02 Lev=02 Prnt=03 Port=00 Cnt=01 Dev#= 14 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=ff(vend.) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=8087 ProdID=0a5a Rev= 0.00 S: Manufacturer=Intel(R) Corporation S: Product=Intel(R) Wilkins Peak 2x2 S: SerialNumber=001122334455 WP_A0 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=1ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms
--- drivers/bluetooth/btusb.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/bluetooth/btusb.c +7 -0
@@ -55,6 +55,7 @@ static struct usb_driver btusb_driver;#define BTUSB_BROKEN_ISOC 0x20#define BTUSB_WRONG_SCO_MTU 0x40#define BTUSB_ATH3012 0x80 +#define BTUSB_INTEL_BOOT 0x200static struct usb_device_id btusb_table[] = {/* Generic Bluetooth USB device */
@@ -125,6 +126,9 @@ static struct usb_device_id btusb_table[/* IMC Networks - Broadcom based */ { USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01) }, + /* Intel Bluetooth USB Bootloader (RAM module) */ + { USB_DEVICE(0x8087, 0x0a5a), .driver_info = BTUSB_INTEL_BOOT }, + { }/* Terminating entry */ };
@@ -1070,6 +1074,9 @@ static int btusb_probe(struct usb_interf hdev->owner =THIS_MODULE ; +if (id->driver_info &BTUSB_INTEL_BOOT ) +set_bit (HCI_QUIRK_RAW_DEVICE , &hdev->quirks); +/* Interface numbers are hardcoded in the specification */ data->isoc =usb_ifnum_to_if (data->udev,1 );
PATCH 33/152 Bluetooth: Ignore isochronous endpoints for Intel USB bootloader
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Marcel Holtmann <[email protected]>
commit d92f2df0565ea04101d6ac04bdc10feeb1d93c94 upstream.
The isochronous endpoints are not valid when the Intel Bluetooth controller boots up in bootloader mode. So just mark these endpoints as broken and then they will not be configured.
--- drivers/bluetooth/btusb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/bluetooth/btusb.c +2 -1
@@ -127,7 +127,8 @@ static struct usb_device_id btusb_table[ { USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01) }, /* Intel Bluetooth USB Bootloader (RAM module) */ - { USB_DEVICE(0x8087, 0x0a5a), .driver_info = BTUSB_INTEL_BOOT }, + { USB_DEVICE(0x8087, 0x0a5a), + .driver_info = BTUSB_INTEL_BOOT | BTUSB_BROKEN_ISOC }, { } /* Terminating entry */ };
PATCH 34/152 Bluetooth: Add support for Acer [13D3:3432]
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Anantha Krishnan <[email protected]>
commit fa2f1394fe9c1a217213f02df77812701de6362f upstream.
Add support for the QCA6174 chip.
T: Bus=04 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 30 Spd=12 MxCh= 0
D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=13d3 ProdID=3432 Rev=00.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
I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -102,6 +102,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x13d3, 0x3375) }, { USB_DEVICE(0x13d3, 0x3393) }, { USB_DEVICE(0x13d3, 0x3402) }, + { USB_DEVICE(0x13d3, 0x3432) },/* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xE02C) },
@@ -151,6 +152,7 @@ static struct usb_device_id ath3k_blist_ { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 }, /* Atheros AR5BBU22 with sflash firmware */ { USB_DEVICE(0x0489, 0xE036), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
@@ -184,6 +184,7 @@ static struct usb_device_id blacklist_ta { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 }, /* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
PATCH 35/152 Bluetooth: Add support for Broadcom device of Asus Z97-DELUXE motherboard
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Marcel Holtmann <[email protected]>
commit c2aef6e8cbebd60f79555baeb9266e220f135a44 upstream.
The Asus Z97-DELUXE motherboard contains a Broadcom based Bluetooth controller on the USB bus. However vendor and product ID are listed as ASUSTek Computer.
T: Bus=01 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0b05 ProdID=17cf Rev= 1.12 S: Manufacturer=Broadcom Corp S: Product=BCM20702A0 S: SerialNumber=54271E910064 C:* #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr= 0mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) 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=ff(vend.) 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 I: If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=84(I) Atr=02(Bulk) MxPS= 32 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 32 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
--- drivers/bluetooth/btusb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/bluetooth/btusb.c +3 -0
@@ -120,6 +120,9 @@ static struct usb_device_id btusb_table[/* Broadcom devices with vendor specific id */ { USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) }, +/* ASUSTek Computer - Broadcom based */ + { USB_VENDOR_AND_INTERFACE_INFO(0x0b05, 0xff, 0x01, 0x01) }, +/* Belkin F8065bf - Broadcom based */ { USB_VENDOR_AND_INTERFACE_INFO(0x050d, 0xff, 0x01, 0x01) },
PATCH 36/152 Add a new PID/VID 0227/0930 for AR3012.
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Vincent Zwanenburg <[email protected]>
commit 89d2975fa06e66ea0d3665d91f799fb1ce4b8bad upstream.
usb devices info:
T: Bus=01 Lev=02 Prnt=05 Port=00 Cnt=01 Dev#= 20 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0930 ProdID=0227 Rev= 0.02 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA A: FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=01 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 I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms
--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -86,6 +86,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x04CA, 0x300b) }, { USB_DEVICE(0x0930, 0x0219) }, { USB_DEVICE(0x0930, 0x0220) }, + { USB_DEVICE(0x0930, 0x0227) }, { USB_DEVICE(0x0b05, 0x17d0) }, { USB_DEVICE(0x0CF3, 0x0036) }, { USB_DEVICE(0x0CF3, 0x3004) },
@@ -136,6 +137,7 @@ static struct usb_device_id ath3k_blist_ { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
@@ -171,6 +171,7 @@ static struct usb_device_id blacklist_ta { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
PATCH 37/152 Bluetooth: Add support for Acer [0489:e078]
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Anantha Krishnan <[email protected]>
commit 4b552bc9edfdc947862af225a0e2521edb5d37a0 upstream.
Add support for the QCA6174 chip.
T: Bus=06 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#= 3 Spd=12 MxCh= 0
D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=0489 ProdID=e078 Rev=00.01
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
I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -77,6 +77,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x0489, 0xe057) }, { USB_DEVICE(0x0489, 0xe056) }, { USB_DEVICE(0x0489, 0xe05f) }, + { USB_DEVICE(0x0489, 0xe078) }, { USB_DEVICE(0x04c5, 0x1330) }, { USB_DEVICE(0x04CA, 0x3004) }, { USB_DEVICE(0x04CA, 0x3005) },
@@ -128,6 +129,7 @@ static struct usb_device_id ath3k_blist_ { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe078), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
@@ -162,6 +162,7 @@ static struct usb_device_id blacklist_ta { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe078), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
PATCH 38/152 Bluetooth: ath3k: Add support of MCI 13d3:3408 bt device
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Tunin <[email protected]>
commit 3bb30a7cdf9242aca90d49aa41baebf9458f96f0 upstream.
Add support for Bluetooth MCI WB335 (AR9565) Wi-Fi+bt module. This Bluetooth module requires loading patch and sysconfig by ath3k driver.
T: Bus=01 Lev=02 Prnt=03 Port=00 Cnt=01 Dev#= 20 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3408 Rev= 0.02 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA A: FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=01 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 I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms
--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -104,6 +104,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x13d3, 0x3375) }, { USB_DEVICE(0x13d3, 0x3393) }, { USB_DEVICE(0x13d3, 0x3402) }, + { USB_DEVICE(0x13d3, 0x3408) }, { USB_DEVICE(0x13d3, 0x3432) },/* Atheros AR5BBU12 with sflash firmware */
@@ -156,6 +157,7 @@ static struct usb_device_id ath3k_blist_ { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x13d3, 0x3408), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 },/* Atheros AR5BBU22 with sflash firmware */
drivers/bluetooth/btusb.c +1 -0
@@ -189,6 +189,7 @@ static struct usb_device_id blacklist_ta { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x13d3, 0x3408), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 },/* Atheros AR5BBU12 with sflash firmware */
PATCH 39/152 Bluetooth: Add USB device 04ca:3010 as Atheros AR3012
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Janne Heikkinen <[email protected]>
commit 134d3b3550f050b9bec37111824452064d1ed928 upstream.
Asus X553MA has USB device 04ca:3010 that is Atheros AR3012 or compatible.
Device from /sys/kernel/debug/usb/devices:
T: Bus=01 Lev=02 Prnt=02 Port=03 Cnt=02 Dev#= 27 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=04ca ProdID=3010 Rev= 0.02 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA A: FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=01 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 I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms
--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -85,6 +85,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x04CA, 0x3007) }, { USB_DEVICE(0x04CA, 0x3008) }, { USB_DEVICE(0x04CA, 0x300b) }, + { USB_DEVICE(0x04CA, 0x3010) }, { USB_DEVICE(0x0930, 0x0219) }, { USB_DEVICE(0x0930, 0x0220) }, { USB_DEVICE(0x0930, 0x0227) },
@@ -138,6 +139,7 @@ static struct usb_device_id ath3k_blist_ { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
@@ -170,6 +170,7 @@ static struct usb_device_id blacklist_ta { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },
PATCH 40/152 eCryptfs: Remove buggy and unnecessary write in file name decode routine
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Michael Halcrow <[email protected]>
commit 942080643bce061c3dd9d5718d3b745dcb39a8bc upstream.
Dmitry Chernenkov used KASAN to discover that eCryptfs writes past the end of the allocated buffer during encrypted filename decoding. This fix corrects the issue by getting rid of the unnecessary 0 write when the current bit offset is 2.
--- fs/ecryptfs/crypto.c | 1 - 1 file changed, 1 deletion(-)
fs/ecryptfs/crypto.c +0 -1
@@ -2038,7 +2038,6 @@ ecryptfs_decode_from_filename(unsigned cbreak ;case 2 : dst[dst_byte_offset++] |= (src_byte); - dst[dst_byte_offset] =0 ; current_bit_offset =0 ;break ; }
PATCH 41/152 USB: adutux: NULL dereferences on disconnect
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit fc625960edecfb57e62c2975d1f155155e28e6ba upstream.
Both "dev->udev" and "interface->dev" are NULL. These printks are not very interesting so I just deleted them.
---
drivers/usb/misc/adutux.c +0 -4
@@ -865,15 +865,11 @@ static void adu_disconnect(struct usb_inusb_set_intfdata (interface,NULL );/* if the device is not opened, then we clean up right now */ -dbg (2 ," %s : open count %d" , __func__, dev->open_count);if (!dev->open_count)adu_delete (dev);mutex_unlock (&adutux_mutex); -dev_info (&interface->dev,"ADU device adutux%d now disconnected\n" , - (minor -ADU_MINOR_BASE )); -dbg (2 ," %s : leave" , __func__); }
PATCH 42/152 ALSA: hda - using uninitialized data
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 69eba10e606a80665f8573221fec589430d9d1cb upstream.
In olden times the snd_hda_param_read() function always set "*start_id" but in 2007 we introduced a new return and it causes uninitialized data bugs in a couple of the callers: print_codec_info() and hdmi_parse_codec().
--- sound/pci/hda/hda_codec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/pci/hda/hda_codec.c +3 -1
@@ -311,8 +311,10 @@ int snd_hda_get_sub_nodes(struct hda_codunsigned int parm; parm =snd_hda_param_read (codec, nid,AC_PAR_NODE_COUNT ); -if (parm ==-1 ) +if (parm ==-1 ) { + *start_id =0 ;return 0 ; + } *start_id = (parm >>16 ) &0x7fff ;return (int )(parm &0x7fff ); }
PATCH 43/152 dm space map metadata: fix sm_bootstrap_get_nr_blocks()
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit c1c6156fe4d4577444b769d7edd5dd503e57bbc9 upstream.
This function isn't right and it causes a static checker warning:
drivers/md/dm-thin.c:3016 maybe_resize_data_dev() error: potentially using uninitialized 'sb_data_size'.
It should set "*count" and return zero on success the same as the sm_metadata_get_nr_blocks() function does earlier.
--- drivers/md/persistent-data/dm-space-map-metadata.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/md/persistent-data/dm-space-map-metadata.c +3 -1
@@ -419,7 +419,9 @@ static int sm_bootstrap_get_nr_blocks(st { struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm); -return smm->ll.nr_blocks; + *count = smm->ll.nr_blocks; + +return 0 ; }static int sm_bootstrap_get_nr_free (struct dm_space_map *sm,dm_block_t *count)
PATCH 44/152 ath9k_hw: fix hardware queue allocation
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Felix Fietkau <[email protected]>
commit ad8fdccf9c197a89e2d2fa78c453283dcc2c343f upstream.
The driver passes the desired hardware queue index for a WMM data queue in qinfo->tqi_subtype. This was ignored in ath9k_hw_setuptxqueue, which instead relied on the order in which the function is called.
--- drivers/net/wireless/ath/ath9k/mac.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/net/wireless/ath/ath9k/mac.c +1 -8
@@ -311,14 +311,7 @@ int ath9k_hw_setuptxqueue(struct ath_hw q =ATH9K_NUM_TX_QUEUES -3 ;break ;case ATH9K_TX_QUEUE_DATA : -for (q =0 ; q <ATH9K_NUM_TX_QUEUES ; q++) -if (ah->txq[q].tqi_type == -ATH9K_TX_QUEUE_INACTIVE ) -break ; -if (q ==ATH9K_NUM_TX_QUEUES ) { -ath_err (common,"No available TX queue\n" ); -return -1 ; - } + q = qinfo->tqi_subtype;break ;default :ath_err (common,"Invalid TX queue type: %u\n" , type);
PATCH 45/152 ath9k: fix BE/BK queue order
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Felix Fietkau <[email protected]>
commit 78063d81d353e10cbdd279c490593113b8fdae1c upstream.
Hardware queues are ordered by priority. Use queue index 0 for BK, which has lower priority than BE.
--- drivers/net/wireless/ath/ath9k/hw.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/hw.h +2 -2
@@ -174,8 +174,8 @@#define PAPRD_IDEAL_AGC2_PWR_RANGE 0xe0enum ath_hw_txq_subtype { -ATH_TXQ_AC_BE =0 , -ATH_TXQ_AC_BK =1 , +ATH_TXQ_AC_BK =0 , +ATH_TXQ_AC_BE =1 ,ATH_TXQ_AC_VI =2 ,ATH_TXQ_AC_VO =3 , };
PATCH 46/152 ath5k: fix hardware queue index assignment
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Felix Fietkau <[email protected]>
commit 9e4982f6a51a2442f1bb588fee42521b44b4531c upstream.
Like with ath9k, ath5k queues also need to be ordered by priority. queue_info->tqi_subtype already contains the correct index, so use it instead of relying on the order of ath5k_hw_setup_tx_queue calls.
--- drivers/net/wireless/ath/ath5k/qcu.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/net/wireless/ath/ath5k/qcu.c +1 -7
@@ -167,13 +167,7 @@ int ath5k_hw_setup_tx_queue(struct ath5k }else {switch (queue_type) {case AR5K_TX_QUEUE_DATA : -for (queue =AR5K_TX_QUEUE_ID_DATA_MIN ; - ah->ah_txq[queue].tqi_type != -AR5K_TX_QUEUE_INACTIVE ; queue++) { - -if (queue >AR5K_TX_QUEUE_ID_DATA_MAX ) -return -EINVAL ; - } + queue = queue_info->tqi_subtype;break ;case AR5K_TX_QUEUE_UAPSD : queue =AR5K_TX_QUEUE_ID_UAPSD ;
PATCH 47/152 iommu/vt-d: Fix an off-by-one bug in __domain_mapping()
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jiang Liu <[email protected]>
commit cc4f14aa170d895c9a43bdb56f62070c8a6da908 upstream.
There's an off-by-one bug in function __domain_mapping(), which may trigger the BUG_ON(nr_pages < lvl_pages) when
(nr_pages + 1) & superpage_mask == 0
The issue was introduced by commit 9051aa0268dc "intel-iommu: Combine domain_pfn_mapping() and domain_sg_mapping()", which sets sg_res to "nr_pages + 1" to avoid some of the 'sg_res==0' code paths.
It's safe to remove extra "+1" because sg_res is only used to calculate page size now.
--- drivers/iommu/intel-iommu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/iommu/intel-iommu.c +3 -5
@@ -1763,7 +1763,7 @@ static int __domain_mapping(struct dmar_struct dma_pte *first_pte =NULL , *pte =NULL ;phys_addr_t uninitialized_var (pteval );int addr_width =agaw_to_width (domain->agaw) -VTD_PAGE_SHIFT ; -unsigned long sg_res; +unsigned long sg_res =0 ;unsigned int largepage_lvl =0 ;unsigned long lvl_pages =0 ;
@@ -1774,10 +1774,8 @@ static int __domain_mapping(struct dmar_ prot &=DMA_PTE_READ |DMA_PTE_WRITE |DMA_PTE_SNP ; -if (sg) - sg_res =0 ; -else { - sg_res = nr_pages +1 ; +if (!sg) { + sg_res = nr_pages; pteval = ((phys_addr_t )phys_pfn <<VTD_PAGE_SHIFT ) | prot; }
PATCH 48/152 drm/vmwgfx: Don't use memory accounting for kernel-side fence objects
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Hellstrom <[email protected]>
commit 1f563a6a46544602183e7493b6ef69769d3d76d9 upstream.
Kernel side fence objects are used when unbinding resources and may thus be created as part of a memory reclaim operation. This might trigger recursive memory reclaims and result in the kernel running out of stack space.
So a simple way out is to avoid accounting of these fence objects. In principle this is OK since while user-space can trigger the creation of such objects, it can't really hold on to them. However, their lifetime is quite long, so some form of accounting should perhaps be implemented in the future.
Fixes kernel crashes when running, for example viewperf11 ensight-04 test 3 with low system memory settings.
---
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +2 -19
@@ -484,14 +484,7 @@ void vmw_fence_obj_flush(struct vmw_fencstatic void vmw_fence_destroy (struct vmw_fence_obj *fence) { -struct vmw_fence_manager *fman = fence->fman; -kfree (fence); -/* -* Free kernel space accounting. -*/ -ttm_mem_global_free (vmw_mem_glob (fman->dev_priv), - fman->fence_size); } int vmw_fence_create(struct vmw_fence_manager *fman,
@@ -499,20 +492,12 @@ int vmw_fence_create(struct vmw_fence_mauint32_t mask, struct vmw_fence_obj **p_fence) { - struct ttm_mem_global *mem_glob = vmw_mem_glob(fman->dev_priv); struct vmw_fence_obj *fence;int ret; - ret =ttm_mem_global_alloc (mem_glob, fman->fence_size, - false, false); -if (unlikely (ret !=0 )) -return ret; - fence =kzalloc (sizeof (*fence),GFP_KERNEL ); -if (unlikely (fence ==NULL )) { - ret = -ENOMEM ; - goto out_no_object; - } +if (unlikely (fence ==NULL )) +return -ENOMEM ; ret =vmw_fence_obj_init (fman, fence, seqno, mask, vmw_fence_destroy);
@@ -524,8 +509,6 @@ int vmw_fence_create(struct vmw_fence_ma out_err_init:kfree (fence); -out_no_object: -ttm_mem_global_free (mem_glob, fman->fence_size);return ret; }
PATCH 49/152 hp_accel: Add support for HP ZBook 15
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dominique Leuenberger <[email protected]>
commit 6583659e0f92e38079a8dd081e0a1181a0f37747 upstream.
HP ZBook 15 laptop needs a non-standard mapping (x_inverted).
--- drivers/platform/x86/hp_accel.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/hp_accel.c +1 -0
@@ -237,6 +237,7 @@ static struct dmi_system_id lis3lv02d_dmAXIS_DMI_MATCH ("HPB64xx" ,"HP ProBook 64" , xy_swap),AXIS_DMI_MATCH ("HPB64xx" ,"HP EliteBook 84" , xy_swap),AXIS_DMI_MATCH ("HPB65xx" ,"HP ProBook 65" , x_inverted), +AXIS_DMI_MATCH ("HPZBook15" ,"HP ZBook 15" , x_inverted), { NULL, }/* Laptop models without axis info (yet): * "NC6910" "HP Compaq 6910"
PATCH 50/152 ALSA: usb-audio: Don't resubmit pending URBs at MIDI error recovery
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 66139a48cee1530c91f37c145384b4ee7043f0b7 upstream.
In snd_usbmidi_error_timer(), the driver tries to resubmit MIDI input URBs to reactivate the MIDI stream, but this causes the error when some of URBs are still pending like:
WARNING: CPU: 0 PID: 0 at ../drivers/usb/core/urb.c:339 usb_submit_urb+0x5f/0x70() URB ef705c40 submitted while active CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.16.6-2-desktop #1 Hardware name: FOXCONN TPS01/TPS01, BIOS 080015 03/23/2010 c0984bfa f4009ed4 c078deaf f4009ee4 c024c884 c09a135c f4009f00 00000000 c0984bfa 00000153 c061ac4f c061ac4f 00000009 00000001 ef705c40 e854d1c0 f4009eec c024c8d3 00000009 f4009ee4 c09a135c f4009f00 f4009f04 c061ac4f Call Trace: [<c0205df6>] try_stack_unwind+0x156/0x170 [<c020482a>] dump_trace+0x5a/0x1b0 [<c0205e56>] show_trace_log_lvl+0x46/0x50 [<c02049d1>] show_stack_log_lvl+0x51/0xe0 [<c0205eb7>] show_stack+0x27/0x50 [<c078deaf>] dump_stack+0x45/0x65 [<c024c884>] warn_slowpath_common+0x84/0xa0 [<c024c8d3>] warn_slowpath_fmt+0x33/0x40 [<c061ac4f>] usb_submit_urb+0x5f/0x70 [<f7974104>] snd_usbmidi_submit_urb+0x14/0x60 [snd_usbmidi_lib] [<f797483a>] snd_usbmidi_error_timer+0x6a/0xa0 [snd_usbmidi_lib] [<c02570c0>] call_timer_fn+0x30/0x130 [<c0257442>] run_timer_softirq+0x1c2/0x260 [<c0251493>] __do_softirq+0xc3/0x270 [<c0204732>] do_softirq_own_stack+0x22/0x30 [<c025186d>] irq_exit+0x8d/0xa0 [<c0795228>] smp_apic_timer_interrupt+0x38/0x50 [<c0794a3c>] apic_timer_interrupt+0x34/0x3c [<c0673d9e>] cpuidle_enter_state+0x3e/0xd0 [<c028bb8d>] cpu_idle_loop+0x29d/0x3e0 [<c028bd23>] cpu_startup_entry+0x53/0x60 [<c0bfac1e>] start_kernel+0x415/0x41a
For avoiding these errors, check the pending URBs and skip resubmitting such ones.
--- sound/usb/midi.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/midi.c +2 -0
@@ -364,6 +364,8 @@ static void snd_usbmidi_error_timer(unsiif (in && in->error_resubmit) { in->error_resubmit =0 ;for (j =0 ; j <INPUT_URBS ; ++j) { +if (atomic_read (&in->urbs[j]->use_count)) +continue ; in->urbs[j]->dev = umidi->dev;snd_usbmidi_submit_urb (in->urbs[j],GFP_ATOMIC ); }
PATCH 51/152 KEYS: Fix stale key registration at error path
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit b26bdde5bb27f3f900e25a95e33a0c476c8c2c48 upstream.
When loading encrypted-keys module, if the last check of aes_get_sizes() in init_encrypted() fails, the driver just returns an error without unregistering its key type. This results in the stale entry in the list. In addition to memory leaks, this leads to a kernel crash when registering a new key type later.
This patch fixes the problem by swapping the calls of aes_get_sizes() and register_key_type(), and releasing resources properly at the error paths.
Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=908163
--- security/keys/encrypted-keys/encrypted.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
security/keys/encrypted-keys/encrypted.c +4 -1
@@ -1016,10 +1016,13 @@ static int __init init_encrypted(void) ret =encrypted_shash_alloc ();if (ret <0 )return ret; + ret =aes_get_sizes (); +if (ret <0 ) + goto out; ret =register_key_type (&key_type_encrypted);if (ret <0 ) goto out; -return aes_get_sizes (); +return 0 ; out:encrypted_shash_release ();return ret;
PATCH 52/152 fib_trie: Fix /proc/net/fib_trie when CONFIG_IP_MULTIPLE_TABLES is not defined
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Duyck <[email protected]>
commit a5a519b2710be43fce3cf9ce7bd8de8db3f2a9de upstream.
In recent testing I had disabled CONFIG_IP_MULTIPLE_TABLES and as a result when I ran "cat /proc/net/fib_trie" the main trie was displayed multiple times. I found that the problem line of code was in the function fib_trie_seq_next. Specifically the line below caused the indexes to go in the opposite direction of our traversal:
h = tb->tb_id & (FIB_TABLE_HASHSZ - 1);
This issue was that the RT tables are defined such that RT_TABLE_LOCAL is ID 255, while it is located at TABLE_LOCAL_INDEX of 0, and RT_TABLE_MAIN is 254 with a TABLE_MAIN_INDEX of 1. This means that the above line will return 1 for the local table and 0 for main. The result is that fib_trie_seq_next will return NULL at the end of the local table, fib_trie_seq_start will return the start of the main table, and then fib_trie_seq_next will loop on main forever as h will always return 0.
The fix for this is to reverse the ordering of the two tables. It has the advantage of making it so that the tables now print in the same order regardless of if multiple tables are enabled or not. In order to make the definition consistent with the multiple tables case I simply masked the to RT_TABLE_XXX values by (FIB_TABLE_HASHSZ - 1). This way the two table layouts should always stay consistent.
--- include/net/ip_fib.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/net/ip_fib.h +2 -2
@@ -175,8 +175,8 @@ extern void fib_free_table(struct fib_ta#ifndef CONFIG_IP_MULTIPLE_TABLES -#define TABLE_LOCAL_INDEX 0 -#define TABLE_MAIN_INDEX 1 +#define TABLE_LOCAL_INDEX (RT_TABLE_LOCAL & (FIB_TABLE_HASHSZ - 1)) +#define TABLE_MAIN_INDEX (RT_TABLE_MAIN & (FIB_TABLE_HASHSZ - 1))static inline struct fib_table *fib_get_table (struct net *net,u32 id) {
PATCH 53/152 Btrfs: fix fs corruption on transaction abort if device supports discard
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit 678886bdc6378c1cbd5072da2c5a3035000214e3 upstream.
When we abort a transaction we iterate over all the ranges marked as dirty in fs_info->freed_extents[0] and fs_info->freed_extents[1], clear them from those trees, add them back (unpin) to the free space caches and, if the fs was mounted with "-o discard", perform a discard on those regions. Also, after adding the regions to the free space caches, a fitrim ioctl call can see those ranges in a block group's free space cache and perform a discard on the ranges, so the same issue can happen without "-o discard" as well.
This causes corruption, affecting one or multiple btree nodes (in the worst case leaving the fs unmountable) because some of those ranges (the ones in the fs_info->pinned_extents tree) correspond to btree nodes/leafs that are referred by the last committed super block - breaking the rule that anything that was committed by a transaction is untouched until the next transaction commits successfully.
I ran into this while running in a loop (for several hours) the fstest that I recently submitted:
[PATCH] fstests: add btrfs test to stress chunk allocation/removal and fstrim
The corruption always happened when a transaction aborted and then fsck complained like this:
_check_btrfs_filesystem: filesystem on /dev/sdc is inconsistent *** fsck.btrfs output ***
Check tree block failed, want=94945280, have=0
Check tree block failed, want=94945280, have=0
Check tree block failed, want=94945280, have=0
Check tree block failed, want=94945280, have=0
Check tree block failed, want=94945280, have=0
read block failed check_tree_block
Couldn't open file system
In this case 94945280 corresponded to the root of a tree. Using frace what I observed was the following sequence of steps happened:
1) transaction N started, fs_info->pinned_extents pointed to
fs_info->freed_extents[0];
2) node/eb 94945280 is created;
3) eb is persisted to disk;
4) transaction N commit starts, fs_info->pinned_extents now points to
fs_info->freed_extents[1], and transaction N completes;
5) transaction N + 1 starts;
6) eb is COWed, and btrfs_free_tree_block() called for this eb;
7) eb range (94945280 to 94945280 + 16Kb) is added to
fs_info->pinned_extents (fs_info->freed_extents[1]);
8) Something goes wrong in transaction N + 1, like hitting ENOSPC
for example, and the transaction is aborted, turning the fs into
readonly mode. The stack trace I got for example:
[112065.253935] [<ffffffff8140c7b6>] dump_stack+0x4d/0x66
[112065.254271] [<ffffffff81042984>] warn_slowpath_common+0x7f/0x98
[112065.254567] [<ffffffffa0325990>] ? __btrfs_abort_transaction+0x50/0x10b [btrfs]
[112065.261674] [<ffffffff810429e5>] warn_slowpath_fmt+0x48/0x50
[112065.261922] [<ffffffffa032949e>] ? btrfs_free_path+0x26/0x29 [btrfs]
[112065.262211] [<ffffffffa0325990>] __btrfs_abort_transaction+0x50/0x10b [btrfs]
[112065.262545] [<ffffffffa036b1d6>] btrfs_remove_chunk+0x537/0x58b [btrfs]
[112065.262771] [<ffffffffa033840f>] btrfs_delete_unused_bgs+0x1de/0x21b [btrfs]
[112065.263105] [<ffffffffa0343106>] cleaner_kthread+0x100/0x12f [btrfs]
(...)
[112065.264493] ---[ end trace dd7903a975a31a08 ]---
[112065.264673] BTRFS: error (device sdc) in btrfs_remove_chunk:2625: errno=-28 No space left
[112065.264997] BTRFS info (device sdc): forced readonly 9) The clear kthread sees that the BTRFS_FS_STATE_ERROR bit is set in
fs_info->fs_state and calls btrfs_cleanup_transaction(), which in
turn calls btrfs_destroy_pinned_extent(); 10) Then btrfs_destroy_pinned_extent() iterates over all the ranges marked as dirty in fs_info->freed_extents[], and for each one it calls discard, if the fs was mounted with "-o discard", and adds the range to the free space cache of the respective block group;
11) btrfs_trim_block_group(), invoked from the fitrim ioctl code path,
sees the free space entries and performs a discard;
12) After an umount and mount (or fsck), our eb's location on disk was full of zeroes, and it should have been untouched, because it was marked as dirty in the fs_info->pinned_extents tree, and therefore used by the trees that the last committed superblock points to.
Fix this by not performing a discard and not adding the ranges to the free space caches - it's useless from this point since the fs is now in readonly mode and we won't write free space caches to disk anymore (otherwise we would leak space) nor any new superblock. By not adding the ranges to the free space caches, it prevents other code paths from allocating that space and write to it as well, therefore being safer and simpler.
This isn't a new problem, as it's been present since 2011 (git commit acce952b0263825da32cf10489413dec78053347).
--- fs/btrfs/disk-io.c | 6 ------ fs/btrfs/extent-tree.c | 10 ++++++---- 2 files changed, 6 insertions(+), 10 deletions(-)
fs/btrfs/disk-io.c +0 -6
@@ -3481,12 +3481,6 @@ static int btrfs_destroy_pinned_extent(sif (ret)break ; -/* opt_discard */ -if (btrfs_test_opt (root,DISCARD )) - ret =btrfs_error_discard_extent (root, start, - end +1 - start, -NULL ); -clear_extent_dirty (unpin, start, end,GFP_NOFS );btrfs_error_unpin_extent_range (root, start, end);cond_resched ();
fs/btrfs/extent-tree.c +6 -4
@@ -4611,7 +4611,8 @@ int btrfs_prepare_extent_commit(struct breturn 0 ; } -static int unpin_extent_range (struct btrfs_root *root,u64 start,u64 end) +static int unpin_extent_range (struct btrfs_root *root,u64 start,u64 end, +const bool return_free_space) {struct btrfs_fs_info *fs_info = root->fs_info;struct btrfs_block_group_cache *cache =NULL ;
@@ -4631,7 +4632,8 @@ static int unpin_extent_range(struct btrif (start < cache->last_byte_to_unpin) { len =min (len, cache->last_byte_to_unpin - start); -btrfs_add_free_space (cache, start, len); +if (return_free_space) +btrfs_add_free_space (cache, start, len); } start += len;
@@ -4676,7 +4678,7 @@ int btrfs_finish_extent_commit(struct bt end + 1 - start, NULL);clear_extent_dirty (unpin, start, end,GFP_NOFS ); -unpin_extent_range (root, start, end); +unpin_extent_range (root, start, end, true);cond_resched (); }
@@ -7650,7 +7652,7 @@ out:int btrfs_error_unpin_extent_range (struct btrfs_root *root,u64 start,u64 end) { -return unpin_extent_range (root, start, end); +return unpin_extent_range (root, start, end, false); } int btrfs_error_discard_extent(struct btrfs_root *root, u64 bytenr,
PATCH 54/152 ncpfs: return proper error from NCP_IOC_SETROOT ioctl
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit a682e9c28cac152e6e54c39efcf046e0c8cfcf63 upstream.
If some error happens in NCP_IOC_SETROOT ioctl, the appropriate error return value is then (in most cases) just overwritten before we return. This can result in reporting success to userspace although error happened.
This bug was introduced by commit 2e54eb96e2c8 ("BKL: Remove BKL from ncpfs"). Propagate the errors correctly.
Coverity id: 1226925.
--- fs/ncpfs/ioctl.c | 1 - 1 file changed, 1 deletion(-)
fs/ncpfs/ioctl.c +0 -1
@@ -445,7 +445,6 @@ static long __ncp_ioctl(struct inode *in result = -EIO ; } } - result =0 ; }mutex_unlock (&server->root_setup_lock);
PATCH 55/152 x86_64, switch_to(): Load TLS descriptors before switching DS and ES
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andy Lutomirski <[email protected]>
commit f647d7c155f069c1a068030255c300663516420e upstream.
Otherwise, if buggy user code points DS or ES into the TLS array, they would be corrupted after a context switch.
This also significantly improves the comments and documents some gotchas in the code.
Before this patch, the both tests below failed. With this patch, the es test passes, although the gsbase test still fails.
----- begin es test -----
/*
* Copyright (c) 2014 Andy Lutomirski
* GPL v2
*/
static unsigned short GDT3(int idx)
{
return (idx << 3) | 3;
}static int create_tls(int idx, unsigned int base)
{
struct user_desc desc = {
.entry_number = idx,
.base_addr = base,
.limit = 0xfffff,
.seg_32bit = 1,
.contents = 0, /* Data, grow-up */
.read_exec_only = 0,
.limit_in_pages = 1,
.seg_not_present = 0,
.useable = 0,
};
if (syscall(SYS_set_thread_area, &desc) != 0)
err(1, "set_thread_area");
return desc.entry_number;
}int main()
{
int idx = create_tls(-1, 0);
printf("Allocated GDT index %d\n", idx);
unsigned short orig_es;
asm volatile ("mov %%es,%0" : "=rm" (orig_es));
int errors = 0;
int total = 1000;
for (int i = 0; i < total; i++) {
asm volatile ("mov %0,%%es" : : "rm" (GDT3(idx)));
usleep(100);
unsigned short es;
asm volatile ("mov %%es,%0" : "=rm" (es));
asm volatile ("mov %0,%%es" : : "rm" (orig_es));
if (es != GDT3(idx)) {
if (errors == 0)
printf("[FAIL]\tES changed from 0x%hx to 0x%hx\n",
GDT3(idx), es);
errors++;
}
}
if (errors) {
printf("[FAIL]\tES was corrupted %d/%d times\n", errors, total);
return 1;
} else {
printf("[OK]\tES was preserved\n");
return 0;
}
}----- end es test -----
----- begin gsbase test -----
/*
* gsbase.c, a gsbase test
* Copyright (c) 2014 Andy Lutomirski
* GPL v2
*/
static unsigned char *testptr, *testptr2;
static unsigned char read_gs_testvals(void)
{
unsigned char ret;
asm volatile ("movb %%gs:%1, %0" : "=r" (ret) : "m" (*testptr));
return ret;
}int main()
{
int errors = 0;
testptr = mmap((void *)0x200000000UL, 1, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_FIXED | MAP_ANONYMOUS, -1, 0);
if (testptr == MAP_FAILED)
err(1, "mmap");
testptr2 = mmap((void *)0x300000000UL, 1, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_FIXED | MAP_ANONYMOUS, -1, 0);
if (testptr2 == MAP_FAILED)
err(1, "mmap");
*testptr = 0;
*testptr2 = 1;
if (syscall(SYS_arch_prctl, ARCH_SET_GS,
(unsigned long)testptr2 - (unsigned long)testptr) != 0)
err(1, "ARCH_SET_GS");
usleep(100);
if (read_gs_testvals() == 1) {
printf("[OK]\tARCH_SET_GS worked\n");
} else {
printf("[FAIL]\tARCH_SET_GS failed\n");
errors++;
}
asm volatile ("mov %0,%%gs" : : "r" (0));
if (read_gs_testvals() == 0) {
printf("[OK]\tWriting 0 to gs worked\n");
} else {
printf("[FAIL]\tWriting 0 to gs failed\n");
errors++;
}
usleep(100);
if (read_gs_testvals() == 0) {
printf("[OK]\tgsbase is still zero\n");
} else {
printf("[FAIL]\tgsbase was corrupted\n");
errors++;
}
return errors == 0 ? 0 : 1;
}----- end gsbase test -----
--- arch/x86/kernel/process_64.c | 101 +++++++++++++++++++++++++++++++------------ 1 file changed, 73 insertions(+), 28 deletions(-)
arch/x86/kernel/process_64.c +73 -28
@@ -385,24 +385,9 @@ __switch_to(struct task_struct *prev_p, fpu =switch_fpu_prepare (prev_p, next_p); -/* -* Reload esp0, LDT and the page table pointer: -*/ +/* Reload esp0 and ss1. */ load_sp0 (tss, next); -/* -* Switch DS and ES. -* This won't pick up thread selector changes, but I guess that is ok. -*/ -savesegment (es, prev->es); -if (unlikely (next->es | prev->es)) -loadsegment (es, next->es); - -savesegment (ds, prev->ds); -if (unlikely (next->ds | prev->ds)) -loadsegment (ds, next->ds); - -/* We must save %fs and %gs before load_TLS() because * %fs and %gs may be cleared by load_TLS(). *
@@ -411,41 +396,101 @@ __switch_to(struct task_struct *prev_p,savesegment (fs, fsindex);savesegment (gs, gsindex); +/* +* Load TLS before restoring any segments so that segment loads +* reference the correct GDT entries. +*/ load_TLS (next, cpu);/* -* Leave lazy mode, flushing any hypercalls made here. -* This must be done before restoring TLS segments so -* the GDT and LDT are properly updated, and must be -* done before math_state_restore, so the TS bit is up -* to date. +* Leave lazy mode, flushing any hypercalls made here. This +* must be done after loading TLS entries in the GDT but before +* loading segments that might reference them, and and it must +* be done before math_state_restore, so the TS bit is up to +* date. */ arch_end_context_switch (next_p); +/* Switch DS and ES. +* +* Reading them only returns the selectors, but writing them (if +* nonzero) loads the full descriptor from the GDT or LDT. The +* LDT for next is loaded in switch_mm, and the GDT is loaded +* above. +* +* We therefore need to write new values to the segment +* registers on every context switch unless both the new and old +* values are zero. +* +* Note that we don't need to do anything for CS and SS, as +* those are saved and restored as part of pt_regs. +*/ +savesegment (es, prev->es); +if (unlikely (next->es | prev->es)) +loadsegment (es, next->es); + +savesegment (ds, prev->ds); +if (unlikely (next->ds | prev->ds)) +loadsegment (ds, next->ds); +/* * Switch FS and GS. * -* Segment register != 0 always requires a reload. Also -* reload when it has changed. When prev process used 64bit -* base always reload to avoid an information leak. +* These are even more complicated than FS and GS: they have +* 64-bit bases are that controlled by arch_prctl. Those bases +* only differ from the values in the GDT or LDT if the selector +* is 0. +* +* Loading the segment register resets the hidden base part of +* the register to 0 or the value from the GDT / LDT. If the +* next base address zero, writing 0 to the segment register is +* much faster than using wrmsr to explicitly zero the base. +* +* The thread_struct.fs and thread_struct.gs values are 0 +* if the fs and gs bases respectively are not overridden +* from the values implied by fsindex and gsindex. They +* are nonzero, and store the nonzero base addresses, if +* the bases are overridden. +* +* (fs != 0 && fsindex != 0) || (gs != 0 && gsindex != 0) should +* be impossible. +* +* Therefore we need to reload the segment registers if either +* the old or new selector is nonzero, and we need to override +* the base address if next thread expects it to be overridden. +* +* This code is unnecessarily slow in the case where the old and +* new indexes are zero and the new base is nonzero -- it will +* unnecessarily write 0 to the selector before writing the new +* base address. +* +* Note: This all depends on arch_prctl being the only way that +* user code can override the segment base. Once wrfsbase and +* wrgsbase are enabled, most of this code will need to change. */ if (unlikely (fsindex | next->fsindex | prev->fs)) {loadsegment (fs, next->fsindex); +/* -* Check if the user used a selector != 0; if yes -* clear 64bit base, since overloaded base is always -* mapped to the Null selector +* If user code wrote a nonzero value to FS, then it also +* cleared the overridden base address. +* +* XXX: if user code wrote 0 to FS and cleared the base +* address itself, we won't notice and we'll incorrectly +* restore the prior base address next time we reschdule +* the process. */ if (fsindex) prev->fs =0 ; } -/* when next process has a 64bit base use it */ if (next->fs)wrmsrl (MSR_FS_BASE , next->fs); prev->fsindex = fsindex;if (unlikely (gsindex | next->gsindex | prev->gs)) {load_gs_index (next->gsindex); + +/* This works (and fails) the same way as fsindex above. */ if (gsindex) prev->gs =0 ; }
Re: [PATCH 3.2 055/152] x86_64, switch_to(): Load TLS descriptors before switching DS and ES
Quoted 83 lines · Ben Hutchings
3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andy Lutomirski <[email protected]>
commit
f647d7c155f069c1a068030255c300663516420eupstream.Otherwise, if buggy user code points DS or ES into the TLS array, they would be corrupted after a context switch.
This also significantly improves the comments and documents some gotchas in the code.
Before this patch, the both tests below failed. With this patch, the es test passes, although the gsbase test still fails.
----- begin es test -----
/*
* Copyright (c) 2014 Andy Lutomirski
* GPL v2
*/static unsigned short GDT3(int idx)
{ return (idx << 3) | 3; }static int
create_tls(int idx, unsigned int base){ struct user_desc desc = { .entry_number = idx, .base_addr = base, .limit = 0xfffff, .seg_32bit = 1, .contents = 0, /* Data, grow-up */ .read_exec_only = 0, .limit_in_pages = 1, .seg_not_present = 0, .useable = 0, }; if (syscall(SYS_set_thread_area, &desc) != 0) err(1, "set_thread_area"); return desc.entry_number; }int
main(){ int idx = create_tls(-1, 0); printf("Allocated GDT index %d\n", idx); unsigned short orig_es; asm volatile ("mov %%es,%0" : "=rm" (orig_es)); int errors = 0; int total = 1000; for (int i = 0; i < total; i++) { asm volatile ("mov %0,%%es" : : "rm" (GDT3(idx))); usleep(100); unsigned short es; asm volatile ("mov %%es,%0" : "=rm" (es)); asm volatile ("mov %0,%%es" : : "rm" (orig_es)); if (es != GDT3(idx)) { if (errors == 0) printf("[FAIL]\tES changed from 0x%hx to 0x%hx\n", GDT3(idx), es); errors++; } } if (errors) { printf("[FAIL]\tES was corrupted %d/%d times\n", errors, total); return 1; } else { printf("[OK]\tES was preserved\n"); return 0; } }
Quoted 1 line
----- end es test -----
This currently fails in 32-bit kernels (at least in qemu):
/ # ./es_test
Allocated GDT index 7
[FAIL] ES changed from 0x3b to 0x7b
[FAIL] ES was corrupted 1000/1000 times
/ # uname -a
Linux (none) 4.0.0-rc1 #1 SMP Tue Feb 24 16:41:58 CET 2015 i686 GNU/Linux
Re: [PATCH 3.2 055/152] x86_64, switch_to(): Load TLS descriptors before switching DS and ES
Quoted 86 lines · Denys Vlasenko
Quoted 83 lines · Ben Hutchings
3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andy Lutomirski <[email protected]>
commit
f647d7c155f069c1a068030255c300663516420eupstream.Otherwise, if buggy user code points DS or ES into the TLS array, they would be corrupted after a context switch.
This also significantly improves the comments and documents some gotchas in the code.
Before this patch, the both tests below failed. With this patch, the es test passes, although the gsbase test still fails.
----- begin es test -----
/*
* Copyright (c) 2014 Andy Lutomirski
* GPL v2
*/static unsigned short GDT3(int idx)
{ return (idx << 3) | 3; }static int
create_tls(int idx, unsigned int base){ struct user_desc desc = { .entry_number = idx, .base_addr = base, .limit = 0xfffff, .seg_32bit = 1, .contents = 0, /* Data, grow-up */ .read_exec_only = 0, .limit_in_pages = 1, .seg_not_present = 0, .useable = 0, }; if (syscall(SYS_set_thread_area, &desc) != 0) err(1, "set_thread_area"); return desc.entry_number; }int
main(){ int idx = create_tls(-1, 0); printf("Allocated GDT index %d\n", idx); unsigned short orig_es; asm volatile ("mov %%es,%0" : "=rm" (orig_es)); int errors = 0; int total = 1000; for (int i = 0; i < total; i++) { asm volatile ("mov %0,%%es" : : "rm" (GDT3(idx))); usleep(100); unsigned short es; asm volatile ("mov %%es,%0" : "=rm" (es)); asm volatile ("mov %0,%%es" : : "rm" (orig_es)); if (es != GDT3(idx)) { if (errors == 0) printf("[FAIL]\tES changed from 0x%hx to 0x%hx\n", GDT3(idx), es); errors++; } } if (errors) { printf("[FAIL]\tES was corrupted %d/%d times\n", errors, total); return 1; } else { printf("[OK]\tES was preserved\n"); return 0; } }Quoted 1 line
----- end es test -----
Quoted 8 lines
This currently fails in 32-bit kernels (at least in qemu):
/ # ./es_test
Allocated GDT index 7
[FAIL] ES changed from0x3bto0x7b
[FAIL] ES was corrupted 1000/1000 times
/ # uname -a
Linux (none) 4.0.0-rc1 #1 SMP Tue Feb 24 16:41:58 CET 2015 i686 GNU/Linux
Want to send a patch? I'll get it in a few days if no one beats me.
--Andy
Re: [PATCH 3.2 055/152] x86_64, switch_to(): Load TLS descriptors before switching DS and ES
Quoted 10 lines · Andy Lutomirski
Quoted 8 lines
This currently fails in 32-bit kernels (at least in qemu):
/ # ./es_test
Allocated GDT index 7
[FAIL] ES changed from0x3bto0x7b
[FAIL] ES was corrupted 1000/1000 times
/ # uname -a
Linux (none) 4.0.0-rc1 #1 SMP Tue Feb 24 16:41:58 CET 2015 i686 GNU/LinuxWant to send a patch? I'll get it in a few days if no one beats me.
I have no patch, sorry (in fact, I failed to find where is the relevant 32-bit counterpart).
It's just security people asked me to backport this and I wondered maybe I should wait a bit on this one, since fix for 32-bit ought to appear as well.
Re: [PATCH 3.2 055/152] x86_64, switch_to(): Load TLS descriptors before switching DS and ES
Quoted 10 lines · Denys Vlasenko
Quoted 9 lines · Andy Lutomirski
Quoted 8 lines
This currently fails in 32-bit kernels (at least in qemu):
/ # ./es_test
Allocated GDT index 7
[FAIL] ES changed from0x3bto0x7b
[FAIL] ES was corrupted 1000/1000 times
/ # uname -a
Linux (none) 4.0.0-rc1 #1 SMP Tue Feb 24 16:41:58 CET 2015 i686 GNU/Linux
Quoted 8 lines
Quoted 1 line
Want to send a patch? I'll get it in a few days if no one beats me.
I have no patch, sorry (in fact, I failed to find where is the relevant 32-bit counterpart).
It's just security people asked me to backport this and I wondered maybe I should wait a bit on this one, since fix for 32-bit ought to appear as well.
For 32-bit kernel, userspace DS and ES are saved at syscall/interrupt entry time and reloaded on exit, unlike in 64-bit where they are saved and loaded at context switch time. Therefore 32-bit is not affected by the issue this patch addresses.
It looks to me though, that the ES test program doesn't actually test what the patch fixes - the segment attributes, like the base address. It tests just the selector, which shouldn't change across a kernel entry (with a few exceptions, like signals). If the test is failing, then it is a different issue from what this patch addresses.
--
Brian Gerst
Re: [PATCH 3.2 055/152] x86_64, switch_to(): Load TLS descriptors before switching DS and ES
Quoted 26 lines · Brian Gerst
Quoted 10 lines · Denys Vlasenko
Quoted 9 lines · Andy Lutomirski
Quoted 8 lines
This currently fails in 32-bit kernels (at least in qemu):
/ # ./es_test
Allocated GDT index 7
[FAIL] ES changed from0x3bto0x7b
[FAIL] ES was corrupted 1000/1000 times
/ # uname -a
Linux (none) 4.0.0-rc1 #1 SMP Tue Feb 24 16:41:58 CET 2015 i686 GNU/LinuxQuoted 8 lines
Quoted 1 line
Want to send a patch? I'll get it in a few days if no one beats me.
I have no patch, sorry (in fact, I failed to find where is the relevant 32-bit counterpart).
It's just security people asked me to backport this and I wondered maybe I should wait a bit on this one, since fix for 32-bit ought to appear as well.
For 32-bit kernel, userspace DS and ES are saved at syscall/interrupt entry time and reloaded on exit, unlike in 64-bit where they are saved and loaded at context switch time. Therefore 32-bit is not affected by the issue this patch addresses.
Quoted 5 lines
It looks to me though, that the ES test program doesn't actually test what the patch fixes - the segment attributes, like the base address. It tests just the selector, which shouldn't change across a kernel entry (with a few exceptions, like signals). If the test is failing, then it is a different issue from what this patch addresses.
It tests it indirectly. The 64-bit code sets the selector to zero if it fails to reload it. Testing the ES base is awkward because it can't be done in 64-bit code at all.
--Andy
Re: [PATCH 3.2 055/152] x86_64, switch_to(): Load TLS descriptors before switching DS and ES
Quoted 33 lines · Andy Lutomirski
Quoted 26 lines · Brian Gerst
Quoted 10 lines · Denys Vlasenko
Quoted 9 lines · Andy Lutomirski
Quoted 8 lines
This currently fails in 32-bit kernels (at least in qemu):
/ # ./es_test
Allocated GDT index 7
[FAIL] ES changed from0x3bto0x7b
[FAIL] ES was corrupted 1000/1000 times
/ # uname -a
Linux (none) 4.0.0-rc1 #1 SMP Tue Feb 24 16:41:58 CET 2015 i686 GNU/LinuxQuoted 8 lines
Quoted 1 line
Want to send a patch? I'll get it in a few days if no one beats me.
I have no patch, sorry (in fact, I failed to find where is the relevant 32-bit counterpart).
It's just security people asked me to backport this and I wondered maybe I should wait a bit on this one, since fix for 32-bit ought to appear as well.
For 32-bit kernel, userspace DS and ES are saved at syscall/interrupt entry time and reloaded on exit, unlike in 64-bit where they are saved and loaded at context switch time. Therefore 32-bit is not affected by the issue this patch addresses.
Quoted 5 lines
It looks to me though, that the ES test program doesn't actually test what the patch fixes - the segment attributes, like the base address. It tests just the selector, which shouldn't change across a kernel entry (with a few exceptions, like signals). If the test is failing, then it is a different issue from what this patch addresses.
Quoted 3 lines
It tests it indirectly. The 64-bit code sets the selector to zero if it fails to reload it. Testing the ES base is awkward because it can't be done in 64-bit code at all.
I figured out why Denys got the failure. usleep() makes a syscall via sysenter. The sysenter path saves es/ds, but does not restore them before sysexit like the int80/iret path would. That leaves them as USER_DS that the kernel loaded for itself. I believe this was an intentional optimization, assuming the vdso would only be called from programs conforming to the ELF ABI.
--
Brian Gerst
Re: [PATCH 3.2 055/152] x86_64, switch_to(): Load TLS descriptors before switching DS and ES
Quoted 38 lines · Brian Gerst
Quoted 33 lines · Andy Lutomirski
Quoted 26 lines · Brian Gerst
Quoted 10 lines · Denys Vlasenko
Quoted 9 lines · Andy Lutomirski
Quoted 8 lines
This currently fails in 32-bit kernels (at least in qemu):
/ # ./es_test
Allocated GDT index 7
[FAIL] ES changed from0x3bto0x7b
[FAIL] ES was corrupted 1000/1000 times
/ # uname -a
Linux (none) 4.0.0-rc1 #1 SMP Tue Feb 24 16:41:58 CET 2015 i686 GNU/LinuxQuoted 8 lines
Quoted 1 line
Want to send a patch? I'll get it in a few days if no one beats me.
I have no patch, sorry (in fact, I failed to find where is the relevant 32-bit counterpart).
It's just security people asked me to backport this and I wondered maybe I should wait a bit on this one, since fix for 32-bit ought to appear as well.
For 32-bit kernel, userspace DS and ES are saved at syscall/interrupt entry time and reloaded on exit, unlike in 64-bit where they are saved and loaded at context switch time. Therefore 32-bit is not affected by the issue this patch addresses.
Quoted 5 lines
It looks to me though, that the ES test program doesn't actually test what the patch fixes - the segment attributes, like the base address. It tests just the selector, which shouldn't change across a kernel entry (with a few exceptions, like signals). If the test is failing, then it is a different issue from what this patch addresses.
Quoted 3 lines
It tests it indirectly. The 64-bit code sets the selector to zero if it fails to reload it. Testing the ES base is awkward because it can't be done in 64-bit code at all.
Quoted 6 lines
I figured out why Denys got the failure.
usleep()makes a syscall via sysenter. The sysenter path saves es/ds, but does not restore them before sysexit like the int80/iret path would. That leaves them asUSER_DSthat the kernel loaded for itself. I believe this was an intentional optimization, assuming the vdso would only be called from programs conforming to the ELF ABI.
Makes sense. The attached variant passes, so I think we're fine.
--Andy
/*
* Copyright (c) 2014-2015 Andy Lutomirski
* GPL v2
*/
#include <stdio.h>
#include <unistd.h>
#include <time.h>
#include <err.h>
#include <asm/ldt.h>
#include <sys/syscall.h>
static unsigned short GDT3(int idx)
{
return (idx << 3) | 3;
}static int create_tls(int idx, unsigned int base)
{
struct user_desc desc = {
.entry_number = idx,
.base_addr = base,
.limit = 0xfffff,
.seg_32bit = 1,
.contents = 0, /* Data, grow-up */
.read_exec_only = 0,
.limit_in_pages = 1,
.seg_not_present = 0,
.useable = 0,
};
if (syscall(SYS_set_thread_area, &desc) != 0)
err(1, "set_thread_area");
return desc.entry_number;
}int main()
{
int idx = create_tls(-1, 0);
printf("Allocated GDT index %d\n", idx);
unsigned short orig_es;
asm volatile ("mov %%es,%0" : "=rm" (orig_es));
int errors = 0;
int total = 1000;
for (int i = 0; i < total; i++) {
struct timespec req = {
.tv_sec = 0,
.tv_nsec = 100000,
};
int ret;
asm volatile ("mov %0,%%es" : : "rm" (GDT3(idx)));
/*
* Force rescheduling. On 32-bit kernels, fast syscalls
* destroy DS and ES, so force int 80.
*/
asm volatile ("int $0x80"
: "=a" (ret)
: "a" (SYS_nanosleep), "b" (&req),
"c" (0));
unsigned short es;
asm volatile ("mov %%es,%0" : "=rm" (es));
asm volatile ("mov %0,%%es" : : "rm" (orig_es));
if (es != GDT3(idx)) {
if (errors == 0)
printf("[FAIL]\tES changed from 0x%hx to 0x%hx\n",
GDT3(idx), es);
errors++;
}
}
if (errors) {
printf("[FAIL]\tES was corrupted %d/%d times\n", errors, total);
return 1;
} else {
printf("[OK]\tES was preserved\n");
return 0;
}
}PATCH 56/152 mac80211: fix multicast LED blinking and counter
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Müller <[email protected]>
commit d025933e29872cb1fe19fc54d80e4dfa4ee5779c upstream.
As multicast-frames can't be fragmented, "dot11MulticastReceivedFrameCount" stopped being incremented after the use-after-free fix. Furthermore, the RX-LED will be triggered by every multicast frame (which wouldn't happen before) which wouldn't allow the LED to rest at all.
Fixes https://bugzilla.kernel.org/show_bug.cgi?id=89431 which also had the patch.
--- net/mac80211/rx.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
net/mac80211/rx.c +6 -5
@@ -1470,14 +1470,14 @@ ieee80211_rx_h_defragment(struct ieee802 sc =le16_to_cpu (hdr->seq_ctrl); frag = sc &IEEE80211_SCTL_FRAG ; -if (likely (!ieee80211_has_morefrags (fc) && frag ==0 )) - goto out; -if (is_multicast_ether_addr (hdr->addr1)) { rx->local->dot11MulticastReceivedFrameCount++; - goto out; + goto out_no_led; } +if (likely (!ieee80211_has_morefrags (fc) && frag ==0 )) + goto out; +I802_DEBUG_INC (rx->local->rx_handlers_fragments);if (skb_linearize (rx->skb))
@@ -1568,9 +1568,10 @@ ieee80211_rx_h_defragment(struct ieee802 status->rx_flags |=IEEE80211_RX_FRAGMENTED ; out: +ieee80211_led_rx (rx->local); + out_no_led:if (rx->sta) rx->sta->rx_packets++; -ieee80211_led_rx (rx->local);return RX_CONTINUE ; }
PATCH 57/152 genirq: Prevent proc race against freeing of irq descriptors
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit c291ee622165cb2c8d4e7af63fffd499354a23be upstream.
Since the rework of the sparse interrupt code to actually free the unused interrupt descriptors there exists a race between the /proc interfaces to the irq subsystem and the code which frees the interrupt descriptor.
CPU0 CPU1
show_interrupts() desc = irq_to_desc(X); free_desc(desc) remove_from_radix_tree(); kfree(desc); raw_spinlock_irq(&desc->lock);
/proc/interrupts is the only interface which can actively corrupt kernel memory via the lock access. /proc/stat can only read from freed memory. Extremly hard to trigger, but possible.
The interfaces in /proc/irq/N/ are not affected by this because the removal of the proc file is serialized in procfs against concurrent readers/writers. The removal happens before the descriptor is freed.
For architectures which have CONFIG_SPARSE_IRQ=n this is a non issue as the descriptor is never freed. It's merely cleared out with the irq descriptor lock held. So any concurrent proc access will either see the old correct value or the cleared out ones.
Protect the lookup and access to the irq descriptor in show_interrupts() with the sparse_irq_lock.
Provide kstat_irqs_usr() which is protecting the lookup and access with sparse_irq_lock and switch /proc/stat to use it.
Document the existing kstat_irqs interfaces so it's clear that the caller needs to take care about protection. The users of these interfaces are either not affected due to SPARSE_IRQ=n or already protected against removal.
[bwh: Backported to 3.2:
- Adjust context
- Handle the CONFIG_GENERIC_HARDIRQS=n case]
---
fs/proc/stat.c +1 -1
@@ -141,7 +141,7 @@ static int show_stat(struct seq_file *p,/* sum again ? it could be updated? */ for_each_irq_nr (j) -seq_printf (p," %u" ,kstat_irqs (j)); +seq_printf (p," %u" ,kstat_irqs_usr (j));seq_printf (p, "\nctxt %llu\n"
include/linux/kernel_stat.h +5 -0
@@ -96,8 +96,13 @@ static inline unsigned int kstat_irqs(un return sum; } +static inline unsigned int kstat_irqs_usr (unsigned int irq) +{ +return kstat_irqs (irq); +}#else extern unsigned int kstat_irqs (unsigned int irq); +extern unsigned int kstat_irqs_usr (unsigned int irq);#endif /*
kernel/irq/internals.h +7 -0
@@ -76,6 +76,13 @@ extern void irq_percpu_disable(struct irextern void mask_irq (struct irq_desc *desc);extern void unmask_irq (struct irq_desc *desc); +#ifdef CONFIG_SPARSE_IRQ +extern void irq_lock_sparse (void ); +extern void irq_unlock_sparse (void ); +#else +static inline void irq_lock_sparse (void ) { } +static inline void irq_unlock_sparse (void ) { } +#endif extern void init_kstat_irqs (struct irq_desc *desc,int node,int nr);irqreturn_t handle_irq_event_percpu (struct irq_desc *desc,struct irqaction *action);
kernel/irq/irqdesc.c +52 -0
79 lines not on this page · raw message
kernel/irq/proc.c +21 -1
@@ -15,6 +15,23 @@#include "internals.h" +/* +* Access rules: +* +* procfs protects read/write of /proc/irq/N/ files against a +* concurrent free of the interrupt descriptor. remove_proc_entry() +* immediately prevents new read/writes to happen and waits for +* already running read/write functions to complete. +* +* We remove the proc entries first and then delete the interrupt +* descriptor from the radix tree and free it. So it is guaranteed +* that irq_to_desc(N) is valid as long as the read/writes are +* permitted by procfs. +* +* The read from /proc/interrupts is a different problem because there +* is no protection. So the lookup and the access to irqdesc +* information must be protected by sparse_irq_lock. +*/ static struct proc_dir_entry *root_irq_dir;#ifdef CONFIG_SMP
@@ -441,9 +458,10 @@ int show_interrupts(struct seq_file *p,seq_putc (p,'\n' ); } +irq_lock_sparse (); desc =irq_to_desc (i);if (!desc) -return 0 ; + goto outsparse;raw_spin_lock_irqsave (&desc->lock, flags);for_each_online_cpu (j)
@@ -481,6 +499,8 @@ int show_interrupts(struct seq_file *p,seq_putc (p,'\n' ); out:raw_spin_unlock_irqrestore (&desc->lock, flags); +outsparse: +irq_unlock_sparse (); return 0; }#endif
PATCH 58/152 decompress_bunzip2: off by one in get_next_block()
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit b5c8afe5be51078a979d86ae5ae78c4ac948063d upstream.
"origPtr" is used as an offset into the bd->dbuf[] array. That array is allocated in start_bunzip() and has "bd->dbufSize" number of elements so the test here should be >= instead of >.
Later we check "origPtr" again before using it as an offset so I don't know if this bug can be triggered in real life.
--- lib/decompress_bunzip2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/decompress_bunzip2.c +1 -1
@@ -185,7 +185,7 @@ static int INIT get_next_block(struct buif (get_bits (bd,1 ))return RETVAL_OBSOLETE_INPUT ; origPtr =get_bits (bd,24 ); -if (origPtr > dbufSize) +if (origPtr >= dbufSize)return RETVAL_DATA_ERROR ;/* mapping table: if some byte values are never used (encoding things like ascii text), the compression code removes the gaps to have fewer
PATCH 59/152 x86/tls: Disallow unusual TLS segments
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andy Lutomirski <[email protected]>
commit 0e58af4e1d2166e9e33375a0f121e4867010d4f8 upstream.
Users have no business installing custom code segments into the GDT, and segments that are not present but are otherwise valid are a historical source of interesting attacks.
For completeness, block attempts to set the L bit. (Prior to this patch, the L bit would have been silently dropped.)
This is an ABI break. I've checked glibc, musl, and Wine, and none of them look like they'll have any trouble.
Note to stable maintainers: this is a hardening patch that fixes no known bugs. Given the possibility of ABI issues, this probably shouldn't be backported quickly.
--- arch/x86/kernel/tls.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/x86/kernel/tls.c +22 -0
@@ -40,6 +40,28 @@ static bool tls_desc_okay(const struct uif (!info->seg_32bit)return false; +/* Only allow data segments in the TLS array. */ +if (info->contents >1 ) +return false; + +/* +* Non-present segments with DPL 3 present an interesting attack +* surface. The kernel should handle such segments correctly, +* but TLS is very difficult to protect in a sandbox, so prevent +* such segments from being created. +* +* If userspace needs to remove a TLS entry, it can still delete +* it outright. +*/ +if (info->seg_not_present) +return false; + +#ifdef CONFIG_X86_64 +/* The L bit makes no sense for data. */ +if (info->lm) +return false; +#endif +return true; }
PATCH 60/152 isofs: Fix infinite looping over CE entries
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit f54e18f1b831c92f6512d2eedb224cd63d607d3d upstream.
Rock Ridge extensions define so called Continuation Entries (CE) which define where is further space with Rock Ridge data. Corrupted isofs image can contain arbitrarily long chain of these, including a one containing loop and thus causing kernel to end in an infinite loop when traversing these entries.
Limit the traversal to 32 entries which should be more than enough space to store all the Rock Ridge data.
--- fs/isofs/rock.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/isofs/rock.c +6 -0
@@ -30,6 +30,7 @@ struct rock_state {int cont_size;int cont_extent;int cont_offset; +int cont_loops;struct inode *inode; };
@@ -73,6 +74,9 @@ static void init_rock_state(struct rock_ rs->inode = inode; } +/* Maximum number of Rock Ridge continuation entries */ +#define RR_MAX_CE_ENTRIES 32 +/* * Returns 0 if the caller should continue scanning, 1 if the scan must end * and -ve on error.
@@ -105,6 +109,8 @@ static int rock_continue(struct rock_sta goto out; } ret = -EIO ; +if (++rs->cont_loops >=RR_MAX_CE_ENTRIES ) + goto out; bh =sb_bread (rs->inode->i_sb, rs->cont_extent);if (bh) { memcpy(rs->buffer, bh->b_data + rs->cont_offset,
PATCH 61/152 iscsi-target: Fail connection on short sendmsg writes
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit 6bf6ca7515c1df06f5c03737537f5e0eb191e29e upstream.
This patch changes iscsit_do_tx_data() to fail on short writes when kernel_sendmsg() returns a value different than requested transfer length, returning -EPIPE and thus causing a connection reset to occur.
This avoids a potential bug in the original code where a short write would result in kernel_sendmsg() being called again with the original iovec base + length.
In practice this has not been an issue because iscsit_do_tx_data() is only used for transferring 48 byte headers + 4 byte digests, along with seldom used control payloads from NOPIN + TEXT_RSP + REJECT with less than 32k of data.
So following Al's audit of iovec consumers, go ahead and fail the connection on short writes for now, and remove the bogus logic ahead of his proper upstream fix.
--- drivers/target/iscsi/iscsi_target_util.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-)
drivers/target/iscsi/iscsi_target_util.c +11 -15
@@ -1483,15 +1483,15 @@ static int iscsit_do_tx_data(struct iscsi_conn *conn, struct iscsi_data_count *count) { - int data = count->data_length, total_tx = 0, tx_loop = 0, iov_len; + int ret, iov_len;struct kvec *iov_p;struct msghdr msg;if (!conn || !conn->sock || !conn->conn_ops)return -1 ; -if (data <=0 ) { -pr_err ("Data length is: %d\n" , data); +if (count->data_length <=0 ) { +pr_err ("Data length is: %d\n" , count->data_length);return -1 ; }
@@ -1500,20 +1500,16 @@ static int iscsit_do_tx_data( iov_p = count->iov; iov_len = count->iov_count; -while (total_tx < data) { - tx_loop =kernel_sendmsg (conn->sock, &msg, iov_p, iov_len, - (data - total_tx)); -if (tx_loop <=0 ) { -pr_debug ("tx_loop: %d total_tx %d\n" , - tx_loop, total_tx); -return tx_loop; - } - total_tx += tx_loop; -pr_debug ("tx_loop: %d, total_tx: %d, data: %d\n" , - tx_loop, total_tx, data); + ret =kernel_sendmsg (conn->sock, &msg, iov_p, iov_len, + count->data_length); +if (ret != count->data_length) { +pr_err ("Unexpected ret: %d send data %d\n" , + ret, count->data_length); +return -EPIPE ; } +pr_debug ("ret: %d, sent data: %d\n" , ret, count->data_length); -return total_tx; +return ret; } int rx_data(
PATCH 62/152 ceph: introduce global empty snap context
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "Yan, Zheng" <[email protected]>
commit 97c85a828f36bbfffe9d77b977b65a5872b6cad4 upstream.
Current snaphost code does not properly handle moving inode from one empty snap realm to another empty snap realm. After changing inode's snap realm, some dirty pages' snap context can be not equal to inode's i_head_snap. This can trigger BUG() in ceph_put_wrbuffer_cap_refs()
The fix is introduce a global empty snap context for all empty snap realm. This avoids triggering the BUG() for filesystem with no snapshot.
[bwh: Backported to 3.2:
- Adjust context
- As we don't have ceph_create_snap_context(), open-code it in ceph_snap_init()]
---
fs/ceph/snap.c +26 -1
@@ -288,6 +288,9 @@ static int cmpu64_rev(const void *a, conreturn 0 ; } + +static struct ceph_snap_context *empty_snapc; +/* * build the snap context for a given realm. */
@@ -329,6 +332,12 @@ static int build_snap_context(struct cepreturn 0 ; } +if (num ==0 && realm->seq == empty_snapc->seq) { +ceph_get_snap_context (empty_snapc); + snapc = empty_snapc; + goto done; + } +/* alloc new snap context */ err = -ENOMEM ;if (num > (SIZE_MAX -sizeof (*snapc)) /sizeof (u64))
@@ -364,6 +373,7 @@ static int build_snap_context(struct cepdout ("build_snap_context %llx %p: %p seq %lld (%d snaps)\n" , realm->ino, realm, snapc, snapc->seq, snapc->num_snaps); +done:if (realm->cached_context)ceph_put_snap_context (realm->cached_context); realm->cached_context = snapc;
@@ -465,6 +475,9 @@ void ceph_queue_cap_snap(struct ceph_inocap_snap. lucky us. */ dout ("queue_cap_snap %p already pending\n" , inode);kfree (capsnap); + }else if (ci->i_snap_realm->cached_context == empty_snapc) { +dout ("queue_cap_snap %p empty snapc\n" , inode); +kfree (capsnap); }else if (dirty & (CEPH_CAP_AUTH_EXCL |CEPH_CAP_XATTR_EXCL |CEPH_CAP_FILE_EXCL |CEPH_CAP_FILE_WR )) {struct ceph_snap_context *snapc = ci->i_head_snapc;
@@ -927,5 +940,17 @@ out:return ; } +int __init ceph_snap_init (void ) +{ + empty_snapc =kzalloc (sizeof (struct ceph_snap_context ),GFP_NOFS ); +if (!empty_snapc) +return -ENOMEM ; +atomic_set (&empty_snapc->nref,1 ); + empty_snapc->seq =1 ; +return 0 ; +} - +void ceph_snap_exit (void ) +{ +ceph_put_snap_context (empty_snapc); +}
fs/ceph/super.c +8 -1
@@ -911,14 +911,20 @@ static int __init init_ceph(void)if (ret) goto out; - ret =register_filesystem (&ceph_fs_type); + ret =ceph_snap_init ();if (ret) goto out_icache; + ret =register_filesystem (&ceph_fs_type); +if (ret) + goto out_snap; +pr_info ("loaded (mds proto %d)\n" ,CEPH_MDSC_PROTOCOL );return 0 ; +out_snap: +ceph_snap_exit (); out_icache:destroy_caches (); out:
@@ -929,6 +935,7 @@ static void __exit exit_ceph(void) {dout ("exit_ceph\n" );unregister_filesystem (&ceph_fs_type); +ceph_snap_exit ();destroy_caches (); }
fs/ceph/super.h +2 -0
@@ -677,6 +677,8 @@ extern void ceph_queue_cap_snap(struct cextern int __ceph_finish_cap_snap (struct ceph_inode_info *ci,struct ceph_cap_snap *capsnap);extern void ceph_cleanup_empty_realms (struct ceph_mds_client *mdsc); +extern int ceph_snap_init (void ); +extern void ceph_snap_exit (void );/* * a cap_snap is "pending" if it is still awaiting an in-progress
PATCH 63/152 x86/tls: Don't validate lm in set_thread_area() after all
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andy Lutomirski <[email protected]>
commit 3fb2f4237bb452eb4e98f6a5dbd5a445b4fed9d0 upstream.
It turns out that there's a lurking ABI issue. GCC, when compiling this in a 32-bit program:
struct user_desc desc = {
.entry_number = idx,
.base_addr = base,
.limit = 0xfffff,
.seg_32bit = 1,
.contents = 0, /* Data, grow-up */
.read_exec_only = 0,
.limit_in_pages = 1,
.seg_not_present = 0,
.useable = 0,
};will leave .lm uninitialized. This means that anything in the kernel that reads user_desc.lm for 32-bit tasks is unreliable.
Revert the .lm check in set_thread_area(). The value never did anything in the first place.
--- arch/x86/include/asm/ldt.h | 7 +++++++ arch/x86/kernel/tls.c | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-)
arch/x86/include/asm/ldt.h +7 -0
@@ -28,6 +28,13 @@ struct user_desc { unsigned int seg_not_present:1; unsigned int useable:1;#ifdef __x86_64__ +/* +* Because this bit is not present in 32-bit user code, user +* programs can pass uninitialized values here. Therefore, in +* any context in which a user_desc comes from a 32-bit program, +* the kernel must act as though lm == 0, regardless of the +* actual value. +*/ unsigned int lm:1;#endif };
arch/x86/kernel/tls.c +0 -6
@@ -56,12 +56,6 @@ static bool tls_desc_okay(const struct uif (info->seg_not_present)return false; -#ifdef CONFIG_X86_64 -/* The L bit makes no sense for data. */ -if (info->lm) -return false; -#endif -return true; }
PATCH 64/152 ALSA: usb-audio: extend KEF X300A FU 10 tweak to Arcam rPAC
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Jaburek <[email protected]>
commit d70a1b9893f820fdbcdffac408c909c50f2e6b43 upstream.
The Arcam rPAC seems to have the same problem - whenever anything (alsamixer, udevd, 3.9+ kernel from 60af3d037eb8c, ..) attempts to access mixer / control interface of the card, the firmware "locks up" the entire device, resulting in
SNDRV_PCM_IOCTL_HW_PARAMS failed (-5): Input/output error
from alsa-lib.
Other operating systems can somehow read the mixer (there seems to be playback volume/mute), but any manipulation is ignored by the device (which has hardware volume controls).
--- sound/usb/mixer_maps.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
sound/usb/mixer_maps.c +12 -3
@@ -304,8 +304,11 @@ static struct usbmix_name_map hercules_u { 0 } /* terminator */ }; -static const struct usbmix_name_map kef_x300a_map[] = { - {10 ,NULL },/* firmware locks up (?) when we try to access this FU */ +/* some (all?) SCMS USB3318 devices are affected by a firmware lock up +* when anything attempts to access FU 10 (control) +*/ +static const struct usbmix_name_map scms_usb3318_map[] = { + {10 ,NULL }, {0 } };
@@ -377,8 +380,14 @@ static struct usbmix_ctl_map usbmix_ctl_ .ignore_ctl_error = 1, }, { +/* KEF X300A */ .id = USB_ID(0x27ac, 0x1000), - .map = kef_x300a_map, + .map = scms_usb3318_map, + }, + { +/* Arcam rPAC */ + .id = USB_ID(0x25c4, 0x0003), + .map = scms_usb3318_map, }, { 0 } /* terminator */ };
PATCH 65/152 ocfs2: fix journal commit deadlock
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Junxiao Bi <[email protected]>
commit 136f49b9171074872f2a14ad0ab10486d1ba13ca upstream.
For buffer write, page lock will be got in write_begin and released in write_end, in ocfs2_write_end_nolock(), before it unlock the page in ocfs2_free_write_ctxt(), it calls ocfs2_run_deallocs(), this will ask for the read lock of journal->j_trans_barrier. Holding page lock and ask for journal->j_trans_barrier breaks the locking order.
This will cause a deadlock with journal commit threads, ocfs2cmt will get write lock of journal->j_trans_barrier first, then it wakes up kjournald2 to do the commit work, at last it waits until done. To commit journal, kjournald2 needs flushing data first, it needs get the cache page lock.
Since some ocfs2 cluster locks are holding by write process, this deadlock may hung the whole cluster.
unlock pages before ocfs2_run_deallocs() can fix the locking order, also put unlock before ocfs2_commit_trans() to make page lock is unlocked before j_trans_barrier to preserve unlocking order.
--- fs/ocfs2/aops.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
fs/ocfs2/aops.c +14 -2
@@ -917,7 +917,7 @@ void ocfs2_unlock_and_free_pages(struct } } -static void ocfs2_free_write_ctxt (struct ocfs2_write_ctxt *wc) +static void ocfs2_unlock_pages (struct ocfs2_write_ctxt *wc) {int i;
@@ -938,7 +938,11 @@ static void ocfs2_free_write_ctxt(structpage_cache_release (wc->w_target_page); }ocfs2_unlock_and_free_pages (wc->w_pages, wc->w_num_pages); +} +static void ocfs2_free_write_ctxt (struct ocfs2_write_ctxt *wc) +{ +ocfs2_unlock_pages (wc);brelse (wc->w_di_bh);kfree (wc); }
@@ -2059,11 +2063,19 @@ out_write_size: di->i_mtime_nsec = di->i_ctime_nsec =cpu_to_le32 (inode->i_mtime.tv_nsec);ocfs2_journal_dirty (handle, wc->w_di_bh); +/* unlock pages before dealloc since it needs acquiring j_trans_barrier +* lock, or it will cause a deadlock since journal commit threads holds +* this lock and will ask for the page lock when flushing the data. +* put it here to preserve the unlock order. +*/ +ocfs2_unlock_pages (wc); +ocfs2_commit_trans (osb, handle);ocfs2_run_deallocs (osb, &wc->w_dealloc); -ocfs2_free_write_ctxt (wc); +brelse (wc->w_di_bh); +kfree (wc);return copied; }
PATCH 66/152 isofs: Fix unchecked printing of ER records
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 4e2024624e678f0ebb916e6192bd23c1f9fdf696 upstream.
We didn't check length of rock ridge ER records before printing them. Thus corrupted isofs image can cause us to access and print some memory behind the buffer with obvious consequences.
--- fs/isofs/rock.c | 3 +++ 1 file changed, 3 insertions(+)
fs/isofs/rock.c +3 -0
@@ -362,6 +362,9 @@ repeat: rs.cont_size =isonum_733 (rr->u.CE.size);break ;case SIG ('E' ,'R' ): +/* Invalid length of ER tag id? */ + if (rr->u.ER.len_id + offsetof(struct rock_ridge, u.ER.data) > rr->len) + goto out;ISOFS_SB (inode->i_sb)->s_rock =1 ;printk (KERN_DEBUG "ISO 9660 Extensions: " ); {
PATCH 67/152 udf: Verify i_size when loading inode
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit e159332b9af4b04d882dbcfe1bb0117f0a6d4b58 upstream.
Verify that inode size is sane when loading inode with data stored in ICB. Otherwise we may get confused later when working with the inode and inode size is too big.
--- fs/udf/inode.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
fs/udf/inode.c +18 -0
@@ -1403,6 +1403,24 @@ static void udf_fill_inode(struct inode iinfo->i_lenEAttr; } +/* Sanity checks for files in ICB so that we don't get confused later */ +if (iinfo->i_alloc_type ==ICBTAG_FLAG_AD_IN_ICB ) { +/* +* For file in ICB data is stored in allocation descriptor +* so sizes should match +*/ +if (iinfo->i_lenAlloc != inode->i_size) { +make_bad_inode (inode); +return ; + } +/* File in ICB has to fit in there... */ +if (inode->i_size > inode->i_sb->s_blocksize - +udf_file_entry_alloc_offset (inode)) { +make_bad_inode (inode); +return ; + } + } +switch (fe->icbTag.fileType) {case ICBTAG_FILE_TYPE_DIRECTORY : inode->i_op = &udf_dir_inode_operations;
PATCH 68/152 udf: Verify symlink size before loading it
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit a1d47b262952a45aae62bd49cfaf33dd76c11a2c upstream.
UDF specification allows arbitrarily large symlinks. However we support only symlinks at most one block large. Check the length of the symlink so that we don't access memory beyond end of the symlink block.
--- fs/udf/symlink.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
fs/udf/symlink.c +13 -4
@@ -74,11 +74,17 @@ static int udf_symlink_filler(struct filstruct inode *inode = page->mapping->host;struct buffer_head *bh =NULL ;unsigned char *symlink; -int err = -EIO ; +int err;unsigned char *p =kmap (page);struct udf_inode_info *iinfo;uint32_t pos; +/* We don't support symlinks longer than one block */ +if (inode->i_size > inode->i_sb->s_blocksize) { + err = -ENAMETOOLONG ; + goto out_unmap; + } + iinfo =UDF_I (inode); pos =udf_block_map (inode,0 );
@@ -88,8 +94,10 @@ static int udf_symlink_filler(struct fil }else { bh =sb_bread (inode->i_sb, pos); -if (!bh) - goto out; +if (!bh) { + err = -EIO ; + goto out_unlock_inode; + } symlink = bh->b_data; }
@@ -103,9 +111,10 @@ static int udf_symlink_filler(struct filunlock_page (page);return 0 ; -out: +out_unlock_inode:up_read (&iinfo->i_data_sem);SetPageError (page); +out_unmap:kunmap (page);unlock_page (page);return err;
PATCH 69/152 udf: Treat symlink component of type 2 as /
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit fef2e9f3301934773e4f1b3cc5c7bffb119346b8 upstream.
Currently, we ignore symlink component of type 2. But mkisofs and other OS' seem to treat it as / so do the same for compatibility.
--- fs/udf/symlink.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
fs/udf/symlink.c +10 -4
@@ -41,10 +41,16 @@ static void udf_pc_to_char(struct super_ pc = (struct pathComponent *)(from + elen);switch (pc->componentType) {case 1 : -if (pc->lengthComponentIdent ==0 ) { - p = to; - *p++ ='/' ; - } +/* +* Symlink points to some place which should be agreed +* upon between originator and receiver of the media. Ignore. +*/ +if (pc->lengthComponentIdent >0 ) +break ; +/* Fall through */ +case 2 : + p = to; + *p++ ='/' ;break ;case 3 :memcpy (p,"../" ,3 );
PATCH 70/152 udf: Check path length when reading symlink
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 0e5cc9a40ada6046e6bc3bdfcd0c0d7e4b706b14 upstream.
Symlink reading code does not check whether the resulting path fits into the page provided by the generic code. This isn't as easy as just checking the symlink size because of various encoding conversions we perform on path. So we have to check whether there is still enough space in the buffer on the fly.
--- fs/udf/dir.c | 3 ++- fs/udf/namei.c | 3 ++- fs/udf/symlink.c | 31 ++++++++++++++++++++++++++----- fs/udf/udfdecl.h | 3 ++- fs/udf/unicode.c | 28 ++++++++++++++++------------ 5 files changed, 48 insertions(+), 20 deletions(-)
fs/udf/dir.c +2 -1
@@ -163,7 +163,8 @@ static int do_udf_readdir(struct inode *struct kernel_lb_addr tloc =lelb_to_cpu (cfi.icb.extLocation); iblock =udf_get_lb_pblock (dir->i_sb, &tloc,0 ); - flen =udf_get_filename (dir->i_sb, nameptr, fname, lfi); + flen =udf_get_filename (dir->i_sb, nameptr, lfi, fname, +UDF_NAME_LEN ); dt_type =DT_UNKNOWN ; }
fs/udf/namei.c +2 -1
@@ -235,7 +235,8 @@ static struct fileIdentDesc *udf_find_enif (!lfi)continue ; - flen =udf_get_filename (dir->i_sb, nameptr, fname, lfi); + flen =udf_get_filename (dir->i_sb, nameptr, lfi, fname, +UDF_NAME_LEN );if (flen &&udf_match (flen, fname, child->len, child->name)) goto out_ok; }
fs/udf/symlink.c +26 -5
@@ -30,13 +30,16 @@#include <linux/buffer_head.h> #include "udf_i.h" -static void udf_pc_to_char (struct super_block *sb,unsigned char *from, -int fromlen,unsigned char *to) +static int udf_pc_to_char (struct super_block *sb,unsigned char *from, +int fromlen,unsigned char *to,int tolen) {struct pathComponent *pc;int elen =0 ; +int comp_len;unsigned char *p = to; +/* Reserve one byte for terminating \0 */ + tolen--;while (elen < fromlen) { pc = (struct pathComponent *)(from + elen);switch (pc->componentType) {
@@ -49,22 +52,37 @@ static void udf_pc_to_char(struct super_break ;/* Fall through */ case 2 : +if (tolen ==0 ) +return -ENAMETOOLONG ; p = to; *p++ ='/' ; + tolen--;break ;case 3 : +if (tolen <3 ) +return -ENAMETOOLONG ;memcpy (p,"../" ,3 ); p +=3 ; + tolen -=3 ;break ;case 4 : +if (tolen <2 ) +return -ENAMETOOLONG ;memcpy (p,"./" ,2 ); p +=2 ; + tolen -=2 ;/* that would be . - just ignore */ break ;case 5 : - p +=udf_get_filename (sb, pc->componentIdent, p, - pc->lengthComponentIdent); + comp_len =udf_get_filename (sb, pc->componentIdent, + pc->lengthComponentIdent, + p, tolen); + p += comp_len; + tolen -= comp_len; +if (tolen ==0 ) +return -ENAMETOOLONG ; *p++ ='/' ; + tolen--;break ; } elen +=sizeof (struct pathComponent ) + pc->lengthComponentIdent;
@@ -73,6 +91,7 @@ static void udf_pc_to_char(struct super_ p[-1 ] ='\0' ; else p[0 ] ='\0' ; +return 0 ; }static int udf_symlink_filler (struct file *file,struct page *page)
@@ -108,8 +127,10 @@ static int udf_symlink_filler(struct fil symlink = bh->b_data; } -udf_pc_to_char (inode->i_sb, symlink, inode->i_size, p); + err =udf_pc_to_char (inode->i_sb, symlink, inode->i_size, p,PAGE_SIZE );brelse (bh); +if (err) + goto out_unlock_inode;up_read (&iinfo->i_data_sem);SetPageUptodate (page);
fs/udf/udfdecl.h +2 -1
@@ -207,7 +207,8 @@ udf_get_lb_pblock(struct super_block *sb }/* unicode.c */ -extern int udf_get_filename (struct super_block *,uint8_t *,uint8_t *,int ); +extern int udf_get_filename (struct super_block *,uint8_t *,int ,uint8_t *, +int );extern int udf_put_filename (struct super_block *,const uint8_t *,uint8_t *,int );extern int udf_build_ustr (struct ustr *,dstring *,int );
fs/udf/unicode.c +16 -12
@@ -28,7 +28,8 @@#include "udf_sb.h" -static int udf_translate_to_linux (uint8_t *,uint8_t *,int ,uint8_t *,int ); +static int udf_translate_to_linux (uint8_t *,int ,uint8_t *,int ,uint8_t *, +int );static int udf_char_to_ustr (struct ustr *dest,const uint8_t *src,int strlen) {
@@ -333,8 +334,8 @@ try_again:return u_len +1 ; } -int udf_get_filename (struct super_block *sb,uint8_t *sname,uint8_t *dname, -int flen) +int udf_get_filename (struct super_block *sb,uint8_t *sname,int slen, +uint8_t *dname,int dlen) {struct ustr *filename, *unifilename;int len =0 ;
@@ -347,7 +348,7 @@ int udf_get_filename(struct super_blockif (!unifilename) goto out1; -if (udf_build_ustr_exact (unifilename, sname, flen)) +if (udf_build_ustr_exact (unifilename, sname, slen)) goto out2;if (UDF_QUERY_FLAG (sb,UDF_FLAG_UTF8 )) {
@@ -366,7 +367,8 @@ int udf_get_filename(struct super_block }else goto out2; - len =udf_translate_to_linux (dname, filename->u_name, filename->u_len, + len =udf_translate_to_linux (dname, dlen, + filename->u_name, filename->u_len, unifilename->u_name, unifilename->u_len); out2:kfree (unifilename);
@@ -403,10 +405,12 @@ int udf_put_filename(struct super_block#define EXT_MARK '.'#define CRC_MARK '#'#define EXT_SIZE 5 +/* Number of chars we need to store generated CRC to make filename unique */ +#define CRC_LEN 5 -static int udf_translate_to_linux (uint8_t *newName,uint8_t *udfName, -int udfLen,uint8_t *fidName, -int fidNameLen) +static int udf_translate_to_linux (uint8_t *newName,int newLen, +uint8_t *udfName,int udfLen, +uint8_t *fidName,int fidNameLen) {int index, newIndex =0 , needsCRC =0 ;int extIndex =0 , newExtIndex =0 , hasExt =0 ;
@@ -440,7 +444,7 @@ static int udf_translate_to_linux(uint8_ newExtIndex = newIndex; } } -if (newIndex <256 ) +if (newIndex < newLen) newName[newIndex++] = curr;else needsCRC =1 ;
@@ -468,13 +472,13 @@ static int udf_translate_to_linux(uint8_ } ext[localExtIndex++] = curr; } - maxFilenameLen =250 - localExtIndex; + maxFilenameLen = newLen -CRC_LEN - localExtIndex;if (newIndex > maxFilenameLen) newIndex = maxFilenameLen;else newIndex = newExtIndex; - }else if (newIndex >250 ) - newIndex =250 ; + }else if (newIndex > newLen -CRC_LEN ) + newIndex = newLen -CRC_LEN ; newName[newIndex++] =CRC_MARK ; valueCRC =crc_itu_t (0 , fidName, fidNameLen); newName[newIndex++] = hexChar[(valueCRC &0xf000 ) >>12 ];
PATCH 71/152 x86_64, vdso: Fix the vdso address randomization algorithm
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andy Lutomirski <[email protected]>
commit 394f56fe480140877304d342dec46d50dc823d46 upstream.
The theory behind vdso randomization is that it's mapped at a random offset above the top of the stack. To avoid wasting a page of memory for an extra page table, the vdso isn't supposed to extend past the lowest PMD into which it can fit. Other than that, the address should be a uniformly distributed address that meets all of the alignment requirements.
The current algorithm is buggy: the vdso has about a 50% probability of being at the very end of a PMD. The current algorithm also has a decent chance of failing outright due to incorrect handling of the case where the top of the stack is near the top of its PMD.
This fixes the implementation. The paxtest estimate of vdso "randomisation" improves from 11 bits to 18 bits. (Disclaimer: I don't know what the paxtest code is actually calculating.)
It's worth noting that this algorithm is inherently biased: the vdso is more likely to end up near the end of its PMD than near the beginning. Ideally we would either nix the PMD sharing requirement or jointly randomize the vdso and the stack to reduce the bias.
In the mean time, this is a considerable improvement with basically no risk of compatibility issues, since the allowed outputs of the algorithm are unchanged.
As an easy test, doing this:
for i in seq 10000
do grep -P vdso /proc/self/maps |cut -d- -f1
done |sort |uniq -d
used to produce lots of output (1445 lines on my most recent run). A tiny subset looks like this:
7fffdfffe0007fffe01fe0007fffe05fe0007fffe07fe0007fffe09fe0007fffe0bfe0007fffe0dfe000
Note the suspicious fe000 endings. With the fix, I get a much more palatable 76 repeated addresses.
[bwh: Backported to 3.2:
- Adjust context
- The whole file is only built for x86_64; adjust comment for this]
--- arch/x86/vdso/vma.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-)
arch/x86/vdso/vma.c +27 -14
@@ -72,30 +72,43 @@ subsys_initcall(init_vdso);struct linux_binprm ; -/* Put the vdso above the (randomized) stack with another randomized offset. -This way there is no hole in the middle of address space. -To save memory make sure it is still in the same PTE as the stack top. -This doesn't give that many random bits */ +/* +* Put the vdso above the (randomized) stack with another randomized +* offset. This way there is no hole in the middle of address space. +* To save memory make sure it is still in the same PTE as the stack +* top. This doesn't give that many random bits. +* +* Note that this algorithm is imperfect: the distribution of the vdso +* start address within a PMD is biased toward the end. +*/ static unsigned long vdso_addr (unsigned long start,unsigned len) {unsigned long addr, end;unsigned offset; - end = (start +PMD_SIZE -1 ) &PMD_MASK ; + +/* +* Round up the start address. It can start out unaligned as a result +* of stack start randomization. +*/ + start =PAGE_ALIGN (start); + +/* Round the lowest possible end address up to a PMD boundary. */ + end = (start + len +PMD_SIZE -1 ) &PMD_MASK ;if (end >=TASK_SIZE_MAX ) end =TASK_SIZE_MAX ; end -= len; -/* This loses some more bits than a modulo, but is cheaper */ - offset =get_random_int () & (PTRS_PER_PTE -1 ); - addr = start + (offset <<PAGE_SHIFT ); -if (addr >= end) - addr = end; + +if (end > start) { + offset =get_random_int () % (((end - start) >>PAGE_SHIFT ) +1 ); + addr = start + (offset <<PAGE_SHIFT ); + }else { + addr = start; + }/* -* page-align it here so that get_unmapped_area doesn't -* align it wrongfully again to the next page. addr can come in 4K -* unaligned here as a result of stack start randomization. +* Forcibly align the final address in case we have a hardware +* issue that requires alignment for performance reasons. */ - addr =PAGE_ALIGN (addr); addr =align_addr (addr,NULL ,ALIGN_VDSO );return addr;
PATCH 72/152 udf: Check component length before reading it
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit e237ec37ec154564f8690c5bd1795339955eeef9 upstream.
Check that length specified in a component of a symlink fits in the input buffer we are reading. Also properly ignore component length for component types that do not use it. Otherwise we read memory after end of buffer for corrupted udf image.
--- fs/udf/symlink.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/udf/symlink.c +7 -2
@@ -42,14 +42,17 @@ static int udf_pc_to_char(struct super_b tolen--;while (elen < fromlen) { pc = (struct pathComponent *)(from + elen); + elen +=sizeof (struct pathComponent );switch (pc->componentType) {case 1 :/* * Symlink points to some place which should be agreed * upon between originator and receiver of the media. Ignore. */ -if (pc->lengthComponentIdent >0 ) +if (pc->lengthComponentIdent >0 ) { + elen += pc->lengthComponentIdent;break ; + }/* Fall through */ case 2 :if (tolen ==0 )
@@ -74,6 +77,9 @@ static int udf_pc_to_char(struct super_b/* that would be . - just ignore */ break ;case 5 : + elen += pc->lengthComponentIdent; +if (elen > fromlen) +return -EIO ; comp_len =udf_get_filename (sb, pc->componentIdent, pc->lengthComponentIdent, p, tolen);
@@ -85,7 +91,6 @@ static int udf_pc_to_char(struct super_b tolen--;break ; } - elen +=sizeof (struct pathComponent ) + pc->lengthComponentIdent; }if (p > to +1 ) p[-1 ] ='\0' ;
PATCH 73/152 crypto: af_alg - fix backlog handling
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Rabin Vincent <[email protected]>
commit 7e77bdebff5cb1e9876c561f69710b9ab8fa1f7e upstream.
If a request is backlogged, it's complete() handler will get called
twice: once with -EINPROGRESS, and once with the final error code.
af_alg's complete handler, unlike other users, does not handle the -EINPROGRESS but instead always completes the completion that recvmsg() is waiting on. This can lead to a return to user space while the request is still pending in the driver. If userspace closes the sockets before the requests are handled by the driver, this will lead to use-after-frees (and potential crashes) in the kernel due to the tfm having been freed.
The crashes can be easily reproduced (for example) by reducing the max queue length in cryptod.c and running the following (from
http://www.chronox.de/libkcapi.html) on AES-NI capable hardware:
$ while true; do kcapi -x 1 -e -c '__ecb-aes-aesni' \
-k 00000000000000000000000000000000 \
-p 00000000000000000000000000000000 >/dev/null & done--- crypto/af_alg.c | 3 +++ 1 file changed, 3 insertions(+)
crypto/af_alg.c +3 -0
@@ -449,6 +449,9 @@ void af_alg_complete(struct crypto_async {struct af_alg_completion *completion = req->data; +if (err == -EINPROGRESS ) +return ; + completion->err = err;complete (&completion->completion); }
PATCH 74/152 net: Fix stacked vlan offload features computation
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Toshiaki Makita <[email protected]>
commit 796f2da81bead71ffc91ef70912cd8d1827bf756 upstream.
When vlan tags are stacked, it is very likely that the outer tag is stored in skb->vlan_tci and skb->protocol shows the inner tag's vlan_proto. Currently netif_skb_features() first looks at skb->protocol even if there is the outer tag in vlan_tci, thus it incorrectly retrieves the protocol encapsulated by the inner vlan instead of the inner vlan protocol. This allows GSO packets to be passed to HW and they end up being corrupted.
[bwh: Backported to 3.2:
- We don't support 802.1ad tag offload
- Keep passing protocol to harmonize_features()]
---
net/core/dev.c +7 -5
@@ -2128,11 +2128,13 @@ u32 netif_skb_features(struct sk_buff *sif (skb_shinfo (skb)->gso_segs > skb->dev->gso_max_segs) features &= ~NETIF_F_GSO_MASK ; -if (protocol ==htons (ETH_P_8021Q )) { -struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data; - protocol = veh->h_vlan_encapsulated_proto; - }else if (!vlan_tx_tag_present (skb)) { -return harmonize_features (skb, protocol, features); +if (!vlan_tx_tag_present (skb)) { +if (unlikely (protocol ==htons (ETH_P_8021Q ))) { +struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data; + protocol = veh->h_vlan_encapsulated_proto; + }else { +return harmonize_features (skb, protocol, features); + } } features &= (skb->dev->vlan_features |NETIF_F_HW_VLAN_TX );
PATCH 75/152 video/logo: prevent use of logos after they have been freed
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
commit 92b004d1aa9f367c372511ca0330f58216b25703 upstream.
If the probe of an fb driver has been deferred due to missing dependencies, and the probe is later ran when a module is loaded, the fbdev framework will try to find a logo to use.
However, the logos are __initdata, and have already been freed. This causes sometimes page faults, if the logo memory is not mapped, sometimes other random crashes as the logo data is invalid, and sometimes nothing, if the fbdev decides to reject the logo (e.g. the random value depicting the logo's height is too big).
This patch adds a late_initcall function to mark the logos as freed. In reality the logos are freed later, and fbdev probe may be ran between this late_initcall and the freeing of the logos. In that case we will miss drawing the logo, even if it would be possible.
--- drivers/video/logo/logo.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/video/logo/logo.c +16 -1
@@ -25,6 +25,21 @@ static int nologo;module_param (nologo, bool,0 );MODULE_PARM_DESC (nologo,"Disables startup logo" ); +/* +* Logos are located in the initdata, and will be freed in kernel_init. +* Use late_init to mark the logos as freed to prevent any further use. +*/ + +static bool logos_freed; + +static int __init fb_logo_late_init (void ) +{ + logos_freed = true; +return 0 ; +} + +late_initcall (fb_logo_late_init); +/* logo's are marked __initdata. Use __init_refok to tell * modpost that it is intended that this function uses data * marked __initdata.
@@ -33,7 +48,7 @@ const struct linux_logo * __init_refok f {const struct linux_logo *logo =NULL ; -if (nologo) +if (nologo || logos_freed)return NULL ;if (depth >=1 ) {
PATCH 76/152 video/fbdev: fix defio's fsync
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
commit 30ea9c5218651bc11cbdba7820be78f04e2d83bc upstream.
fb_deferred_io_fsync() returns the value of schedule_delayed_work() as an error code, but schedule_delayed_work() does not return an error. It returns true/false depending on whether the work was already queued.
Fix this by ignoring the return value of schedule_delayed_work().
--- drivers/video/fb_defio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/video/fb_defio.c +3 -2
@@ -83,9 +83,10 @@ int fb_deferred_io_fsync(struct file *ficancel_delayed_work_sync (&info->deferred_work);/* Run it immediately */ - err =schedule_delayed_work (&info->deferred_work,0 ); +schedule_delayed_work (&info->deferred_work,0 );mutex_unlock (&inode->i_mutex); -return err; + +return 0 ; }EXPORT_SYMBOL_GPL (fb_deferred_io_fsync);
PATCH 77/152 USB: cp210x: fix ID for production CEL MeshConnect USB Stick
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Preston Fick <[email protected]>
commit 90441b4dbe90ba0c38111ea89fa093a8c9627801 upstream.
Fixing typo for MeshConnect IDs. The original PID (0x8875) is not in production and is not needed. Instead it has been changed to the official production PID (0x8857).
--- drivers/usb/serial/cp210x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/cp210x.c +1 -1
@@ -126,7 +126,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */ { USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */ { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */ - { USB_DEVICE(0x10C4, 0x8875) }, /* CEL MeshConnect USB Stick */ + { USB_DEVICE(0x10C4, 0x8857) }, /* CEL MeshConnect USB Stick */ { USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */ { USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */ { USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */
PATCH 78/152 Revert "tcp: Apply device TSO segment limit earlier"
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
This reverts commit 9f871e883277cc22c6217db806376dce52401a31, which was commit 1485348d2424e1131ea42efc033cbd9366462b01 upstream.
It can cause connections to stall when a PMTU event occurs. This was fixed by commit 843925f33fcc ("tcp: Do not apply TSO segment limit to non-TSO packets") upstream, but that depends on other changes to TSO.
The original issue this fixed was a performance regression for the sfc driver in extreme cases of TSO (skb with > 100 segments). This is not really very important and it seems best to revert it rather than try to fix it up.
---
include/net/sock.h +0 -2
@@ -194,7 +194,6 @@ struct sock_common {* @sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK) * @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4) * @sk_gso_max_size: Maximum GSO segment size to build -* @sk_gso_max_segs: Maximum number of GSO segments * @sk_lingertime: %SO_LINGER l_linger setting * @sk_backlog: always used with the per-socket spinlock held * @sk_callback_lock: used with the callbacks in the end of this struct
@@ -311,7 +310,6 @@ struct sock {int sk_route_nocaps;int sk_gso_type;unsigned int sk_gso_max_size; -u16 sk_gso_max_segs;int sk_rcvlowat;unsigned long sk_lingertime;struct sk_buff_head sk_error_queue;
net/core/sock.c +0 -1
@@ -1311,7 +1311,6 @@ void sk_setup_caps(struct sock *sk, stru }else { sk->sk_route_caps |=NETIF_F_SG |NETIF_F_HW_CSUM ; sk->sk_gso_max_size = dst->dev->gso_max_size; - sk->sk_gso_max_segs = dst->dev->gso_max_segs; } } }
net/ipv4/tcp.c +1 -3
@@ -738,9 +738,7 @@ static unsigned int tcp_xmit_size_goal(s old_size_goal + mss_now > xmit_size_goal)) { xmit_size_goal = old_size_goal; }else { - tp->xmit_size_goal_segs = -min_t (u16, xmit_size_goal / mss_now, - sk->sk_gso_max_segs); + tp->xmit_size_goal_segs = xmit_size_goal / mss_now; xmit_size_goal = tp->xmit_size_goal_segs * mss_now; } }
net/ipv4/tcp_cong.c +1 -2
@@ -290,8 +290,7 @@ int tcp_is_cwnd_limited(const struct soc left = tp->snd_cwnd - in_flight;if (sk_can_gso (sk) && left * sysctl_tcp_tso_win_divisor < tp->snd_cwnd && - left * tp->mss_cache < sk->sk_gso_max_size && - left < sk->sk_gso_max_segs) + left * tp->mss_cache < sk->sk_gso_max_size)return 1 ;return left <=tcp_max_burst (tp); }
net/ipv4/tcp_output.c +9 -12
@@ -1320,21 +1320,21 @@ static void tcp_cwnd_validate(struct soc* when we would be allowed to send the split-due-to-Nagle skb fully. */ static unsigned int tcp_mss_split_point (const struct sock *sk,const struct sk_buff *skb, -unsigned int mss_now,unsigned int max_segs) +unsigned int mss_now,unsigned int cwnd) {const struct tcp_sock *tp =tcp_sk (sk); -u32 needed, window, max_len; +u32 needed, window, cwnd_len; window =tcp_wnd_end (tp) -TCP_SKB_CB (skb)->seq; - max_len = mss_now * max_segs; + cwnd_len = mss_now * cwnd; -if (likely (max_len <= window && skb !=tcp_write_queue_tail (sk))) -return max_len; +if (likely (cwnd_len <= window && skb !=tcp_write_queue_tail (sk))) +return cwnd_len; needed =min (skb->len, window); -if (max_len <= needed) -return max_len; +if (cwnd_len <= needed) +return cwnd_len;return needed - needed % mss_now; }
@@ -1562,8 +1562,7 @@ static int tcp_tso_should_defer(struct s limit =min (send_win, cong_win);/* If a full-sized TSO skb can be sent, do it. */ - if (limit >= min_t(unsigned int, sk->sk_gso_max_size, - sk->sk_gso_max_segs * tp->mss_cache)) +if (limit >= sk->sk_gso_max_size) goto send_now;/* Middle in queue won't get any more data, full sendable already? */
@@ -1792,9 +1791,7 @@ static int tcp_write_xmit(struct sock *s limit = mss_now;if (tso_segs >1 && !tcp_urg_mode (tp)) limit =tcp_mss_split_point (sk, skb, mss_now, - min_t(unsigned int, - cwnd_quota, - sk->sk_gso_max_segs)); + cwnd_quota);if (skb->len > limit &&unlikely (tso_fragment (sk, skb, limit, mss_now, gfp)))
PATCH 79/152 ALSA: hda - Fix wrong gpio_dir & gpio_mask hint setups for IDT/STAC codecs
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit c507de88f6a336bd7296c9ec0073b2d4af8b4f5e upstream.
stac_store_hints() does utterly wrong for masking the values for gpio_dir and gpio_data, likely due to copy&paste errors. Fortunately, this feature is used very rarely, so the impact must be really small.
--- sound/pci/hda/patch_sigmatel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/hda/patch_sigmatel.c +2 -2
@@ -4309,9 +4309,9 @@ static void stac_store_hints(struct hda_ spec->gpio_mask; }if (get_int_hint (codec,"gpio_dir" , &spec->gpio_dir)) - spec->gpio_mask &= spec->gpio_mask; -if (get_int_hint (codec,"gpio_data" , &spec->gpio_data)) spec->gpio_dir &= spec->gpio_mask; +if (get_int_hint (codec,"gpio_data" , &spec->gpio_data)) + spec->gpio_data &= spec->gpio_mask;if (get_int_hint (codec,"eapd_mask" , &spec->eapd_mask)) spec->eapd_mask &= spec->gpio_mask;if (get_int_hint (codec,"gpio_mute" , &spec->gpio_mute))
PATCH 80/152 spi: dw: Fix detecting FIFO depth
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Axel Lin <[email protected]>
commit d297933cc7fcfbaaf2d37570baac73287bf0357d upstream.
Current code tries to find the highest valid fifo depth by checking the value it wrote to DW_SPI_TXFLTR. There are a few problems in current code:
1) There is an off-by-one in dws->fifo_len setting because it assumes the latest register write fails so the latest valid value should be fifo - 1.
2) We know the depth could be from 2 to 256 from HW spec, so it is not necessary to test fifo == 257. In the case fifo is 257, it means the latest valid setting is fifo = 256. So after the for loop iteration, we should check fifo == 2 case instead of fifo == 257 if detecting the FIFO depth fails.
This patch fixes above issues.
--- drivers/spi/spi-dw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-dw.c +2 -2
@@ -786,13 +786,13 @@ static void spi_hw_init(struct dw_spi *d*/ if (!dws->fifo_len) {u32 fifo; -for (fifo =2 ; fifo <=257 ; fifo++) { +for (fifo =2 ; fifo <=256 ; fifo++) {dw_writew (dws,DW_SPI_TXFLTR , fifo);if (fifo !=dw_readw (dws,DW_SPI_TXFLTR ))break ; } - dws->fifo_len = (fifo ==257 ) ?0 : fifo; + dws->fifo_len = (fifo ==2 ) ?0 : fifo -1 ;dw_writew (dws,DW_SPI_TXFLTR ,0 ); } }
PATCH 81/152 spi: dw-mid: fix FIFO size
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
commit 67bf9cda4b498b8cea4a40be67a470afe57d2e88 upstream.
The FIFO size is 40 accordingly to the specifications, but this means 0x40, i.e. 64 bytes. This patch fixes the typo and enables FIFO size autodetection for Intel MID devices.
--- drivers/spi/spi-dw-mid.c | 1 - 1 file changed, 1 deletion(-)
drivers/spi/spi-dw-mid.c +0 -1
@@ -219,7 +219,6 @@ int dw_spi_mid_init(struct dw_spi *dws)iounmap (clk_reg); dws->num_cs =16 ; - dws->fifo_len =40 ;/* FIFO has 40 words buffer */ #ifdef CONFIG_SPI_DW_MID_DMA dws->dma_priv =kzalloc (sizeof (struct mid_dma ),GFP_KERNEL );
PATCH 82/152 virtio: use dev_to_virtio wrapper in virtio
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Wanlong Gao <[email protected]>
commit 9bffdca8c64a72ac54c47a552734ab457bc720d4 upstream.
Use dev_to_virtio wrapper in virtio to make code clearly.
--- drivers/virtio/virtio.c | 19 +++++++++---------- include/linux/virtio.h | 6 +++++- 2 files changed, 14 insertions(+), 11 deletions(-)
drivers/virtio/virtio.c +9 -10
@@ -9,33 +9,32 @@ static unsigned int dev_index;static ssize_t device_show (struct device *_d,struct device_attribute *attr,char *buf) { - struct virtio_device *dev = container_of(_d,struct virtio_device,dev); +struct virtio_device *dev =dev_to_virtio (_d);return sprintf (buf,"0x%04x\n" , dev->id.device); }static ssize_t vendor_show (struct device *_d,struct device_attribute *attr,char *buf) { - struct virtio_device *dev = container_of(_d,struct virtio_device,dev); +struct virtio_device *dev =dev_to_virtio (_d);return sprintf (buf,"0x%04x\n" , dev->id.vendor); }static ssize_t status_show (struct device *_d,struct device_attribute *attr,char *buf) { - struct virtio_device *dev = container_of(_d,struct virtio_device,dev); +struct virtio_device *dev =dev_to_virtio (_d);return sprintf (buf,"0x%08x\n" , dev->config->get_status (dev)); }static ssize_t modalias_show (struct device *_d,struct device_attribute *attr,char *buf) { - struct virtio_device *dev = container_of(_d,struct virtio_device,dev); - +struct virtio_device *dev =dev_to_virtio (_d);return sprintf (buf,"virtio:d%08Xv%08X\n" , dev->id.device, dev->id.vendor); }static ssize_t features_show (struct device *_d,struct device_attribute *attr,char *buf) { - struct virtio_device *dev = container_of(_d, struct virtio_device, dev); +struct virtio_device *dev =dev_to_virtio (_d);unsigned int i;ssize_t len =0 ;
@@ -70,7 +69,7 @@ static inline int virtio_id_match(conststatic int virtio_dev_match (struct device *_dv,struct device_driver *_dr) {unsigned int i; - struct virtio_device *dev = container_of(_dv,struct virtio_device,dev); +struct virtio_device *dev =dev_to_virtio (_dv);const struct virtio_device_id *ids; ids = container_of(_dr, struct virtio_driver, driver)->id_table;
@@ -82,7 +81,7 @@ static int virtio_dev_match(struct devicstatic int virtio_uevent (struct device *_dv,struct kobj_uevent_env *env) { - struct virtio_device *dev = container_of(_dv,struct virtio_device,dev); +struct virtio_device *dev =dev_to_virtio (_dv);return add_uevent_var (env,"MODALIAS=virtio:d%08Xv%08X" , dev->id.device, dev->id.vendor);
@@ -110,7 +109,7 @@ EXPORT_SYMBOL_GPL(virtio_check_driver_ofstatic int virtio_dev_probe (struct device *_d) {int err, i; - struct virtio_device *dev = container_of(_d,struct virtio_device,dev); +struct virtio_device *dev =dev_to_virtio (_d);struct virtio_driver *drv =container_of (dev->dev.driver, struct virtio_driver, driver);u32 device_features;
@@ -148,7 +147,7 @@ static int virtio_dev_probe(struct devicstatic int virtio_dev_remove (struct device *_d) { - struct virtio_device *dev = container_of(_d,struct virtio_device,dev); +struct virtio_device *dev =dev_to_virtio (_d);struct virtio_driver *drv =container_of (dev->dev.driver, struct virtio_driver, driver);
include/linux/virtio.h +5 -1
@@ -127,7 +127,11 @@ struct virtio_device {void *priv; }; -#define dev_to_virtio (dev) container_of(dev, struct virtio_device, dev) +static inline struct virtio_device *dev_to_virtio (struct device *_dev) +{ + return container_of(_dev, struct virtio_device, dev); +} +int register_virtio_device (struct virtio_device *dev);void unregister_virtio_device (struct virtio_device *dev);
Re: [PATCH 3.2 082/152] virtio: use dev_to_virtio wrapper in virtio
Quoted 1 line · Ben Hutchings
3.2.67-rc1 review patch. If anyone has any objections, please let me know.
Ben, what are your criteria for putting patches into 3.2?
This patch is a trivial cleanup. It doesn't fix anything, but it does add some churn.
I can see that 083 and 084 follow this, but 083 needed a backport anyway. And it wasn't an issue we saw in Real Life (device removal is rare), so it wasn't CC: stable.
084 was a comment addition. Backporting that just seems weird.
Thanks,
Rusty.
Re: [PATCH 3.2 082/152] virtio: use dev_to_virtio wrapper in virtio
Quoted 7 lines · Rusty Russell
Quoted 1 line · Ben Hutchings
3.2.67-rc1 review patch. If anyone has any objections, please let me know.
Ben, what are your criteria for putting patches into 3.2?
This patch is a trivial cleanup. It doesn't fix anything, but it does add some churn.
It fixes the definition of dev_to_virtio().
Quoted 2 lines
I can see that 083 and 084 follow this, but 083 needed a backport anyway.
Patch 083 "virtio_pci: defer kfree until release callback" uses dev_to_virtio(_d) which would expand to a syntax error without this.
Quoted 4 lines
And it wasn't an issue we saw in Real Life (device removal is rare), so it wasn't CC: stable.
084 was a comment addition. Backporting that just seems weird.
Nevertheless, it had 'cc: stable' and is obviously harmless.
Ben.
Signature · 2 lines
Ben Hutchings To err is human; to really foul things up requires a computer.
Re: [PATCH 3.2 082/152] virtio: use dev_to_virtio wrapper in virtio
Quoted 10 lines · Ben Hutchings
Quoted 7 lines · Rusty Russell
Quoted 1 line · Ben Hutchings
3.2.67-rc1 review patch. If anyone has any objections, please let me know.
Ben, what are your criteria for putting patches into 3.2?
This patch is a trivial cleanup. It doesn't fix anything, but it does add some churn.
It fixes the definition of
dev_to_virtio().
Argh, sorry I should have caught that. The commit message didn't actually mention that it fixed anything (and I took it). :(
Quoted 6 lines
Quoted 2 lines
I can see that 083 and 084 follow this, but 083 needed a backport anyway.
Patch 083 "
virtio_pci: defer kfree until release callback" usesdev_to_virtio(_d)which would expand to a syntax error without this.
Quoted 6 lines
Quoted 4 lines
And it wasn't an issue we saw in Real Life (device removal is rare), so it wasn't CC: stable.
084 was a comment addition. Backporting that just seems weird.
Nevertheless, it had 'cc: stable' and is obviously harmless.
Ah I see, you stripped the cc:stable in your version. The original did indeed have CC:stable, which is MST's perogative...
Thanks for the explanation,
Rusty.
PATCH 83/152 virtio_pci: defer kfree until release callback
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Sasha Levin <[email protected]>
commit 63bd62a08ca45a0c804c3c89777edc7f76a2d6da upstream.
A struct device which has just been unregistered can live on past the point at which a driver decides to drop it's initial reference to the kobject gained on allocation.
This implies that when releasing a virtio device, we can't free a struct virtio_device until the underlying struct device has been released, which might not happen immediately on device_unregister().
Unfortunately, this is exactly what virtio pci does:
it has an empty release callback, and frees memory immediately after unregistering the device.
This causes an easy to reproduce crash if CONFIG_DEBUG_KOBJECT_RELEASE it enabled.
To fix, free the memory only once we know the device is gone in the release callback.
--- drivers/virtio/virtio_pci.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/virtio/virtio_pci.c +4 -6
@@ -612,11 +612,10 @@ static struct virtio_config_ops virtio_pstatic void virtio_pci_release_dev (struct device *_d) { -/* -* No need for a release method as we allocate/free -* all devices together with the pci devices. -* Provide an empty one to avoid getting a warning from core. -*/ +struct virtio_device *vdev =dev_to_virtio (_d); +struct virtio_pci_device *vp_dev =to_vp_device (vdev); + +kfree (vp_dev); }/* the PCI probing function */
@@ -704,7 +703,6 @@ static void __devexit virtio_pci_remove(pci_iounmap (pci_dev, vp_dev->ioaddr);pci_release_regions (pci_dev);pci_disable_device (pci_dev); -kfree (vp_dev); }#ifdef CONFIG_PM
PATCH 84/152 virtio_pci: document why we defer kfree
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "Michael S. Tsirkin" <[email protected]>
commit a1eb03f546d651a8f39c7d0692b1f7f5b4e7e3cd upstream.
The reason we defer kfree until release function is because it's a general rule for kobjects: kfree of the reference counter itself is only legal in the release function.
Previous patch didn't make this clear, document this in code.
--- drivers/virtio/virtio_pci.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/virtio/virtio_pci.c +3 -0
@@ -615,6 +615,9 @@ static void virtio_pci_release_dev(strucstruct virtio_device *vdev =dev_to_virtio (_d);struct virtio_pci_device *vp_dev =to_vp_device (vdev); +/* As struct device is a kobject, it's not safe to +* free the memory (including the reference counter itself) +* until it's release callback. */ kfree (vp_dev); }
PATCH 85/152 USB: cp210x: add IDs for CEL USB sticks and MeshWorks devices
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: David Peterson <[email protected]>
commit 1ae78a4870989a354028cb17dabf819b595e70e3 upstream.
Added virtual com port VID/PID entries for CEL USB sticks and MeshWorks devices.
--- drivers/usb/serial/cp210x.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/serial/cp210x.c +3 -1
@@ -126,10 +126,12 @@ static const struct usb_device_id id_tab { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */ { USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */ { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */ - { USB_DEVICE(0x10C4, 0x8857) }, /* CEL MeshConnect USB Stick */ + { USB_DEVICE(0x10C4, 0x8856) }, /* CEL EM357 ZigBee USB Stick - LR */ + { USB_DEVICE(0x10C4, 0x8857) }, /* CEL EM357 ZigBee USB Stick */ { USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */ { USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */ { USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */ + { USB_DEVICE(0x10C4, 0x8977) }, /* CEL MeshWorks DevKit Device */ { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
PATCH 86/152 ASoC: wm8960: Fix capture sample rate from 11250 to 11025
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Zidan Wang <[email protected]>
commit 22ee76daddb87f88d2336d1b4737ef27c4f307ac upstream.
wm8960 codec can't support sample rate 11250, it must be 11025.
--- sound/soc/codecs/wm8960.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm8960.c +1 -1
@@ -499,7 +499,7 @@ static struct { { 22050, 2 }, { 24000, 2 }, { 16000, 3 }, - { 11250, 4 }, + { 11025, 4 }, { 12000, 4 }, { 8000, 5 }, };
PATCH 87/152 mm: propagate error from stack expansion even for guard page
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit fee7e49d45149fba60156f5b59014f764d3e3728 upstream.
Jay Foad reports that the address sanitizer test (asan) sometimes gets confused by a stack pointer that ends up being outside the stack vma that is reported by /proc/maps.
This happens due to an interaction between RLIMIT_STACK and the guard
page: when we do the guard page check, we ignore the potential error from the stack expansion, which effectively results in a missing guard page, since the expected stack expansion won't have been done.
And since /proc/maps explicitly ignores the guard page (commitd7824370e263: "mm: fix up some user-visible effects of the stack guard page"), the stack pointer ends up being outside the reported stack area.
This is the minimal patch: it just propagates the error. It also effectively makes the guard page part of the stack limit, which in turn measn that the actual real stack is one page less than the stack limit.
Let's see if anybody notices. We could teach acct_stack_growth() to allow an extra page for a grow-up/grow-down stack in the rlimit test, but I don't want to add more complexity if it isn't needed.
--- include/linux/mm.h | 2 +- mm/memory.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
include/linux/mm.h +1 -1
@@ -1470,7 +1470,7 @@ extern int expand_downwards(struct vm_ar#if VM_GROWSUP extern int expand_upwards (struct vm_area_struct *vma,unsigned long address);#else -#define expand_upwards (vma, address) do { } while (0) +#define expand_upwards (vma, address) (0)#endif /* Look up the first VMA which satisfies addr < vm_end, NULL if none. */
mm/memory.c +2 -2
@@ -3117,7 +3117,7 @@ static inline int check_stack_guard_pageif (prev && prev->vm_end == address)return prev->vm_flags &VM_GROWSDOWN ?0 : -ENOMEM ; -expand_downwards (vma, address -PAGE_SIZE ); +return expand_downwards (vma, address -PAGE_SIZE ); }if ((vma->vm_flags &VM_GROWSUP ) && address +PAGE_SIZE == vma->vm_end) {struct vm_area_struct *next = vma->vm_next;
@@ -3126,7 +3126,7 @@ static inline int check_stack_guard_pageif (next && next->vm_start == address +PAGE_SIZE )return next->vm_flags &VM_GROWSUP ?0 : -ENOMEM ; -expand_upwards (vma, address +PAGE_SIZE ); +return expand_upwards (vma, address +PAGE_SIZE ); }return 0 ; }
PATCH 88/152 sata_dwc_460ex: fix resource leak on error path
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
commit 4aaa71873ddb9faf4b0c4826579e2f6d18ff9ab4 upstream.
DMA mapped IO should be unmapped on the error path in probe() and unconditionally on remove().
--- drivers/ata/sata_dwc_460ex.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/ata/sata_dwc_460ex.c +12 -14
@@ -791,7 +791,7 @@ static int dma_dwc_init(struct sata_dwc_if (err) {dev_err (host_pvt.dwc_dev,"%s: dma_request_interrupts returns" " %d\n" , __func__, err); - goto error_out; +return err; }/* Enabe DMA */
@@ -802,11 +802,6 @@ static int dma_dwc_init(struct sata_dwc_ sata_dma_regs);return 0 ; - -error_out: -dma_dwc_exit (hsdev); - -return err; }static int sata_dwc_scr_read (struct ata_link *link,unsigned int scr,u32 *val)
@@ -1634,7 +1629,7 @@ static int sata_dwc_probe(struct platforchar *ver = (char *)&versionr;u8 *base =NULL ;int err =0 ; -int irq, rc; +int irq;struct ata_host *host;struct ata_port_info pi = sata_dwc_port_info[0 ];const struct ata_port_info *ppi[] = { &pi,NULL };
@@ -1688,7 +1683,7 @@ static int sata_dwc_probe(struct platforif (irq ==NO_IRQ ) {dev_err (&ofdev->dev,"no SATA DMA irq\n" ); err = -ENODEV ; - goto error_out; + goto error_iomap; }/* Get physical SATA DMA register base address */
@@ -1697,14 +1692,16 @@ static int sata_dwc_probe(struct platfordev_err (&ofdev->dev,"ioremap failed for AHBDMA register" " address\n" ); err = -ENODEV ; - goto error_out; + goto error_iomap; }/* Save dev for later use in dev_xxx() routines */ host_pvt.dwc_dev = &ofdev->dev;/* Initialize AHB DMAC */ -dma_dwc_init (hsdev, irq); + err =dma_dwc_init (hsdev, irq); +if (err) + goto error_dma_iomap;/* Enable SATA Interrupts */ sata_dwc_enable_interrupts (hsdev);
@@ -1722,9 +1719,8 @@ static int sata_dwc_probe(struct platfor* device discovery process, invoking our port_start() handler & * error_handler() to execute a dummy Softreset EH session */ - rc =ata_host_activate (host, irq, sata_dwc_isr,0 , &sata_dwc_sht); - -if (rc !=0 ) + err =ata_host_activate (host, irq, sata_dwc_isr,0 , &sata_dwc_sht); +if (err)dev_err (&ofdev->dev,"failed to activate host" );dev_set_drvdata (&ofdev->dev, host);
@@ -1733,7 +1729,8 @@ static int sata_dwc_probe(struct platfor error_out:/* Free SATA DMA resources */ dma_dwc_exit (hsdev); - +error_dma_iomap: +iounmap ((void __iomem *)host_pvt.sata_dma_regs); error_iomap:iounmap (base); error_kmalloc:
@@ -1754,6 +1751,7 @@ static int sata_dwc_remove(struct platfo/* Free SATA DMA resources */ dma_dwc_exit (hsdev); +iounmap ((void __iomem *)host_pvt.sata_dma_regs);iounmap (hsdev->reg_base);kfree (hsdev);kfree (host);
PATCH 89/152 time: settimeofday: Validate the values of tv from user
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Sasha Levin <[email protected]>
commit 6ada1fc0e1c4775de0e043e1bd3ae9d065491aa5 upstream.
An unvalidated user input is multiplied by a constant, which can result in an undefined behaviour for large values. While this is validated later, we should avoid triggering undefined behaviour.
[jstultz: include trivial milisecond->microsecond correction noticed by Andy]
--- include/linux/time.h | 13 +++++++++++++ kernel/time.c | 4 ++++ 2 files changed, 17 insertions(+)
include/linux/time.h +13 -0
@@ -138,6 +138,19 @@ static inline bool timespec_valid_strictreturn true; } +static inline bool timeval_valid (const struct timeval *tv) +{ +/* Dates before 1970 are bogus */ +if (tv->tv_sec <0 ) +return false; + +/* Can't have more microseconds then a second */ +if (tv->tv_usec <0 || tv->tv_usec >=USEC_PER_SEC ) +return false; + +return true; +} +extern void read_persistent_clock (struct timespec *ts);extern void read_boot_clock (struct timespec *ts);extern int update_persistent_clock (struct timespec now);
kernel/time.c +4 -0
@@ -192,6 +192,10 @@ SYSCALL_DEFINE2(settimeofday, struct timif (tv) {if (copy_from_user (&user_tv, tv,sizeof (*tv)))return -EFAULT ; + +if (!timeval_valid (&user_tv)) +return -EINVAL ; + new_ts.tv_sec = user_tv.tv_sec; new_ts.tv_nsec = user_tv.tv_usec *NSEC_PER_USEC ; }
PATCH 90/152 time: adjtimex: Validate the ADJ_FREQUENCY values
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Sasha Levin <[email protected]>
commit 5e5aeb4367b450a28f447f6d5ab57d8f2ab16a5f upstream.
Verify that the frequency value from userspace is valid and makes sense.
Unverified values can cause overflows later on.
--- kernel/time/ntp.c | 7 +++++++ 1 file changed, 7 insertions(+)
kernel/time/ntp.c +7 -0
@@ -608,6 +608,13 @@ int do_adjtimex(struct timex *txc)return -EINVAL ; } +if (txc->modes &ADJ_FREQUENCY ) { +if (LONG_MIN /PPM_SCALE > txc->freq) +return -EINVAL ; +if (LONG_MAX /PPM_SCALE < txc->freq) +return -EINVAL ; + } +if (txc->modes &ADJ_SETOFFSET ) {struct timespec delta; delta.tv_sec = txc->time.tv_sec;
Re: [PATCH 3.2 090/152] time: adjtimex: Validate the ADJ_FREQUENCY values
Quoted 2 lines · Ben Hutchings
3.2.67-rc1 review patch. If anyone has any objections, please let me know.
John reported a regression with this commit [1]. A fix seems to be already available, but since it hasn't been accepted into mainline yet I haven't picked this patch for the 3.16 kernel.
[1] https://lists.ubuntu.com/archives/kernel-team/2015-February/053981.html
Cheers,
--
Luís
Quoted 42 lines
------------------
From: Sasha Levin <[email protected]>
commit
5e5aeb4367b450a28f447f6d5ab57d8f2ab16a5fupstream.Verify that the frequency value from userspace is valid and makes sense.
Unverified values can cause overflows later on.
Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Signed-off-by Sasha Levin <[email protected]>[jstultz: Fix up bug for negative values and drop redunent cap check]Signed-off-by John Stultz <[email protected]>[bwh: Backported to 3.2: adjust context]Signed-off-by Ben Hutchings <[email protected]>--- kernel/time/ntp.c | 7 +++++++ 1 file changed, 7 insertions(+)kernel/time/ntp.c +7
-1@@ -608,6 +608,13 @@ int do_adjtimex(struct timex *txc)return -EINVAL ; } +if (txc->modes &ADJ_FREQUENCY ) { +if (LONG_MIN /PPM_SCALE > txc->freq) +return -EINVAL ; +if (LONG_MAX /PPM_SCALE < txc->freq) +return -EINVAL ; + } +if (txc->modes &ADJ_SETOFFSET ) {struct timespec delta; delta.tv_sec = txc->time.tv_sec; --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 090/152] time: adjtimex: Validate the ADJ_FREQUENCY values
Quoted 9 lines · Luis Henriques
Quoted 2 lines · Ben Hutchings
3.2.67-rc1 review patch. If anyone has any objections, please let me know.
John reported a regression with this commit [1]. A fix seems to be already available, but since it hasn't been accepted into mainline yet I haven't picked this patch for the 3.16 kernel.
[1] https://lists.ubuntu.com/archives/kernel-team/2015-February/053981.html
OK, I'll defer this for now.
Ben.
Quoted 46 lines
Cheers,
--
LuísQuoted 42 lines
------------------
From: Sasha Levin <[email protected]>
commit
5e5aeb4367b450a28f447f6d5ab57d8f2ab16a5fupstream.Verify that the frequency value from userspace is valid and makes sense.
Unverified values can cause overflows later on.
Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Signed-off-by Sasha Levin <[email protected]>[jstultz: Fix up bug for negative values and drop redunent cap check]Signed-off-by John Stultz <[email protected]>[bwh: Backported to 3.2: adjust context]Signed-off-by Ben Hutchings <[email protected]>--- kernel/time/ntp.c | 7 +++++++ 1 file changed, 7 insertions(+)kernel/time/ntp.c +7
-1@@ -608,6 +608,13 @@ int do_adjtimex(struct timex *txc)return -EINVAL ; } +if (txc->modes &ADJ_FREQUENCY ) { +if (LONG_MIN /PPM_SCALE > txc->freq) +return -EINVAL ; +if (LONG_MAX /PPM_SCALE < txc->freq) +return -EINVAL ; + } +if (txc->modes &ADJ_SETOFFSET ) {struct timespec delta; delta.tv_sec = txc->time.tv_sec; --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
Signature · 2 lines
Ben Hutchings To err is human; to really foul things up requires a computer.
PATCH 91/152 Input: i8042 - reset keyboard to fix Elantech touchpad detection
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Srihari Vijayaraghavan <[email protected]>
commit 148e9a711e034e06310a8c36b64957934ebe30f2 upstream.
On some laptops, keyboard needs to be reset in order to successfully detect touchpad (e.g., some Gigabyte laptop models with Elantech touchpads). Without resettin keyboard touchpad pretends to be completely dead.
Based on the original patch by Mateusz Jończyk this version has been expanded to include DMI based detection & application of the fix automatically on the affected models of laptops. This has been confirmed to fix problem by three users already on three different models of laptops.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=81331
Tested by: Zakariya Dehlawi <[email protected]>
--- Documentation/kernel-parameters.txt | 1 + drivers/input/serio/i8042-x86ia64io.h | 32 ++++++++++++++++++++++++++++++++ drivers/input/serio/i8042.c | 14 ++++++++++++++ 3 files changed, 47 insertions(+)
Documentation/kernel-parameters.txt +1 -0
@@ -940,6 +940,7 @@ bytes respectively. Such letter suffixes i8042.notimeout [HW] Ignore timeout condition signalled by conroller i8042.reset [HW] Reset the controller during init and cleanup i8042.unlock [HW] Unlock (ignore) the keylock + i8042.kbdreset [HW] Reset device connected to KBD port i810= [HW,DRM]
drivers/input/serio/i8042-x86ia64io.h +32 -0
@@ -714,6 +714,35 @@ static const struct dmi_system_id __init { } }; +/* +* Some laptops need keyboard reset before probing for the trackpad to get +* it detected, initialised & finally work. +*/ +static const struct dmi_system_id __initconst i8042_dmi_kbdreset_table[] = { + { +/* Gigabyte P35 v2 - Elantech touchpad */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"GIGABYTE" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"P35V2" ), + }, + }, + { +/* Aorus branded Gigabyte X3 Plus - Elantech touchpad */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"GIGABYTE" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"X3" ), + }, + }, + { +/* Gigabyte P34 - Elantech touchpad */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"GIGABYTE" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"P34" ), + }, + }, + { } +}; +#endif /* CONFIG_X86 */ #ifdef CONFIG_PNP
@@ -992,6 +1021,9 @@ static int __init i8042_platform_init(voif (dmi_check_system (i8042_dmi_dritek_table)) i8042_dritek = true; +if (dmi_check_system (i8042_dmi_kbdreset_table)) + i8042_kbdreset = true; +/* * A20 was already enabled during early kernel init. But some buggy * BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to
drivers/input/serio/i8042.c +14 -0
@@ -67,6 +67,10 @@ static bool i8042_notimeout;module_param_named (notimeout, i8042_notimeout, bool,0 );MODULE_PARM_DESC (notimeout,"Ignore timeouts signalled by i8042" ); +static bool i8042_kbdreset; +module_param_named (kbdreset, i8042_kbdreset, bool,0 ); +MODULE_PARM_DESC (kbdreset,"Reset device connected to KBD port" ); +#ifdef CONFIG_X86 static bool i8042_dritek;module_param_named (dritek, i8042_dritek, bool,0 );
@@ -783,6 +787,16 @@ static int __init i8042_check_aux(void)return -1 ;/* +* Reset keyboard (needed on some laptops to successfully detect +* touchpad, e.g., some Gigabyte laptop models with Elantech +* touchpads). +*/ +if (i8042_kbdreset) { +pr_warn ("Attempting to reset device connected to KBD port\n" ); +i8042_kbd_write (NULL , (unsigned char )0xff ); + } + +/* * Test AUX IRQ delivery to make sure BIOS did not grab the IRQ and * used it for a PCI card or somethig else. */
PATCH 92/152 regulator: core: fix race condition in regulator_put()
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ashay Jaiswal <[email protected]>
commit 83b0302d347a49f951e904184afe57ac3723476e upstream.
The regulator framework maintains a list of consumer regulators for a regulator device and protects it from concurrent access using the regulator device's mutex lock.
In the case of regulator_put() the consumer is removed and regulator device's parameters are updated without holding the regulator device's mutex. This would lead to a race condition between the regulator_put() and any function which traverses the consumer list or modifies regulator device's parameters.
Fix this race condition by holding the regulator device's mutex in case of regulator_put.
[bwh: Backported to 3.2:
- Adjust context
- Don't touch the comment; __regulator_put() has not been split out of regulator_put() here]
--- drivers/regulator/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/regulator/core.c +2 -0
@@ -1314,12 +1314,14 @@ void regulator_put(struct regulator *regdevice_remove_file (regulator->dev, ®ulator->dev_attr);kfree (regulator->dev_attr.attr.name); } +mutex_lock (&rdev->mutex);kfree (regulator->supply_name);list_del (®ulator->list);kfree (regulator); rdev->open_count--; rdev->exclusive =0 ; +mutex_unlock (&rdev->mutex);module_put (rdev->owner);mutex_unlock (®ulator_list_mutex);
PATCH 93/152 Input: I8042 - add Acer Aspire 7738 to the nomux list
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
commit 9333caeaeae4f831054e0e127a6ed3948b604d3e upstream.
When KBC is in active multiplexing mode the touchpad on this laptop does not work.
--- drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/input/serio/i8042-x86ia64io.h +7 -0
@@ -408,6 +408,13 @@ static const struct dmi_system_id __init }, }, { +/* Acer Aspire 7738 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7738"), + }, + }, + {/* Gericom Bellagio */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Gericom"),
PATCH 94/152 mm: prevent endless growth of anon_vma hierarchy
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Khlebnikov <[email protected]>
commit 7a3ef208e662f4b63d43a23f61a64a129c525bbc upstream.
Constantly forking task causes unlimited grow of anon_vma chain. Each next child allocates new level of anon_vmas and links vma to all previous levels because pages might be inherited from any level.
This patch adds heuristic which decides to reuse existing anon_vma instead of forking new one. It adds counter anon_vma->degree which counts linked vmas and directly descending anon_vmas and reuses anon_vma if counter is lower than two. As a result each anon_vma has either vma or at least two descending anon_vmas. In such trees half of nodes are leafs with alive vmas, thus count of anon_vmas is no more than two times bigger than count of vmas.
This heuristic reuses anon_vmas as few as possible because each reuse adds false aliasing among vmas and rmap walker ought to scan more ptes when it searches where page is might be mapped.
--- include/linux/rmap.h | 10 ++++++++++ mm/rmap.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-)
include/linux/rmap.h +10 -0
@@ -37,6 +37,16 @@ struct anon_vma {atomic_t refcount;/* +* Count of child anon_vmas and VMAs which points to this anon_vma. +* +* This counter is used for making decision about reusing anon_vma +* instead of forking new one. See comments in function anon_vma_clone. +*/ +unsigned degree; + +struct anon_vma *parent;/* Parent of this anon_vma */ + +/* * NOTE: the LSB of the head.next is set by * mm_take_all_locks() _after_ taking the above lock. So the * head must only be read/written after taking the above lock
mm/rmap.c +41 -1
108 lines not on this page · raw message
PATCH 95/152 mm: remove unused arg of set_page_dirty_balance()
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Miklos Szeredi <[email protected]>
commit ed6d7c8e578331cad594ee70d60e2e146b5dce7b upstream.
There's only one caller of set_page_dirty_balance() and that will call it with page_mkwrite == 0.
The page_mkwrite argument was unused since commit b827e496c893 "mm: close page_mkwrite races".
--- include/linux/writeback.h | 2 +- mm/memory.c | 2 +- mm/page-writeback.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
include/linux/writeback.h +1 -1
@@ -190,7 +190,7 @@ int write_cache_pages(struct address_spa struct writeback_control *wbc, writepage_t writepage, void *data);int do_writepages (struct address_space *mapping,struct writeback_control *wbc); -void set_page_dirty_balance (struct page *page,int page_mkwrite); +void set_page_dirty_balance (struct page *page);void writeback_set_ratelimit (void );void tag_pages_for_writeback (struct address_space *mapping,pgoff_t start,pgoff_t end);
mm/memory.c +1 -1
@@ -2671,7 +2671,7 @@ reuse:*/ if (!page_mkwrite) {wait_on_page_locked (dirty_page); -set_page_dirty_balance (dirty_page, page_mkwrite); +set_page_dirty_balance (dirty_page); }put_page (dirty_page);if (page_mkwrite) {
mm/page-writeback.c +2 -2
@@ -1202,9 +1202,9 @@ pause:bdi_start_background_writeback (bdi); } -void set_page_dirty_balance (struct page *page,int page_mkwrite) +void set_page_dirty_balance (struct page *page) { -if (set_page_dirty (page) || page_mkwrite) { +if (set_page_dirty (page)) {struct address_space *mapping =page_mapping (page);if (mapping)
PATCH 96/152 mm: protect set_page_dirty() from ongoing truncation
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Weiner <[email protected]>
commit 2d6d7f98284648c5ed113fe22a132148950b140f upstream.
Tejun, while reviewing the code, spotted the following race condition between the dirtying and truncation of a page:
__set_page_dirty_nobuffers() __delete_from_page_cache()
if (TestSetPageDirty(page))
page->mapping = NULL
if (PageDirty())
dec_zone_page_state(page, NR_FILE_DIRTY);
dec_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE);
if (page->mapping)
account_page_dirtied(page)
__inc_zone_page_state(page, NR_FILE_DIRTY);
__inc_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE);which results in an imbalance of NR_FILE_DIRTY and BDI_RECLAIMABLE.
Dirtiers usually lock out truncation, either by holding the page lock directly, or in case of zap_pte_range(), by pinning the mapcount with the page table lock held. The notable exception to this rule, though, is do_wp_page(), for which this race exists. However, do_wp_page() already waits for a locked page to unlock before setting the dirty bit, in order to prevent a race where clear_page_dirty() misses the page bit in the presence of dirty ptes. Upgrade that wait to a fully locked set_page_dirty() to also cover the situation explained above.
Afterwards, the code in set_page_dirty() dealing with a truncation race is no longer needed. Remove it.
[bwh: Backported to 3.2:
- Adjust context
- Use VM_BUG_ON() rather than VM_BUG_ON_PAGE()]
--- include/linux/writeback.h | 1 - mm/memory.c | 27 +++++++++++++++++---------- mm/page-writeback.c | 43 ++++++++++++------------------------------- 3 files changed, 29 insertions(+), 42 deletions(-)
include/linux/writeback.h +0 -1
@@ -190,7 +190,6 @@ int write_cache_pages(struct address_spa struct writeback_control *wbc, writepage_t writepage, void *data);int do_writepages (struct address_space *mapping,struct writeback_control *wbc); -void set_page_dirty_balance (struct page *page);void writeback_set_ratelimit (void );void tag_pages_for_writeback (struct address_space *mapping,pgoff_t start,pgoff_t end);
mm/memory.c +17 -10
@@ -2661,17 +2661,24 @@ reuse:if (!dirty_page)return ret; -/* -* Yes, Virginia, this is actually required to prevent a race -* with clear_page_dirty_for_io() from clearing the page dirty -* bit after it clear all dirty ptes, but before a racing -* do_wp_page installs a dirty pte. -* -* __do_fault is protected similarly. -*/ if (!page_mkwrite) { -wait_on_page_locked (dirty_page); -set_page_dirty_balance (dirty_page); +struct address_space *mapping; +int dirtied; + +lock_page (dirty_page); + dirtied =set_page_dirty (dirty_page); +VM_BUG_ON (PageAnon (dirty_page)); + mapping = dirty_page->mapping; +unlock_page (dirty_page); + +if (dirtied && mapping) { +/* +* Some device drivers do not set page.mapping +* but still dirty their pages +*/ +balance_dirty_pages_ratelimited (mapping); + } + }put_page (dirty_page);if (page_mkwrite) {
mm/page-writeback.c +12 -31
72 lines not on this page · raw message
PATCH 97/152 HID: roccat: potential out of bounds in pyra_sysfs_write_settings()
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 606185b20caf4c57d7e41e5a5ea4aff460aef2ab upstream.
This is a static checker fix. We write some binary settings to the sysfs file. One of the settings is the "->startup_profile". There isn't any checking to make sure it fits into the pyra->profile_settings[] array in the profile_activated() function.
I added a check to pyra_sysfs_write_settings() in both places because I wasn't positive that the other callers were correct.
[bwh: Backported to 3.2: pyra_sysfs_write_settings() doesn't define a
settings variable, so write the cast-expression inline]
--- drivers/hid/hid-roccat-pyra.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/hid/hid-roccat-pyra.c +6 -0
@@ -35,6 +35,8 @@ static struct class *pyra_class;static void profile_activated (struct pyra_device *pyra,unsigned int new_profile) { +if (new_profile >=ARRAY_SIZE (pyra->profile_settings)) +return ; pyra->actual_profile = new_profile; pyra->actual_cpi = pyra->profile_settings[pyra->actual_profile].y_cpi; }
@@ -303,6 +305,10 @@ static ssize_t pyra_sysfs_write_settingsif (off !=0 || count !=sizeof (struct pyra_settings ))return -EINVAL ; +if (((struct pyra_settings const *)buf)->startup_profile >= +ARRAY_SIZE (pyra->profile_settings)) +return -EINVAL ; +mutex_lock (&pyra->pyra_lock); difference =memcmp (buf, &pyra->settings,sizeof (struct pyra_settings ));if (difference) {
PATCH 98/152 OHCI: add a quirk for ULi M5237 blocking on reset
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Arseny Solokha <[email protected]>
commit 56abcab833fafcfaeb2f5b25e0364c1dec45f53e upstream.
Commit 8dccddbc2368 ("OHCI: final fix for NVIDIA problems (I hope)") introduced into 3.1.9 broke boot on e.g. Freescale P2020DS development board. The code path that was previously specific to NVIDIA controllers had then become taken for all chips.
However, the M5237 installed on the board wedges solid when accessing its base+OHCI_FMINTERVAL register, making it impossible to boot any kernel newer than 3.1.8 on this particular and apparently other similar machines.
Don't readl() and writel() base+OHCI_FMINTERVAL on PCI ID 10b9:5237.
The patch is suitable for the -next tree as well as all maintained kernels up to 3.2 inclusive.
--- drivers/usb/host/pci-quirks.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/usb/host/pci-quirks.c +15 -3
@@ -470,7 +470,8 @@ static void __devinit quirk_usb_handoff_ {void __iomem *base;u32 control; -u32 fminterval; +u32 fminterval =0 ; +bool no_fminterval = false;int cnt;if (!mmio_resource_enabled (pdev,0 ))
@@ -480,6 +481,13 @@ static void __devinit quirk_usb_handoff_if (base ==NULL )return ; +/* +* ULi M5237 OHCI controller locks the whole system when accessing +* the OHCI_FMINTERVAL offset. +*/ +if (pdev->vendor ==PCI_VENDOR_ID_AL && pdev->device ==0x5237 ) + no_fminterval = true; + control =readl (base +OHCI_CONTROL );/* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */
@@ -518,7 +526,9 @@ static void __devinit quirk_usb_handoff_ }/* software reset of the controller, preserving HcFmInterval */ - fminterval =readl (base +OHCI_FMINTERVAL ); +if (!no_fminterval) + fminterval =readl (base +OHCI_FMINTERVAL ); +writel (OHCI_HCR , base +OHCI_CMDSTATUS );/* reset requires max 10 us delay */
@@ -527,7 +537,9 @@ static void __devinit quirk_usb_handoff_break ;udelay (1 ); } -writel (fminterval, base +OHCI_FMINTERVAL ); + +if (!no_fminterval) +writel (fminterval, base +OHCI_FMINTERVAL );/* Now the controller is safely in SUSPEND and nothing can wake it up */ iounmap (base);
PATCH 99/152 usb: gadget: udc: atmel: change setting for DMA
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Bo Shen <[email protected]>
commit f40afdddeb6c54ffd1e2920a5e93e363d6748db6 upstream.
According to the datasheet, when transfer using DMA, the control setting for IN packet only need END_BUF_EN, END_BUF_IE, CH_EN, while for OUT packet, need more two bits END_TR_EN and END_TR_IE to be configured.
--- drivers/usb/gadget/atmel_usba_udc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/gadget/atmel_usba_udc.c +3 -3
@@ -739,10 +739,10 @@ static int queue_dma(struct usba_udc *ud req->ctrl =USBA_BF (DMA_BUF_LEN , req->req.length) |USBA_DMA_CH_EN |USBA_DMA_END_BUF_IE - |USBA_DMA_END_TR_EN |USBA_DMA_END_TR_IE ; + |USBA_DMA_END_BUF_EN ; -if (ep->is_in) - req->ctrl |=USBA_DMA_END_BUF_EN ; +if (!ep->is_in) + req->ctrl |=USBA_DMA_END_TR_EN |USBA_DMA_END_TR_IE ;/* * Add this request to the queue and submit for DMA if
PATCH 100/152 usb: gadget: udc: atmel: fix possible IN hang issue
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Bo Shen <[email protected]>
commit 6785a1034461c2d2c205215f63a50a740896e55b upstream.
When receive data, the RXRDY in status register set by hardware after a new packet has been stored in the endpoint FIFO. When it is copied from FIFO, this bit is cleared which make the FIFO can be accessed again.
In the receive_data() function, this bit RXRDY has been cleared. So, after the receive_data() function return, this bit should not be cleared again, or else it may cause the accessing FIFO corrupt, which will make the data loss.
--- drivers/usb/gadget/atmel_usba_udc.c | 1 - 1 file changed, 1 deletion(-)
drivers/usb/gadget/atmel_usba_udc.c +0 -1
@@ -1597,7 +1597,6 @@ static void usba_ep_irq(struct usba_udcif ((epstatus & epctrl) &USBA_RX_BK_RDY ) {DBG (DBG_BUS ,"%s: RX data ready\n" , ep->ep.name);receive_data (ep); -usba_ep_writel (ep,CLR_STA ,USBA_RX_BK_RDY ); } }
PATCH 101/152 usb: gadget: udc: atmel: fix possible oops when unloading module
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Songjun Wu <[email protected]>
commit 5fb694f96e7c19e66b1c55124b98812e32e3efa5 upstream.
When unloading the module 'g_hid.ko', the urb request will be dequeued and the completion routine will be excuted. If there is no urb packet, the urb request will not be added to the endpoint queue and the completion routine pointer in urb request is NULL.
Accessing to this NULL function pointer will cause the Oops issue reported below.
Add the code to check if the urb request is in the endpoint queue or not. If the urb request is not in the endpoint queue, a negative error code will be returned.
Here is the Oops log:
Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = dedf0000 [00000000] *pgd=3ede5831, *pte=00000000, *ppte=00000000 Internal error: Oops: 80000007 [#1] ARM Modules linked in: g_hid(-) usb_f_hid libcomposite CPU: 0 PID: 923 Comm: rmmod Not tainted 3.18.0+ #2 Hardware name: Atmel SAMA5 (Device Tree) task: df6b1100 ti: dedf6000 task.ti: dedf6000 PC is at 0x0 LR is at usb_gadget_giveback_request+0xc/0x10 pc : [<00000000>] lr : [<c02ace88>] psr: 60000093
sp : dedf7eb0 ip : df572634 fp : 00000000
r10: 00000000 r9 : df52e210 r8 : 60000013
r7 : df6a9858 r6 : df52e210 r5 : df6a9858 r4 : df572600 r3 : 00000000 r2 : ffffff98 r1 : df572600 r0 : df6a9868
Flags: nZCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment user
Control: 10c53c7d Table: 3edf0059 DAC: 00000015 Process rmmod (pid: 923, stack limit = 0xdedf6230)
Stack: (0xdedf7eb0 to 0xdedf8000)
7ea0: 00000000 c02adbbc df572580 deced608
7ec0: df572600 df6a9868 df572634 c02aed3c df577c00 c01b8608 00000000 df6be27c
7ee0: 00200200 00100100 bf0162f4 c000e544 dedf6000 00000000 00000000 bf010c00
7f00: bf0162cc bf00159c 00000000 df572980 df52e218 00000001 df5729b8 bf0031d0
[..]
[<c02ace88>] (usb_gadget_giveback_request) from [<c02adbbc>] (request_complete+0x64/0x88) [<c02adbbc>] (request_complete) from [<c02aed3c>] (usba_ep_dequeue+0x70/0x128)
[<c02aed3c>] (usba_ep_dequeue) from [<bf010c00>] (hidg_unbind+0x50/0x7c [usb_f_hid]) [<bf010c00>] (hidg_unbind [usb_f_hid]) from [<bf00159c>] (remove_config.isra.6+0x98/0x9c [libcomposite]) [<bf00159c>] (remove_config.isra.6 [libcomposite]) from [<bf0031d0>] (__composite_unbind+0x34/0x98 [libcomposite]) [<bf0031d0>] (__composite_unbind [libcomposite]) from [<c02acee0>] (usb_gadget_remove_driver+0x50/0x78) [<c02acee0>] (usb_gadget_remove_driver) from [<c02ad570>] (usb_gadget_unregister_driver+0x64/0x94) [<c02ad570>] (usb_gadget_unregister_driver) from [<bf0160c0>] (hidg_cleanup+0x10/0x34 [g_hid]) [<bf0160c0>] (hidg_cleanup [g_hid]) from [<c0056748>] (SyS_delete_module+0x118/0x19c) [<c0056748>] (SyS_delete_module) from [<c000e3c0>] (ret_fast_syscall+0x0/0x30)
Code: bad PC value
--- drivers/usb/gadget/atmel_usba_udc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/usb/gadget/atmel_usba_udc.c +11 -1
@@ -850,7 +850,7 @@ static int usba_ep_dequeue(struct usb_ep {struct usba_ep *ep =to_usba_ep (_ep);struct usba_udc *udc = ep->udc; -struct usba_request *req =to_usba_req (_req); +struct usba_request *req;unsigned long flags;u32 status;
@@ -859,6 +859,16 @@ static int usba_ep_dequeue(struct usb_epspin_lock_irqsave (&udc->lock, flags); +list_for_each_entry (req, &ep->queue, queue) { +if (&req->req == _req) +break ; + } + +if (&req->req != _req) { +spin_unlock_irqrestore (&udc->lock, flags); +return -EINVAL ; + } +if (req->using_dma) {/* * If this request is currently being transferred,
PATCH 102/152 USB: console: fix potential use after free
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 32a4bf2e81ec378e5925d4e069e0677a6c86a6ad upstream.
Use tty kref to release the fake tty in usb_console_setup to avoid use after free if the underlying serial driver has acquired a reference.
Note that using the tty destructor release_one_tty requires some more state to be initialised.
--- drivers/usb/serial/console.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/usb/serial/console.c +10 -5
@@ -47,6 +47,8 @@ static struct console usbcons;* ------------------------------------------------------------ */ +static const struct tty_operations usb_console_fake_tty_ops = { +};/* * The parsing of the command line works exactly like the
@@ -141,14 +143,17 @@ static int usb_console_setup(struct cons goto reset_open_count; }kref_init (&tty->kref); -tty_port_tty_set (&port->port, tty); tty->driver = usb_serial_tty_driver; tty->index = co->index; +INIT_LIST_HEAD (&tty->tty_files); +kref_get (&tty->driver->kref); + tty->ops = &usb_console_fake_tty_ops;if (tty_init_termios (tty)) { retval = -ENOMEM ;err ("no more memory" ); - goto free_tty; + goto put_tty; } +tty_port_tty_set (&port->port, tty); }/* only call the device specific open if this
@@ -170,7 +175,7 @@ static int usb_console_setup(struct cons serial->type->set_termios (tty, port, &dummy);tty_port_tty_set (&port->port,NULL ); -kfree (tty); +tty_kref_put (tty); }set_bit (ASYNCB_INITIALIZED , &port->port.flags); }
@@ -186,8 +191,8 @@ static int usb_console_setup(struct cons fail:tty_port_tty_set (&port->port,NULL ); - free_tty: -kfree (tty); + put_tty: +tty_kref_put (tty); reset_open_count: port->port.count =0 ;usb_autopm_put_interface (serial->interface);
PATCH 103/152 mm: Don't count the stack guard page towards RLIMIT_STACK
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit 690eac53daff34169a4d74fc7bfbd388c4896abb upstream.
Commit fee7e49d4514 ("mm: propagate error from stack expansion even for guard page") made sure that we return the error properly for stack growth conditions. It also theorized that counting the guard page towards the stack limit might break something, but also said "Let's see if anybody notices".
Somebody did notice. Apparently android-x86 sets the stack limit very close to the limit indeed, and including the guard page in the rlimit check causes the android 'zygote' process problems.
So this adds the (fairly trivial) code to make the stack rlimit check be against the actual real stack size, rather than the size of the vma that includes the guard page.
--- mm/mmap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
mm/mmap.c +5 -2
@@ -1648,14 +1648,17 @@ static int acct_stack_growth(struct vm_a {struct mm_struct *mm = vma->vm_mm;struct rlimit *rlim = current->signal->rlim; -unsigned long new_start; +unsigned long new_start, actual_size;/* address space limit tests */ if (!may_expand_vm (mm, grow))return -ENOMEM ;/* Stack limit test */ -if (size >ACCESS_ONCE (rlim[RLIMIT_STACK ].rlim_cur)) + actual_size = size; +if (size && (vma->vm_flags & (VM_GROWSUP |VM_GROWSDOWN ))) + actual_size -=PAGE_SIZE ; +if (actual_size >ACCESS_ONCE (rlim[RLIMIT_STACK ].rlim_cur))return -ENOMEM ;/* mlock limit tests */
PATCH 104/152 mm: fix corner case in anon_vma endless growing prevention
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Khlebnikov <[email protected]>
commit b800c91a0517071156e772d4fb329ad33590da62 upstream.
Fix for BUG_ON(anon_vma->degree) splashes in unlink_anon_vmas() ("kernel BUG at mm/rmap.c:399!") caused by commit 7a3ef208e662 ("mm: prevent endless growth of anon_vma hierarchy")
Anon_vma_clone() is usually called for a copy of source vma in destination argument. If source vma has anon_vma it should be already in dst->anon_vma. NULL in dst->anon_vma is used as a sign that it's called from anon_vma_fork(). In this case anon_vma_clone() finds anon_vma for reusing.
Vma_adjust() calls it differently and this breaks anon_vma reusing
logic: anon_vma_clone() links vma to old anon_vma and updates degree counters but vma_adjust() overrides vma->anon_vma right after that. As a result final unlink_anon_vmas() decrements degree for wrong anon_vma.
This patch assigns ->anon_vma before calling anon_vma_clone().
[bwh: Backported to 3.2: vma_adjust() didn't use a variable to propagate
the error code from anon_vma_clone(); change that at the same time]
---
mm/mmap.c +7 -2
@@ -537,9 +537,14 @@ again: remove_next = 1 + (end > next->* shrinking vma had, to cover any anon pages imported. */ if (exporter && exporter->anon_vma && !importer->anon_vma) { -if (anon_vma_clone (importer, exporter)) -return -ENOMEM ; +int error; + importer->anon_vma = exporter->anon_vma; + error =anon_vma_clone (importer, exporter); +if (error) { + importer->anon_vma =NULL ; +return error; + } } }
PATCH 105/152 crypto: prefix module autoloading with "crypto-"
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 5d26a105b5a73e5635eae0629b42fa0a90e07b7b upstream.
This prefixes all crypto module loading with "crypto-" so we never run the risk of exposing module auto-loading to userspace via a crypto API, as demonstrated by Mathias Krause:
https://lkml.org/lkml/2013/3/4/70
[bwh: Backported to 3.2:
- Adjust filenames
- Drop changes to algorithms and drivers we don't have
- Add aliases to generic C implementations that didn't need them before]
--- arch/s390/crypto/aes_s390.c | 2 +- arch/s390/crypto/des_s390.c | 4 ++-- arch/s390/crypto/ghash_s390.c | 2 +- arch/s390/crypto/sha1_s390.c | 2 +- arch/s390/crypto/sha256_s390.c | 4 ++-- arch/s390/crypto/sha512_s390.c | 4 ++-- arch/x86/crypto/aes_glue.c | 4 ++-- arch/x86/crypto/aesni-intel_glue.c | 2 +- arch/x86/crypto/blowfish_glue.c | 4 ++-- arch/x86/crypto/crc32c-intel.c | 4 ++-- arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 +- arch/x86/crypto/salsa20_glue.c | 4 ++-- arch/x86/crypto/sha1_ssse3_glue.c | 2 +- arch/x86/crypto/twofish_glue.c | 4 ++-- arch/x86/crypto/twofish_glue_3way.c | 4 ++-- crypto/aes_generic.c | 2 +- crypto/ansi_cprng.c | 2 +- crypto/anubis.c | 1 + crypto/api.c | 4 ++-- crypto/arc4.c | 1 + crypto/blowfish_generic.c | 2 +- crypto/camellia.c | 2 +- crypto/cast5.c | 2 +- crypto/cast6.c | 2 +- crypto/ccm.c | 4 ++-- crypto/crc32c.c | 2 +- crypto/crypto_null.c | 6 +++--- crypto/ctr.c | 2 +- crypto/deflate.c | 2 +- crypto/des_generic.c | 2 +- crypto/fcrypt.c | 1 + crypto/gcm.c | 6 +++--- crypto/ghash-generic.c | 2 +- crypto/khazad.c | 1 + crypto/krng.c | 2 +- crypto/lzo.c | 1 + crypto/md4.c | 2 +- crypto/md5.c | 1 + crypto/michael_mic.c | 1 + crypto/rmd128.c | 1 + crypto/rmd160.c | 1 + crypto/rmd256.c | 1 + crypto/rmd320.c | 1 + crypto/salsa20_generic.c | 2 +- crypto/seed.c | 1 + crypto/serpent.c | 4 ++-- crypto/sha1_generic.c | 2 +- crypto/sha256_generic.c | 4 ++-- crypto/sha512_generic.c | 4 ++-- crypto/tea.c | 4 ++-- crypto/tgr192.c | 4 ++-- crypto/twofish_generic.c | 2 +- crypto/wp512.c | 4 ++-- crypto/zlib.c | 1 + drivers/crypto/padlock-aes.c | 2 +- drivers/crypto/padlock-sha.c | 8 ++++---- drivers/s390/crypto/ap_bus.c | 3 ++- include/linux/crypto.h | 13 +++++++++++++
arch/s390/crypto/aes_s390.c +1 -1
@@ -972,7 +972,7 @@ static void __exit aes_s390_fini(void)module_init (aes_s390_init);module_exit (aes_s390_fini); -MODULE_ALIAS ("aes-all" ); +MODULE_ALIAS_CRYPTO ("aes-all" );MODULE_DESCRIPTION ("Rijndael (AES) Cipher Algorithm" );MODULE_LICENSE ("GPL" );
arch/s390/crypto/des_s390.c +2 -2
@@ -626,8 +626,8 @@ static void __exit des_s390_exit(void)module_init (des_s390_init);module_exit (des_s390_exit); -MODULE_ALIAS ("des" ); -MODULE_ALIAS ("des3_ede" ); +MODULE_ALIAS_CRYPTO ("des" ); +MODULE_ALIAS_CRYPTO ("des3_ede" );MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("DES & Triple DES EDE Cipher Algorithms" );
arch/s390/crypto/ghash_s390.c +1 -1
@@ -161,7 +161,7 @@ static void __exit ghash_mod_exit(void)module_init (ghash_mod_init);module_exit (ghash_mod_exit); -MODULE_ALIAS ("ghash" ); +MODULE_ALIAS_CRYPTO ("ghash" );MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("GHASH Message Digest Algorithm, s390 implementation" );
arch/s390/crypto/sha1_s390.c +1 -1
@@ -103,6 +103,6 @@ static void __exit sha1_s390_fini(void)module_init (sha1_s390_init);module_exit (sha1_s390_fini); -MODULE_ALIAS ("sha1" ); +MODULE_ALIAS_CRYPTO ("sha1" );MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("SHA1 Secure Hash Algorithm" );
arch/s390/crypto/sha256_s390.c +2 -2
@@ -143,7 +143,7 @@ static void __exit sha256_s390_fini(voidmodule_init (sha256_s390_init);module_exit (sha256_s390_fini); -MODULE_ALIAS ("sha256" ); -MODULE_ALIAS ("sha224" ); +MODULE_ALIAS_CRYPTO ("sha256" ); +MODULE_ALIAS_CRYPTO ("sha224" );MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("SHA256 and SHA224 Secure Hash Algorithm" );
arch/s390/crypto/sha512_s390.c +2 -2
@@ -86,7 +86,7 @@ static struct shash_alg sha512_alg = { } }; -MODULE_ALIAS ("sha512" ); +MODULE_ALIAS_CRYPTO ("sha512" );static int sha384_init (struct shash_desc *desc) {
@@ -126,7 +126,7 @@ static struct shash_alg sha384_alg = { } }; -MODULE_ALIAS ("sha384" ); +MODULE_ALIAS_CRYPTO ("sha384" );static int __init init (void ) {
arch/x86/crypto/aes_glue.c +2 -2
@@ -67,5 +67,5 @@ module_exit(aes_fini);MODULE_DESCRIPTION ("Rijndael (AES) Cipher Algorithm, asm optimized" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("aes" ); -MODULE_ALIAS ("aes-asm" ); +MODULE_ALIAS_CRYPTO ("aes" ); +MODULE_ALIAS_CRYPTO ("aes-asm" );
arch/x86/crypto/aesni-intel_glue.c +1 -1
@@ -1380,4 +1380,4 @@ module_exit(aesni_exit);MODULE_DESCRIPTION ("Rijndael (AES) Cipher Algorithm, Intel AES-NI instructions optimized" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("aes" ); +MODULE_ALIAS_CRYPTO ("aes" );
arch/x86/crypto/blowfish_glue.c +2 -2
@@ -488,5 +488,5 @@ module_exit(fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Blowfish Cipher Algorithm, asm optimized" ); -MODULE_ALIAS ("blowfish" ); -MODULE_ALIAS ("blowfish-asm" ); +MODULE_ALIAS_CRYPTO ("blowfish" ); +MODULE_ALIAS_CRYPTO ("blowfish-asm" );
arch/x86/crypto/crc32c-intel.c +2 -2
@@ -194,5 +194,5 @@ MODULE_AUTHOR("Austin Zhang <austin.zhanMODULE_DESCRIPTION ("CRC32c (Castagnoli) optimization using Intel Hardware." );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("crc32c" ); -MODULE_ALIAS ("crc32c-intel" ); +MODULE_ALIAS_CRYPTO ("crc32c" ); +MODULE_ALIAS_CRYPTO ("crc32c-intel" );
arch/x86/crypto/ghash-clmulni-intel_glue.c +1 -1
@@ -339,4 +339,4 @@ module_exit(ghash_pclmulqdqni_mod_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("GHASH Message Digest Algorithm, " "acclerated by PCLMULQDQ-NI" ); -MODULE_ALIAS ("ghash" ); +MODULE_ALIAS_CRYPTO ("ghash" );
arch/x86/crypto/salsa20_glue.c +2 -2
@@ -125,5 +125,5 @@ module_exit(fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Salsa20 stream cipher algorithm (optimized assembly version)" ); -MODULE_ALIAS ("salsa20" ); -MODULE_ALIAS ("salsa20-asm" ); +MODULE_ALIAS_CRYPTO ("salsa20" ); +MODULE_ALIAS_CRYPTO ("salsa20-asm" );
arch/x86/crypto/sha1_ssse3_glue.c +1 -1
@@ -237,4 +237,4 @@ module_exit(sha1_ssse3_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("SHA1 Secure Hash Algorithm, Supplemental SSE3 accelerated" ); -MODULE_ALIAS ("sha1" ); +MODULE_ALIAS_CRYPTO ("sha1" );
arch/x86/crypto/twofish_glue.c +2 -2
@@ -97,5 +97,5 @@ module_exit(fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Twofish Cipher Algorithm, asm optimized" ); -MODULE_ALIAS ("twofish" ); -MODULE_ALIAS ("twofish-asm" ); +MODULE_ALIAS_CRYPTO ("twofish" ); +MODULE_ALIAS_CRYPTO ("twofish-asm" );
arch/x86/crypto/twofish_glue_3way.c +2 -2
@@ -468,5 +468,5 @@ module_exit(fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Twofish Cipher Algorithm, 3-way parallel asm optimized" ); -MODULE_ALIAS ("twofish" ); -MODULE_ALIAS ("twofish-asm" ); +MODULE_ALIAS_CRYPTO ("twofish" ); +MODULE_ALIAS_CRYPTO ("twofish-asm" );
crypto/aes_generic.c +1 -1
@@ -1475,4 +1475,4 @@ module_exit(aes_fini);MODULE_DESCRIPTION ("Rijndael (AES) Cipher Algorithm" );MODULE_LICENSE ("Dual BSD/GPL" ); -MODULE_ALIAS ("aes" ); +MODULE_ALIAS_CRYPTO ("aes" );
crypto/ansi_cprng.c +1 -1
@@ -485,4 +485,4 @@ module_param(dbg, int, 0);MODULE_PARM_DESC (dbg,"Boolean to enable debugging (0/1 == off/on)" );module_init (prng_mod_init);module_exit (prng_mod_fini); -MODULE_ALIAS ("stdrng" ); +MODULE_ALIAS_CRYPTO ("stdrng" );
crypto/anubis.c +1 -0
@@ -705,3 +705,4 @@ module_exit(anubis_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Anubis Cryptographic Algorithm" ); +MODULE_ALIAS_CRYPTO ("anubis" );
crypto/api.c +2 -2
@@ -222,11 +222,11 @@ struct crypto_alg *crypto_larval_lookup( alg =crypto_alg_lookup (name, type, mask);if (!alg) { -request_module ("%s" , name); +request_module ("crypto-%s" , name);if (!((type ^CRYPTO_ALG_NEED_FALLBACK ) & mask &CRYPTO_ALG_NEED_FALLBACK )) -request_module ("%s-all" , name); +request_module ("crypto-%s-all" , name); alg =crypto_alg_lookup (name, type, mask); }
crypto/arc4.c +1 -0
@@ -101,3 +101,4 @@ module_exit(arc4_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("ARC4 Cipher Algorithm" );MODULE_AUTHOR ("Jon Oberheide <[email protected]>" ); +MODULE_ALIAS_CRYPTO ("arc4" );
crypto/blowfish_generic.c +1 -1
@@ -139,4 +139,4 @@ module_exit(blowfish_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Blowfish Cipher Algorithm" ); -MODULE_ALIAS ("blowfish" ); +MODULE_ALIAS_CRYPTO ("blowfish" );
crypto/camellia.c +1 -0
@@ -1114,3 +1114,4 @@ module_exit(camellia_fini);MODULE_DESCRIPTION ("Camellia Cipher Algorithm" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_CRYPTO ("camellia" );
crypto/cast5.c +1 -0
@@ -806,4 +806,5 @@ module_exit(cast5_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Cast5 Cipher Algorithm" ); +MODULE_ALIAS_CRYPTO ("cast5" );
crypto/cast6.c +1 -0
@@ -545,3 +545,4 @@ module_exit(cast6_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Cast6 Cipher Algorithm" ); +MODULE_ALIAS_CRYPTO ("cast6" );
crypto/ccm.c +2 -2
@@ -888,5 +888,5 @@ module_exit(crypto_ccm_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Counter with CBC MAC" ); -MODULE_ALIAS ("ccm_base" ); -MODULE_ALIAS ("rfc4309" ); +MODULE_ALIAS_CRYPTO ("ccm_base" ); +MODULE_ALIAS_CRYPTO ("rfc4309" );
crypto/crc32c.c +1 -0
@@ -258,3 +258,4 @@ module_exit(crc32c_mod_fini);MODULE_AUTHOR ("Clay Haapala <[email protected]>" );MODULE_DESCRIPTION ("CRC32c (Castagnoli) calculations wrapper for lib/crc32c" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_CRYPTO ("crc32c" );
crypto/crypto_null.c +3 -3
@@ -156,9 +156,9 @@ static struct crypto_alg skcipher_null = .decrypt = skcipher_null_crypt } } }; -MODULE_ALIAS ("compress_null" ); -MODULE_ALIAS ("digest_null" ); -MODULE_ALIAS ("cipher_null" ); +MODULE_ALIAS_CRYPTO ("compress_null" ); +MODULE_ALIAS_CRYPTO ("digest_null" ); +MODULE_ALIAS_CRYPTO ("cipher_null" );static int __init crypto_null_mod_init (void ) {
crypto/ctr.c +1 -1
@@ -421,4 +421,4 @@ module_exit(crypto_ctr_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("CTR Counter block mode" ); -MODULE_ALIAS ("rfc3686" ); +MODULE_ALIAS_CRYPTO ("rfc3686" );
crypto/deflate.c +1 -1
@@ -223,4 +223,4 @@ module_exit(deflate_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Deflate Compression Algorithm for IPCOMP" );MODULE_AUTHOR ("James Morris <[email protected]>" ); - +MODULE_ALIAS_CRYPTO ("deflate" );
crypto/des_generic.c +1 -1
@@ -975,7 +975,7 @@ static struct crypto_alg des3_ede_alg = .cia_decrypt = des3_ede_decrypt } } }; -MODULE_ALIAS ("des3_ede" ); +MODULE_ALIAS_CRYPTO ("des3_ede" );static int __init des_generic_mod_init (void ) {
crypto/fcrypt.c +1 -0
@@ -421,3 +421,4 @@ module_exit(fcrypt_mod_fini);MODULE_LICENSE ("Dual BSD/GPL" );MODULE_DESCRIPTION ("FCrypt Cipher Algorithm" );MODULE_AUTHOR ("David Howells <[email protected]>" ); +MODULE_ALIAS_CRYPTO ("fcrypt" );
crypto/gcm.c +3 -3
@@ -1374,6 +1374,6 @@ module_exit(crypto_gcm_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Galois/Counter Mode" );MODULE_AUTHOR ("Mikko Herranen <[email protected]>" ); -MODULE_ALIAS ("gcm_base" ); -MODULE_ALIAS ("rfc4106" ); -MODULE_ALIAS ("rfc4543" ); +MODULE_ALIAS_CRYPTO ("gcm_base" ); +MODULE_ALIAS_CRYPTO ("rfc4106" ); +MODULE_ALIAS_CRYPTO ("rfc4543" );
crypto/ghash-generic.c +1 -1
@@ -173,4 +173,4 @@ module_exit(ghash_mod_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("GHASH Message Digest Algorithm" ); -MODULE_ALIAS ("ghash" ); +MODULE_ALIAS_CRYPTO ("ghash" );
crypto/khazad.c +1 -0
@@ -881,3 +881,4 @@ module_exit(khazad_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Khazad Cryptographic Algorithm" ); +MODULE_ALIAS_CRYPTO ("khazad" );
crypto/krng.c +1 -1
@@ -63,4 +63,4 @@ module_exit(krng_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Kernel Random Number Generator" ); -MODULE_ALIAS ("stdrng" ); +MODULE_ALIAS_CRYPTO ("stdrng" );
crypto/lzo.c +1 -0
@@ -104,3 +104,4 @@ module_exit(lzo_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("LZO Compression Algorithm" ); +MODULE_ALIAS_CRYPTO ("lzo" );
crypto/md4.c +1 -1
@@ -255,4 +255,4 @@ module_exit(md4_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("MD4 Message Digest Algorithm" ); - +MODULE_ALIAS_CRYPTO ("md4" );
crypto/md5.c +1 -0
@@ -168,3 +168,4 @@ module_exit(md5_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("MD5 Message Digest Algorithm" ); +MODULE_ALIAS_CRYPTO ("md5" );
crypto/michael_mic.c +1 -0
@@ -184,3 +184,4 @@ module_exit(michael_mic_exit);MODULE_LICENSE ("GPL v2" );MODULE_DESCRIPTION ("Michael MIC" );MODULE_AUTHOR ("Jouni Malinen <[email protected]>" ); +MODULE_ALIAS_CRYPTO ("michael_mic" );
crypto/rmd128.c +1 -0
@@ -327,3 +327,4 @@ module_exit(rmd128_mod_fini);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Adrian-Ken Rueegsegger <[email protected]>" );MODULE_DESCRIPTION ("RIPEMD-128 Message Digest" ); +MODULE_ALIAS_CRYPTO ("rmd128" );
crypto/rmd160.c +1 -0
@@ -371,3 +371,4 @@ module_exit(rmd160_mod_fini);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Adrian-Ken Rueegsegger <[email protected]>" );MODULE_DESCRIPTION ("RIPEMD-160 Message Digest" ); +MODULE_ALIAS_CRYPTO ("rmd160" );
crypto/rmd256.c +1 -0
@@ -346,3 +346,4 @@ module_exit(rmd256_mod_fini);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Adrian-Ken Rueegsegger <[email protected]>" );MODULE_DESCRIPTION ("RIPEMD-256 Message Digest" ); +MODULE_ALIAS_CRYPTO ("rmd256" );
crypto/rmd320.c +1 -0
@@ -395,3 +395,4 @@ module_exit(rmd320_mod_fini);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Adrian-Ken Rueegsegger <[email protected]>" );MODULE_DESCRIPTION ("RIPEMD-320 Message Digest" ); +MODULE_ALIAS_CRYPTO ("rmd320" );
crypto/salsa20_generic.c +1 -1
@@ -249,4 +249,4 @@ module_exit(salsa20_generic_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Salsa20 stream cipher algorithm" ); -MODULE_ALIAS ("salsa20" ); +MODULE_ALIAS_CRYPTO ("salsa20" );
crypto/seed.c +1 -0
@@ -477,3 +477,4 @@ module_exit(seed_fini);MODULE_DESCRIPTION ("SEED Cipher Algorithm" );MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Hye-Shik Chang <[email protected]>, Kim Hyun <[email protected]>" ); +MODULE_ALIAS_CRYPTO ("seed" );
crypto/serpent.c +2 -1
@@ -584,4 +584,5 @@ module_exit(serpent_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Serpent and tnepres (kerneli compatible serpent reversed) Cipher Algorithm" );MODULE_AUTHOR ("Dag Arne Osvik <[email protected]>" ); -MODULE_ALIAS ("tnepres" ); +MODULE_ALIAS_CRYPTO ("tnepres" ); +MODULE_ALIAS_CRYPTO ("serpent" );
crypto/sha1_generic.c +1 -1
@@ -153,4 +153,4 @@ module_exit(sha1_generic_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("SHA1 Secure Hash Algorithm" ); -MODULE_ALIAS ("sha1" ); +MODULE_ALIAS_CRYPTO ("sha1" );
crypto/sha256_generic.c +2 -2
@@ -398,5 +398,5 @@ module_exit(sha256_generic_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("SHA-224 and SHA-256 Secure Hash Algorithm" ); -MODULE_ALIAS ("sha224" ); -MODULE_ALIAS ("sha256" ); +MODULE_ALIAS_CRYPTO ("sha224" ); +MODULE_ALIAS_CRYPTO ("sha256" );
crypto/sha512_generic.c +2 -2
@@ -294,5 +294,5 @@ module_exit(sha512_generic_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("SHA-512 and SHA-384 Secure Hash Algorithms" ); -MODULE_ALIAS ("sha384" ); -MODULE_ALIAS ("sha512" ); +MODULE_ALIAS_CRYPTO ("sha384" ); +MODULE_ALIAS_CRYPTO ("sha512" );
crypto/tea.c +2 -2
@@ -299,8 +299,8 @@ static void __exit tea_mod_fini(void)crypto_unregister_alg (&xeta_alg); } -MODULE_ALIAS ("xtea" ); -MODULE_ALIAS ("xeta" ); +MODULE_ALIAS_CRYPTO ("xtea" ); +MODULE_ALIAS_CRYPTO ("xeta" );module_init (tea_mod_init);module_exit (tea_mod_fini);
crypto/tgr192.c +2 -2
@@ -702,8 +702,8 @@ static void __exit tgr192_mod_fini(void)crypto_unregister_shash (&tgr128); } -MODULE_ALIAS ("tgr160" ); -MODULE_ALIAS ("tgr128" ); +MODULE_ALIAS_CRYPTO ("tgr160" ); +MODULE_ALIAS_CRYPTO ("tgr128" );module_init (tgr192_mod_init);module_exit (tgr192_mod_fini);
crypto/twofish_generic.c +1 -1
@@ -212,4 +212,4 @@ module_exit(twofish_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Twofish Cipher Algorithm" ); -MODULE_ALIAS ("twofish" ); +MODULE_ALIAS_CRYPTO ("twofish" );
crypto/wp512.c +2 -2
@@ -1194,8 +1194,8 @@ static void __exit wp512_mod_fini(void)crypto_unregister_shash (&wp256); } -MODULE_ALIAS ("wp384" ); -MODULE_ALIAS ("wp256" ); +MODULE_ALIAS_CRYPTO ("wp384" ); +MODULE_ALIAS_CRYPTO ("wp256" );module_init (wp512_mod_init);module_exit (wp512_mod_fini);
crypto/zlib.c +1 -0
@@ -378,3 +378,4 @@ module_exit(zlib_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Zlib Compression Algorithm" );MODULE_AUTHOR ("Sony Corporation" ); +MODULE_ALIAS_CRYPTO ("zlib" );
drivers/crypto/padlock-aes.c +1 -1
@@ -559,4 +559,4 @@ MODULE_DESCRIPTION("VIA PadLock AES algoMODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Michal Ludvig" ); -MODULE_ALIAS ("aes" ); +MODULE_ALIAS_CRYPTO ("aes" );
drivers/crypto/padlock-sha.c +4 -4
@@ -593,7 +593,7 @@ MODULE_DESCRIPTION("VIA PadLock SHA1/SHAMODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Michal Ludvig" ); -MODULE_ALIAS ("sha1-all" ); -MODULE_ALIAS ("sha256-all" ); -MODULE_ALIAS ("sha1-padlock" ); -MODULE_ALIAS ("sha256-padlock" ); +MODULE_ALIAS_CRYPTO ("sha1-all" ); +MODULE_ALIAS_CRYPTO ("sha256-all" ); +MODULE_ALIAS_CRYPTO ("sha1-padlock" ); +MODULE_ALIAS_CRYPTO ("sha256-padlock" );
include/linux/crypto.h +13 -0
@@ -25,6 +25,19 @@#include <linux/uaccess.h> /* +* Autoloaded crypto modules should only use a prefixed name to avoid allowing +* arbitrary modules to be loaded. Loading from userspace may still need the +* unprefixed names, so retains those aliases as well. +* This uses __MODULE_INFO directly instead of MODULE_ALIAS because pre-4.3 +* gcc (e.g. avr32 toolchain) uses __LINE__ for uniqueness, and this macro +* expands twice on the same line. Instead, use a separate base name for the +* alias. +*/ +#define MODULE_ALIAS_CRYPTO (name) \ + __MODULE_INFO(alias, alias_userspace, name); \ + __MODULE_INFO(alias, alias_crypto, "crypto-" name) + +/* * Algorithm masks and types. */ #define CRYPTO_ALG_TYPE_MASK 0x0000000f
PATCH 106/152 crypto: include crypto- module prefix in template
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 4943ba16bbc2db05115707b3ff7b4874e9e3c560 upstream.
This adds the module loading prefix "crypto-" to the template lookup as well.
For example, attempting to load 'vfat(blowfish)' via AF_ALG now correctly includes the "crypto-" prefix at every level, correctly rejecting "vfat":
net-pf-38 algif-hash crypto-vfat(blowfish) crypto-vfat(blowfish)-all crypto-vfat
---
arch/x86/crypto/fpu.c +3 -0
@@ -17,6 +17,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/slab.h> +#include <linux/crypto.h> #include <asm/i387.h> struct crypto_fpu_ctx {
@@ -159,3 +160,5 @@ void __exit crypto_fpu_exit(void) {crypto_unregister_template (&crypto_fpu_tmpl); } + +MODULE_ALIAS_CRYPTO ("fpu" );
crypto/algapi.c +2 -2
@@ -477,8 +477,8 @@ static struct crypto_template *__crypto_struct crypto_template *crypto_lookup_template (const char *name) { -return try_then_request_module (__crypto_lookup_template (name),"%s" , - name); +return try_then_request_module (__crypto_lookup_template (name), +"crypto-%s" , name); }EXPORT_SYMBOL_GPL (crypto_lookup_template);
crypto/authenc.c +1 -0
@@ -710,3 +710,4 @@ module_exit(crypto_authenc_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Simple AEAD wrapper for IPsec" ); +MODULE_ALIAS_CRYPTO ("authenc" );
crypto/authencesn.c +1 -0
@@ -833,3 +833,4 @@ module_exit(crypto_authenc_esn_module_exMODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Steffen Klassert <[email protected]>" );MODULE_DESCRIPTION ("AEAD wrapper for IPsec with extended sequence numbers" ); +MODULE_ALIAS_CRYPTO ("authencesn" );
crypto/cbc.c +1 -0
@@ -289,3 +289,4 @@ module_exit(crypto_cbc_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("CBC block cipher algorithm" ); +MODULE_ALIAS_CRYPTO ("cbc" );
crypto/ccm.c +1 -0
@@ -890,3 +890,4 @@ MODULE_LICENSE("GPL");MODULE_DESCRIPTION ("Counter with CBC MAC" );MODULE_ALIAS_CRYPTO ("ccm_base" );MODULE_ALIAS_CRYPTO ("rfc4309" ); +MODULE_ALIAS_CRYPTO ("ccm" );
crypto/chainiv.c +1 -0
@@ -360,3 +360,4 @@ module_exit(chainiv_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Chain IV Generator" ); +MODULE_ALIAS_CRYPTO ("chainiv" );
crypto/cryptd.c +1 -0
@@ -955,3 +955,4 @@ module_exit(cryptd_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Software async crypto daemon" ); +MODULE_ALIAS_CRYPTO ("cryptd" );
crypto/ctr.c +1 -0
@@ -422,3 +422,4 @@ module_exit(crypto_ctr_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("CTR Counter block mode" );MODULE_ALIAS_CRYPTO ("rfc3686" ); +MODULE_ALIAS_CRYPTO ("ctr" );
crypto/cts.c +1 -0
@@ -351,3 +351,4 @@ module_exit(crypto_cts_module_exit);MODULE_LICENSE ("Dual BSD/GPL" );MODULE_DESCRIPTION ("CTS-CBC CipherText Stealing for CBC" ); +MODULE_ALIAS_CRYPTO ("cts" );
crypto/ecb.c +1 -0
@@ -185,3 +185,4 @@ module_exit(crypto_ecb_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("ECB block cipher algorithm" ); +MODULE_ALIAS_CRYPTO ("ecb" );
crypto/eseqiv.c +1 -0
@@ -267,3 +267,4 @@ module_exit(eseqiv_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Encrypted Sequence Number IV Generator" ); +MODULE_ALIAS_CRYPTO ("eseqiv" );
crypto/gcm.c +1 -0
@@ -1377,3 +1377,4 @@ MODULE_AUTHOR("Mikko Herranen <[email protected]MODULE_ALIAS_CRYPTO ("gcm_base" );MODULE_ALIAS_CRYPTO ("rfc4106" );MODULE_ALIAS_CRYPTO ("rfc4543" ); +MODULE_ALIAS_CRYPTO ("gcm" );
crypto/hmac.c +1 -0
@@ -271,3 +271,4 @@ module_exit(hmac_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("HMAC hash algorithm" ); +MODULE_ALIAS_CRYPTO ("hmac" );
crypto/lrw.c +1 -0
@@ -312,3 +312,4 @@ module_exit(crypto_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("LRW block cipher mode" ); +MODULE_ALIAS_CRYPTO ("lrw" );
crypto/pcbc.c +1 -0
@@ -295,3 +295,4 @@ module_exit(crypto_pcbc_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("PCBC block cipher algorithm" ); +MODULE_ALIAS_CRYPTO ("pcbc" );
crypto/pcrypt.c +1 -0
@@ -565,3 +565,4 @@ module_exit(pcrypt_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Steffen Klassert <[email protected]>" );MODULE_DESCRIPTION ("Parallel crypto wrapper" ); +MODULE_ALIAS_CRYPTO ("pcrypt" );
crypto/seqiv.c +1 -0
@@ -363,3 +363,4 @@ module_exit(seqiv_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Sequence Number IV Generator" ); +MODULE_ALIAS_CRYPTO ("seqiv" );
crypto/vmac.c +1 -0
@@ -673,4 +673,5 @@ module_exit(vmac_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("VMAC hash algorithm" ); +MODULE_ALIAS_CRYPTO ("vmac" );
crypto/xcbc.c +1 -0
@@ -286,3 +286,4 @@ module_exit(crypto_xcbc_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("XCBC keyed hash algorithm" ); +MODULE_ALIAS_CRYPTO ("xcbc" );
crypto/xts.c +1 -0
@@ -289,3 +289,4 @@ module_exit(crypto_module_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("XTS block cipher mode" ); +MODULE_ALIAS_CRYPTO ("xts" );
PATCH 107/152 crypto: add missing crypto module aliases
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Krause <[email protected]>
commit 3e14dcf7cb80b34a1f38b55bc96f02d23fdaaaaf upstream.
Commit 5d26a105b5a7 ("crypto: prefix module autoloading with "crypto-"") changed the automatic module loading when requesting crypto algorithms to prefix all module requests with "crypto-". This requires all crypto modules to have a crypto specific module alias even if their file name would otherwise match the requested crypto algorithm.
Even though commit 5d26a105b5a7 added those aliases for a vast amount of modules, it was missing a few. Add the required MODULE_ALIAS_CRYPTO annotations to those files to make them get loaded automatically, again. This fixes, e.g., requesting 'ecb(blowfish-generic)', which used to work with kernels v3.18 and below.
Also change MODULE_ALIAS() lines to MODULE_ALIAS_CRYPTO(). The former won't work for crypto modules any more.
[bwh: Backported to 3.2:
- Adjust filenames
- Drop changes to algorithms and drivers we don't have]
---
crypto/aes_generic.c +1 -0
@@ -1476,3 +1476,4 @@ module_exit(aes_fini);MODULE_DESCRIPTION ("Rijndael (AES) Cipher Algorithm" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_ALIAS_CRYPTO ("aes" ); +MODULE_ALIAS_CRYPTO ("aes-generic" );
crypto/ansi_cprng.c +1 -0
@@ -486,3 +486,4 @@ MODULE_PARM_DESC(dbg, "Boolean to enablemodule_init (prng_mod_init);module_exit (prng_mod_fini);MODULE_ALIAS_CRYPTO ("stdrng" ); +MODULE_ALIAS_CRYPTO ("ansi_cprng" );
crypto/blowfish_generic.c +1 -0
@@ -140,3 +140,4 @@ module_exit(blowfish_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Blowfish Cipher Algorithm" );MODULE_ALIAS_CRYPTO ("blowfish" ); +MODULE_ALIAS_CRYPTO ("blowfish-generic" );
crypto/des_generic.c +4 -3
@@ -975,8 +975,6 @@ static struct crypto_alg des3_ede_alg = .cia_decrypt = des3_ede_decrypt } } }; -MODULE_ALIAS_CRYPTO ("des3_ede" ); -static int __init des_generic_mod_init (void ) {int ret =0 ;
@@ -1004,4 +1002,7 @@ module_exit(des_generic_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("DES & Triple DES EDE Cipher Algorithms" );MODULE_AUTHOR ("Dag Arne Osvik <[email protected]>" ); -MODULE_ALIAS ("des" ); +MODULE_ALIAS_CRYPTO ("des" ); +MODULE_ALIAS_CRYPTO ("des-generic" ); +MODULE_ALIAS_CRYPTO ("des3_ede" ); +MODULE_ALIAS_CRYPTO ("des3_ede-generic" );
crypto/ghash-generic.c +1 -0
@@ -174,3 +174,4 @@ module_exit(ghash_mod_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("GHASH Message Digest Algorithm" );MODULE_ALIAS_CRYPTO ("ghash" ); +MODULE_ALIAS_CRYPTO ("ghash-generic" );
crypto/krng.c +1 -0
@@ -64,3 +64,4 @@ module_exit(krng_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Kernel Random Number Generator" );MODULE_ALIAS_CRYPTO ("stdrng" ); +MODULE_ALIAS_CRYPTO ("krng" );
crypto/salsa20_generic.c +1 -0
@@ -250,3 +250,4 @@ module_exit(salsa20_generic_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Salsa20 stream cipher algorithm" );MODULE_ALIAS_CRYPTO ("salsa20" ); +MODULE_ALIAS_CRYPTO ("salsa20-generic" );
crypto/sha1_generic.c +1 -0
@@ -154,3 +154,4 @@ MODULE_LICENSE("GPL");MODULE_DESCRIPTION ("SHA1 Secure Hash Algorithm" );MODULE_ALIAS_CRYPTO ("sha1" ); +MODULE_ALIAS_CRYPTO ("sha1-generic" );
crypto/sha256_generic.c +2 -0
@@ -399,4 +399,6 @@ MODULE_LICENSE("GPL");MODULE_DESCRIPTION ("SHA-224 and SHA-256 Secure Hash Algorithm" );MODULE_ALIAS_CRYPTO ("sha224" ); +MODULE_ALIAS_CRYPTO ("sha224-generic" );MODULE_ALIAS_CRYPTO ("sha256" ); +MODULE_ALIAS_CRYPTO ("sha256-generic" );
crypto/sha512_generic.c +2 -0
@@ -295,4 +295,6 @@ MODULE_LICENSE("GPL");MODULE_DESCRIPTION ("SHA-512 and SHA-384 Secure Hash Algorithms" );MODULE_ALIAS_CRYPTO ("sha384" ); +MODULE_ALIAS_CRYPTO ("sha384-generic" );MODULE_ALIAS_CRYPTO ("sha512" ); +MODULE_ALIAS_CRYPTO ("sha512-generic" );
crypto/tea.c +1 -0
@@ -299,6 +299,7 @@ static void __exit tea_mod_fini(void)crypto_unregister_alg (&xeta_alg); } +MODULE_ALIAS_CRYPTO ("tea" );MODULE_ALIAS_CRYPTO ("xtea" );MODULE_ALIAS_CRYPTO ("xeta" );
crypto/tgr192.c +1 -0
@@ -702,6 +702,7 @@ static void __exit tgr192_mod_fini(void)crypto_unregister_shash (&tgr128); } +MODULE_ALIAS_CRYPTO ("tgr192" );MODULE_ALIAS_CRYPTO ("tgr160" );MODULE_ALIAS_CRYPTO ("tgr128" );
crypto/twofish_generic.c +1 -0
@@ -213,3 +213,4 @@ module_exit(twofish_mod_fini);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Twofish Cipher Algorithm" );MODULE_ALIAS_CRYPTO ("twofish" ); +MODULE_ALIAS_CRYPTO ("twofish-generic" );
crypto/wp512.c +1 -0
@@ -1194,6 +1194,7 @@ static void __exit wp512_mod_fini(void)crypto_unregister_shash (&wp256); } +MODULE_ALIAS_CRYPTO ("wp512" );MODULE_ALIAS_CRYPTO ("wp384" );MODULE_ALIAS_CRYPTO ("wp256" );
PATCH 108/152 gpio: fix memory and reference leaks in gpiochip_add error path
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 5539b3c938d64a60cb1fc442ac3ce9263d52de0c upstream.
Memory allocated and references taken by of_gpiochip_add and acpi_gpiochip_add were never released on errors in gpiochip_add (e.g. failure to find free gpio range).
has a node pointer")
automatically")
[bwh: Backported to 3.2:
- Move call to of_gpiochip_add() into conditional section rather than rearranging gotos and labels which are in different places here
- There's no ACPI support]
--- drivers/gpio/gpiolib.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpio/gpiolib.c +5 -3
@@ -1075,9 +1075,9 @@ int gpiochip_add(struct gpio_chip *chip) ? (1 <<FLAG_IS_OUT ) :0 ; } - } -of_gpiochip_add (chip); +of_gpiochip_add (chip); + } unlock:spin_unlock_irqrestore (&gpio_lock, flags);
@@ -1086,8 +1086,10 @@ unlock: goto fail; status =gpiochip_export (chip); -if (status) +if (status) { +of_gpiochip_remove (chip); goto fail; + }return 0 ; fail:
PATCH 109/152 ftrace/jprobes/x86: Fix conflict between jprobes and function graph tracing
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (Red Hat)" <[email protected]>
commit 237d28db036e411f22c03cfd5b0f6dc2aa9bf3bc upstream.
If the function graph tracer traces a jprobe callback, the system will crash. This can easily be demonstrated by compiling the jprobe sample module that is in the kernel tree, loading it and running the function graph tracer.
# modprobe jprobe_example.ko # echo function_graph > /sys/kernel/debug/tracing/current_tracer # ls
The first two commands end up in a nice crash after the first fork. (do_fork has a jprobe attached to it, so "ls" just triggers that fork)
The problem is caused by the jprobe_return() that all jprobe callbacks must end with. The way jprobes works is that the function a jprobe is attached to has a breakpoint placed at the start of it (or it uses ftrace if fentry is supported). The breakpoint handler (or ftrace callback) will copy the stack frame and change the ip address to return to the jprobe handler instead of the function. The jprobe handler must end with jprobe_return() which swaps the stack and does an int3 (breakpoint). This breakpoint handler will then put back the saved stack frame, simulate the instruction at the beginning of the function it added a breakpoint to, and then continue on.
For function tracing to work, it hijakes the return address from the stack frame, and replaces it with a hook function that will trace the end of the call. This hook function will restore the return address of the function call.
If the function tracer traces the jprobe handler, the hook function for that handler will not be called, and its saved return address will be used for the next function. This will result in a kernel crash.
To solve this, pause function tracing before the jprobe handler is called and unpause it before it returns back to the function it probed.
Some other updates:
Used a variable "saved_sp" to hold kcb->jprobe_saved_sp. This makes the code look a bit cleaner and easier to understand (various tries to fix this bug required this change).
Note, if fentry is being used, jprobes will change the ip address before the function graph tracer runs and it will not be able to trace the function that the jprobe is probing.
--- arch/x86/kernel/kprobes.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
arch/x86/kernel/kprobes.c +15 -5
@@ -1058,6 +1058,15 @@ int __kprobes setjmp_pre_handler(struct regs->flags &= ~X86_EFLAGS_IF ;trace_hardirqs_off (); regs->ip = (unsigned long )(jp->entry); + +/* +* jprobes use jprobe_return() which skips the normal return +* path of the function, and this messes up the accounting of the +* function graph tracer to get messed up. +* +* Pause function graph tracing while performing the jprobe function. +*/ +pause_graph_tracing ();return 1 ; }
@@ -1083,24 +1092,25 @@ int __kprobes longjmp_break_handler(strustruct kprobe_ctlblk *kcb =get_kprobe_ctlblk ();u8 *addr = (u8 *) (regs->ip -1 ); struct jprobe *jp = container_of(p, struct jprobe, kp); +void *saved_sp = kcb->jprobe_saved_sp;if ((addr > (u8 *) jprobe_return) && (addr < (u8 *) jprobe_return_end)) { -if (stack_addr (regs) != kcb->jprobe_saved_sp) { +if (stack_addr (regs) != saved_sp) {struct pt_regs *saved_regs = &kcb->jprobe_saved_regs;printk (KERN_ERR "current sp %p does not match saved sp %p\n" , -stack_addr (regs), kcb->jprobe_saved_sp); +stack_addr (regs), saved_sp);printk (KERN_ERR "Saved registers for jprobe %p\n" , jp);show_registers (saved_regs);printk (KERN_ERR "Current registers\n" );show_registers (regs);BUG (); } +/* It's OK to start function graph tracing again */ +unpause_graph_tracing (); *regs = kcb->jprobe_saved_regs; -memcpy ((kprobe_opcode_t *)(kcb->jprobe_saved_sp), - kcb->jprobes_stack, -MIN_STACK_SIZE (kcb->jprobe_saved_sp)); +memcpy (saved_sp, kcb->jprobes_stack,MIN_STACK_SIZE (saved_sp));preempt_enable_no_resched ();return 1 ; }
PATCH 110/152 can: dev: fix crtlmode_supported check
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Hartkopp <[email protected]>
commit 9b1087aa5e86448fe6ad40a58964e35f3ba423d5 upstream.
When changing flags in the CAN drivers ctrlmode the provided new content has to be checked whether the bits are allowed to be changed. The bits that are to be changed are given as a bitfield in cm->mask. Therefore checking against cm->flags is wrong as the content can hold any kind of values.
The iproute2 tool sets the bits in cm->mask and cm->flags depending on the detected command line options. To be robust against bogus user space applications additionally sanitize the provided flags with the provided mask.
--- drivers/net/can/dev.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/can/dev.c +6 -2
@@ -605,10 +605,14 @@ static int can_changelink(struct net_devif (dev->flags &IFF_UP )return -EBUSY ; cm =nla_data (data[IFLA_CAN_CTRLMODE ]); -if (cm->flags & ~priv->ctrlmode_supported) + +/* check whether changed bits are allowed to be modified */ +if (cm->mask & ~priv->ctrlmode_supported)return -EOPNOTSUPP ; + +/* clear bits to be modified and copy the flag values */ priv->ctrlmode &= ~cm->mask; - priv->ctrlmode |= cm->flags; + priv->ctrlmode |= (cm->flags & cm->mask); }if (data[IFLA_CAN_BITTIMING ]) {
PATCH 111/152 sysfs.h: add ATTRIBUTE_GROUPS() macro
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit f2f37f58b1b933b06d6d84e80a31a1b500fb0db2 upstream.
To make it easier for driver subsystems to work with attribute groups, create the ATTRIBUTE_GROUPS macro to remove some of the repetitive typing for the most common use for attribute groups.
--- include/linux/sysfs.h | 9 +++++++++ 1 file changed, 9 insertions(+)
include/linux/sysfs.h +9 -0
@@ -80,6 +80,15 @@ struct attribute_group {#define __ATTR_NULL { .attr = { .name = NULL } } +#define ATTRIBUTE_GROUPS (name) \ +static const struct attribute_group name##_group = { \ + .attrs = name##_attrs, \ +}; \ +static const struct attribute_group *name##_groups[] = { \ + &name##_group, \ + NULL, \ +} +#define attr_name (_attr) (_attr).attr.namestruct file ;
PATCH 112/152 driver core: Introduce device_create_groups
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
commit 39ef311204941ddd01ea2950d6220c8ccc710d15 upstream.
device_create_groups lets callers create devices as well as associated sysfs attributes with a single call. This avoids race conditions seen if sysfs attributes on new devices are created later.
[fixed up comment block placement and add checks for printk buffer formats - gregkh]
--- drivers/base/core.c | 111 ++++++++++++++++++++++++++++++++++++------------- include/linux/device.h | 5 +++ 2 files changed, 88 insertions(+), 28 deletions(-)
drivers/base/core.c +83 -28
@@ -1417,34 +1417,11 @@ static void device_create_release(structkfree (dev); } -/** -* device_create_vargs - creates a device and registers it with sysfs -* @class: pointer to the struct class that this device should be registered to -* @parent: pointer to the parent struct device of this new device, if any -* @devt: the dev_t for the char device to be added -* @drvdata: the data to be added to the device for callbacks -* @fmt: string for the device's name -* @args: va_list for the device's name -* -* This function can be used by char device classes. A struct device -* will be created in sysfs, registered to the specified class. -* -* A "dev" file will be created, showing the dev_t for the device, if -* the dev_t is not 0,0. -* If a pointer to a parent struct device is passed in, the newly created -* struct device will be a child of that device in sysfs. -* The pointer to the struct device will be returned from the call. -* Any further sysfs files that might be required can be created using this -* pointer. -* -* Returns &struct device pointer on success, or ERR_PTR() on error. -* -* Note: the struct class passed to this function must have previously -* been created with a call to class_create(). -*/ -struct device *device_create_vargs (struct class *class,struct device *parent, -dev_t devt,void *drvdata,const char *fmt, -va_list args) +static struct device * +device_create_groups_vargs (struct class *class,struct device *parent, +dev_t devt,void *drvdata, +const struct attribute_group **groups, +const char *fmt,va_list args) {struct device *dev =NULL ;int retval = -ENODEV ;
@@ -1461,6 +1438,7 @@ struct device *device_create_vargs(struc dev->devt = devt; dev->class = class; dev->parent = parent; + dev->groups = groups; dev->release = device_create_release;dev_set_drvdata (dev, drvdata);
@@ -1478,6 +1456,39 @@ error:put_device (dev);return ERR_PTR (retval); } + +/** +* device_create_vargs - creates a device and registers it with sysfs +* @class: pointer to the struct class that this device should be registered to +* @parent: pointer to the parent struct device of this new device, if any +* @devt: the dev_t for the char device to be added +* @drvdata: the data to be added to the device for callbacks +* @fmt: string for the device's name +* @args: va_list for the device's name +* +* This function can be used by char device classes. A struct device +* will be created in sysfs, registered to the specified class. +* +* A "dev" file will be created, showing the dev_t for the device, if +* the dev_t is not 0,0. +* If a pointer to a parent struct device is passed in, the newly created +* struct device will be a child of that device in sysfs. +* The pointer to the struct device will be returned from the call. +* Any further sysfs files that might be required can be created using this +* pointer. +* +* Returns &struct device pointer on success, or ERR_PTR() on error. +* +* Note: the struct class passed to this function must have previously +* been created with a call to class_create(). +*/ +struct device *device_create_vargs (struct class *class,struct device *parent, +dev_t devt,void *drvdata,const char *fmt, +va_list args) +{ +return device_create_groups_vargs (class, parent, devt, drvdata,NULL , + fmt, args); +}EXPORT_SYMBOL_GPL (device_create_vargs);/**
@@ -1517,6 +1528,50 @@ struct device *device_create(struct clas }EXPORT_SYMBOL_GPL (device_create); +/** +* device_create_with_groups - creates a device and registers it with sysfs +* @class: pointer to the struct class that this device should be registered to +* @parent: pointer to the parent struct device of this new device, if any +* @devt: the dev_t for the char device to be added +* @drvdata: the data to be added to the device for callbacks +* @groups: NULL-terminated list of attribute groups to be created +* @fmt: string for the device's name +* +* This function can be used by char device classes. A struct device +* will be created in sysfs, registered to the specified class. +* Additional attributes specified in the groups parameter will also +* be created automatically. +* +* A "dev" file will be created, showing the dev_t for the device, if +* the dev_t is not 0,0. +* If a pointer to a parent struct device is passed in, the newly created +* struct device will be a child of that device in sysfs. +* The pointer to the struct device will be returned from the call. +* Any further sysfs files that might be required can be created using this +* pointer. +* +* Returns &struct device pointer on success, or ERR_PTR() on error. +* +* Note: the struct class passed to this function must have previously +* been created with a call to class_create(). +*/ +struct device *device_create_with_groups (struct class *class, +struct device *parent,dev_t devt, +void *drvdata, +const struct attribute_group **groups, +const char *fmt, ...) +{ +va_list vargs; +struct device *dev; + +va_start (vargs, fmt); + dev =device_create_groups_vargs (class, parent, devt, drvdata, groups, + fmt, vargs); +va_end (vargs); +return dev; +} +EXPORT_SYMBOL_GPL (device_create_with_groups); +static int __match_devt (struct device *dev,void *data) {dev_t *devt = data;
include/linux/device.h +5 -0
@@ -767,6 +767,11 @@ extern __printf(5, 6)struct device *device_create (struct class *cls,struct device *parent,dev_t devt,void *drvdata,const char *fmt, ...); +extern __printf(6, 7) +struct device *device_create_with_groups(struct class *cls, + struct device *parent, dev_t devt, void *drvdata, + const struct attribute_group **groups, + const char *fmt, ...); extern void device_destroy(struct class *cls, dev_t devt); /*
PATCH 113/152 gpio: sysfs: fix gpio-chip device-attribute leak
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 121b6a79955a3a3fd7bbb9b8cb88d5b9dad6283d upstream.
The gpio-chip device attributes were never destroyed when the device was removed.
Fix by using device_create_with_groups() to create the device attributes of the chip class device.
Note that this also fixes the attribute-creation race with userspace.
--- drivers/gpio/gpiolib.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/gpio/gpiolib.c +8 -11
@@ -587,16 +587,13 @@ static ssize_t chip_ngpio_show(struct de } static DEVICE_ATTR(ngpio, 0444, chip_ngpio_show, NULL); -static const struct attribute *gpiochip_attrs[] = { +static struct attribute *gpiochip_attrs[] = { &dev_attr_base.attr, &dev_attr_label.attr, &dev_attr_ngpio.attr,NULL , }; - -static const struct attribute_group gpiochip_attr_group = { - .attrs = (struct attribute **) gpiochip_attrs, -}; +ATTRIBUTE_GROUPS (gpiochip);/* * /sys/class/gpio/export ... write-only
@@ -918,13 +915,13 @@ static int gpiochip_export(struct gpio_c/* use chip->base for the ID; it's already known to be unique */ mutex_lock (&sysfs_lock); - dev =device_create (&gpio_class, chip->dev,MKDEV (0 ,0 ), chip, -"gpiochip%d" , chip->base); -if (!IS_ERR (dev)) { - status =sysfs_create_group (&dev->kobj, - &gpiochip_attr_group); - }else + dev =device_create_with_groups (&gpio_class, chip->dev,MKDEV (0 ,0 ), + chip, gpiochip_groups, +"gpiochip%d" , chip->base); +if (IS_ERR (dev)) status =PTR_ERR (dev); +else + status =0 ; chip->exported = (status ==0 );mutex_unlock (&sysfs_lock);
PATCH 114/152 gpiolib: Refactor gpio_export
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ryan Mallon <[email protected]>
commit fc4e2514995d9cd7f3e1a67098ce65d72acf8ec7 upstream.
The gpio_export function uses nested if statements and the status variable to handle the failure cases. This makes the function logic difficult to follow. Refactor the code to abort immediately on failure using goto. This makes the code slightly longer, but significantly reduces the nesting and number of split lines and makes the code easier to read.
--- drivers/gpio/gpiolib.c | 85 +++++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 39 deletions(-)
drivers/gpio/gpiolib.c +45 -38
@@ -697,8 +697,9 @@ int gpio_export(unsigned gpio, bool dire {unsigned long flags;struct gpio_desc *desc; -int status = -EINVAL ; +int status;const char *ioname =NULL ; +struct device *dev;/* can't export until sysfs is available ... */ if (!gpio_class.p) {
@@ -706,59 +707,65 @@ int gpio_export(unsigned gpio, bool direreturn -ENOENT ; } -if (!gpio_is_valid (gpio)) - goto done; +if (!gpio_is_valid (gpio)) { +pr_debug ("%s: gpio %d is not valid\n" , __func__, gpio); +return -EINVAL ; + }mutex_lock (&sysfs_lock);spin_lock_irqsave (&gpio_lock, flags); desc = &gpio_desc[gpio]; -if (test_bit (FLAG_REQUESTED , &desc->flags) - && !test_bit (FLAG_EXPORT , &desc->flags)) { - status =0 ; -if (!desc->chip->direction_input - || !desc->chip->direction_output) - direction_may_change = false; +if (!test_bit (FLAG_REQUESTED , &desc->flags) || +test_bit (FLAG_EXPORT , &desc->flags)) { +spin_unlock_irqrestore (&gpio_lock, flags); +pr_debug ("%s: gpio %d unavailable (requested=%d, exported=%d)\n" , + __func__, gpio, +test_bit (FLAG_REQUESTED , &desc->flags), +test_bit (FLAG_EXPORT , &desc->flags)); +return -EPERM ; } + +if (!desc->chip->direction_input || !desc->chip->direction_output) + direction_may_change = false;spin_unlock_irqrestore (&gpio_lock, flags);if (desc->chip->names && desc->chip->names[gpio - desc->chip->base]) ioname = desc->chip->names[gpio - desc->chip->base]; -if (status ==0 ) { -struct device *dev; + dev =device_create (&gpio_class, desc->chip->dev,MKDEV (0 ,0 ), + desc, ioname ? ioname :"gpio%u" , gpio); +if (IS_ERR (dev)) { + status =PTR_ERR (dev); + goto fail_unlock; + } + + status =sysfs_create_group (&dev->kobj, &gpio_attr_group); +if (status) + goto fail_unregister_device; + +if (direction_may_change) { + status =device_create_file (dev, &dev_attr_direction); +if (status) + goto fail_unregister_device; + } - dev =device_create (&gpio_class, desc->chip->dev,MKDEV (0 ,0 ), - desc, ioname ? ioname :"gpio%u" , gpio); -if (!IS_ERR (dev)) { - status =sysfs_create_group (&dev->kobj, - &gpio_attr_group); - -if (!status && direction_may_change) - status =device_create_file (dev, - &dev_attr_direction); - -if (!status &&gpio_to_irq (gpio) >=0 - && (direction_may_change - || !test_bit (FLAG_IS_OUT , - &desc->flags))) - status =device_create_file (dev, - &dev_attr_edge); - -if (status !=0 ) -device_unregister (dev); - }else - status =PTR_ERR (dev); -if (status ==0 ) -set_bit (FLAG_EXPORT , &desc->flags); +if (gpio_to_irq (gpio) >=0 && (direction_may_change || + !test_bit (FLAG_IS_OUT , &desc->flags))) { + status =device_create_file (dev, &dev_attr_edge); +if (status) + goto fail_unregister_device; } +set_bit (FLAG_EXPORT , &desc->flags);mutex_unlock (&sysfs_lock); +return 0 ; -done: -if (status) -pr_debug ("%s: gpio%d status %d\n" , __func__, gpio, status); - +fail_unregister_device: +device_unregister (dev); +fail_unlock: +mutex_unlock (&sysfs_lock); +pr_debug ("%s: gpio%d status %d\n" , __func__, gpio, status);return status; }EXPORT_SYMBOL_GPL (gpio_export);
PATCH 115/152 Fix circular locking dependency (3.3-rc2)
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
commit 864533ceb6db336dead389577c102a8b792a121a upstream.
Hi,
Quoted 86 lines · Felipe Balbi
Hi guys,
I have just triggered the folllowing:
[ 84.860321] ======================================================
[ 84.860321] [ INFO: possible circular locking dependency detected ]
[ 84.860321] 3.3.0-rc2-00026-ge4e8a39 #474 Not tainted
[ 84.860321] -------------------------------------------------------
[ 84.860321] bash/949 is trying to acquire lock:
[ 84.860321] (sysfs_lock){+.+.+.}, at: [<c0275358>]gpio_value_store+0x24/0xcc
[ 84.860321]
[ 84.860321] but task is already holding lock:
[ 84.860321] (s_active#22){++++.+}, at: [<c016996c>]sysfs_write_file+0xdc/0x184
[ 84.911468]
[ 84.911468] which lock already depends on the new lock.
[ 84.911468]
[ 84.920043]
[ 84.920043] the existing dependency chain (in reverse order) is:
[ 84.920043]
[ 84.927886] -> #1 (s_active#22){++++.+}:
[ 84.927886] [<c008f640>]check_prevs_add+0xdc/0x150
[ 84.927886] [<c008fc18>] validate_chain.clone.24+0x564/0x694
[ 84.927886] [<c0090cdc>]__lock_acquire+0x49c/0x980
[ 84.951660] [<c0091838>]lock_acquire+0x98/0x100
[ 84.951660] [<c016a8e8>]sysfs_deactivate+0xb0/0x100
[ 84.962982] [<c016b1b4>]sysfs_addrm_finish+0x2c/0x6c
[ 84.962982] [<c016b8bc>]sysfs_remove_dir+0x84/0x98
[ 84.962982] [<c02590d8>]kobject_del+0x10/0x78
[ 84.974670] [<c02c29e8>]device_del+0x140/0x170
[ 84.974670] [<c02c2a24>]device_unregister+0xc/0x18
[ 84.985382] [<c0276894>]gpio_unexport+0xbc/0xdc
[ 84.985382] [<c02768c8>]gpio_free+0x14/0xfc
[ 85.001708] [<c0276a28>]unexport_store+0x78/0x8c
[ 85.001708] [<c02c5af8>]class_attr_store+0x18/0x24
[ 85.007293] [<c0169990>]sysfs_write_file+0x100/0x184
[ 85.018981] [<c0109d48>]vfs_write+0xb4/0x148
[ 85.018981] [<c0109fd0>]sys_write+0x40/0x70
[ 85.018981] [<c0013cc0>]ret_fast_syscall+0x0/0x3c
[ 85.035003]
[ 85.035003] -> #0 (sysfs_lock){+.+.+.}:
[ 85.035003] [<c008f54c>]check_prev_add+0x680/0x698
[ 85.035003] [<c008f640>]check_prevs_add+0xdc/0x150
[ 85.052093] [<c008fc18>] validate_chain.clone.24+0x564/0x694
[ 85.052093] [<c0090cdc>]__lock_acquire+0x49c/0x980
[ 85.052093] [<c0091838>]lock_acquire+0x98/0x100
[ 85.069885] [<c047e280>]mutex_lock_nested+0x3c/0x2f4
[ 85.069885] [<c0275358>]gpio_value_store+0x24/0xcc
[ 85.069885] [<c02c18dc>]dev_attr_store+0x18/0x24
[ 85.087158] [<c0169990>]sysfs_write_file+0x100/0x184
[ 85.087158] [<c0109d48>]vfs_write+0xb4/0x148
[ 85.098297] [<c0109fd0>]sys_write+0x40/0x70
[ 85.098297] [<c0013cc0>]ret_fast_syscall+0x0/0x3c
[ 85.109069]
[ 85.109069] other info that might help us debug this:
[ 85.109069]
[ 85.117462] Possible unsafe locking scenario:
[ 85.117462]
[ 85.117462] CPU0 CPU1
[ 85.128417] ---- ----
[ 85.128417]lock(s_active#22);
[ 85.128417] lock(sysfs_lock);
[ 85.128417] lock(s_active#22);
[ 85.142486]lock(sysfs_lock);
[ 85.151794]
[ 85.151794] *** DEADLOCK ***
[ 85.151794]
[ 85.151794] 2 locks held by bash/949:
[ 85.158020] #0: (&buffer->mutex){+.+.+.}, at: [<c01698b8>]sysfs_write_file+0x28/0x184
[ 85.170349] #1: (s_active#22){++++.+}, at: [<c016996c>]sysfs_write_file+0xdc/0x184
[ 85.170349]
[ 85.178588] stack backtrace:
[ 85.178588] [<c001b824>] (unwind_backtrace+0x0/0xf0) from [<c008de64>] (print_circular_bug+0x100/0x114) [ 85.193023] [<c008de64>] (print_circular_bug+0x100/0x114) from [<c008f54c>] (check_prev_add+0x680/0x698) [ 85.193023] [<c008f54c>] (check_prev_add+0x680/0x698) from [<c008f640>] (check_prevs_add+0xdc/0x150) [ 85.212524] [<c008f640>] (check_prevs_add+0xdc/0x150) from [<c008fc18>] (validate_chain.clone.24+0x564/0x694) [ 85.212524] [<c008fc18>] (validate_chain.clone.24+0x564/0x694) from [<c0090cdc>] (__lock_acquire+0x49c/0x980) [ 85.233306] [<c0090cdc>] (__lock_acquire+0x49c/0x980) from [<c0091838>] (lock_acquire+0x98/0x100) [ 85.233306] [<c0091838>] (lock_acquire+0x98/0x100) from [<c047e280>] (mutex_lock_nested+0x3c/0x2f4) [ 85.242614] [<c047e280>] (mutex_lock_nested+0x3c/0x2f4) from [<c0275358>] (gpio_value_store+0x24/0xcc) [ 85.261840] [<c0275358>] (gpio_value_store+0x24/0xcc) from [<c02c18dc>] (dev_attr_store+0x18/0x24) [ 85.261840] [<c02c18dc>] (dev_attr_store+0x18/0x24) from [<c0169990>] (sysfs_write_file+0x100/0x184) [ 85.271240] [<c0169990>] (sysfs_write_file+0x100/0x184) from [<c0109d48>] (vfs_write+0xb4/0x148) [ 85.290008] [<c0109d48>] (vfs_write+0xb4/0x148) from [<c0109fd0>] (sys_write+0x40/0x70)
[ 85.298400] [<c0109fd0>] (sys_write+0x40/0x70) from [<c0013cc0>] (ret_fast_syscall+0x0/0x3c) -bash: echo: write error: Operation not permitted
Quoted 8 lines
the way to trigger is:
root@legolas:~# cd /sys/class/gpio/ root@legolas:/sys/class/gpio# echo 2 > export root@legolas:/sys/class/gpio# echo 2 > unexport root@legolas:/sys/class/gpio# echo 2 > export root@legolas:/sys/class/gpio# cd gpio2/ root@legolas:/sys/class/gpio/gpio2# echo 1 > value
Looks 'sysfs_lock' needn't to be held for unregister, so the patch below may fix the problem.
--- drivers/gpio/gpiolib.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpio/gpiolib.c +5 -3
@@ -877,6 +877,7 @@ void gpio_unexport(unsigned gpio) {struct gpio_desc *desc;int status =0 ; +struct device *dev =NULL ;if (!gpio_is_valid (gpio)) { status = -EINVAL ;
@@ -888,19 +889,20 @@ void gpio_unexport(unsigned gpio) desc = &gpio_desc[gpio];if (test_bit (FLAG_EXPORT , &desc->flags)) { -struct device *dev =NULL ; dev =class_find_device (&gpio_class,NULL , desc, match_export);if (dev) {gpio_setup_irq (desc, dev,0 );clear_bit (FLAG_EXPORT , &desc->flags); -put_device (dev); -device_unregister (dev); }else status = -ENODEV ; }mutex_unlock (&sysfs_lock); +if (dev) { +device_unregister (dev); +put_device (dev); + } done:if (status)pr_debug ("%s: gpio%d status %d\n" , __func__, gpio, status);
PATCH 116/152 gpio: sysfs: fix gpio device-attribute leak
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 0915e6feb38de8d3601819992a5bd050201a56fa upstream.
The gpio device attributes were never destroyed when the gpio was unexported (or on export failures).
Use device_create_with_groups() to create the default device attributes of the gpio class device. Note that this also fixes the attribute-creation race with userspace for these attributes.
Remove contingent attributes in export error path and on unexport.
--- drivers/gpio/gpiolib.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
drivers/gpio/gpiolib.c +12 -14
@@ -317,7 +317,7 @@ static ssize_t gpio_value_store(struct dreturn status; } -static const DEVICE_ATTR(value, 0644, +static DEVICE_ATTR(value, 0644, gpio_value_show, gpio_value_store);static irqreturn_t gpio_sysfs_irq (int irq,void *priv)
@@ -540,18 +540,15 @@ static ssize_t gpio_active_low_store(strreturn status ? : size; } -static const DEVICE_ATTR(active_low, 0644, +static DEVICE_ATTR(active_low, 0644, gpio_active_low_show, gpio_active_low_store); -static const struct attribute *gpio_attrs[] = { +static struct attribute *gpio_attrs[] = { &dev_attr_value.attr, &dev_attr_active_low.attr,NULL , }; - -static const struct attribute_group gpio_attr_group = { - .attrs = (struct attribute **) gpio_attrs, -}; +ATTRIBUTE_GROUPS (gpio);/* * /sys/class/gpio/gpiochipN/
@@ -733,17 +730,14 @@ int gpio_export(unsigned gpio, bool direif (desc->chip->names && desc->chip->names[gpio - desc->chip->base]) ioname = desc->chip->names[gpio - desc->chip->base]; - dev =device_create (&gpio_class, desc->chip->dev,MKDEV (0 ,0 ), - desc, ioname ? ioname :"gpio%u" , gpio); + dev =device_create_with_groups (&gpio_class, desc->chip->dev, +MKDEV (0 ,0 ), desc, gpio_groups, + ioname ? ioname :"gpio%u" , gpio);if (IS_ERR (dev)) { status =PTR_ERR (dev); goto fail_unlock; } - status =sysfs_create_group (&dev->kobj, &gpio_attr_group); -if (status) - goto fail_unregister_device; -if (direction_may_change) { status =device_create_file (dev, &dev_attr_direction);if (status)
@@ -754,13 +748,15 @@ int gpio_export(unsigned gpio, bool dire !test_bit(FLAG_IS_OUT, &desc->flags))) { status =device_create_file (dev, &dev_attr_edge);if (status) - goto fail_unregister_device; + goto fail_remove_attr_direction; }set_bit (FLAG_EXPORT , &desc->flags);mutex_unlock (&sysfs_lock);return 0 ; +fail_remove_attr_direction: +device_remove_file (dev, &dev_attr_direction); fail_unregister_device:device_unregister (dev); fail_unlock:
@@ -900,6 +896,8 @@ void gpio_unexport(unsigned gpio)mutex_unlock (&sysfs_lock);if (dev) { +device_remove_file (dev, &dev_attr_edge); +device_remove_file (dev, &dev_attr_direction);device_unregister (dev);put_device (dev); }
PATCH 117/152 gpio: sysfs: fix gpio attribute-creation race
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit ebbeba120ab2ec6ac5f3afc1425ec6ff0b77ad6f upstream.
Fix attribute-creation race with userspace by using the default group to create also the contingent gpio device attributes.
[bwh: Backported to 3.2:
- Adjust filenames, context
- Use gpio_to_desc(), not gpiod_to_desc(), in gpio_is_visible()
- gpio_is_visible() must return mode_t]
---
drivers/gpio/gpiolib.c +41 -22
@@ -58,6 +58,7 @@ struct gpio_desc {#define FLAG_TRIG_FALL 5/* trigger on falling edge */ #define FLAG_TRIG_RISE 6/* trigger on rising edge */ #define FLAG_ACTIVE_LOW 7/* sysfs value has active low */ +#define FLAG_SYSFS_DIR 10/* show sysfs direction attribute */ #define ID_SHIFT 16/* add new flags before this one */
@@ -543,12 +544,45 @@ static ssize_t gpio_active_low_store(str static DEVICE_ATTR(active_low, 0644, gpio_active_low_show, gpio_active_low_store); +static mode_t gpio_is_visible (struct kobject *kobj,struct attribute *attr, +int n) +{ + struct device *dev = container_of(kobj, struct device, kobj); +struct gpio_desc *desc =dev_get_drvdata (dev); +unsigned gpio = desc - gpio_desc; +mode_t mode = attr->mode; +bool show_direction =test_bit (FLAG_SYSFS_DIR , &desc->flags); + +if (attr == &dev_attr_direction.attr) { +if (!show_direction) + mode =0 ; + }else if (attr == &dev_attr_edge.attr) { +if (gpio_to_irq (gpio) <0 ) + mode =0 ; +if (!show_direction &&test_bit (FLAG_IS_OUT , &desc->flags)) + mode =0 ; + } + +return mode; +} +static struct attribute *gpio_attrs[] = { + &dev_attr_direction.attr, + &dev_attr_edge.attr, &dev_attr_value.attr, &dev_attr_active_low.attr,NULL , }; -ATTRIBUTE_GROUPS (gpio); + +static const struct attribute_group gpio_group = { + .attrs = gpio_attrs, + .is_visible = gpio_is_visible, +}; + +static const struct attribute_group *gpio_groups[] = { + &gpio_group, +NULL +};/* * /sys/class/gpio/gpiochipN/
@@ -723,8 +757,11 @@ int gpio_export(unsigned gpio, bool direreturn -EPERM ; } -if (!desc->chip->direction_input || !desc->chip->direction_output) - direction_may_change = false; +if (desc->chip->direction_input && desc->chip->direction_output && + direction_may_change) { +set_bit (FLAG_SYSFS_DIR , &desc->flags); + } +spin_unlock_irqrestore (&gpio_lock, flags);if (desc->chip->names && desc->chip->names[gpio - desc->chip->base])
@@ -738,27 +775,10 @@ int gpio_export(unsigned gpio, bool dire goto fail_unlock; } -if (direction_may_change) { - status =device_create_file (dev, &dev_attr_direction); -if (status) - goto fail_unregister_device; - } - -if (gpio_to_irq (gpio) >=0 && (direction_may_change || - !test_bit (FLAG_IS_OUT , &desc->flags))) { - status =device_create_file (dev, &dev_attr_edge); -if (status) - goto fail_remove_attr_direction; - } -set_bit (FLAG_EXPORT , &desc->flags);mutex_unlock (&sysfs_lock);return 0 ; -fail_remove_attr_direction: -device_remove_file (dev, &dev_attr_direction); -fail_unregister_device: -device_unregister (dev); fail_unlock:mutex_unlock (&sysfs_lock);pr_debug ("%s: gpio%d status %d\n" , __func__, gpio, status);
@@ -889,6 +909,7 @@ void gpio_unexport(unsigned gpio) dev =class_find_device (&gpio_class,NULL , desc, match_export);if (dev) {gpio_setup_irq (desc, dev,0 ); +clear_bit (FLAG_SYSFS_DIR , &desc->flags);clear_bit (FLAG_EXPORT , &desc->flags); }else status = -ENODEV ;
@@ -896,8 +917,6 @@ void gpio_unexport(unsigned gpio)mutex_unlock (&sysfs_lock);if (dev) { -device_remove_file (dev, &dev_attr_edge); -device_remove_file (dev, &dev_attr_direction);device_unregister (dev);put_device (dev); }
PATCH 118/152 net: sctp: fix race for one-to-many sockets in sendmsg's auto associate
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
commit 2061dcd6bff8b774b4fac8b0739b6be3f87bc9f2 upstream.
I.e. one-to-many sockets in SCTP are not required to explicitly call into connect(2) or sctp_connectx(2) prior to data exchange. Instead, they can directly invoke sendmsg(2) and the SCTP stack will automatically trigger connection establishment through 4WHS via sctp_primitive_ASSOCIATE(). However, this in its current implementation is racy: INIT is being sent out immediately (as it cannot be bundled anyway) and the rest of the DATA chunks are queued up for later xmit when connection is established, meaning sendmsg(2) will return successfully. This behaviour can result in an undesired side-effect that the kernel made the application think the data has already been transmitted, although none of it has actually left the machine, worst case even after close(2)'ing the socket.
Instead, when the association from client side has been shut down e.g. first gracefully through SCTP_EOF and then close(2), the client could afterwards still receive the server's INIT_ACK due to a connection with higher latency. This INIT_ACK is then considered out of the blue and hence responded with ABORT as there was no alive assoc found anymore. This can be easily reproduced f.e. with sctp_test application from lksctp. One way to fix this race is to wait for the handshake to actually complete.
The fix defers waiting after sctp_primitive_ASSOCIATE() and sctp_primitive_SEND() succeeded, so that DATA chunks cooked up from sctp_sendmsg() have already been placed into the output queue through the side-effect interpreter, and therefore can then be bundeled together with COOKIE_ECHO control chunks.
strace from example application (shortened):
socket(PF_INET, SOCK_SEQPACKET, IPPROTO_SCTP) = 3
sendmsg(3, {msg_name(28)={sa_family=AF_INET, sin_port=htons(8888), sin_addr=inet_addr("192.168.1.115")},
msg_iov(1)=[{"hello", 5}], msg_controllen=0, msg_flags=0}, 0) = 5
sendmsg(3, {msg_name(28)={sa_family=AF_INET, sin_port=htons(8888), sin_addr=inet_addr("192.168.1.115")},
msg_iov(1)=[{"hello", 5}], msg_controllen=0, msg_flags=0}, 0) = 5
sendmsg(3, {msg_name(28)={sa_family=AF_INET, sin_port=htons(8888), sin_addr=inet_addr("192.168.1.115")},
msg_iov(1)=[{"hello", 5}], msg_controllen=0, msg_flags=0}, 0) = 5
sendmsg(3, {msg_name(28)={sa_family=AF_INET, sin_port=htons(8888), sin_addr=inet_addr("192.168.1.115")},
msg_iov(1)=[{"hello", 5}], msg_controllen=0, msg_flags=0}, 0) = 5sendmsg(3, {msg_name(28)={sa_family=AF_INET, sin_port=htons(8888), sin_addr=inet_addr("192.168.1.115")},
msg_iov(0)=[], msg_controllen=48, {cmsg_len=48, cmsg_level=0x84 /* SOL_??? */, cmsg_type=, ...}, msg_flags=0}, 0) = 0 // graceful shutdown for SOCK_SEQPACKET via SCTP_EOF
close(3) = 0
tcpdump before patch (fooling the application):
22:33:36.306142 IP 192.168.1.114.41462 > 192.168.1.115.8888: sctp (1) [INIT] [init tag: 3879023686] [rwnd: 106496] [OS: 10] [MIS: 65535] [init TSN: 3139201684] 22:33:36.316619 IP 192.168.1.115.8888 > 192.168.1.114.41462: sctp (1) [INIT ACK] [init tag: 3345394793] [rwnd: 106496] [OS: 10] [MIS: 10] [init TSN: 3380109591] 22:33:36.317600 IP 192.168.1.114.41462 > 192.168.1.115.8888: sctp (1) [ABORT]
tcpdump after patch:
14:28:58.884116 IP 192.168.1.114.35846 > 192.168.1.115.8888: sctp (1) [INIT] [init tag: 438593213] [rwnd: 106496] [OS: 10] [MIS: 65535] [init TSN: 3092969729] 14:28:58.888414 IP 192.168.1.115.8888 > 192.168.1.114.35846: sctp (1) [INIT ACK] [init tag: 381429855] [rwnd: 106496] [OS: 10] [MIS: 10] [init TSN: 2141904492] 14:28:58.888638 IP 192.168.1.114.35846 > 192.168.1.115.8888: sctp (1) [COOKIE ECHO] , (2) [DATA] (B)(E) [TSN: 3092969729] [...] 14:28:58.893278 IP 192.168.1.115.8888 > 192.168.1.114.35846: sctp (1) [COOKIE ACK] , (2) [SACK] [cum ack 3092969729] [a_rwnd 106491] [#gap acks 0] [#dup tsns 0] 14:28:58.893591 IP 192.168.1.114.35846 > 192.168.1.115.8888: sctp (1) [DATA] (B)(E) [TSN: 3092969730] [...]
14:28:59.096963 IP 192.168.1.115.8888 > 192.168.1.114.35846: sctp (1) [SACK] [cum ack 3092969730] [a_rwnd 106496] [#gap acks 0] [#dup tsns 0] 14:28:59.097086 IP 192.168.1.114.35846 > 192.168.1.115.8888: sctp (1) [DATA] (B)(E) [TSN: 3092969731] [...] , (2) [DATA] (B)(E) [TSN: 3092969732] [...] 14:28:59.103218 IP 192.168.1.115.8888 > 192.168.1.114.35846: sctp (1) [SACK] [cum ack 3092969732] [a_rwnd 106486] [#gap acks 0] [#dup tsns 0] 14:28:59.103330 IP 192.168.1.114.35846 > 192.168.1.115.8888: sctp (1) [SHUTDOWN]
14:28:59.107793 IP 192.168.1.115.8888 > 192.168.1.114.35846: sctp (1) [SHUTDOWN ACK]
14:28:59.107890 IP 192.168.1.114.35846 > 192.168.1.115.8888: sctp (1) [SHUTDOWN COMPLETE]
Looks like this bug is from the pre-git history museum. ;)
--- net/sctp/socket.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/sctp/socket.c +7 -0
@@ -1611,6 +1611,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocsctp_scope_t scope;long timeo;__u16 sinfo_flags =0 ; +bool wait_connect = false;struct sctp_datamsg *datamsg;int msg_flags = msg->msg_flags;
@@ -1929,6 +1930,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc err =sctp_primitive_ASSOCIATE (asoc,NULL );if (err <0 ) goto out_free; + wait_connect = true;SCTP_DEBUG_PRINTK ("We associated primitively.\n" ); }
@@ -1968,6 +1970,11 @@ SCTP_STATIC int sctp_sendmsg(struct kiocelse err = msg_len; +if (unlikely (wait_connect)) { + timeo =sock_sndtimeo (sk, msg_flags &MSG_DONTWAIT ); +sctp_wait_for_connect (asoc, &timeo); + } +/* If we are already past ASSOCIATE, the lower * layers are responsible for association cleanup. */
PATCH 119/152 ALSA: usb-audio: Add mic volume fix quirk for Logitech Webcam C210
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jason Lee Cragg <[email protected]>
commit 6455931186bff407493135e74c5f32efd30860e2 upstream.
--- sound/usb/mixer.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/mixer.c +1 -0
@@ -834,6 +834,7 @@ static void volume_control_quirks(structcase USB_ID (0x046d ,0x0807 ):/* Logitech Webcam C500 */ case USB_ID (0x046d ,0x0808 ):case USB_ID (0x046d ,0x0809 ): +case USB_ID (0x046d ,0x0819 ):/* Logitech Webcam C210 */ case USB_ID (0x046d ,0x081b ):/* HD Webcam c310 */ case USB_ID (0x046d ,0x081d ):/* HD Webcam c510 */ case USB_ID (0x046d ,0x0825 ):/* HD Webcam c270 */
PATCH 120/152 libata: allow sata_sil24 to opt-out of tag ordered submission
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Williams <[email protected]>
commit 72dd299d5039a336493993dcc63413cf31d0e662 upstream.
Ronny reports: https://bugzilla.kernel.org/show_bug.cgi?id=87101
"Since commit 8a4aeec8d "libata/ahci: accommodate tag ordered controllers" the access to the harddisk on the first SATA-port is failing on its first access. The access to the harddisk on the second port is working normal.
When reverting the above commit, access to both harddisks is working fine again."
Maintain tag ordered submission as the default, but allow sata_sil24 to continue with the old behavior.
--- drivers/ata/libata-core.c | 5 ++++- drivers/ata/sata_sil24.c | 2 +- include/linux/libata.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-)
drivers/ata/libata-core.c +4 -1
@@ -4730,7 +4730,10 @@ static struct ata_queued_cmd *ata_qc_newreturn NULL ;for (i =0 , tag = ap->last_tag +1 ; i < max_queue; i++, tag++) { - tag = tag < max_queue ? tag :0 ; +if (ap->flags &ATA_FLAG_LOWTAG ) + tag = i; +else + tag = tag < max_queue ? tag :0 ;/* the last tag is reserved for internal command. */ if (tag ==ATA_TAG_INTERNAL )
drivers/ata/sata_sil24.c +1 -1
@@ -246,7 +246,7 @@ enum {/* host flags */ SIL24_COMMON_FLAGS =ATA_FLAG_SATA |ATA_FLAG_PIO_DMA |ATA_FLAG_NCQ |ATA_FLAG_ACPI_SATA | -ATA_FLAG_AN |ATA_FLAG_PMP , +ATA_FLAG_AN |ATA_FLAG_PMP |ATA_FLAG_LOWTAG ,SIL24_FLAG_PCIX_IRQ_WOC = (1 <<24 ),/* IRQ loss errata on PCI-X */ IRQ_STAT_4PORTS = 0xf,
include/linux/libata.h +1 -0
@@ -207,6 +207,7 @@ enum {ATA_FLAG_SW_ACTIVITY = (1 <<22 ),/* driver supports sw activity * led */ ATA_FLAG_NO_DIPM = (1 <<23 ),/* host not happy with DIPM */ + ATA_FLAG_LOWTAG = (1 << 24), /* host wants lowest available tag *//* bits 24:31 of ap->flags are reserved for LLD specific flags */
PATCH 121/152 scripts/recordmcount.pl: There is no -m32 gcc option on Super-H anymore
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Michael Karcher <[email protected]>
commit 1caf6aaaa47471831d77c75f094d4e00ad1ec808 upstream.
Compiling SH with gcc-4.8 fails due to the -m32 option not being supported.
=46romhttp://buildd.debian-ports.org/status/fetch.php?pkg=linux&arch=sh4&ver=3.16.7-ckt4-1&stamp=1421425783
CC init/main.o
gcc-4.8: error: unrecognized command line option '-m32'
ld: cannot find init/.tmp_mc_main.o: No such file or directory
objcopy: 'init/.tmp_mx_main.o': No such file
rm: cannot remove 'init/.tmp_mx_main.o': No such file or directory
rm: cannot remove 'init/.tmp_mc_main.o': No such file or directory
--- scripts/recordmcount.pl | 1 - 1 file changed, 1 deletion(-)
scripts/recordmcount.pl +0 -1
@@ -262,7 +262,6 @@ if ($arch eq "x86_64") { # force flags for this arch $ld .= " -m shlelf_linux"; $objcopy .= " -O elf32-sh-linux"; - $cc .= " -m32"; } elsif ($arch eq "powerpc") { $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\.?\\S+)";
PATCH 122/152 libata: prevent HSM state change race between ISR and PIO
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: David Jeffery <[email protected]>
commit ce7514526742c0898b837d4395f515b79dfb5a12 upstream.
It is possible for ata_sff_flush_pio_task() to set ap->hsm_task_state to HSM_ST_IDLE in between the time __ata_sff_port_intr() checks for HSM_ST_IDLE and before it calls ata_sff_hsm_move() causing ata_sff_hsm_move() to BUG().
This problem is hard to reproduce making this patch hard to verify, but this fix will prevent the race.
I have not been able to reproduce the problem, but here is a crash dump from a 2.6.32 kernel.
On examining the ata port's state, its hsm_task_state field has a value of HSM_ST_IDLE:
crash> struct ata_port.hsm_task_state ffff881c1121c000
hsm_task_state = 0
Normally, this should not be possible as ata_sff_hsm_move() was called from ata_sff_host_intr(), which checks hsm_task_state and won't call ata_sff_hsm_move() if it has a HSM_ST_IDLE value.
PID: 11053 TASK: ffff8816e846cae0 CPU: 0 COMMAND: "sshd"
#0 [ffff88008ba03960] machine_kexec at ffffffff81038f3b #1 [ffff88008ba039c0] crash_kexec at ffffffff810c5d92 #2 [ffff88008ba03a90] oops_end at ffffffff8152b510 #3 [ffff88008ba03ac0] die at ffffffff81010e0b #4 [ffff88008ba03af0] do_trap at ffffffff8152ad74 #5 [ffff88008ba03b50] do_invalid_op at ffffffff8100cf95 #6 [ffff88008ba03bf0] invalid_op at ffffffff8100bf9b
[exception RIP: ata_sff_hsm_move+317]
RIP: ffffffff813a77ad RSP: ffff88008ba03ca0 RFLAGS: 00010097
RAX: 0000000000000000 RBX: ffff881c1121dc60 RCX: 0000000000000000
RDX: ffff881c1121dd10 RSI: ffff881c1121dc60 RDI: ffff881c1121c000
RBP: ffff88008ba03d00 R8: 0000000000000000 R9: 000000000000002e
R10: 000000000001003f R11: 000000000000009b R12: ffff881c1121c000
R13: 0000000000000000 R14: 0000000000000050 R15: ffff881c1121dd78
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 #7 [ffff88008ba03d08] ata_sff_host_intr at ffffffff813a7fbd #8 [ffff88008ba03d38] ata_sff_interrupt at ffffffff813a821e #9 [ffff88008ba03d78] handle_IRQ_event at ffffffff810e6ec0
drivers/ata/libata-sff.c +12 -0
@@ -1333,7 +1333,19 @@ void ata_sff_flush_pio_task(struct ata_pDPRINTK ("ENTER\n" );cancel_delayed_work_sync (&ap->sff_pio_task); + +/* +* We wanna reset the HSM state to IDLE. If we do so without +* grabbing the port lock, critical sections protected by it which +* expect the HSM state to stay stable may get surprised. For +* example, we may set IDLE in between the time +* __ata_sff_port_intr() checks for HSM_ST_IDLE and before it calls +* ata_sff_hsm_move() causing ata_sff_hsm_move() to BUG(). +*/ +spin_lock_irq (ap->lock); ap->hsm_task_state =HSM_ST_IDLE ; +spin_unlock_irq (ap->lock); + ap->sff_pio_task_link =NULL ;if (ata_msg_ctl (ap))
PATCH 123/152 x86, hyperv: Mark the Hyper-V clocksource as being continuous
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "K. Y. Srinivasan" <[email protected]>
commit 32c6590d126836a062b3140ed52d898507987017 upstream.
The Hyper-V clocksource is continuous; mark it accordingly.
--- arch/x86/kernel/cpu/mshyperv.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/cpu/mshyperv.c +1 -0
@@ -56,6 +56,7 @@ static struct clocksource hyperv_cs = { .rating = 400, /* use this when running on Hyperv*/ .read = read_hv_clock, .mask = CLOCKSOURCE_MASK(64), + .flags = CLOCK_SOURCE_IS_CONTINUOUS, };static void __init ms_hyperv_init_platform (void )
PATCH 124/152 x86, tls, ldt: Stop checking lm in LDT_empty
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andy Lutomirski <[email protected]>
commit e30ab185c490e9a9381385529e0fd32f0a399495 upstream.
32-bit programs don't have an lm bit in their ABI, so they can't reliably cause LDT_empty to return true without resorting to memset. They shouldn't need to do this.
This should fix a longstanding, if minor, issue in all 64-bit kernels as well as a potential regression in the TLS hardening code.
--- arch/x86/include/asm/desc.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
arch/x86/include/asm/desc.h +2 -7
@@ -248,7 +248,8 @@ static inline void native_load_tls(struc gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i]; } -#define _LDT_empty (info) \ +/* This intentionally ignores lm, since 32-bit apps don't have that field. */ +#define LDT_empty (info) \ ((info)->base_addr == 0 && \ (info)->limit == 0 && \ (info)->contents == 0 && \
@@ -258,12 +259,6 @@ static inline void native_load_tls(struc (info)->seg_not_present == 1 && \ (info)->useable == 0) -#ifdef CONFIG_X86_64 -#define LDT_empty (info) (_LDT_empty(info) && ((info)->lm == 0)) -#else -#define LDT_empty (info) (_LDT_empty(info)) -#endif -static inline void clear_LDT (void ) {set_ldt (NULL ,0 );
PATCH 125/152 Input: i8042 - add noloop quirk for Medion Akoya E7225 (MD98857)
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jochen Hein <[email protected]>
commit 1d90d6d5522befa8efa1a7ea406be65cf865ded4 upstream.
Without this the aux port does not get detected, and consequently the touchpad will not work.
With this patch the touchpad is detected:
$ dmesg | grep -E "(SYN|i8042|serio)" pnp 00:03: Plug and Play ACPI device, IDs SYN1d22 PNP0f13 (active) i8042: PNP: PS/2 Controller [PNP0303:PS2K,PNP0f13:PS2M] at 0x60,0x64 irq 1,12 serio: i8042 KBD port at 0x60,0x64 irq 1 serio: i8042 AUX port at 0x60,0x64 irq 12 input: AT Translated Set 2 keyboard as /devices/platform/i8042/serio0/input/input4 psmouse serio1: synaptics: Touchpad model: 1, fw: 8.1, id: 0x1e2b1, caps: 0xd00123/0x840300/0x126800, board id: 2863, fw id: 1473085 input: SynPS/2 Synaptics TouchPad as /devices/platform/i8042/serio1/input/input6
dmidecode excerpt for this laptop is:
Handle 0x0001, DMI type 1, 27 bytes
System Information
Manufacturer: Medion
Product Name: Akoya E7225
Version: 1.0
--- drivers/input/serio/i8042-x86ia64io.h | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/input/serio/i8042-x86ia64io.h +8 -0
@@ -152,6 +152,14 @@ static const struct dmi_system_id __init }, }, { +/* Medion Akoya E7225 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Medion" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Akoya E7225" ), + DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"), + }, + }, + {/* Blue FB5601 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "blue"),
PATCH 126/152 x86, tls: Interpret an all-zero struct user_desc as "no segment"
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andy Lutomirski <[email protected]>
commit 3669ef9fa7d35f573ec9c0e0341b29251c2734a7 upstream.
The Witcher 2 did something like this to allocate a TLS segment index:
struct user_desc u_info;
bzero(&u_info, sizeof(u_info));
u_info.entry_number = (uint32_t)-1;
syscall(SYS_set_thread_area, &u_info);Strictly speaking, this code was never correct. It should have set read_exec_only and seg_not_present to 1 to indicate that it wanted to find a free slot without putting anything there, or it should have put something sensible in the TLS slot if it wanted to allocate a TLS entry for real. The actual effect of this code was to allocate a bogus segment that could be used to exploit espfix.
The set_thread_area hardening patches changed the behavior, causing set_thread_area to return -EINVAL and crashing the game.
This changes set_thread_area to interpret this as a request to find a free slot and to leave it empty, which isn't *quite* what the game expects but should be close enough to keep it working. In particular, using the code above to allocate two segments will allocate the same segment both times.
According to FrostbittenKing on Github, this fixes The Witcher 2.
If this somehow still causes problems, we could instead allocate a limit==0 32-bit data segment, but that seems rather ugly to me.
--- arch/x86/include/asm/desc.h | 13 +++++++++++++ arch/x86/kernel/tls.c | 25 +++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-)
arch/x86/include/asm/desc.h +13 -0
@@ -259,6 +259,19 @@ static inline void native_load_tls(struc (info)->seg_not_present == 1 && \ (info)->useable == 0) +/* Lots of programs expect an all-zero user_desc to mean "no segment at all". */ +static inline bool LDT_zero (const struct user_desc *info) +{ +return (info->base_addr ==0 && + info->limit ==0 && + info->contents ==0 && + info->read_exec_only ==0 && + info->seg_32bit ==0 && + info->limit_in_pages ==0 && + info->seg_not_present ==0 && + info->useable ==0 ); +} +static inline void clear_LDT (void ) {set_ldt (NULL ,0 );
arch/x86/kernel/tls.c +23 -2
@@ -30,7 +30,28 @@ static int get_free_idx(void)static bool tls_desc_okay (const struct user_desc *info) { -if (LDT_empty (info)) +/* +* For historical reasons (i.e. no one ever documented how any +* of the segmentation APIs work), user programs can and do +* assume that a struct user_desc that's all zeros except for +* entry_number means "no segment at all". This never actually +* worked. In fact, up to Linux 3.19, a struct user_desc like +* this would create a 16-bit read-write segment with base and +* limit both equal to zero. +* +* That was close enough to "no segment at all" until we +* hardened this function to disallow 16-bit TLS segments. Fix +* it up by interpreting these zeroed segments the way that they +* were almost certainly intended to be interpreted. +* +* The correct way to ask for "no segment at all" is to specify +* a user_desc that satisfies LDT_empty. To keep everything +* working, we accept both. +* +* Note that there's a similar kludge in modify_ldt -- look at +* the distinction between modes 1 and 0x11. +*/ +if (LDT_empty (info) ||LDT_zero (info))return true;/*
@@ -72,7 +93,7 @@ static void set_tls_desc(struct task_str cpu =get_cpu ();while (n-- >0 ) { -if (LDT_empty (info)) +if (LDT_empty (info) ||LDT_zero (info)) desc->a = desc->b =0 ;else fill_ldt (desc, info);
PATCH 127/152 nl80211: fix per-station group key get/del and memory leak
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit 0fa7b39131576dd1baa6ca17fca53c65d7f62249 upstream.
In case userspace attempts to obtain key information for or delete a unicast key, this is currently erroneously rejected unless the driver sets the WIPHY_FLAG_IBSS_RSN flag. Apparently enough drivers do so it was never noticed.
Fix that, and while at it fix a potential memory leak: the error path in the get_key() function was placed after allocating a message but didn't free it - move it to a better place. Luckily admin permissions are needed to call this operation.
--- net/wireless/nl80211.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
net/wireless/nl80211.c +4 -5
@@ -1815,6 +1815,9 @@ static int nl80211_get_key(struct sk_bufif (!rdev->ops->get_key)return -EOPNOTSUPP ; +if (!pairwise && mac_addr && !(rdev->wiphy.flags &WIPHY_FLAG_IBSS_RSN )) +return -ENOENT ; + msg =nlmsg_new (NLMSG_DEFAULT_SIZE ,GFP_KERNEL );if (!msg)return -ENOMEM ;
@@ -1832,10 +1835,6 @@ static int nl80211_get_key(struct sk_bufif (mac_addr)NLA_PUT (msg,NL80211_ATTR_MAC ,ETH_ALEN , mac_addr); -if (pairwise && mac_addr && - !(rdev->wiphy.flags &WIPHY_FLAG_IBSS_RSN )) -return -ENOENT ; - err = rdev->ops->get_key (&rdev->wiphy, dev, key_idx, pairwise, mac_addr, &cookie, get_key_callback);
@@ -2007,7 +2006,7 @@ static int nl80211_del_key(struct sk_bufwdev_lock (dev->ieee80211_ptr); err =nl80211_key_allowed (dev->ieee80211_ptr); -if (key.type ==NL80211_KEYTYPE_PAIRWISE && mac_addr && +if (key.type ==NL80211_KEYTYPE_GROUP && mac_addr && !(rdev->wiphy.flags &WIPHY_FLAG_IBSS_RSN )) err = -ENOENT ;
PATCH 128/152 usb-storage/SCSI: blacklist FUA on JMicron 152d:2566 USB-SATA controller
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Nezhevenko <[email protected]>
commit bf5c4136fa5ce471bdbf4cf59a813e32755fd014 upstream.
It looks like FUA support is broken on JMicron 152d:2566 bridge:
[223159.885704] sd 7:0:0:0: [sdc] Write Protect is off [223159.885706] sd 7:0:0:0: [sdc] Mode Sense: 47 00 10 08 [223159.885942] sd 7:0:0:0: [sdc] Write cache: enabled, read cache: enabled, supports DPO and FUA
[223283.691677] sd 7:0:0:0: [sdc] [223283.691680] Result: hostbyte=DID_OK driverbyte=DRIVER_SENSE [223283.691681] sd 7:0:0:0: [sdc] [223283.691682] Sense Key : Illegal Request [current] [223283.691684] sd 7:0:0:0: [sdc] [223283.691685] Add. Sense: Invalid field in cdb [223283.691686] sd 7:0:0:0: [sdc] CDB: [223283.691687] Write(10): 2a 08 15 d0 83 0d 00 00 01 00 [223283.691690] blk_update_request: critical target error, dev sdc, sector 2927892584
This patch adds blacklist flag so that sd will not use FUA
--- drivers/usb/storage/unusual_devs.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/storage/unusual_devs.h +7 -0
@@ -1956,6 +1956,13 @@ UNUSUAL_DEV( 0x152d, 0x2329, 0x0100, 0x USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_IGNORE_RESIDUE | US_FL_SANE_SENSE ), +/* Reported by Dmitry Nezhevenko <[email protected]> */ +UNUSUAL_DEV (0x152d ,0x2566 ,0x0114 ,0x0114 , +"JMicron" , +"USB to ATA/ATAPI Bridge" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_BROKEN_FUA ), +/* Entrega Technologies U1-SC25 (later Xircom PortGear PGSCSI) * and Mac USB Dock USB-SCSI */ UNUSUAL_DEV( 0x1645, 0x0007, 0x0100, 0x0133,
PATCH 129/152 usb-core bInterval quirk
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: James P Michels III <[email protected]>
commit cd83ce9e6195aa3ea15ab4db92892802c20df5d0 upstream.
This patch adds a usb quirk to support devices with interupt endpoints and bInterval values expressed as microframes. The quirk causes the parse endpoint function to modify the reported bInterval to a standards conforming value.
There is currently code in the endpoint parser that checks for bIntervals that are outside of the valid range (1-16 for USB 2+ high speed and super speed interupt endpoints). In this case, the code assumes the bInterval is being reported in 1ms frames. As well, the correction is only applied if the original bInterval value is out of the 1-16 range.
With this quirk applied to the device, the bInterval will be accurately adjusted from microframes to an exponent.
--- drivers/usb/core/config.c | 11 +++++++++++ drivers/usb/core/quirks.c | 4 ++++ include/linux/usb/quirks.h | 11 +++++++++++ 3 files changed, 26 insertions(+)
drivers/usb/core/config.c +11 -0
@@ -201,6 +201,17 @@ static int usb_parse_endpoint(struct devif (n ==0 ) n =9 ;/* 32 ms = 2^(9-1) uframes */ j =16 ; + +/* +* Adjust bInterval for quirked devices. +* This quirk fixes bIntervals reported in +* linear microframes. +*/ +if (to_usb_device (ddev)->quirks & +USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL ) { + n =clamp (fls (d->bInterval), i, j); + i = j = n; + }break ;default :/* USB_SPEED_FULL or _LOW */ /* For low-speed, 10 ms is the official minimum.
drivers/usb/core/quirks.c +4 -0
@@ -150,6 +150,10 @@ static const struct usb_device_id usb_qu/* SKYMEDI USB_DRIVE */ { USB_DEVICE(0x1516, 0x8628), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Razer - Razer Blade Keyboard */ + { USB_DEVICE(0x1532, 0x0116), .driver_info = + USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, + /* BUILDWIN Photo Frame */ { USB_DEVICE(0x1908, 0x1315), .driver_info = USB_QUIRK_HONOR_BNUMINTERFACES },
include/linux/usb/quirks.h +11 -0
@@ -30,6 +30,17 @@descriptor */ #define USB_QUIRK_DELAY_INIT 0x00000040 +/* +* For high speed and super speed interupt endpoints, the USB 2.0 and +* USB 3.0 spec require the interval in microframes +* (1 microframe = 125 microseconds) to be calculated as +* interval = 2 ^ (bInterval-1). +* +* Devices with this quirk report their bInterval as the result of this +* calculation instead of the exponent variable used in the calculation. +*/ +#define USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL 0x00000080 +/* device generates spurious wakeup, ignore remote wakeup capability */ #define USB_QUIRK_IGNORE_REMOTE_WAKEUP 0x00000200
PATCH 130/152 USB: Add OTG PET device to TPL
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Macpaul Lin <[email protected]>
commit e5dff0e80463cc3fa236e898ef1491b40be70b19 upstream.
OTG device shall support this device for allowing compliance automated testing. The modification is derived from Pavankumar and Vijayavardhans' previous work.
--- drivers/usb/core/otg_whitelist.h | 5 +++++ drivers/usb/core/quirks.c | 4 ++++ 2 files changed, 9 insertions(+)
drivers/usb/core/otg_whitelist.h +5 -0
@@ -59,6 +59,11 @@ static int is_targeted(struct usb_device le16_to_cpu(dev->descriptor.idProduct) == 0xbadd))return 0 ; +/* OTG PET device is always targeted (see OTG 2.0 ECN 6.4.2) */ +if ((le16_to_cpu (dev->descriptor.idVendor) ==0x1a0a && +le16_to_cpu (dev->descriptor.idProduct) ==0x0200 )) +return 1 ; +/* NOTE: can't use usb_match_id() since interface caches * aren't set up yet. this is cut/paste from that code. */
drivers/usb/core/quirks.c +4 -0
@@ -168,6 +168,10 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x0b05, 0x17e0), .driver_info = USB_QUIRK_IGNORE_REMOTE_WAKEUP }, + /* Protocol and OTG Electrical Test Device */ + { USB_DEVICE(0x1a0a, 0x0200), .driver_info = + USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, + { } /* terminating entry must be last */ };
PATCH 131/152 drm/i915: Only fence tiled region of object.
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Bob Paauwe <[email protected]>
commit af1a7301c7cf8912dca03065d448c4437c5c239f upstream.
When creating a fence for a tiled object, only fence the area that makes up the actual tiles. The object may be larger than the tiled area and if we allow those extra addresses to be fenced, they'll get converted to addresses beyond where the object is mapped. This opens up the possiblity of writes beyond the end of object.
To prevent this, we adjust the size of the fence to only encompass the area that makes up the actual tiles. The extra space is considered un-tiled and now behaves as if it was a linear object.
Testcase: igt/gem_tiled_fence_overflow
[bwh: Backported to 3.2:
- Adjust context, indentation
- Apply to both i965_write_fence_reg() and sandybridge_write_fence_reg(), which have been combined into one function upstream]
--- drivers/gpu/drm/i915/i915_gem.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/i915_gem.c +14 -0
@@ -2248,6 +2248,13 @@ static int sandybridge_write_fence_reg(sint regnum = obj->fence_reg;uint64_t val; +/* Adjust fence size to match tiled area */ +if (obj->tiling_mode !=I915_TILING_NONE ) { +uint32_t row_size = obj->stride * + (obj->tiling_mode ==I915_TILING_Y ?32 :8 ); + size = (size / row_size) * row_size; + } + val = (uint64_t )((obj->gtt_offset + size -4096 ) &0xfffff000 ) <<32 ; val |= obj->gtt_offset &0xfffff000 ;
@@ -2285,6 +2292,13 @@ static int i965_write_fence_reg(struct dint regnum = obj->fence_reg;uint64_t val; +/* Adjust fence size to match tiled area */ +if (obj->tiling_mode !=I915_TILING_NONE ) { +uint32_t row_size = obj->stride * + (obj->tiling_mode ==I915_TILING_Y ?32 :8 ); + size = (size / row_size) * row_size; + } + val = (uint64_t )((obj->gtt_offset + size -4096 ) &0xfffff000 ) <<32 ; val |= obj->gtt_offset &0xfffff000 ;
PATCH 132/152 ALSA: seq-dummy: remove deadlock-causing events on close
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Clemens Ladisch <[email protected]>
commit 0767e95bb96d7fdddcd590fb809e6975d93aebc5 upstream.
When the last subscriber to a "Through" port has been removed, the subscribed destination ports might still be active, so it would be wrong to send "all sounds off" and "reset controller" events to them. The proper place for such a shutdown would be the closing of the actual MIDI port (and close_substream() in rawmidi.c already can do this).
This also fixes a deadlock when dummy_unuse() tries to send events to its own port that is already locked because it is being freed.
--- sound/core/seq/seq_dummy.c | 31 ------------------------------- 1 file changed, 31 deletions(-)
sound/core/seq/seq_dummy.c +0 -31
@@ -82,36 +82,6 @@ struct snd_seq_dummy_port {static int my_client =-1 ;/* -* unuse callback - send ALL_SOUNDS_OFF and RESET_CONTROLLERS events -* to subscribers. -* Note: this callback is called only after all subscribers are removed. -*/ -static int -dummy_unuse (void *private_data,struct snd_seq_port_subscribe *info) -{ -struct snd_seq_dummy_port *p; -int i; -struct snd_seq_event ev; - - p = private_data; -memset (&ev,0 ,sizeof (ev)); -if (p->duplex) - ev.source.port = p->connect; -else - ev.source.port = p->port; - ev.dest.client =SNDRV_SEQ_ADDRESS_SUBSCRIBERS ; - ev.type =SNDRV_SEQ_EVENT_CONTROLLER ; -for (i =0 ; i <16 ; i++) { - ev.data.control.channel = i; - ev.data.control.param =MIDI_CTL_ALL_SOUNDS_OFF ; -snd_seq_kernel_client_dispatch (p->client, &ev,0 ,0 ); - ev.data.control.param =MIDI_CTL_RESET_CONTROLLERS ; -snd_seq_kernel_client_dispatch (p->client, &ev,0 ,0 ); - } -return 0 ; -} - -/* * event input callback - just redirect events to subscribers */ static int
@@ -175,7 +145,6 @@ create_port(int idx, int type) | SNDRV_SEQ_PORT_TYPE_PORT;memset (&pcb,0 ,sizeof (pcb)); pcb.owner =THIS_MODULE ; - pcb.unuse = dummy_unuse; pcb.event_input = dummy_input; pcb.private_free = dummy_free; pcb.private_data = rec;
PATCH 133/152 net: sctp: fix slab corruption from use after free on INIT collisions
In reply to Ben Hutchings3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
commit 600ddd6825543962fb807884169e57b580dba208 upstream.
When hitting an INIT collision case during the 4WHS with AUTH enabled, as already described in detail in commit 1be9a950c646 ("net: sctp: inherit auth_capable on INIT collisions"), it can happen that we occasionally still remotely trigger the following panic on server side which seems to have been uncovered after the fix from commit 1be9a950c646 ...
[ 533.876389] BUG: unable to handle kernel paging request at 00000000ffffffff [ 533.913657] IP: [<ffffffff811ac385>] __kmalloc+0x95/0x230 [ 533.940559] PGD 5030f2067 PUD 0 [ 533.957104] Oops: 0000 [#1] SMP [ 533.974283] Modules linked in: sctp mlx4_en [...] [ 534.939704] Call Trace: [ 534.951833] [<ffffffff81294e30>] ? crypto_init_shash_ops+0x60/0xf0 [ 534.984213] [<ffffffff81294e30>] crypto_init_shash_ops+0x60/0xf0 [ 535.015025] [<ffffffff8128c8ed>] __crypto_alloc_tfm+0x6d/0x170 [ 535.045661] [<ffffffff8128d12c>] crypto_alloc_base+0x4c/0xb0 [ 535.074593] [<ffffffff8160bd42>] ? _raw_spin_lock_bh+0x12/0x50 [ 535.105239] [<ffffffffa0418c11>] sctp_inet_listen+0x161/0x1e0 [sctp] [ 535.138606] [<ffffffff814e43bd>] SyS_listen+0x9d/0xb0 [ 535.166848] [<ffffffff816149a9>] system_call_fastpath+0x16/0x1b
... or depending on the the application, for example this one:
[ 1370.026490] BUG: unable to handle kernel paging request at 00000000ffffffff [ 1370.026506] IP: [<ffffffff811ab455>] kmem_cache_alloc+0x75/0x1d0 [ 1370.054568] PGD 633c94067 PUD 0 [ 1370.070446] Oops: 0000 [#1] SMP [ 1370.085010] Modules linked in: sctp kvm_amd kvm [...] [ 1370.963431] Call Trace: [ 1370.974632] [<ffffffff8120f7cf>] ? SyS_epoll_ctl+0x53f/0x960 [ 1371.000863] [<ffffffff8120f7cf>] SyS_epoll_ctl+0x53f/0x960 [ 1371.027154] [<ffffffff812100d3>] ? anon_inode_getfile+0xd3/0x170 [ 1371.054679] [<ffffffff811e3d67>] ? __alloc_fd+0xa7/0x130 [ 1371.080183] [<ffffffff816149a9>] system_call_fastpath+0x16/0x1b
With slab debugging enabled, we can see that the poison has been overwritten:
[ 669.826368] BUG kmalloc-128 (Tainted: G W ): Poison overwritten [ 669.826385] INFO: 0xffff880228b32e50-0xffff880228b32e50. First byte 0x6a instead of 0x6b [ 669.826414] INFO: Allocated in sctp_auth_create_key+0x23/0x50 [sctp] age=3 cpu=0 pid=18494 [ 669.826424] __slab_alloc+0x4bf/0x566 [ 669.826433] __kmalloc+0x280/0x310 [ 669.826453] sctp_auth_create_key+0x23/0x50 [sctp] [ 669.826471] sctp_auth_asoc_create_secret+0xcb/0x1e0 [sctp] [ 669.826488] sctp_auth_asoc_init_active_key+0x68/0xa0 [sctp] [ 669.826505] sctp_do_sm+0x29d/0x17c0 [sctp] [...] [ 669.826629] INFO: Freed in kzfree+0x31/0x40 age=1 cpu=0 pid=18494 [ 669.826635] __slab_free+0x39/0x2a8 [ 669.826643] kfree+0x1d6/0x230 [ 669.826650] kzfree+0x31/0x40 [ 669.826666] sctp_auth_key_put+0x19/0x20 [sctp] [ 669.826681] sctp_assoc_update+0x1ee/0x2d0 [sctp] [ 669.826695] sctp_do_sm+0x674/0x17c0 [sctp]
Since this only triggers in some collision-cases with AUTH, the problem at heart is that sctp_auth_key_put() on asoc->asoc_shared_key is called twice when having refcnt 1, once directly in sctp_assoc_update() and yet again from within sctp_auth_asoc_init_active_key() via sctp_assoc_update() on the already kzfree'd memory, which is also consistent with the observation of the poison decrease from 0x6b to 0x6a (note: the overwrite is detected at a later point in time when poison is checked on new allocation).
Reference counting of auth keys revisited:
Shared keys for AUTH chunks are being stored in endpoints and associations in endpoint_shared_keys list. On endpoint creation, a null key is being added; on association creation, all endpoint shared keys are being cached and thus cloned over to the association. struct sctp_shared_key only holds a pointer to the actual key bytes, that is, struct sctp_auth_bytes which keeps track of users internally through refcounting. Naturally, on assoc or enpoint destruction, sctp_shared_key are being destroyed directly and the reference on sctp_auth_bytes dropped.
User space can add keys to either list via setsockopt(2) through struct sctp_authkey and by passing that to sctp_auth_set_key() which replaces or adds a new auth key. There, sctp_auth_create_key() creates a new sctp_auth_bytes with refcount 1 and in case of replacement drops the reference on the old sctp_auth_bytes. A key can be set active from user space through setsockopt() on the id via sctp_auth_set_active_key(), which iterates through either endpoint_shared_keys and in case of an assoc, invokes (one of various places) sctp_auth_asoc_init_active_key().
sctp_auth_asoc_init_active_key() computes the actual secret from local's and peer's random, hmac and shared key parameters and returns a new key directly as sctp_auth_bytes, that is asoc->asoc_shared_key, plus drops the reference if there was a previous one. The secret, which where we eventually double drop the ref comes from sctp_auth_asoc_set_secret() with intitial refcount of 1, which also stays unchanged eventually in sctp_assoc_update(). This key is later being used for crypto layer to set the key for the hash in crypto_hash_setkey() from sctp_auth_calculate_hmac().
To close the loop: asoc->asoc_shared_key is freshly allocated secret material and independant of the sctp_shared_key management keeping track of only shared keys in endpoints and assocs. Hence, also commit 4184b2a79a76 ("net: sctp: fix memory leak in auth key management") is independant of this bug here since it concerns a different layer (though same structures being used eventually). asoc->asoc_shared_key is reference dropped correctly on assoc destruction in sctp_association_free() and when active keys are being replaced in sctp_auth_asoc_init_active_key(), it always has a refcount of 1. Hence, it's freed prematurely in sctp_assoc_update(). Simple fix is to remove that sctp_auth_key_put() from there which fixes these panics.
--- net/sctp/associola.c | 1 - 1 file changed, 1 deletion(-)
net/sctp/associola.c +0 -1
@@ -1272,7 +1272,6 @@ void sctp_assoc_update(struct sctp_assoc asoc->peer.peer_hmacs = new->peer.peer_hmacs; new->peer.peer_hmacs =NULL ; -sctp_auth_key_put (asoc->asoc_shared_key);sctp_auth_asoc_init_active_key (asoc,GFP_ATOMIC ); }