3.17.3-stable review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 3.17.3-stable review
This is the start of the stable review cycle for the 3.17.3 release. There are 319 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri Nov 14 01:07:52 UTC 2014. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.17.3-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 3.17.3-rc1
Olivier Gay <[email protected]>
HID: add keyboard input assist hid usages
Dave Chinner <[email protected]>
xfs: track bulkstat progress by agino
Dave Chinner <[email protected]>
xfs: bulkstat error handling is broken
Dave Chinner <[email protected]>
xfs: bulkstat main loop logic is a mess
Dave Chinner <[email protected]>
xfs: bulkstat chunk-formatter has issues
Dave Chinner <[email protected]>
xfs: bulkstat chunk formatting cursor is broken
Dave Chinner <[email protected]>
xfs: bulkstat btree walk doesn't terminate
Jan Kara <[email protected]>
xfs: Check error during inode btree iteration in xfs_bulkstat()
Dave Chinner <[email protected]>
xfs: bulkstat doesn't release AGI buffer on error
Chris Mason <[email protected]>
Btrfs: fix kfree on list_head in btrfs_lookup_csums_range error cleanup
Grant Likely <[email protected]>
of: Fix overflow bug in string property parsing functions
Andreas Färber <[email protected]>
ARM: dts: zynq: Enable PL clocks for Parallella
Yijing Wang <[email protected]>
sysfs: driver core: Fix glue dir race condition by gdp_mutex
Wolfram Sang <[email protected]>
i2c: at91: don't account as iowait
Grzegorz Jaszczyk <[email protected]>
irqchip: armada-370-xp: Fix MPIC interrupt handling
Grzegorz Jaszczyk <[email protected]>
irqchip: armada-370-xp: Fix MSI interrupt handling
Krzysztof Kozlowski <[email protected]>
regulator: max77693: Fix use of uninitialized regulator config
Hui Wang <[email protected]>
ALSA: hda - fix mute led problem for three HP laptops
Anton Blanchard <[email protected]>
powerpc: do_notify_resume can be called with bad thread_info flags argument
Benjamin Herrenschmidt <[email protected]>
powerpc/powernv: Properly fix LPC debugfs endianness
Dan Streetman <[email protected]>
powerpc: use device_online/offline() instead of cpu_up/down()
Robert Jarzmik <[email protected]>
ARM: pxa: fix hang on startup with DEBUG_LL
David Cohen <[email protected]>
pinctrl: baytrail: show output gpio state correctly on Intel Baytrail
Al Viro <[email protected]>
fix breakage in o2net_send_tcp_msg()
Hans de Goede <[email protected]>
samsung-laptop: Add broken-acpi-video quirk for NC210/NC110
Hans de Goede <[email protected]>
acer-wmi: Add acpi_backlight=video quirk for the Acer KAV80
Jan Kara <[email protected]>
rbd: Fix error recovery in rbd_obj_read_sync()
Laurent Pinchart <[email protected]>
mm: cma: Don't crash on allocation if CMA area can't be activated
jens stein <[email protected]>
drm/i915: Ignore VBT backlight check on Macbook 2, 1
Ville Syrjälä <[email protected]>
drm/i915: Fix GMBUSFREQ on vlv/chv
Ville Syrjälä <[email protected]>
drm/i915: Do a dummy DPCD read before the actual read
Alex Deucher <[email protected]>
drm/radeon: remove invalid pci id
Alex Deucher <[email protected]>
drm/radeon: dpm fixes for asrock systems
Michel Dänzer <[email protected]>
drm/radeon: Use drm_malloc_ab instead of kmalloc_array
Alex Deucher <[email protected]>
drm/radeon/dpm: disable ulv support on SI
Sinclair Yeh <[email protected]>
drm/vmwgfx: Filter out modes those cannot be supported by the current VRAM size.
Jiang Liu <[email protected]>
x86, intel-mid: Create IRQs for APB timers and RTC timers
Kirill Tkhai <[email protected]>
sched: Use rq->rd in sched_setaffinity() under RCU read lock
Felipe Balbi <[email protected]>
usb: gadget: function: acm: make f_acm pass USB20CV Chapter9
Felipe Balbi <[email protected]>
usb: dwc3: gadget: fix set_halt() bug with pending transfers
Ben Hutchings <[email protected]>
mtd: m25p80: Fix module aliases for m25p80
Ondrej Kozina <[email protected]>
crypto: algif - avoid excessive use of socket buffer in skcipher
Sylwester Nawrocki <[email protected]>
media: Remove references to non-existent PLAT_S5P symbol
Jan Kara <[email protected]>
mm: Remove false WARN_ON from pagecache_isize_extended()
Andy Lutomirski <[email protected]>
x86, apic: Handle a bad TSC more gracefully
Mathias Krause <[email protected]>
posix-timers: Fix stack info leak in timer_create()
Dmitry Eremin-Solenikov <[email protected]>
mtd: cfi_cmdset_0001.c: fix resume for LH28F640BF chips
Karl Beldan <[email protected]>
mac80211: fix typo in starting baserate for rts_cts_rate_idx
Ian Abbott <[email protected]>
staging: comedi: fix memory leak / bad pointer freeing for chanlist
Ian Abbott <[email protected]>
staging: comedi: (regression) channel list must be set for COMEDI_CMD ioctl
Imre Deak <[email protected]>
PM / Sleep: fix recovery during resuming from hibernation
Imre Deak <[email protected]>
PM / Sleep: fix async suspend_late/freeze_late error handling
Peter Hurley <[email protected]>
tty: Fix high cpu load if tty is unreleaseable
Imre Deak <[email protected]>
tty/vt: don't set font mappings on vc not supporting this
Jan Kara <[email protected]>
quota: Properly return errors from dquot_writeback_dquots()
Greg Kroah-Hartman <[email protected]>
PCI: Rename sysfs 'enabled' file back to 'enable'
Jan Kara <[email protected]>
ext3: Don't check quota format when there are no quota files
Emmanuel Grumbach <[email protected]>
Revert "iwlwifi: mvm: treat EAPOLs like mgmt frames wrt rate"
Emmanuel Grumbach <[email protected]>
iwlwifi: dvm: drop non VO frames when flushing
Emmanuel Grumbach <[email protected]>
iwlwifi: configure the LTR
Emmanuel Grumbach <[email protected]>
iwlwifi: mvm: BT Coex - update the MPLUT Boost register value
Will Deacon <[email protected]>
zap_pte_range: update addr when forcing flush after TLB batching faiure
J. Bruce Fields <[email protected]>
nfsd4: fix crash on unknown operation number
J. Bruce Fields <[email protected]>
nfsd4: fix response size estimation for OP_SEQUENCE
Jason Baron <[email protected]>
cpc925_edac: Report UE events properly
Jason Baron <[email protected]>
e7xxx_edac: Report CE events properly
Jason Baron <[email protected]>
i3200_edac: Report CE events properly
Jason Baron <[email protected]>
i82860_edac: Report CE events properly
Christoph Hellwig <[email protected]>
scsi: set REQ_QUEUE for the blk-mq case
Tony Battersby <[email protected]>
lib/scatterlist: fix memory leak with scsi-mq
Jan Kara <[email protected]>
scsi: Fix error handling in SCSI_IOCTL_SEND_COMMAND
Hans de Goede <[email protected]>
xhci: Disable streams on Asmedia 1042 xhci controllers
Oliver Neukum <[email protected]>
xhci: no switching back on non-ULT Haswell
Konstantin Khlebnikov <[email protected]>
mm/balloon_compaction: fix deflation when compaction is disabled
Jan Kara <[email protected]>
lib/bitmap.c: fix undefined shift in __bitmap_shift_{left|right}()
Johannes Weiner <[email protected]>
mm: memcontrol: fix missed end-writeback page accounting
Johannes Weiner <[email protected]>
mm: page-writeback: inline account_page_dirtied() into single caller
Wang Nan <[email protected]>
cgroup/kmemleak: add kmemleak_free() for cgroup deallocations.
Yu Zhao <[email protected]>
mm: free compound page with correct order
Andriy Skulysh <[email protected]>
sh: fix sh770x SCIF memory regions
Dmitry Kasatkin <[email protected]>
ima: check xattr value length and type in the ima_inode_setxattr()
Sylwester Nawrocki <[email protected]>
usb: Remove references to non-existent PLAT_S5P symbol
Johan Hovold <[email protected]>
USB: kobil_sct: fix non-atomic allocation in write path
Hans de Goede <[email protected]>
usb: Do not allow usb_alloc_streams on unconfigured devices
Johan Hovold <[email protected]>
USB: opticon: fix non-atomic allocation in write path
Alan Stern <[email protected]>
usb-storage: handle a skipped data phase
Takashi Iwai <[email protected]>
ALSA: usb-audio: Fix device_del() sysfs warnings at disconnect
Felipe Balbi <[email protected]>
usb: gadget: udc: core: fix kernel oops with soft-connect
Adel Gadllah <[email protected]>
HID: usbhid: enable always-poll quirk for Elan Touchscreen 016f
Adel Gadllah <[email protected]>
HID: usbhid: enable always-poll quirk for Elan Touchscreen 009b
Oliver Neukum <[email protected]>
HID: usbhid: add another mouse that needs QUIRK_ALWAYS_POLL
Oliver Neukum <[email protected]>
HID: usbhid: fix PIXART optical mouse
Johan Hovold <[email protected]>
HID: usbhid: enable always-poll quirk for Elan Touchscreen
Johan Hovold <[email protected]>
HID: usbhid: add always-poll quirk
Adel Gadllah <[email protected]>
USB: quirks: enable device-qualifier quirk for yet another Elan touchscreen
Adel Gadllah <[email protected]>
USB: quirks: enable device-qualifier quirk for another Elan touchscreen
Johan Hovold <[email protected]>
USB: quirks: enable device-qualifier quirk for Elan Touchscreen
Johan Hovold <[email protected]>
USB: core: add device-qualifier quirk
Torsten Fleischer <[email protected]>
usb: chipidea: Fix oops when removing the ci_hdrc module
David Cohen <[email protected]>
usb: ffs: fix regression when quirk_ep_out_aligned_size flag is set
Robert Baldyga <[email protected]>
usb: gadget: f_fs: remove redundant ffs_data_get()
Sebastian Andrzej Siewior <[email protected]>
usb: musb: dsps: start OTG timer on resume again
Thomas Gleixner <[email protected]>
usb: musb: cppi41: restart hrtimer only if not yet done
Hans de Goede <[email protected]>
uas: Add US_FL_NO_ATA_1X quirk for 1 more Seagate model
Hans de Goede <[email protected]>
uas: Add US_FL_NO_ATA_1X quirk for 2 more Seagate models
Hans de Goede <[email protected]>
uas: Add NO_ATA_1X for VIA VL711 devices
Dmitry Eremin-Solenikov <[email protected]>
spi: pxa2xx: toggle clocks on suspend if not disabled by runtime PM
Alexander Stein <[email protected]>
spi: fsl-dspi: Fix CTAR selection
Ray Jui <[email protected]>
spi: pl022: Fix incorrect dma_unmap_sg
Jack Pham <[email protected]>
usb: dwc3: gadget: Properly initialize LINK TRB
Roger Quadros <[email protected]>
Revert "usb: dwc3: dwc3-omap: Disable/Enable only wrapper interrupts in prepare/complete"
Cyril Brulebois <[email protected]>
wireless: rt2x00: add new rt2800usb device
Canek Peláez Valdés <[email protected]>
rt2x00: support Ralink 5362.
Dan Williams <[email protected]>
USB: option: add Haier CE81B CDMA modem
Daniele Palmas <[email protected]>
usb: option: add support for Telit LE910
Oussama Ghorbel <[email protected]>
phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly
Johan Hovold <[email protected]>
USB: cdc-acm: add quirk for control-line state requests
Johan Hovold <[email protected]>
USB: cdc-acm: only raise DTR on transitions from B0
Johan Hovold <[email protected]>
USB: cdc-acm: add device id for GW Instek AFG-2225
Perry Hung <[email protected]>
usb: serial: ftdi_sio: add "bricked" FTDI device PID
Frans Klaver <[email protected]>
usb: serial: ftdi_sio: add Awinda Station and Dongle products
Nathaniel Ting <[email protected]>
USB: serial: cp210x: add Silicon Labs 358x VID and PID
Peter Hurley <[email protected]>
serial: Fix divide-by-zero fault in uart_get_divisor()
Stephen Boyd <[email protected]>
serial: msm_serial: Fix kgdb continue
Lars-Peter Clausen <[email protected]>
staging:iio:ade7758: Remove "raw" from channel name
Lars-Peter Clausen <[email protected]>
staging:iio:ade7758: Fix check if channels are enabled in prenable
Lars-Peter Clausen <[email protected]>
staging:iio:ade7758: Fix NULL pointer deref when enabling buffer
George McCollister <[email protected]>
iio: as3935: allocate correct iio_device size
Lars-Peter Clausen <[email protected]>
staging:iio:ad5933: Drop "raw" from channel names
Lars-Peter Clausen <[email protected]>
staging:iio:ad5933: Fix NULL pointer deref when enabling buffer
Fabio Estevam <[email protected]>
iio: adc: mxs-lradc: Disable the clock on probe failure
Robin van der Gracht <[email protected]>
iio: st_sensors: Fix buffer copy
Michal Hocko <[email protected]>
OOM, PM: OOM killed task shouldn't escape PM suspend
Lv Zheng <[email protected]>
ACPI / EC: Fix regression due to conflicting firmware behavior between Samsung and Acer.
Jiang Liu <[email protected]>
ACPI, irq, x86: Return IRQ instead of GSI in mp_register_gsi()
Jiang Liu <[email protected]>
x86: ACPI: Do not translate GSI number if IOAPIC is disabled
Zhang Rui <[email protected]>
ACPI: invoke acpi_device_wakeup() with correct parameters
Al Viro <[email protected]>
fix inode leaks on d_splice_alias() failure exits
Cong Wang <[email protected]>
freezer: Do not freeze tasks killed by OOM killer
Dirk Brandewie <[email protected]>
intel_pstate: Correct BYT VID values.
Dirk Brandewie <[email protected]>
intel_pstate: Fix BYT frequency reporting
Dirk Brandewie <[email protected]>
intel_pstate: Don't lose sysfs settings during cpu offline
Matt Fleming <[email protected]>
rtc: Disable EFI rtc for x86
Bryan O'Donoghue <[email protected]>
x86: Add cpu_detect_cache_sizes to init_intel() add Quark legacy_cache()
David E. Box <[email protected]>
x86/platform/intel/iosf: Add Braswell PCI ID
Pali Rohár <[email protected]>
cpufreq: intel_pstate: Fix setting max_perf_pct in performance policy
Gabriele Mazzotta <[email protected]>
cpufreq: intel_pstate: Reflect current no_turbo state correctly
Dirk Brandewie <[email protected]>
cpufreq: expose scaling_cur_freq sysfs file for set_policy() drivers
Alex Deucher <[email protected]>
drm/radeon: fix vm page table block size calculation
Alex Deucher <[email protected]>
drm/radeon: use gart memory for DMA ring tests
Alex Deucher <[email protected]>
drm/radeon: fix speaker allocation setup
Paulo Zanoni <[email protected]>
drm/i915: properly reenable gen8 pipe IRQs
U. Artie Eoff <[email protected]>
drm/i915: intel_backlight scale() math WA
Ben Skeggs <[email protected]>
drm/nouveau: fix regression on agp boards
Brian Silverman <[email protected]>
futex: Fix a race condition between REQUEUE_PI and task death
Dmitry Monakhov <[email protected]>
ext4: prevent bugon on race between write/fcntl
Darrick J. Wong <[email protected]>
ext4: enable journal checksum when metadata checksum feature enabled
Jan Kara <[email protected]>
ext4: fix overflow when updating superblock backups after resize
Jan Kara <[email protected]>
ext4: fix oops when loading block bitmap failed
Darrick J. Wong <[email protected]>
ext4: check s_chksum_driver when looking for bg csum presence
Dmitry Monakhov <[email protected]>
ext4: move error report out of atomic context in ext4_init_block_bitmap()
Dmitry Monakhov <[email protected]>
ext4: Replace open coded mdata csum feature to helper function
Eric Sandeen <[email protected]>
ext4: fix reservation overflow in ext4_da_write_begin
Theodore Ts'o <[email protected]>
ext4: don't orphan or truncate the boot loader inode
Theodore Ts'o <[email protected]>
ext4: add ext4_iget_normal() which is to be used for dir tree lookups
Dmitry Monakhov <[email protected]>
ext4: grab missed write_count for EXT4_IOC_SWAP_BOOT
Jan Kara <[email protected]>
ext4: fix mmap data corruption when blocksize < pagesize
Jan Kara <[email protected]>
ext4: don't check quota format when there are no quota files
Darrick J. Wong <[email protected]>
ext4: check EA value offset when loading
Darrick J. Wong <[email protected]>
jbd2: free bh when descriptor block checksum fails
Marc-André Lureau <[email protected]>
qxl: don't create too large primary surface
David Daney <[email protected]>
MIPS: tlbex: Properly fix HUGE TLB Refill exception handler
Markos Chandras <[email protected]>
MIPS: ftrace: Fix a microMIPS build problem
Markos Chandras <[email protected]>
MIPS: cp1emu: Fix ISA restrictions for cop1x_op instructions
Aaro Koskinen <[email protected]>
MIPS: loongson2_cpufreq: Fix CPU clock rate setting mismerge
Aaro Koskinen <[email protected]>
MIPS: ptrace.h: Add a missing include
Nicholas Bellinger <[email protected]>
target: Fix APTPL metadata handling for dynamic MappedLUNs
Quinn Tran <[email protected]>
target: Fix queue full status NULL pointer for SCF_TRANSPORT_TASK_SENSE
Nicholas Bellinger <[email protected]>
iser-target: Disable TX completion interrupt coalescing
Joern Engel <[email protected]>
qla_target: don't delete changed nacls
Vineet Gupta <[email protected]>
ARC: unbork FPU save/restore
Anton Kolesov <[email protected]>
ARC: Update order of registers in KGDB to match GDB 7.5
Vineet Gupta <[email protected]>
ARC: [nsimosci] Allow "headless" models to boot
Petr Matousek <[email protected]>
kvm: vmx: handle invvpid vm exit gracefully
Nadav Amit <[email protected]>
KVM: x86: Handle errors when RIP is set during far jumps
Nadav Amit <[email protected]>
KVM: x86: Emulator fixes for eip canonical checks on near branches
Nadav Amit <[email protected]>
KVM: x86: Fix wrong masking on relative jump/call
Michael S. Tsirkin <[email protected]>
kvm: x86: don't kill guest on unknown exit reason
Nadav Amit <[email protected]>
KVM: x86: Check non-canonical addresses upon WRMSR
Andy Honig <[email protected]>
KVM: x86: Improve thread safety in pit
Andy Honig <[email protected]>
KVM: x86: Prevent host from panicking on shared MSR writes.
Nadav Amit <[email protected]>
KVM: x86: PREFETCH and HINT_NOP should have SrcMem flag
Nadav Amit <[email protected]>
KVM: x86: Emulator does not decode clflush well
Nadav Amit <[email protected]>
KVM: x86: Decoding guest instructions which cross page boundary may fail
Quentin Casasnovas <[email protected]>
kvm: fix excessive pages un-pinning in kvm_iommu_map error path.
Paolo Bonzini <[email protected]>
KVM: emulate: avoid accessing NULL ctxt->memopp
Dan Carpenter <[email protected]>
media: vmalloc_sg: off by one in error handling
Axel Lin <[email protected]>
media: tda7432: Fix setting TDA7432_MUTE bit for TDA7432_RF register
Tomas Melin <[email protected]>
media: rc-core: fix protocol_change regression in ir_raw_event_register
Ulrich Eckhardt <[email protected]>
media: ds3000: fix LNB supply voltage on Tevii S480 on initialization
Ulrich Eckhardt <[email protected]>
media: imon: fix other RC type protocol support
Frank Schaefer <[email protected]>
media: em28xx-v4l: fix video buffer field order reporting in progressive mode
Frank Schaefer <[email protected]>
media: em28xx-v4l: give back all active video buffers to the vb2 core properly on streaming stop
Antti Palosaari <[email protected]>
media: m88ts2022: fix 32bit overflow on filter calc
Mauro Carvalho Chehab <[email protected]>
media: siano: add support for PCTV 77e
Frank Schaefer <[email protected]>
media: em28xx: check if a device has audio earlier"
Paul Fertser <[email protected]>
media: usb: uvc: add a quirk for Dell XPS M1330 webcam
Maciej Matraszek <[email protected]>
media: v4l2-common: fix overflow in v4l_bound_align_image()
Ben Skeggs <[email protected]>
drm/gt214-/kms: fix hda eld regression
Ben Skeggs <[email protected]>
drm/nouveau/bios: memset dcb struct to zero before parsing
Ezequiel Garcia <[email protected]>
drm/tilcdc: Fix the error path in tilcdc_load()
Josh Boyer <[email protected]>
drm/vmwgfx: Fix drm.h include
Tvrtko Ursulin <[email protected]>
drm/i915: Do not leak pages when freeing userptr objects
Chris Wilson <[email protected]>
drm/i915: Do not store the error pointer for a failed userptr registration
Emil Velikov <[email protected]>
drm/nouveau/gpio: rename g92 class to g94
Benjamin Herrenschmidt <[email protected]>
drm/ast: Fix HW cursor image
Jason Gerecke <[email protected]>
HID: input: Fix TransducerSerialNumber implementation
Hans de Goede <[email protected]>
Input: i8042 - quirks for Fujitsu Lifebook A544 and Lifebook AH544
Andreas Bosch <[email protected]>
Input: alps - fix v4 button press recognition
Hans de Goede <[email protected]>
Input: i8042 - add noloop quirk for Asus X750LN
Dmitry Torokhov <[email protected]>
Input: synaptics - gate forcepad support by DMI check
Mikulas Patocka <[email protected]>
framebuffer: fix border color
Mikulas Patocka <[email protected]>
framebuffer: fix screen corruption when copying
Prarit Bhargava <[email protected]>
modules, lock around setting of MODULE_STATE_UNFORMED
Alexey Khoroshilov <[email protected]>
dm log userspace: fix memory leak in dm_ulog_tfr_init failure path
Christoph Hellwig <[email protected]>
Revert "block: all blk-mq requests are tagged"
Mike Snitzer <[email protected]>
block: fix alignment_offset math that assumes io_min is a power-of-2
Lai Jiangshan <[email protected]>
drbd: compute the end before rb_insert_augmented()
Mikulas Patocka <[email protected]>
dm bufio: when done scanning return from __scan immediately
Joe Thornber <[email protected]>
dm bufio: update last_accessed when relinking a buffer
Jens Axboe <[email protected]>
blk-mq: fix potential hang if rolling wakeup depth is too high
Olaf Hering <[email protected]>
drm/cirrus: bind also to qemu-xen-traditional
Roger Pau Monné <[email protected]>
xen-blkback: fix leak on grant map error path
Vitaly Kuznetsov <[email protected]>
xen/blkback: unmap all persistent grants when frontend gets disconnected
Michael S. Tsirkin <[email protected]>
virtio_pci: fix virtio spec compliance on restore
Krzysztof Kozlowski <[email protected]>
power: charger-manager: Fix NULL pointer exception with missing cm-fuel-gauge
Stephen Smalley <[email protected]>
selinux: fix inode security list corruption
Valdis Kletnieks <[email protected]>
pstore: Fix duplicate {console,ftrace}-efi entries
Alex Williamson <[email protected]>
iommu/amd: Split init_iommu_group() from iommu_init_device()
Alex Williamson <[email protected]>
iommu: Rework iommu_group_get_for_pci_dev()
Chris Ball <[email protected]>
mfd: rtsx_pcr: Fix MSI enable error handling
Sebastian Andrzej Siewior <[email protected]>
mfd: ti_am335x_tscadc: Fix TSC resume
Vignesh R <[email protected]>
mfd: ti_am335x_tscadc: Fix TSC operation after ADC continouous mode
Eric W. Biederman <[email protected]>
mnt: Prevent pivot_root from creating a loop in the mount tree
Richard Genoud <[email protected]>
UBI: add missing kmem_cache_free() in process_pool_aeb error path
Ezequiel Garcia <[email protected]>
UBI: Dispatch update notification if the volume is updated
Ezequiel Garcia <[email protected]>
UBI: block: Add support for the UBI_VOLUME_UPDATED notification
Ezequiel Garcia <[email protected]>
UBI: block: Fix block device size setting
Martin Schwidefsky <[email protected]>
s390/topology: call set_sched_topology early
Daniel Borkmann <[email protected]>
random: add and use memzero_explicit() for clearing data
Thorsten Knabe <[email protected]>
um: ubd: Fix for processes stuck in D state forever
Kirill Tkhai <[email protected]>
sched: Use dl_bw_of() under RCU read lock
Ilya Dryomov <[email protected]>
libceph: ceph-msgr workqueue needs a resque worker
Ilya Dryomov <[email protected]>
rbd: rbd workqueues need a resque worker
Al Viro <[email protected]>
fix misuses of f_count() in ppp and netlink
Al Viro <[email protected]>
kill wbuf_queued/wbuf_dwork_lock
Al Viro <[email protected]>
missing data dependency barrier in prepend_name()
Takashi Iwai <[email protected]>
ALSA: pcm: Zero-clear reserved fields of PCM status ioctl in compat mode
Christian Vogel <[email protected]>
ALSA: bebob: Uninitialized id returned by saffirepro_both_clk_src_get
Takashi Iwai <[email protected]>
ALSA: hda - Add workaround for CMI8888 snoop behavior
Dmitry Kasatkin <[email protected]>
evm: check xattr value length and type in evm_inode_setxattr()
Dmitry Kasatkin <[email protected]>
evm: properly handle INTEGRITY_NOXATTRS EVM status
Peter Zijlstra <[email protected]>
perf: Fix unclone_ctx() vs. locking
Dexuan Cui <[email protected]>
x86, pageattr: Prevent overflow in slow_virt_to_phys() for X86_PAE
Andy Lutomirski <[email protected]>
x86_64, entry: Fix out of bounds read on sysenter
Andy Lutomirski <[email protected]>
x86_64, entry: Filter RFLAGS.NT on entry from userspace
Oleg Nesterov <[email protected]>
x86, fpu: shift drop_init_fpu() from save_xstate_sig() to handle_signal()
Oleg Nesterov <[email protected]>
x86, fpu: __restore_xstate_sig()->math_state_restore() needs preempt_disable()
Ben Hutchings <[email protected]>
x86: Reject x32 executables if x32 ABI not supported
Jan Kara <[email protected]>
vfs: fix data corruption when blocksize < pagesize for mmaped data
Artem Bityutskiy <[email protected]>
UBIFS: fix free log space calculation
Artem Bityutskiy <[email protected]>
UBIFS: fix a race condition
Eric Rannaud <[email protected]>
fs: allow open(dir, O_TMPFILE|..., 0) with mode 0
Tetsuo Handa <[email protected]>
fs: Fix theoretical division by 0 in super_cache_scan().
Mikulas Patocka <[email protected]>
fs: make cont_expand_zero interruptible
Bartlomiej Zolnierkiewicz <[email protected]>
mmc: sdhci-s3c: fix runtime PM handling on sdhci_add_host() failure
Roger Tseng <[email protected]>
mmc: rtsx_pci_sdmmc: fix incorrect last byte in R2 response
Stephen Warren <[email protected]>
mmc: don't request CD IRQ until mmc_start_host()
Roger Tseng <[email protected]>
mmc: rtsx_usb_sdmmc: fix incorrect last byte in R2 response
Peter Griffin <[email protected]>
mmc: sdhci-pxav3: set_uhs_signaling is initialized twice differently
Fu Zhonghui <[email protected]>
mmc: core: sdio: Fix unconditional wake_up_process() on sdio thread
Lars-Peter Clausen <[email protected]>
ASoC: adau1761: Fix input PGA volume
Liam Girdwood <[email protected]>
ASoC: Intel: HSW/BDW only support S16 and S24 formats.
Dmitry Lavnikevich <[email protected]>
ASoC: tlv320aic3x: fix PLL D configuration
Daniel Mack <[email protected]>
ASoC: soc-pcm: fix sig_bits determination in soc_pcm_apply_msb()
Daniel Mack <[email protected]>
ASoC: soc-dapm: fix use after free
Daniel Mack <[email protected]>
ASoC: core: fix use after free in snd_soc_remove_platform()
Ondrej Zary <[email protected]>
libata-sff: Fix controllers with no ctl port
Scott Carter <[email protected]>
pata_serverworks: disable 64-KB DMA transfers on Broadcom OSB4 IDE Controller
Guenter Roeck <[email protected]>
Revert "percpu: free percpu allocation info for uniprocessor system"
Trond Myklebust <[email protected]>
SUNRPC: Add missing support for RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT
Benjamin Coddington <[email protected]>
SUNRPC: Don't wake tasks during connection abort
Benjamin Coddington <[email protected]>
lockd: Try to reconnect if statd has moved
Andy Shevchenko <[email protected]>
stmmac: pci: set default of the filter bins
Ben Hutchings <[email protected]>
drivers/net: macvtap and tun depend on INET
Ben Hutchings <[email protected]>
drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets
Ben Hutchings <[email protected]>
drivers/net: Disable UFO through virtio
Tom Herbert <[email protected]>
gre: Use inner mac length when computing tunnel length
Or Gerlitz <[email protected]>
mlx4: Avoid leaking steering rules on flow creation error flow
Or Gerlitz <[email protected]>
net/mlx4_en: Don't attempt to TX offload the outer UDP checksum for VXLAN
Nicolas Cavallari <[email protected]>
ipv4: Do not cache routing failures due to disabled forwarding.
Anish Bhatt <[email protected]>
cxgb4 : Fix missing initialization of win0_lock
Eric Dumazet <[email protected]>
macvlan: fix a race on port dismantle and possible skb leaks
Eric Dumazet <[email protected]>
tcp: md5: do not use alloc_percpu()
Haiyang Zhang <[email protected]>
hyperv: Fix the total_data_buflen in send path
Sathya Perla <[email protected]>
net: fix saving TX flow hash in sock for outgoing connections
Karl Beldan <[email protected]>
net: tso: fix unaligned access to crafted TCP header in helper API
Thomas Graf <[email protected]>
netlink: Re-add locking to netlink_lookup() and seq walker
Ian Morgan <[email protected]>
ax88179_178a: fix bonding failure
Jon Paul Maloy <[email protected]>
tipc: fix bug in bundled buffer reception
Li RongQing <[email protected]>
ipv4: fix a potential use after free in ip_tunnel_core.c
Vasily Averin <[email protected]>
ipv4: dst_entry leak in ip_send_unicast_reply()
Li RongQing <[email protected]>
vxlan: fix a free after use
Li RongQing <[email protected]>
vxlan: using pskb_may_pull as early as possible
Li RongQing <[email protected]>
vxlan: fix a use after free in vxlan_encap_bypass
Jiri Pirko <[email protected]>
ipv4: fix nexthop attlen check in fib_nh_match
Alexei Starovoitov <[email protected]>
x86: bpf_jit: fix two bugs in eBPF JIT compiler
Paolo Bonzini <[email protected]>
KVM: emulator: fix execution close to the segment limit
Rabin Vincent <[email protected]>
tracing/syscalls: Ignore numbers outside NR_syscalls' range
-------------
Diffstat:
Makefile | 4 +- arch/arc/boot/dts/nsimosci.dts | 2 +- arch/arc/include/asm/arcregs.h | 8 - arch/arc/include/asm/kgdb.h | 32 ++- arch/arc/include/asm/processor.h | 9 + arch/arm/Kconfig.debug | 2 +- arch/arm/boot/dts/zynq-parallella.dts | 4 + arch/arm/mach-pxa/include/mach/addr-map.h | 5 + arch/mips/include/asm/ftrace.h | 4 +- arch/mips/include/uapi/asm/ptrace.h | 2 + arch/mips/loongson/lemote-2f/clock.c | 5 +- arch/mips/math-emu/cp1emu.c | 4 +- arch/mips/mm/tlbex.c | 6 +- arch/powerpc/kernel/entry_64.S | 6 + arch/powerpc/platforms/powernv/opal-lpc.c | 59 +++++ arch/powerpc/platforms/pseries/dlpar.c | 4 +- arch/s390/kernel/topology.c | 18 +- arch/sh/kernel/cpu/sh3/setup-sh770x.c | 6 +- arch/um/drivers/ubd_kern.c | 5 +- arch/x86/ia32/ia32entry.S | 18 +- arch/x86/include/asm/elf.h | 5 +- arch/x86/include/asm/kvm_host.h | 16 +- arch/x86/include/uapi/asm/vmx.h | 2 + arch/x86/kernel/acpi/boot.c | 16 +- arch/x86/kernel/apb_timer.c | 2 - arch/x86/kernel/apic/apic.c | 4 +- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/cpu/intel.c | 17 +- arch/x86/kernel/iosf_mbi.c | 2 + arch/x86/kernel/signal.c | 5 + arch/x86/kernel/tsc.c | 5 +- arch/x86/kernel/xsave.c | 7 +- arch/x86/kvm/emulate.c | 293 +++++++++++++++------ arch/x86/kvm/i8254.c | 2 + arch/x86/kvm/svm.c | 8 +- arch/x86/kvm/vmx.c | 24 +- arch/x86/kvm/x86.c | 38 ++- arch/x86/mm/pageattr.c | 2 +- arch/x86/net/bpf_jit_comp.c | 25 +- arch/x86/platform/intel-mid/sfi.c | 2 + block/blk-mq-tag.c | 4 +- block/blk-settings.c | 4 +- block/scsi_ioctl.c | 3 +- crypto/algif_skcipher.c | 2 +- drivers/acpi/device_pm.c | 2 +- drivers/acpi/ec.c | 25 +- drivers/ata/libata-sff.c | 20 +- drivers/ata/pata_serverworks.c | 13 +- drivers/base/core.c | 4 +- drivers/base/power/main.c | 2 + drivers/block/drbd/drbd_interval.c | 4 + drivers/block/rbd.c | 5 +- drivers/block/xen-blkback/blkback.c | 1 + drivers/block/xen-blkback/xenbus.c | 6 +- drivers/char/random.c | 8 +- drivers/cpufreq/cpufreq.c | 23 +- drivers/cpufreq/intel_pstate.c | 110 ++++++-- drivers/edac/cpc925_edac.c | 2 +- drivers/edac/e7xxx_edac.c | 2 +- drivers/edac/i3200_edac.c | 4 +- drivers/edac/i82860_edac.c | 2 +- drivers/gpu/drm/ast/ast_mode.c | 4 +- drivers/gpu/drm/cirrus/cirrus_drv.c | 2 + drivers/gpu/drm/i915/i915_gem_userptr.c | 31 ++- drivers/gpu/drm/i915/i915_irq.c | 5 +- drivers/gpu/drm/i915/intel_display.c | 5 +- drivers/gpu/drm/i915/intel_dp.c | 7 + drivers/gpu/drm/i915/intel_panel.c | 8 +- drivers/gpu/drm/nouveau/Makefile | 2 +- drivers/gpu/drm/nouveau/core/engine/device/nv50.c | 22 +- drivers/gpu/drm/nouveau/core/engine/device/nvc0.c | 14 +- drivers/gpu/drm/nouveau/core/include/subdev/gpio.h | 2 +- drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c | 1 + drivers/gpu/drm/nouveau/core/subdev/gpio/nv92.c | 74 ------ drivers/gpu/drm/nouveau/core/subdev/gpio/nv94.c | 74 ++++++ drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c | 4 +- drivers/gpu/drm/nouveau/core/subdev/gpio/priv.h | 4 +- drivers/gpu/drm/nouveau/nouveau_chan.c | 12 +- drivers/gpu/drm/nouveau/nv50_display.c | 18 +- drivers/gpu/drm/qxl/qxl_display.c | 16 +- drivers/gpu/drm/radeon/cik_sdma.c | 21 +- drivers/gpu/drm/radeon/dce3_1_afmt.c | 4 +- drivers/gpu/drm/radeon/dce6_afmt.c | 6 +- drivers/gpu/drm/radeon/evergreen_hdmi.c | 6 +- drivers/gpu/drm/radeon/kv_dpm.c | 19 +- drivers/gpu/drm/radeon/r600_dma.c | 21 +- drivers/gpu/drm/radeon/radeon.h | 2 + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- drivers/gpu/drm/radeon/radeon_device.c | 2 +- drivers/gpu/drm/radeon/radeon_ring.c | 4 +- drivers/gpu/drm/radeon/radeon_vm.c | 4 +- drivers/gpu/drm/radeon/si_dpm.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 60 ++++- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 16 +- drivers/hid/hid-debug.c | 6 + drivers/hid/hid-ids.h | 7 + drivers/hid/hid-input.c | 12 +- drivers/hid/usbhid/hid-core.c | 26 +- drivers/hid/usbhid/hid-quirks.c | 5 + drivers/i2c/busses/i2c-at91.c | 2 +- drivers/iio/common/st_sensors/st_sensors_buffer.c | 2 +- drivers/iio/proximity/as3935.c | 2 +- drivers/infiniband/hw/mlx4/main.c | 10 +- drivers/infiniband/ulp/isert/ib_isert.c | 4 +- drivers/input/mouse/alps.c | 4 +- drivers/input/mouse/synaptics.c | 22 +- drivers/input/mouse/synaptics.h | 8 +- drivers/input/serio/i8042-x86ia64io.h | 22 ++ drivers/iommu/amd_iommu.c | 27 +- drivers/iommu/iommu.c | 163 +++++++----- drivers/irqchip/irq-armada-370-xp.c | 23 +- drivers/md/dm-bufio.c | 5 +- drivers/md/dm-log-userspace-transfer.c | 2 +- drivers/media/common/siano/sms-cards.c | 6 + drivers/media/common/siano/sms-cards.h | 1 + drivers/media/dvb-frontends/ds3000.c | 7 + drivers/media/i2c/tda7432.c | 2 +- drivers/media/platform/Kconfig | 6 +- drivers/media/platform/exynos4-is/Kconfig | 2 +- drivers/media/platform/s5p-tv/Kconfig | 2 +- drivers/media/rc/imon.c | 3 +- drivers/media/rc/rc-ir-raw.c | 1 - drivers/media/rc/rc-main.c | 2 + drivers/media/tuners/m88ts2022.c | 2 +- drivers/media/usb/em28xx/em28xx-cards.c | 11 - drivers/media/usb/em28xx/em28xx-core.c | 12 +- drivers/media/usb/em28xx/em28xx-video.c | 15 +- drivers/media/usb/siano/smsusb.c | 2 + drivers/media/usb/uvc/uvc_driver.c | 9 + drivers/media/v4l2-core/v4l2-common.c | 9 +- drivers/media/v4l2-core/videobuf-dma-sg.c | 6 +- drivers/mfd/rtsx_pcr.c | 2 +- drivers/mfd/ti_am335x_tscadc.c | 5 +- drivers/mmc/core/sdio.c | 12 +- drivers/mmc/core/sdio_irq.c | 4 +- drivers/mmc/core/slot-gpio.c | 2 - drivers/mmc/host/mmc_spi.c | 1 + drivers/mmc/host/rtsx_pci_sdmmc.c | 7 + drivers/mmc/host/rtsx_usb_sdmmc.c | 7 + drivers/mmc/host/sdhci-pxav3.c | 3 +- drivers/mmc/host/sdhci-s3c.c | 4 +- drivers/mmc/host/sdhci-sirf.c | 1 + drivers/mmc/host/tmio_mmc_pio.c | 1 + drivers/mtd/chips/cfi_cmdset_0001.c | 2 + drivers/mtd/devices/m25p80.c | 50 ++++ drivers/mtd/ubi/block.c | 25 +- drivers/mtd/ubi/cdev.c | 4 +- drivers/mtd/ubi/fastmap.c | 1 + drivers/net/Kconfig | 2 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 1 + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 7 +- drivers/net/ethernet/mellanox/mlx4/mcg.c | 4 + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 7 + drivers/net/hyperv/netvsc_drv.c | 1 + drivers/net/macvlan.c | 10 +- drivers/net/macvtap.c | 16 +- drivers/net/ppp/ppp_generic.c | 2 +- drivers/net/tun.c | 25 +- drivers/net/usb/ax88179_178a.c | 7 +- drivers/net/virtio_net.c | 24 +- drivers/net/vxlan.c | 15 +- drivers/net/wireless/iwlwifi/dvm/mac80211.c | 24 +- drivers/net/wireless/iwlwifi/iwl-trans.h | 2 + drivers/net/wireless/iwlwifi/mvm/coex.c | 4 +- drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 4 +- drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 35 ++- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 1 + drivers/net/wireless/iwlwifi/mvm/fw.c | 9 + drivers/net/wireless/iwlwifi/mvm/ops.c | 1 + drivers/net/wireless/iwlwifi/mvm/tx.c | 8 +- drivers/net/wireless/iwlwifi/pcie/trans.c | 16 +- drivers/net/wireless/rt2x00/rt2800.h | 4 +- drivers/net/wireless/rt2x00/rt2800lib.c | 6 + drivers/net/wireless/rt2x00/rt2800usb.c | 1 + drivers/of/base.c | 88 ++----- drivers/of/selftest.c | 66 ++++- drivers/of/testcase-data/tests-phandle.dtsi | 2 + drivers/pci/pci-sysfs.c | 8 +- drivers/phy/phy-omap-usb2.c | 6 +- drivers/pinctrl/pinctrl-baytrail.c | 2 +- drivers/platform/x86/acer-wmi.c | 11 + drivers/platform/x86/samsung-laptop.c | 10 + drivers/power/charger-manager.c | 5 + drivers/regulator/max77693.c | 2 +- drivers/rtc/Kconfig | 2 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 11 +- drivers/scsi/scsi_lib.c | 5 + drivers/spi/spi-fsl-dspi.c | 4 +- drivers/spi/spi-pl022.c | 2 +- drivers/spi/spi-pxa2xx.c | 7 +- drivers/staging/comedi/comedi_fops.c | 18 +- drivers/staging/iio/adc/mxs-lradc.c | 12 +- drivers/staging/iio/impedance-analyzer/ad5933.c | 15 +- drivers/staging/iio/meter/ade7758.h | 1 - drivers/staging/iio/meter/ade7758_core.c | 57 +--- drivers/staging/iio/meter/ade7758_ring.c | 5 +- drivers/target/target_core_device.c | 3 +- drivers/target/target_core_pr.c | 6 +- drivers/target/target_core_pr.h | 2 +- drivers/target/target_core_tpg.c | 8 + drivers/target/target_core_transport.c | 3 +- drivers/tty/serial/msm_serial.c | 22 +- drivers/tty/serial/serial_core.c | 2 +- drivers/tty/tty_io.c | 7 +- drivers/tty/vt/consolemap.c | 7 + drivers/usb/chipidea/core.c | 1 - drivers/usb/class/cdc-acm.c | 20 +- drivers/usb/class/cdc-acm.h | 2 + drivers/usb/core/hcd.c | 2 + drivers/usb/core/hub.c | 3 + drivers/usb/core/quirks.c | 10 + drivers/usb/dwc3/dwc3-omap.c | 15 +- drivers/usb/dwc3/ep0.c | 4 +- drivers/usb/dwc3/gadget.c | 19 +- drivers/usb/dwc3/gadget.h | 2 +- drivers/usb/gadget/function/f_acm.c | 7 +- drivers/usb/gadget/function/f_fs.c | 42 ++- drivers/usb/gadget/udc/udc-core.c | 5 + drivers/usb/host/Kconfig | 4 +- drivers/usb/host/xhci-pci.c | 18 +- drivers/usb/musb/musb_cppi41.c | 3 +- drivers/usb/musb/musb_dsps.c | 4 +- drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/ftdi_sio.c | 3 + drivers/usb/serial/ftdi_sio_ids.h | 12 +- drivers/usb/serial/kobil_sct.c | 5 +- drivers/usb/serial/opticon.c | 2 +- drivers/usb/serial/option.c | 10 + drivers/usb/storage/transport.c | 26 ++ drivers/usb/storage/unusual_uas.h | 28 ++ drivers/video/console/bitblit.c | 3 +- drivers/video/console/fbcon_ccw.c | 3 +- drivers/video/console/fbcon_cw.c | 3 +- drivers/video/console/fbcon_ud.c | 3 +- drivers/video/fbdev/core/cfbcopyarea.c | 13 +- drivers/virtio/virtio_pci.c | 33 ++- fs/btrfs/file-item.c | 2 +- fs/buffer.c | 8 + fs/dcache.c | 7 + fs/ext3/super.c | 7 - fs/ext4/balloc.c | 12 +- fs/ext4/bitmap.c | 12 +- fs/ext4/ext4.h | 13 +- fs/ext4/extents.c | 6 +- fs/ext4/file.c | 2 +- fs/ext4/ialloc.c | 7 +- fs/ext4/inline.c | 3 +- fs/ext4/inode.c | 46 +++- fs/ext4/ioctl.c | 13 +- fs/ext4/mmp.c | 6 +- fs/ext4/namei.c | 45 ++-- fs/ext4/resize.c | 5 +- fs/ext4/super.c | 32 +-- fs/ext4/xattr.c | 38 ++- fs/jbd2/recovery.c | 1 + fs/jffs2/jffs2_fs_sb.h | 2 - fs/jffs2/wbuf.c | 17 +- fs/lockd/mon.c | 6 + fs/namei.c | 3 +- fs/namespace.c | 3 + fs/nfsd/nfs4proc.c | 7 +- fs/ocfs2/cluster/tcp.c | 2 +- fs/pstore/inode.c | 4 +- fs/quota/dquot.c | 2 +- fs/super.c | 2 + fs/ubifs/commit.c | 8 +- fs/ubifs/log.c | 19 +- fs/xfs/xfs_itable.c | 250 +++++++++--------- fs/xfs/xfs_itable.h | 16 -- include/drm/drm_pciids.h | 1 - include/linux/blkdev.h | 8 +- include/linux/hid.h | 1 + include/linux/memcontrol.h | 58 ++-- include/linux/mm.h | 2 +- include/linux/of.h | 84 +++++- include/linux/oom.h | 3 + include/linux/string.h | 5 +- include/linux/sunrpc/xprt.h | 1 + include/linux/usb/quirks.h | 3 + include/net/ipv6.h | 2 + include/scsi/scsi_tcq.h | 8 +- include/uapi/drm/vmwgfx_drm.h | 2 +- include/uapi/linux/input.h | 7 + kernel/events/core.c | 54 ++-- kernel/freezer.c | 3 + kernel/futex.c | 22 +- kernel/module.c | 2 + kernel/power/hibernate.c | 8 +- kernel/power/process.c | 40 ++- kernel/sched/core.c | 19 +- kernel/time/posix-timers.c | 1 + kernel/trace/trace_syscalls.c | 8 +- lib/bitmap.c | 8 +- lib/scatterlist.c | 6 +- lib/string.c | 16 ++ mm/balloon_compaction.c | 2 + mm/cma.c | 1 + mm/huge_memory.c | 4 +- mm/memcontrol.c | 105 ++++---- mm/memory.c | 1 + mm/oom_kill.c | 17 ++ mm/page-writeback.c | 43 ++- mm/page_alloc.c | 8 + mm/page_cgroup.c | 1 + mm/percpu.c | 2 - mm/rmap.c | 20 +- mm/truncate.c | 56 ++++ net/ceph/messenger.c | 6 +- net/core/tso.c | 3 +- net/ipv4/fib_semantics.c | 2 +- net/ipv4/gre_offload.c | 2 +- net/ipv4/ip_output.c | 12 +- net/ipv4/ip_tunnel_core.c | 3 +- net/ipv4/route.c | 1 + net/ipv4/tcp.c | 59 ++--- net/ipv4/tcp_ipv4.c | 4 +- net/ipv6/output_core.c | 34 +++ net/ipv6/tcp_ipv6.c | 4 +- net/mac80211/rate.c | 2 +- net/netlink/af_netlink.c | 39 ++- net/sunrpc/clnt.c | 3 + net/sunrpc/xprtsock.c | 4 + net/tipc/link.c | 7 +- security/integrity/evm/evm_main.c | 16 +- security/integrity/ima/ima_appraise.c | 2 + security/integrity/integrity.h | 1 + security/selinux/hooks.c | 2 +- sound/core/pcm_compat.c | 2 + sound/firewire/bebob/bebob_focusrite.c | 62 ++++- sound/firewire/bebob/bebob_stream.c | 18 +- sound/pci/hda/hda_intel.c | 4 +- sound/pci/hda/patch_realtek.c | 3 - sound/soc/codecs/adau1761.c | 4 + sound/soc/codecs/tlv320aic3x.c | 13 + sound/soc/intel/sst-haswell-pcm.c | 4 +- sound/soc/soc-core.c | 4 +- sound/soc/soc-dapm.c | 25 +- sound/soc/soc-pcm.c | 2 +- sound/usb/card.c | 9 +- virt/kvm/iommu.c | 8 +- 341 files changed, 3006 insertions(+), 1524 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/319 tracing/syscalls: Ignore numbers outside NR_syscalls range
3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rabin Vincent <[email protected]>
commit 086ba77a6db00ed858ff07451bedee197df868c9 upstream.
ARM has some private syscalls (for example, set_tls(2)) which lie outside the range of NR_syscalls. If any of these are called while syscall tracing is being performed, out-of-bounds array access will occur in the ftrace and perf sys_{enter,exit} handlers.
# trace-cmd record -e raw_syscalls:* true && trace-cmd report ... true-653 [000] 384.675777: sys_enter: NR 192 (0, 1000, 3, 4000022, ffffffff, 0) true-653 [000] 384.675812: sys_exit: NR 192 = 1995915264 true-653 [000] 384.675971: sys_enter: NR 983045 (76f74480, 76f74000, 76f74b28, 76f74480, 76f76f74, 1) true-653 [000] 384.675988: sys_exit: NR 983045 = 0 ...
# trace-cmd record -e syscalls:* true [ 17.289329] Unable to handle kernel paging request at virtual address aaaaaace [ 17.289590] pgd = 9e71c000 [ 17.289696] [aaaaaace] *pgd=00000000 [ 17.289985] Internal error: Oops: 5 [#1] PREEMPT SMP ARM [ 17.290169] Modules linked in: [ 17.290391] CPU: 0 PID: 704 Comm: true Not tainted 3.18.0-rc2+ #21 [ 17.290585] task: 9f4dab00 ti: 9e710000 task.ti: 9e710000 [ 17.290747] PC is at ftrace_syscall_enter+0x48/0x1f8 [ 17.290866] LR is at syscall_trace_enter+0x124/0x184
Fix this by ignoring out-of-NR_syscalls-bounds syscall numbers.
Commit cd0980fc8add "tracing: Check invalid syscall nr while tracing syscalls" added the check for less than zero, but it should have also checked for greater than NR_syscalls.
--- kernel/trace/trace_syscalls.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/trace/trace_syscalls.c +4 -4
@@ -313,7 +313,7 @@ static void ftrace_syscall_enter(void *dint size; syscall_nr =trace_get_syscall_nr (current, regs); -if (syscall_nr <0 ) +if (syscall_nr <0 || syscall_nr >= NR_syscalls)return ;/* Here we're inside tp handler's rcu_read_lock_sched (__DO_TRACE) */
@@ -360,7 +360,7 @@ static void ftrace_syscall_exit(void *daint syscall_nr; syscall_nr =trace_get_syscall_nr (current, regs); -if (syscall_nr <0 ) +if (syscall_nr <0 || syscall_nr >= NR_syscalls)return ;/* Here we're inside tp handler's rcu_read_lock_sched (__DO_TRACE()) */
@@ -567,7 +567,7 @@ static void perf_syscall_enter(void *ignint size; syscall_nr =trace_get_syscall_nr (current, regs); -if (syscall_nr <0 ) +if (syscall_nr <0 || syscall_nr >= NR_syscalls)return ;if (!test_bit (syscall_nr, enabled_perf_enter_syscalls))return ;
@@ -641,7 +641,7 @@ static void perf_syscall_exit(void *ignoint size; syscall_nr =trace_get_syscall_nr (current, regs); -if (syscall_nr <0 ) +if (syscall_nr <0 || syscall_nr >= NR_syscalls)return ;if (!test_bit (syscall_nr, enabled_perf_exit_syscalls))return ;
Greg Kroah-Hartman
maintainerPATCH 2/319 KVM: emulator: fix execution close to the segment limit
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Bonzini <[email protected]>
commit fd56e1546a5f734290cbedd2b81c518850736511 upstream.
Emulation of code that is 14 bytes to the segment limit or closer (e.g. RIP = 0xFFFFFFF2 after reset) is broken because we try to read as many as 15 bytes from the beginning of the instruction, and __linearize fails when the passed (address, size) pair reaches out of the segment.
To fix this, let __linearize return the maximum accessible size (clamped to 2^32-1) for usage in __do_insn_fetch_bytes, and avoid the limit check by passing zero for the desired size.
For expand-down segments, __linearize is performing a redundant check. (u32)(addr.ea + size - 1) <= lim can only happen if addr.ea is close to 4GB; in this case, addr.ea + size - 1 will also fail the check against the upper bound of the segment (which is provided by the D/B bit). After eliminating the redundant check, it is simple to compute the *max_size for expand-down segments too.
Now that the limit check is done in __do_insn_fetch_bytes, we want to inject a general protection fault there if size < op_size (like __linearize would have done), instead of just aborting.
This fixes booting Tiano Core from emulated flash with EPT disabled.
--- arch/x86/kvm/emulate.c | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-)
arch/x86/kvm/emulate.c +33 -10
@@ -613,7 +613,8 @@ static bool insn_aligned(struct x86_emulstatic int __linearize (struct x86_emulate_ctxt *ctxt,struct segmented_address addr, -unsigned size,bool write,bool fetch, +unsigned *max_size,unsigned size, +bool write,bool fetch,ulong *linear) {struct desc_struct desc;
@@ -624,10 +625,15 @@ static int __linearize(struct x86_emulatunsigned cpl; la =seg_base (ctxt, addr.seg) + addr.ea; + *max_size =0 ;switch (ctxt->mode) {case X86EMUL_MODE_PROT64 :if (((signed long )la <<16 ) >>16 != la)return emulate_gp (ctxt,0 ); + + *max_size =min_t (u64, ~0u , (1ull <<48 ) - la); +if (size > *max_size) + goto bad;break ;default : usable = ctxt->ops->get_segment(ctxt, &sel, &desc, NULL,
@@ -645,20 +651,25 @@ static int __linearize(struct x86_emulatif ((ctxt->mode ==X86EMUL_MODE_REAL ) && !fetch && (ctxt->d & NoBigReal)) {/* la is between zero and 0xffff */ -if (la >0xffff || (u32)(la + size -1 ) >0xffff ) +if (la >0xffff ) goto bad; + *max_size =0x10000 - la; }else if ((desc.type &8 ) || !(desc.type &4 )) {/* expand-up segment */ -if (addr.ea > lim || (u32)(addr.ea + size -1 ) > lim) +if (addr.ea > lim) goto bad; + *max_size =min_t (u64, ~0u , (u64 )lim +1 - addr.ea); }else {/* expand-down segment */ -if (addr.ea <= lim || (u32)(addr.ea + size -1 ) <= lim) +if (addr.ea <= lim) goto bad; lim = desc.d ?0xffffffff :0xffff ; -if (addr.ea > lim || (u32)(addr.ea + size -1 ) > lim) +if (addr.ea > lim) goto bad; + *max_size =min_t (u64, ~0u , (u64 )lim +1 - addr.ea); } +if (size > *max_size) + goto bad; cpl = ctxt->ops->cpl (ctxt);if (!(desc.type &8 )) {/* data segment */
@@ -693,7 +704,8 @@ static int linearize(struct x86_emulate_ unsigned size, bool write, ulong *linear) { - return __linearize(ctxt, addr, size, write, false, linear); + unsigned max_size; +return __linearize (ctxt, addr, &max_size, size, write, false, linear); }
@@ -718,17 +730,27 @@ static int segmented_read_std(struct x86static int __do_insn_fetch_bytes (struct x86_emulate_ctxt *ctxt,int op_size) {int rc; -unsigned size; +unsigned size, max_size;unsigned long linear;int cur_size = ctxt->fetch.end - ctxt->fetch.data;struct segmented_address addr = { .seg =VCPU_SREG_CS , .ea = ctxt->eip + cur_size }; - size =15UL ^ cur_size; - rc =__linearize (ctxt, addr, size, false, true, &linear); +/* +* We do not know exactly how many bytes will be needed, and +* __linearize is expensive, so fetch as much as possible. We +* just have to avoid going beyond the 15 byte limit, the end +* of the segment, or the end of the page. +* +* __linearize is called with size 0 so that it does not do any +* boundary check itself. Instead, we use max_size to check +* against op_size. +*/ + rc =__linearize (ctxt, addr, &max_size,0 , false, true, &linear);if (unlikely (rc !=X86EMUL_CONTINUE ))return rc; + size =min_t (unsigned,15UL ^ cur_size, max_size); size =min_t (unsigned, size,PAGE_SIZE -offset_in_page (linear));/*
@@ -738,7 +760,8 @@ static int __do_insn_fetch_bytes(struct* still, we must have hit the 15-byte boundary. */ if (unlikely (size < op_size)) -return X86EMUL_UNHANDLEABLE ; +return emulate_gp (ctxt,0 ); + rc = ctxt->ops->fetch (ctxt, linear, ctxt->fetch.end, size, &ctxt->exception);if (unlikely (rc !=X86EMUL_CONTINUE ))
Greg Kroah-Hartman
maintainerPATCH 3/319 x86: bpf_jit: fix two bugs in eBPF JIT compiler
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Starovoitov <[email protected]>
[ Upstream commit e0ee9c12157dc74e49e4731e0d07512e7d1ceb95 ]
1.
JIT compiler using multi-pass approach to converge to final image size, since x86 instructions are variable length. It starts with large gaps between instructions (so some jumps may use imm32 instead of imm8) and iterates until total program size is the same as in previous pass. This algorithm works only if program size is strictly decreasing. Programs that use LD_ABS insn need additional code in prologue, but it was not emitted during 1st pass, so there was a chance that 2nd pass would adjust imm32->imm8 jump offsets to the same number of bytes as increase in prologue, which may cause algorithm to erroneously decide that size converged. Fix it by always emitting largest prologue in the first pass which is detected by oldproglen==0 check.
Also change error check condition 'proglen != oldproglen' to fail gracefully.
2.
while staring at the code realized that 64-byte buffer may not be enough when 1st insn is large, so increase it to 128 to avoid buffer overflow (theoretical maximum size of prologue+div is 109) and add runtime check.
--- arch/x86/net/bpf_jit_comp.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
arch/x86/net/bpf_jit_comp.c +19 -6
@@ -211,12 +211,17 @@ struct jit_context {bool seen_ld_abs; }; +/* maximum number of bytes emitted while JITing one eBPF insn */ +#define BPF_MAX_INSN_SIZE 128 +#define BPF_INSN_SAFETY 64 +static int do_jit (struct bpf_prog *bpf_prog,int *addrs,u8 *image,int oldproglen,struct jit_context *ctx) {struct bpf_insn *insn = bpf_prog->insnsi;int insn_cnt = bpf_prog->len; -u8 temp[64 ]; +bool seen_ld_abs = ctx->seen_ld_abs | (oldproglen ==0 ); +u8 temp[BPF_MAX_INSN_SIZE +BPF_INSN_SAFETY ];int i;int proglen =0 ;u8 *prog = temp;
@@ -254,7 +259,7 @@ static int do_jit(struct bpf_prog *bpf_pEMIT2 (0x31 ,0xc0 );/* xor eax, eax */ EMIT3 (0x4D ,0x31 ,0xED );/* xor r13, r13 */ -if (ctx->seen_ld_abs) { +if (seen_ld_abs) {/* r9d : skb->len - skb->data_len (headlen) * r10 : skb->data */
@@ -655,7 +660,7 @@ xadd: if (is_imm8(insn->off))case BPF_JMP |BPF_CALL : func = (u8 *) __bpf_call_base + imm32; jmp_offset = func - (image + addrs[i]); -if (ctx->seen_ld_abs) { +if (seen_ld_abs) {EMIT2 (0x41 ,0x52 );/* push %r10 */ EMIT2 (0x41 ,0x51 );/* push %r9 */ /* need to adjust jmp offset, since
@@ -669,7 +674,7 @@ xadd: if (is_imm8(insn->off))return -EINVAL ; }EMIT1_off32 (0xE8 , jmp_offset); -if (ctx->seen_ld_abs) { +if (seen_ld_abs) {EMIT2 (0x41 ,0x59 );/* pop %r9 */ EMIT2 (0x41 ,0x5A );/* pop %r10 */ }
@@ -774,7 +779,8 @@ emit_jmp: goto common_load;case BPF_LD |BPF_ABS |BPF_W : func =CHOOSE_LOAD_FUNC (imm32, sk_load_word); -common_load: ctx->seen_ld_abs = true; +common_load: + ctx->seen_ld_abs = seen_ld_abs = true; jmp_offset = func - (image + addrs[i]);if (!func || !is_simm32 (jmp_offset)) { pr_err("unsupported bpf func %d addr %p image %p\n",
@@ -848,6 +854,11 @@ common_load: ctx->seen_ld_abs = true; } ilen = prog - temp; +if (ilen >BPF_MAX_INSN_SIZE ) { +pr_err ("bpf_jit_compile fatal insn size error\n" ); +return -EFAULT ; + } +if (image) {if (unlikely (proglen + ilen > oldproglen)) {pr_err ("bpf_jit_compile fatal error\n" );
@@ -904,9 +915,11 @@ void bpf_int_jit_compile(struct bpf_prog goto out; }if (image) { -if (proglen != oldproglen) +if (proglen != oldproglen) {pr_err ("bpf_jit: proglen=%d != oldproglen=%d\n" , proglen, oldproglen); + goto out; + }break ; }if (proglen == oldproglen) {
Greg Kroah-Hartman
maintainerPATCH 4/319 ipv4: fix nexthop attlen check in fib_nh_match
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Pirko <[email protected]>
[ Upstream commit f76936d07c4eeb36d8dbb64ebd30ab46ff85d9f7 ]
fib_nh_match does not match nexthops correctly. Example:
ip route add 172.16.10/24 nexthop via 192.168.122.12 dev eth0 \
nexthop via 192.168.122.13 dev eth0
ip route del 172.16.10/24 nexthop via 192.168.122.14 dev eth0 \
nexthop via 192.168.122.15 dev eth0Del command is successful and route is removed. After this patch applied, the route is correctly matched and result is:
RTNETLINK answers: No such process
Please consider this for stable trees as well.
--- net/ipv4/fib_semantics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/fib_semantics.c +1 -1
@@ -535,7 +535,7 @@ int fib_nh_match(struct fib_config *cfg,return 1 ; attrlen =rtnh_attrlen (rtnh); -if (attrlen <0 ) { +if (attrlen >0 ) {struct nlattr *nla, *attrs =rtnh_attrs (rtnh); nla =nla_find (attrs, attrlen,RTA_GATEWAY );
Greg Kroah-Hartman
maintainerPATCH 5/319 vxlan: fix a use after free in vxlan_encap_bypass
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li RongQing <[email protected]>
[ Upstream commit ce6502a8f9572179f044a4d62667c4645256d6e4 ]
when netif_rx() is done, the netif_rx handled skb maybe be freed, and should not be used.
--- drivers/net/vxlan.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/vxlan.c +5 -3
@@ -1717,6 +1717,8 @@ static void vxlan_encap_bypass(struct skstruct pcpu_sw_netstats *tx_stats, *rx_stats;union vxlan_addr loopback;union vxlan_addr *remote_ip = &dst_vxlan->default_dst.remote_ip; +struct net_device *dev = skb->dev; +int len = skb->len; tx_stats =this_cpu_ptr (src_vxlan->dev->tstats); rx_stats =this_cpu_ptr (dst_vxlan->dev->tstats);
@@ -1740,16 +1742,16 @@ static void vxlan_encap_bypass(struct sku64_stats_update_begin (&tx_stats->syncp); tx_stats->tx_packets++; - tx_stats->tx_bytes += skb->len; + tx_stats->tx_bytes += len;u64_stats_update_end (&tx_stats->syncp);if (netif_rx (skb) ==NET_RX_SUCCESS ) {u64_stats_update_begin (&rx_stats->syncp); rx_stats->rx_packets++; - rx_stats->rx_bytes += skb->len; + rx_stats->rx_bytes += len;u64_stats_update_end (&rx_stats->syncp); }else { - skb->dev->stats.rx_dropped++; + dev->stats.rx_dropped++; } }
Greg Kroah-Hartman
maintainerPATCH 6/319 vxlan: using pskb_may_pull as early as possible
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li RongQing <[email protected]>
[ Upstream commit 91269e390d062b526432f2ef1352b8df82e0e0bc ]
pskb_may_pull should be used to check if skb->data has enough space, skb->len can not ensure that.
--- drivers/net/vxlan.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/vxlan.c +2 -4
@@ -1440,9 +1440,6 @@ static int neigh_reduce(struct net_devicif (!in6_dev) goto out; -if (!pskb_may_pull (skb, skb->len)) - goto out; - iphdr =ipv6_hdr (skb); saddr = &iphdr->saddr; daddr = &iphdr->daddr;
@@ -1929,7 +1926,8 @@ static netdev_tx_t vxlan_xmit(struct sk_return arp_reduce (dev, skb); #if IS_ENABLED(CONFIG_IPV6) else if (ntohs(eth->h_proto) == ETH_P_IPV6 && - skb->len >= sizeof(struct ipv6hdr) + sizeof(struct nd_msg) && + pskb_may_pull(skb, sizeof(struct ipv6hdr) + + sizeof(struct nd_msg)) && ipv6_hdr(skb)->nexthdr == IPPROTO_ICMPV6) {struct nd_msg *msg;
Greg Kroah-Hartman
maintainerPATCH 7/319 vxlan: fix a free after use
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li RongQing <[email protected]>
[ Upstream commit 7a9f526fc3ee49b6034af2f243676ee0a27dcaa8 ]
pskb_may_pull maybe change skb->data and make eth pointer oboslete, so eth needs to reload
--- drivers/net/vxlan.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/vxlan.c +1 -0
@@ -1936,6 +1936,7 @@ static netdev_tx_t vxlan_xmit(struct sk_ msg->icmph.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION) return neigh_reduce(dev, skb); } + eth =eth_hdr (skb);#endif }
Greg Kroah-Hartman
maintainerPATCH 8/319 ipv4: dst_entry leak in ip_send_unicast_reply()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vasily Averin <[email protected]>
[ Upstream commit 4062090e3e5caaf55bed4523a69f26c3265cc1d2 ]
ip_setup_cork() called inside ip_append_data() steals dst entry from rt to cork and in case errors in __ip_append_data() nobody frees stolen dst entry
--- net/ipv4/ip_output.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/ipv4/ip_output.c +9 -3
@@ -1533,6 +1533,7 @@ void ip_send_unicast_reply(struct net *nstruct sk_buff *nskb;struct sock *sk;struct inet_sock *inet; +int err;if (ip_options_echo (&replyopts.opt.opt, skb))return ;
@@ -1572,8 +1573,13 @@ void ip_send_unicast_reply(struct net *nsock_net_set (sk, net);__skb_queue_head_init (&sk->sk_write_queue); sk->sk_sndbuf = sysctl_wmem_default; -ip_append_data (sk, &fl4, ip_reply_glue_bits, arg->iov->iov_base, len,0 , - &ipc, &rt,MSG_DONTWAIT ); + err =ip_append_data (sk, &fl4, ip_reply_glue_bits, arg->iov->iov_base, + len,0 , &ipc, &rt,MSG_DONTWAIT ); +if (unlikely (err)) { +ip_flush_pending_frames (sk); + goto out; + } + nskb =skb_peek (&sk->sk_write_queue);if (nskb) {if (arg->csumoffset >=0 )
@@ -1585,7 +1591,7 @@ void ip_send_unicast_reply(struct net *nskb_set_queue_mapping (nskb,skb_get_queue_mapping (skb));ip_push_pending_frames (sk, &fl4); } - +out:put_cpu_var (unicast_sock);ip_rt_put (rt);
Greg Kroah-Hartman
maintainerPATCH 9/319 ipv4: fix a potential use after free in ip_tunnel_core.c
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li RongQing <[email protected]>
[ Upstream commit 1245dfc8cadb258386fcd27df38215a0eccb1f17 ]
pskb_may_pull() maybe change skb->data and make eth pointer oboslete, so set eth after pskb_may_pull()
--- net/ipv4/ip_tunnel_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv4/ip_tunnel_core.c +2 -1
@@ -91,11 +91,12 @@ int iptunnel_pull_header(struct sk_buffskb_pull_rcsum (skb, hdr_len);if (inner_proto ==htons (ETH_P_TEB )) { -struct ethhdr *eh = (struct ethhdr *)skb->data; +struct ethhdr *eh;if (unlikely (!pskb_may_pull (skb,ETH_HLEN )))return -ENOMEM ; + eh = (struct ethhdr *)skb->data;if (likely (ntohs (eh->h_proto) >=ETH_P_802_3_MIN )) skb->protocol = eh->h_proto;else
Greg Kroah-Hartman
maintainerPATCH 10/319 tipc: fix bug in bundled buffer reception
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jon Paul Maloy <[email protected]>
[ Upstream commit 643566d4b47e2956110e79c0e6f65db9b9ea42c6 ]
In commit ec8a2e5621db2da24badb3969eda7fd359e1869f ("tipc: same receive code path for connection protocol and data messages") we omitted the the possiblilty that an arriving message extracted from a bundle buffer may be a multicast message. Such messages need to be to be delivered to the socket via a separate function, tipc_sk_mcast_rcv(). As a result, small multicast messages arriving as members of a bundle buffer will be silently dropped.
This commit corrects the error by considering this case in the function tipc_link_bundle_rcv().
--- net/tipc/link.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/tipc/link.c +6 -1
@@ -1936,7 +1936,12 @@ void tipc_link_bundle_rcv(struct sk_buff } omsg =buf_msg (obuf); pos +=align (msg_size (omsg)); -if (msg_isdata (omsg) || (msg_user (omsg) ==CONN_MANAGER )) { +if (msg_isdata (omsg)) { +if (unlikely (msg_type (omsg) ==TIPC_MCAST_MSG )) +tipc_sk_mcast_rcv (obuf); +else +tipc_sk_rcv (obuf); + }else if (msg_user (omsg) ==CONN_MANAGER ) {tipc_sk_rcv (obuf); }else if (msg_user (omsg) ==NAME_DISTRIBUTOR ) {tipc_named_rcv (obuf);
Greg Kroah-Hartman
maintainerPATCH 11/319 ax88179_178a: fix bonding failure
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Morgan <[email protected]>
[ Upstream commit 95ff88688781db2f64042e69bd499e518bbb36e5 ]
The following patch fixes a bug which causes the ax88179_178a driver to be incapable of being added to a bond.
When I brought up the issue with the bonding maintainers, they indicated that the real problem was with the NIC driver which must return zero for success (of setting the MAC address). I see that several other NIC drivers follow that pattern by either simply always returing zero, or by passing through a negative (error) result while rewriting any positive return code to zero. With that same philisophy applied to the ax88179_178a driver, it allows it to work correctly with the bonding driver.
I believe this is suitable for queuing in -stable, as it's a small, simple, and obvious fix that corrects a defect with no other known workaround.
This patch is against vanilla 3.17(.0).
drivers/net/usb/ax88179_178a.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
--- drivers/net/usb/ax88179_178a.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/usb/ax88179_178a.c +6 -1
@@ -937,6 +937,7 @@ static int ax88179_set_mac_addr(struct n {struct usbnet *dev =netdev_priv (net);struct sockaddr *addr = p; +int ret;if (netif_running (net))return -EBUSY ;
@@ -946,8 +947,12 @@ static int ax88179_set_mac_addr(struct nmemcpy (net->dev_addr, addr->sa_data,ETH_ALEN );/* Set the MAC address */ -return ax88179_write_cmd (dev,AX_ACCESS_MAC ,AX_NODE_ID ,ETH_ALEN , + ret =ax88179_write_cmd (dev,AX_ACCESS_MAC ,AX_NODE_ID ,ETH_ALEN ,ETH_ALEN , net->dev_addr); +if (ret <0 ) +return ret; + +return 0 ; }static const struct net_device_ops ax88179_netdev_ops = {
Greg Kroah-Hartman
maintainerPATCH 12/319 netlink: Re-add locking to netlink_lookup() and seq walker
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Graf <[email protected]>
[ Upstream commit 78fd1d0ab072d4d9b5f0b7c14a1516665170b565 ]
The synchronize_rcu() in netlink_release() introduces unacceptable latency. Reintroduce minimal lookup so we can drop the synchronize_rcu() until socket destruction has been RCUfied.
--- net/netlink/af_netlink.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-)
net/netlink/af_netlink.c +25 -12
@@ -96,6 +96,14 @@ static DECLARE_WAIT_QUEUE_HEAD(nl_table_static int netlink_dump (struct sock *sk);static void netlink_skb_destructor (struct sk_buff *skb); +/* nl_table locking explained: +* Lookup and traversal are protected with nl_sk_hash_lock or nl_table_lock +* combined with an RCU read-side lock. Insertion and removal are protected +* with nl_sk_hash_lock while using RCU list modification primitives and may +* run in parallel to nl_table_lock protected lookups. Destruction of the +* Netlink socket may only occur *after* nl_table_lock has been acquired +* either during or after the socket has been removed from the list. +*/ DEFINE_RWLOCK (nl_table_lock);EXPORT_SYMBOL_GPL (nl_table_lock);static atomic_t nl_table_users =ATOMIC_INIT (0 );
@@ -109,10 +117,10 @@ EXPORT_SYMBOL_GPL(nl_sk_hash_lock);static int lockdep_nl_sk_hash_is_held (void ) {#ifdef CONFIG_LOCKDEP -return (debug_locks) ?lockdep_is_held (&nl_sk_hash_lock) :1 ; -#else -return 1 ; +if (debug_locks) +return lockdep_is_held (&nl_sk_hash_lock) ||lockdep_is_held (&nl_table_lock);#endif +return 1 ; }static ATOMIC_NOTIFIER_HEAD (netlink_chain);
@@ -1028,11 +1036,13 @@ static struct sock *netlink_lookup(strucstruct netlink_table *table = &nl_table[protocol];struct sock *sk; +read_lock (&nl_table_lock);rcu_read_lock (); sk =__netlink_lookup (table, portid, net);if (sk)sock_hold (sk);rcu_read_unlock (); +read_unlock (&nl_table_lock);return sk; }
@@ -1257,9 +1267,6 @@ static int netlink_release(struct socket }netlink_table_ungrab (); -/* Wait for readers to complete */ -synchronize_net (); -kfree (nlk->groups); nlk->groups =NULL ;
@@ -1281,6 +1288,7 @@ static int netlink_autobind(struct socke retry:cond_resched (); +netlink_table_grab ();rcu_read_lock ();if (__netlink_lookup (table, portid, net)) {/* Bind collision, search negative portid values. */
@@ -1288,9 +1296,11 @@ retry:if (rover >-4097 ) rover =-4097 ;rcu_read_unlock (); +netlink_table_ungrab (); goto retry; }rcu_read_unlock (); +netlink_table_ungrab (); err =netlink_insert (sk, net, portid);if (err == -EADDRINUSE )
@@ -2921,14 +2931,16 @@ static struct sock *netlink_seq_socket_i }static void *netlink_seq_start (struct seq_file *seq,loff_t *pos) -__acquires (RCU ) +__acquires (nl_table_lock)__acquires (RCU ) { +read_lock (&nl_table_lock);rcu_read_lock ();return *pos ?netlink_seq_socket_idx (seq, *pos -1 ) :SEQ_START_TOKEN ; }static void *netlink_seq_next (struct seq_file *seq,void *v,loff_t *pos) { +struct rhashtable *ht;struct netlink_sock *nlk;struct nl_seq_iter *iter;struct net *net;
@@ -2943,19 +2955,19 @@ static void *netlink_seq_next(struct seq iter = seq->private; nlk = v; -rht_for_each_entry_rcu (nlk, nlk->node.next, node) + i = iter->link; + ht = &nl_table[i].hash; +rht_for_each_entry (nlk, nlk->node.next, ht, node)if (net_eq (sock_net ((struct sock *)nlk), net))return nlk; - i = iter->link; j = iter->hash_idx +1 ; do { - struct rhashtable *ht = &nl_table[i].hash; const struct bucket_table *tbl = rht_dereference_rcu(ht->tbl, ht); for (; j < tbl->size; j++) { - rht_for_each_entry_rcu(nlk, tbl->buckets[j], node) { + rht_for_each_entry(nlk, tbl->buckets[j], ht, node) { if (net_eq(sock_net((struct sock *)nlk), net)) { iter->link = i; iter->hash_idx = j;
@@ -2971,9 +2983,10 @@ static void *netlink_seq_next(struct seq }static void netlink_seq_stop (struct seq_file *seq,void *v) -__releases (RCU ) +__releases (RCU )__releases (nl_table_lock) {rcu_read_unlock (); +read_unlock (&nl_table_lock); }
Greg Kroah-Hartman
maintainerPATCH 13/319 net: tso: fix unaligned access to crafted TCP header in helper API
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karl Beldan <[email protected]>
[ Upstream commit a63ba13eec092b70d4e5522d692eaeb2f9747387 ]
The crafted header start address is from a driver supplied buffer, which one can reasonably expect to be aligned on a 4-bytes boundary. However ATM the TSO helper API is only used by ethernet drivers and the tcp header will then be aligned to a 2-bytes only boundary from the header start address.
--- net/core/tso.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/tso.c +2 -1
@@ -1,6 +1,7 @@#include <linux/export.h> #include <net/ip.h> #include <net/tso.h> +#include <asm/unaligned.h> /* Calculate expected number of TX descriptors */ int tso_count_descs (struct sk_buff *skb)
@@ -23,7 +24,7 @@ void tso_build_hdr(struct sk_buff *skb, iph->id =htons (tso->ip_id); iph->tot_len =htons (size + hdr_len - mac_hdr_len); tcph = (struct tcphdr *)(hdr +skb_transport_offset (skb)); - tcph->seq =htonl (tso->tcp_seq); +put_unaligned_be32 (tso->tcp_seq, &tcph->seq); tso->ip_id++;if (!is_last) {
Greg Kroah-Hartman
maintainerPATCH 14/319 net: fix saving TX flow hash in sock for outgoing connections
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sathya Perla <[email protected]>
[ Upstream commit 9e7ceb060754f134231f68cb29d5db31419fe1ed ]
The commit "net: Save TX flow hash in sock and set in skbuf on xmit" introduced the inet_set_txhash() and ip6_set_txhash() routines to calculate and record flow hash(sk_txhash) in the socket structure. sk_txhash is used to set skb->hash which is used to spread flows across multiple TXQs.
But, the above routines are invoked before the source port of the connection is created. Because of this all outgoing connections that just differ in the source port get hashed into the same TXQ.
This patch fixes this problem for IPv4/6 by invoking the the above routines after the source port is available for the socket.
--- net/ipv4/tcp_ipv4.c | 4 ++-- net/ipv6/tcp_ipv6.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
net/ipv4/tcp_ipv4.c +2 -2
@@ -208,8 +208,6 @@ int tcp_v4_connect(struct sock *sk, stru inet->inet_dport = usin->sin_port; inet->inet_daddr = daddr; -inet_set_txhash (sk); -inet_csk (sk)->icsk_ext_hdr_len =0 ;if (inet_opt)inet_csk (sk)->icsk_ext_hdr_len = inet_opt->opt.optlen;
@@ -226,6 +224,8 @@ int tcp_v4_connect(struct sock *sk, struif (err) goto failure; +inet_set_txhash (sk); + rt =ip_route_newports (fl4, rt, orig_sport, orig_dport, inet->inet_sport, inet->inet_dport, sk);if (IS_ERR (rt)) {
net/ipv6/tcp_ipv6.c +2 -2
@@ -198,8 +198,6 @@ static int tcp_v6_connect(struct sock *s sk->sk_v6_daddr = usin->sin6_addr; np->flow_label = fl6.flowlabel; -ip6_set_txhash (sk); -/* * TCP over IPv4 */
@@ -295,6 +293,8 @@ static int tcp_v6_connect(struct sock *sif (err) goto late_failure; +ip6_set_txhash (sk); +if (!tp->write_seq &&likely (!tp->repair)) tp->write_seq = secure_tcpv6_sequence_number(np->saddr.s6_addr32, sk->sk_v6_daddr.s6_addr32,
Greg Kroah-Hartman
maintainerPATCH 15/319 hyperv: Fix the total_data_buflen in send path
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haiyang Zhang <[email protected]>
[ Upstream commit 942396b01989d54977120f3625e5ba31afe7a75c ]
total_data_buflen is used by netvsc_send() to decide if a packet can be put into send buffer. It should also include the size of RNDIS message before the Ethernet frame. Otherwise, a messge with total size bigger than send_section_size may be copied into the send buffer, and cause data corruption.
[Request to include this patch to the Stable branches]
--- drivers/net/hyperv/netvsc_drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/hyperv/netvsc_drv.c +1 -0
@@ -556,6 +556,7 @@ do_lso: do_send:/* Start filling in the page buffers with the rndis hdr */ rndis_msg->msg_len += rndis_msg_size; + packet->total_data_buflen = rndis_msg->msg_len; packet->page_buf_cnt =init_page_array (rndis_msg, rndis_msg_size, skb, &packet->page_buf[0 ]);
Greg Kroah-Hartman
maintainerPATCH 16/319 tcp: md5: do not use alloc_percpu()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 349ce993ac706869d553a1816426d3a4bfda02b1 ]
percpu tcp_md5sig_pool contains memory blobs that ultimately go through sg_set_buf().
-> sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
This requires that whole area is in a physically contiguous portion of memory. And that @buf is not backed by vmalloc().
Given that alloc_percpu() can use vmalloc() areas, this does not fit the requirements.
Replace alloc_percpu() by a static DEFINE_PER_CPU() as tcp_md5sig_pool is small anyway, there is no gain to dynamically allocate it.
--- net/ipv4/tcp.c | 59 +++++++++++++++++++-------------------------------------- 1 file changed, 20 insertions(+), 39 deletions(-)
net/ipv4/tcp.c +20 -39
@@ -2985,61 +2985,42 @@ EXPORT_SYMBOL(compat_tcp_getsockopt);#endif #ifdef CONFIG_TCP_MD5SIG -static struct tcp_md5sig_pool __percpu *tcp_md5sig_pool__read_mostly ; +static DEFINE_PER_CPU(struct tcp_md5sig_pool, tcp_md5sig_pool);static DEFINE_MUTEX (tcp_md5sig_mutex); - -static void __tcp_free_md5sig_pool (struct tcp_md5sig_pool __percpu *pool) -{ -int cpu; - -for_each_possible_cpu (cpu) { -struct tcp_md5sig_pool *p =per_cpu_ptr (pool, cpu); - -if (p->md5_desc.tfm) -crypto_free_hash (p->md5_desc.tfm); - } -free_percpu (pool); -} +static bool tcp_md5sig_pool_populated = false;static void __tcp_alloc_md5sig_pool (void ) {int cpu; -struct tcp_md5sig_pool __percpu *pool; - - pool = alloc_percpu(struct tcp_md5sig_pool); -if (!pool) -return ;for_each_possible_cpu (cpu) { -struct crypto_hash *hash; +if (!per_cpu (tcp_md5sig_pool, cpu).md5_desc.tfm) { +struct crypto_hash *hash; - hash =crypto_alloc_hash ("md5" ,0 ,CRYPTO_ALG_ASYNC ); -if (IS_ERR_OR_NULL (hash)) - goto out_free; - -per_cpu_ptr (pool, cpu)->md5_desc.tfm = hash; + hash =crypto_alloc_hash ("md5" ,0 ,CRYPTO_ALG_ASYNC ); +if (IS_ERR_OR_NULL (hash)) +return ; +per_cpu (tcp_md5sig_pool, cpu).md5_desc.tfm = hash; + } } -/* before setting tcp_md5sig_pool, we must commit all writes -* to memory. See ACCESS_ONCE() in tcp_get_md5sig_pool() +/* before setting tcp_md5sig_pool_populated, we must commit all writes +* to memory. See smp_rmb() in tcp_get_md5sig_pool() */ smp_wmb (); - tcp_md5sig_pool = pool; -return ; -out_free: -__tcp_free_md5sig_pool (pool); + tcp_md5sig_pool_populated = true; }bool tcp_alloc_md5sig_pool (void ) { -if (unlikely (!tcp_md5sig_pool)) { +if (unlikely (!tcp_md5sig_pool_populated)) {mutex_lock (&tcp_md5sig_mutex); -if (!tcp_md5sig_pool) +if (!tcp_md5sig_pool_populated)__tcp_alloc_md5sig_pool ();mutex_unlock (&tcp_md5sig_mutex); } -return tcp_md5sig_pool !=NULL ; +return tcp_md5sig_pool_populated; }EXPORT_SYMBOL (tcp_alloc_md5sig_pool);
@@ -3053,13 +3034,13 @@ EXPORT_SYMBOL(tcp_alloc_md5sig_pool);*/ struct tcp_md5sig_pool *tcp_get_md5sig_pool (void ) { -struct tcp_md5sig_pool __percpu *p; -local_bh_disable (); - p =ACCESS_ONCE (tcp_md5sig_pool); -if (p) -return __this_cpu_ptr (p); +if (tcp_md5sig_pool_populated) { +/* coupled with smp_wmb() in __tcp_alloc_md5sig_pool() */ +smp_rmb (); +return this_cpu_ptr (&tcp_md5sig_pool); + }local_bh_enable ();return NULL ; }
Greg Kroah-Hartman
maintainerPATCH 17/319 macvlan: fix a race on port dismantle and possible skb leaks
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit fe0ca7328d03d36aafecebb3af650e1bb2841c20 ]
We need to cancel the work queue after rcu grace period, otherwise it can be rescheduled by incoming packets.
We need to purge queue if some skbs are still in it.
We can use __skb_queue_head_init() variant inmacvlan_process_broadcast()
--- drivers/net/macvlan.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/macvlan.c +8 -2
@@ -201,7 +201,7 @@ static void macvlan_process_broadcast(ststruct sk_buff *skb;struct sk_buff_head list; -skb_queue_head_init (&list); +__skb_queue_head_init (&list);spin_lock_bh (&port->bc_queue.lock);skb_queue_splice_tail_init (&port->bc_queue, &list);
@@ -941,9 +941,15 @@ static void macvlan_port_destroy(struct {struct macvlan_port *port =macvlan_port_get_rtnl (dev); -cancel_work_sync (&port->bc_work); dev->priv_flags &= ~IFF_MACVLAN_PORT ;netdev_rx_handler_unregister (dev); + +/* After this point, no packet can schedule bc_work anymore, +* but we need to cancel it and purge left skbs if any. +*/ +cancel_work_sync (&port->bc_work); +__skb_queue_purge (&port->bc_queue); +kfree_rcu (port, rcu); }
Greg Kroah-Hartman
maintainerPATCH 18/319 cxgb4 : Fix missing initialization of win0_lock
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anish Bhatt <[email protected]>
[ Upstream commit e327c225c911529898ec300cb96d2088893de3df ]
win0_lock was being used un-initialized, resulting in warning traces being seen when lock debugging is enabled (and just wrong)
memory with PCIe Window method')
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +1 -0
@@ -6557,6 +6557,7 @@ static int init_one(struct pci_dev *pdevspin_lock_init (&adapter->stats_lock);spin_lock_init (&adapter->tid_release_lock); +spin_lock_init (&adapter->win0_lock);INIT_WORK (&adapter->tid_release_task, process_tid_release_list);INIT_WORK (&adapter->db_full_task, process_db_full);
Greg Kroah-Hartman
maintainerPATCH 19/319 ipv4: Do not cache routing failures due to disabled forwarding.
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Cavallari <[email protected]>
[ Upstream commit fa19c2b050ab5254326f5fc07096dd3c6a8d5d58 ]
If we cache them, the kernel will reuse them, independently of whether forwarding is enabled or not. Which means that if forwarding is disabled on the input interface where the first routing request comes from, then that unreachable result will be cached and reused for other interfaces, even if forwarding is enabled on them. The opposite is also true.
This can be verified with two interfaces A and B and an output interface C, where B has forwarding enabled, but not A and trying
ip route get $dst iif A from $src && ip route get $dst iif B from $src
--- net/ipv4/route.c | 1 + 1 file changed, 1 insertion(+)
net/ipv4/route.c +1 -0
@@ -1798,6 +1798,7 @@ local_input: no_route:RT_CACHE_STAT_INC (in_no_route); res.type =RTN_UNREACHABLE ; + res.fi =NULL ; goto local_input;/*
Greg Kroah-Hartman
maintainerPATCH 20/319 net/mlx4_en: Dont attempt to TX offload the outer UDP checksum for VXLAN
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Or Gerlitz <[email protected]>
[ Upstream commit a4f2dacbf2a5045e34b98a35d9a3857800f25a7b ]
For VXLAN/NVGRE encapsulation, the current HW doesn't support offloading both the outer UDP TX checksum and the inner TCP/UDP TX checksum.
The driver doesn't advertize SKB_GSO_UDP_TUNNEL_CSUM, however we are wrongly telling the HW to offload the outer UDP checksum for encapsulated packets, fix that.
offloads of vxlan tunneling')
--- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx4/en_tx.c +5 -2
@@ -808,8 +808,11 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff tx_desc->ctrl.fence_size = (real_size /16 ) &0x3f ; tx_desc->ctrl.srcrb_flags = priv->ctrl_flags;if (likely (skb->ip_summed ==CHECKSUM_PARTIAL )) { - tx_desc->ctrl.srcrb_flags |=cpu_to_be32 (MLX4_WQE_CTRL_IP_CSUM | -MLX4_WQE_CTRL_TCP_UDP_CSUM ); +if (!skb->encapsulation) + tx_desc->ctrl.srcrb_flags |=cpu_to_be32 (MLX4_WQE_CTRL_IP_CSUM | +MLX4_WQE_CTRL_TCP_UDP_CSUM ); +else + tx_desc->ctrl.srcrb_flags |=cpu_to_be32 (MLX4_WQE_CTRL_IP_CSUM ); ring->tx_csum++; }
Greg Kroah-Hartman
maintainerPATCH 21/319 mlx4: Avoid leaking steering rules on flow creation error flow
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Or Gerlitz <[email protected]>
[ Upstream commit 571e1b2c7a4c2fd5faa1648462a6b65fa26530d7 ]
If mlx4_ib_create_flow() attempts to create > 1 rules with the firmware, and one of these registrations fail, we leaked the already created flow rules.
One example of the leak is when the registration of the VXLAN ghost steering rule fails, we didn't unregister the original rule requested by the user, introduced in commit d2fce8a9060d "mlx4: Set user-space raw Ethernet QPs to properly handle VXLAN traffic".
While here, add dump of the VXLAN portion of steering rules so it can actually be seen when flow creation fails.
--- drivers/infiniband/hw/mlx4/main.c | 10 ++++++++-- drivers/net/ethernet/mellanox/mlx4/mcg.c | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mlx4/main.c +8 -2
@@ -1173,18 +1173,24 @@ static struct ib_flow *mlx4_ib_create_fl err =__mlx4_ib_create_flow (qp, flow_attr, domain, type[i], &mflow->reg_id[i]);if (err) - goto err_free; + goto err_create_flow; i++; }if (i <ARRAY_SIZE (type) && flow_attr->type ==IB_FLOW_ATTR_NORMAL ) { err =mlx4_ib_tunnel_steer_add (qp, flow_attr, &mflow->reg_id[i]);if (err) - goto err_free; + goto err_create_flow; + i++; }return &mflow->ibflow; +err_create_flow: +while (i) { + (void )__mlx4_ib_destroy_flow (to_mdev (qp->device)->dev, mflow->reg_id[i]); + i--; + } err_free:kfree (mflow);return ERR_PTR (err);
drivers/net/ethernet/mellanox/mlx4/mcg.c +4 -0
@@ -955,6 +955,10 @@ static void mlx4_err_rule(struct mlx4_de cur->ib.dst_gid_msk);break ; +case MLX4_NET_TRANS_RULE_ID_VXLAN : + len +=snprintf (buf + len,BUF_SIZE - len, +"VNID = %d " ,be32_to_cpu (cur->vxlan.vni)); +break ;case MLX4_NET_TRANS_RULE_ID_IPV6 :break ;
Greg Kroah-Hartman
maintainerPATCH 22/319 gre: Use inner mac length when computing tunnel length
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tom Herbert <[email protected]>
[ Upstream commit 14051f0452a2c26a3f4791e6ad6a435e8f1945ff ]
Currently, skb_inner_network_header is used but this does not account for Ethernet header for ETH_P_TEB. Use skb_inner_mac_header which handles TEB and also should work with IP encapsulation in which case inner mac and inner network headers are the same.
Tested: Ran TCP_STREAM over GRE, worked as expected.
--- net/ipv4/gre_offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/gre_offload.c +1 -1
@@ -51,7 +51,7 @@ static struct sk_buff *gre_gso_segment(s greh = (struct gre_base_hdr *)skb_transport_header (skb); - ghl =skb_inner_network_header (skb) -skb_transport_header (skb); + ghl =skb_inner_mac_header (skb) -skb_transport_header (skb);if (unlikely (ghl <sizeof (*greh))) goto out;
Greg Kroah-Hartman
maintainerPATCH 23/319 drivers/net: Disable UFO through virtio
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
[ Upstream commit 3d0ad09412ffe00c9afa201d01effdb6023d09b4 ]
IPv6 does not allow fragmentation by routers, so there is no fragmentation ID in the fixed header. UFO for IPv6 requires the ID to be passed separately, but there is no provision for this in the virtio net protocol.
Until recently our software implementation of UFO/IPv6 generated a new ID, but this was a bug. Now we will use ID=0 for any UFO/IPv6 packet passed through a tap, which is even worse.
Unfortunately there is no distinction between UFO/IPv4 and v6 features, so disable UFO on taps and virtio_net completely until we have a proper solution.
We cannot depend on VM managers respecting the tap feature flags, so keep accepting UFO packets but log a warning the first time we do this.
--- drivers/net/macvtap.c | 13 +++++-------- drivers/net/tun.c | 19 +++++++++++-------- drivers/net/virtio_net.c | 24 ++++++++++++++---------- 3 files changed, 30 insertions(+), 26 deletions(-)
drivers/net/macvtap.c +5 -8
@@ -65,7 +65,7 @@ static struct cdev macvtap_cdev;static const struct proto_ops macvtap_socket_ops;#define TUN_OFFLOADS (NETIF_F_HW_CSUM | NETIF_F_TSO_ECN | NETIF_F_TSO | \ - NETIF_F_TSO6 | NETIF_F_UFO) + NETIF_F_TSO6)#define RX_OFFLOADS (NETIF_F_GRO | NETIF_F_LRO)#define TAP_FEATURES (NETIF_F_GSO | NETIF_F_SG)
@@ -569,6 +569,8 @@ static int macvtap_skb_from_vnet_hdr(str gso_type =SKB_GSO_TCPV6 ;break ;case VIRTIO_NET_HDR_GSO_UDP : +pr_warn_once ("macvtap: %s: using disabled UFO feature; please fix this program\n" , + current->comm); gso_type =SKB_GSO_UDP ;break ;default :
@@ -614,8 +616,6 @@ static void macvtap_skb_to_vnet_hdr(cons vnet_hdr->gso_type =VIRTIO_NET_HDR_GSO_TCPV4 ; else if (sinfo->gso_type & SKB_GSO_TCPV6) vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV6; - else if (sinfo->gso_type & SKB_GSO_UDP) - vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_UDP; elseBUG ();if (sinfo->gso_type &SKB_GSO_TCP_ECN )
@@ -950,9 +950,6 @@ static int set_offload(struct macvtap_quif (arg &TUN_F_TSO6 ) feature_mask |=NETIF_F_TSO6 ; } - -if (arg &TUN_F_UFO ) - feature_mask |=NETIF_F_UFO ; }/* tun/tap driver inverts the usage for TSO offloads, where
@@ -963,7 +960,7 @@ static int set_offload(struct macvtap_qu* When user space turns off TSO, we turn off GSO/LRO so that * user-space will not receive TSO frames. */ -if (feature_mask & (NETIF_F_TSO |NETIF_F_TSO6 |NETIF_F_UFO )) +if (feature_mask & (NETIF_F_TSO |NETIF_F_TSO6 )) features |=RX_OFFLOADS ;else features &= ~RX_OFFLOADS ;
@@ -1064,7 +1061,7 @@ static long macvtap_ioctl(struct file *fcase TUNSETOFFLOAD :/* let the user check for future flags */ if (arg & ~(TUN_F_CSUM |TUN_F_TSO4 |TUN_F_TSO6 | -TUN_F_TSO_ECN |TUN_F_UFO )) +TUN_F_TSO_ECN ))return -EINVAL ;rtnl_lock ();
drivers/net/tun.c +11 -8
@@ -174,7 +174,7 @@ struct tun_struct {struct net_device *dev;netdev_features_t set_features;#define TUN_USER_FEATURES (NETIF_F_HW_CSUM|NETIF_F_TSO_ECN|NETIF_F_TSO| \ - NETIF_F_TSO6|NETIF_F_UFO) + NETIF_F_TSO6)int vnet_hdr_sz;int sndbuf;
@@ -1149,8 +1149,18 @@ static ssize_t tun_get_user(struct tun_sskb_shinfo (skb)->gso_type =SKB_GSO_TCPV6 ;break ;case VIRTIO_NET_HDR_GSO_UDP : + { +static bool warned; + +if (!warned) { + warned = true; +netdev_warn (tun->dev, +"%s: using disabled UFO feature; please fix this program\n" , + current->comm); + }skb_shinfo (skb)->gso_type =SKB_GSO_UDP ;break ; + }default : tun->dev->stats.rx_frame_errors++;kfree_skb (skb);
@@ -1251,8 +1261,6 @@ static ssize_t tun_put_user(struct tun_s gso.gso_type =VIRTIO_NET_HDR_GSO_TCPV4 ; else if (sinfo->gso_type & SKB_GSO_TCPV6) gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV6; - else if (sinfo->gso_type & SKB_GSO_UDP) - gso.gso_type = VIRTIO_NET_HDR_GSO_UDP; else { pr_err("unexpected GSO type: " "0x%x, gso_size %d, hdr_len %d\n",
@@ -1762,11 +1770,6 @@ static int set_offload(struct tun_struct features |=NETIF_F_TSO6 ; arg &= ~(TUN_F_TSO4 |TUN_F_TSO6 ); } - -if (arg &TUN_F_UFO ) { - features |=NETIF_F_UFO ; - arg &= ~TUN_F_UFO ; - } }/* This gives the user a way to test for new features in future by
drivers/net/virtio_net.c +14 -10
@@ -497,8 +497,17 @@ static void receive_buf(struct receive_qskb_shinfo (skb)->gso_type =SKB_GSO_TCPV4 ;break ;case VIRTIO_NET_HDR_GSO_UDP : + { +static bool warned; + +if (!warned) { + warned = true; +netdev_warn (dev, +"host using disabled UFO feature; please fix it\n" ); + }skb_shinfo (skb)->gso_type =SKB_GSO_UDP ;break ; + }case VIRTIO_NET_HDR_GSO_TCPV6 :skb_shinfo (skb)->gso_type =SKB_GSO_TCPV6 ;break ;
@@ -885,8 +894,6 @@ static int xmit_skb(struct send_queue *s hdr->hdr.gso_type =VIRTIO_NET_HDR_GSO_TCPV4 ; else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) hdr->hdr.gso_type = VIRTIO_NET_HDR_GSO_TCPV6; - else if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP) - hdr->hdr.gso_type = VIRTIO_NET_HDR_GSO_UDP; elseBUG ();if (skb_shinfo (skb)->gso_type &SKB_GSO_TCP_ECN )
@@ -1710,7 +1717,7 @@ static int virtnet_probe(struct virtio_d dev->features |=NETIF_F_HW_CSUM |NETIF_F_SG |NETIF_F_FRAGLIST ;if (virtio_has_feature (vdev,VIRTIO_NET_F_GSO )) { - dev->hw_features |=NETIF_F_TSO |NETIF_F_UFO + dev->hw_features |=NETIF_F_TSO |NETIF_F_TSO_ECN |NETIF_F_TSO6 ; }/* Individual feature bits: what can host handle? */
@@ -1720,11 +1727,9 @@ static int virtnet_probe(struct virtio_d dev->hw_features |=NETIF_F_TSO6 ;if (virtio_has_feature (vdev,VIRTIO_NET_F_HOST_ECN )) dev->hw_features |=NETIF_F_TSO_ECN ; -if (virtio_has_feature (vdev,VIRTIO_NET_F_HOST_UFO )) - dev->hw_features |=NETIF_F_UFO ;if (gso) - dev->features |= dev->hw_features & (NETIF_F_ALL_TSO |NETIF_F_UFO ); + dev->features |= dev->hw_features &NETIF_F_ALL_TSO ;/* (!csum && gso) case will be fixed by register_netdev() */ }if (virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_CSUM ))
@@ -1764,8 +1769,7 @@ static int virtnet_probe(struct virtio_d/* If we can receive ANY GSO packets, we must allocate large ones. */ if (virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_TSO4 ) ||virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_TSO6 ) || -virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_ECN ) || -virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_UFO )) +virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_ECN )) vi->big_packets = true;if (virtio_has_feature (vdev,VIRTIO_NET_F_MRG_RXBUF ))
@@ -1965,9 +1969,9 @@ static struct virtio_device_id id_table[static unsigned int features[] = {VIRTIO_NET_F_CSUM ,VIRTIO_NET_F_GUEST_CSUM ,VIRTIO_NET_F_GSO ,VIRTIO_NET_F_MAC , -VIRTIO_NET_F_HOST_TSO4 ,VIRTIO_NET_F_HOST_UFO ,VIRTIO_NET_F_HOST_TSO6 , +VIRTIO_NET_F_HOST_TSO4 ,VIRTIO_NET_F_HOST_TSO6 ,VIRTIO_NET_F_HOST_ECN ,VIRTIO_NET_F_GUEST_TSO4 ,VIRTIO_NET_F_GUEST_TSO6 , -VIRTIO_NET_F_GUEST_ECN ,VIRTIO_NET_F_GUEST_UFO , +VIRTIO_NET_F_GUEST_ECN ,VIRTIO_NET_F_MRG_RXBUF ,VIRTIO_NET_F_STATUS ,VIRTIO_NET_F_CTRL_VQ ,VIRTIO_NET_F_CTRL_RX ,VIRTIO_NET_F_CTRL_VLAN ,VIRTIO_NET_F_GUEST_ANNOUNCE ,VIRTIO_NET_F_MQ ,
Re: [PATCH 3.17 023/319] drivers/net: Disable UFO through virtio
Quoted 13 lines · Greg Kroah-Hartman
3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
[ Upstream commit
3d0ad09412ffe00c9afa201d01effdb6023d09b4]IPv6 does not allow fragmentation by routers, so there is no fragmentation ID in the fixed header. UFO for IPv6 requires the ID to be passed separately, but there is no provision for this in the virtio net protocol.
Quoted 7 lines
Until recently our software implementation of UFO/IPv6 generated a new ID, but this was a bug. Now we will use ID=0 for any UFO/IPv6 packet passed through a tap, which is even worse.
Unfortunately there is no distinction between UFO/IPv4 and v6 features, so disable UFO on taps and
virtio_netcompletely until we have a proper solution.
[...]
Please drop this patch for 3.14 and 3.17. It causes problems for migration of VMs and we're probably going to revert part of this. The following patch ("drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets") might no longer apply, in which case you can drop that as well until we have this sorted out upstream.
Ben.
Signature · 3 lines
Ben Hutchings
Experience is directly proportional to the value of equipment destroyed.
- Carolyn ScheppnerRe: [PATCH 3.17 023/319] drivers/net: Disable UFO through virtio
Quoted 21 lines · Ben Hutchings
Quoted 13 lines · Greg Kroah-Hartman
3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
[ Upstream commit
3d0ad09412ffe00c9afa201d01effdb6023d09b4]IPv6 does not allow fragmentation by routers, so there is no fragmentation ID in the fixed header. UFO for IPv6 requires the ID to be passed separately, but there is no provision for this in the virtio net protocol.
Quoted 7 lines
Until recently our software implementation of UFO/IPv6 generated a new ID, but this was a bug. Now we will use ID=0 for any UFO/IPv6 packet passed through a tap, which is even worse.
Unfortunately there is no distinction between UFO/IPv4 and v6 features, so disable UFO on taps and
virtio_netcompletely until we have a proper solution.
Quoted 8 lines
[...]
Please drop this patch for 3.14 and 3.17. It causes problems for migration of VMs and we're probably going to revert part of this. The following patch ("
drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets") might no longer apply, in which case you can drop that as well until we have this sorted out upstream.
I guess the same applies to the 3.16 kernel; I'll drop both patches from the kernel currently under review.
Cheers,
--
Lu�s
Quoted 6 lines
Ben.
Signature · 3 lines
Ben Hutchings Experience is directly proportional to the value of equipment destroyed. - Carolyn Scheppner
Re: [PATCH 3.17 023/319] drivers/net: Disable UFO through virtio
In reply to Ben Hutchings-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 22 lines · Ben Hutchings
Quoted 14 lines · Greg Kroah-Hartman
3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
[ Upstream commit
3d0ad09412ffe00c9afa201d01effdb6023d09b4]IPv6 does not allow fragmentation by routers, so there is no fragmentation ID in the fixed header. UFO for IPv6 requires the ID to be passed separately, but there is no provision for this in the virtio net protocol.
Quoted 7 lines
Until recently our software implementation of UFO/IPv6 generated a new ID, but this was a bug. Now we will use ID=0 for any UFO/IPv6 packet passed through a tap, which is even worse.
Unfortunately there is no distinction between UFO/IPv4 and v6 features, so disable UFO on taps and
virtio_netcompletely until we have a proper solution.
Quoted 8 lines
[...]
Please drop this patch for 3.14 and 3.17. It causes problems for migration of VMs and we're probably going to revert part of this. The following patch ("
drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets") might no longer apply, in which case you can drop that as well until we have this sorted out upstream.
The same holds for 3.12, I suppose?
thanks,
- --
js
suse labs
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBAgAGBQJUZO8DAAoJEL0lsQQGtHBJ6m0QAKtFdrlbdrBszq6o7pR5B+Jz 7ULH2GpXb+s0eGK5jf2Wfrz3IGnpStPZa8wpOVVrCLX/sggccEwgTfTIN9LgDS84 juNP1aHKVMXc62Mf/ZTJpZF7+k1HbRp/M5EnZpFy/QrwHjbn1s+KGtepkLtt7Lsg QHtmU+kvfoJKI1yOrStwuNYoOVLHl8cfG8gIB/8JLSuii9IzEO5nt4pHLbemW7s1 cwICvtRlQJkRDf7wWLPvy77pvBdlMERg5zqANQPZTyopQvn2nMs9V4h8JMiZYx0l YR1aw8CrYm1BiOSCscNSCla5ypU3VcWLaNLHGhsaJwMwl12FhR4+4biNrobfHjU7 1dvWTA5VD9Hdz0rf/iqMpOrA7qbyp/ucmYkcpPe+y6BCT7f8VapnsUWrQxPU37N8 WdLYa4D9dgA1uL4zQICiQQpQqoJVTRZRep5W07zuMkjWiQnSVwRbOMiWD3bpee20 wrppKHKSwRskKK25J9wXWgLu+EfgqvskqB5RjzmDU2jZv/bkBqfTf00JY6ar4rlr lAQHXnVaBHA3agY7yOvRc/95vNGW1BN/z+/fDu0sl/h5JCmapzN7mr5eSLWLQK8N aVgc+y/z5rYsID2SKPI3gCKTCfIiASYAedNn+e67OiTTrTcNg2d9SWKJctVcsAD+ nBEnS4azRHV/9tyMKIFS
=6NLa
-----END PGP SIGNATURE-----
Re: [PATCH 3.17 023/319] drivers/net: Disable UFO through virtio
Quoted 25 lines · Jiri Slaby
Quoted 24 lines · Ben Hutchings
Quoted 21 lines · Greg Kroah-Hartman
3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
[ Upstream commit
3d0ad09412ffe00c9afa201d01effdb6023d09b4]IPv6 does not allow fragmentation by routers, so there is no fragmentation ID in the fixed header. UFO for IPv6 requires the ID to be passed separately, but there is no provision for this in the virtio net protocol.
Until recently our software implementation of UFO/IPv6 generated a new ID, but this was a bug. Now we will use ID=0 for any UFO/IPv6 packet passed through a tap, which is even worse.
Unfortunately there is no distinction between UFO/IPv4 and v6 features, so disable UFO on taps and
virtio_netcompletely until we have a proper solution.[...]
Quoted 8 lines
Quoted 6 lines
Please drop this patch for 3.14 and 3.17. It causes problems for migration of VMs and we're probably going to revert part of this. The following patch ("
drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets") might no longer apply, in which case you can drop that as well until we have this sorted out upstream.The same holds for 3.12, I suppose?
Right.
Ben.
Signature · 2 lines
Ben Hutchings friends: People who know you well, but like you anyway.
Re: [PATCH 3.17 023/319] drivers/net: Disable UFO through virtio
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 34 lines · Ben Hutchings
Quoted 33 lines · Jiri Slaby
Quoted 31 lines · Ben Hutchings
Quoted 14 lines · Greg Kroah-Hartman
3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
[ Upstream commit
3d0ad09412ffe00c9afa201d01effdb6023d09b4]IPv6 does not allow fragmentation by routers, so there is no
fragmentation ID in the fixed header. UFO for IPv6 requires
the ID to be passed separately, but there is no provision for this in the virtio net protocol.Quoted 8 lines
Until recently our software implementation of UFO/IPv6 generated a new ID, but this was a bug. Now we will use ID=0 for any UFO/IPv6 packet passed through a tap, which is even worse.
Unfortunately there is no distinction between UFO/IPv4 and v6
features, so disable UFO on taps andvirtio_netcompletely
until we have a proper solution.[...]
Please drop this patch for 3.14 and 3.17. It causes problems for migration of VMs and we're probably going to revert part of this. The following patch ("
drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets") might no longer apply, in which case you can drop that as well until we have this sorted out upstream.
Quoted 3 lines
Quoted 1 line
The same holds for 3.12, I suppose?
Right.
Great, I dropped that one.
Thanks!
- --
js
suse labs
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBAgAGBQJUZPw3AAoJEL0lsQQGtHBJuegP/R1DEoyC2tBsWD78lPFirrF7 bMgXR/KWruqMa2UL9heWgaJOhrFtsmUiaRWgkFapuGyjpMmWm5ZH1qpZTsBo9Y0u rXFsxJgPF3X2OCBLj7AcaKPsGahYSTpBMY665e+lhO5uqYDx/2B84QqWsLlm3yls JuWNdMmct/6h8mkGbwTGQ+iM9ancqF2vwNd70Rax1KwydowOxN5/uQfWrkUGUJga Hh2PKF0OB7goI5MlYPeLiFPLqTigB0k7Rs4G1bFElM8ATTxQ5Fz89rMjd7KXN6kD ND8mtlMXIvOuTQN1w14Zrke11RFsy2OG5qHDt6xw0Z2dvoflUHdzRAdW3u1ikpI0 7q36uHeokdAI45iqQEmFdSjJmpS1dsSpVNIirrugePi0HSE5oz/wma4762V3mTfk C1QAkOVxGW8WiwSvmKzqMHeCXIHxekxuaHtQlHPXmZ8foTtliU74jbp8RAZiwyZW Onaj6cU6K1KWAqgZBsSRmz8YP6yU0xKxjD1b/QK47drEJtHQmog7hfx9bYi+Jd9v 47PL38ZYI0ncwQBtybFbOMtqCjHnK5eQowZJY/1fQlaffQf4cZf5dIiU7lAdLsad torFKi0drQsLkT5mCTHYGGC/UbyxM4BC/XSaBWXDOvXHPIdr4gC+YYDCS2ZSR4oo 6XJG/XuyKEAkIkgl5bwJ
=qzaW
-----END PGP SIGNATURE-----
Greg Kroah-Hartman
maintainerRe: [PATCH 3.17 023/319] drivers/net: Disable UFO through virtio
In reply to Ben HutchingsQuoted 21 lines · Ben Hutchings
Quoted 13 lines · Greg Kroah-Hartman
3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
[ Upstream commit
3d0ad09412ffe00c9afa201d01effdb6023d09b4]IPv6 does not allow fragmentation by routers, so there is no fragmentation ID in the fixed header. UFO for IPv6 requires the ID to be passed separately, but there is no provision for this in the virtio net protocol.
Quoted 7 lines
Until recently our software implementation of UFO/IPv6 generated a new ID, but this was a bug. Now we will use ID=0 for any UFO/IPv6 packet passed through a tap, which is even worse.
Unfortunately there is no distinction between UFO/IPv4 and v6 features, so disable UFO on taps and
virtio_netcompletely until we have a proper solution.
Quoted 7 lines
[...]
Please drop this patch for 3.14 and 3.17. It causes problems for migration of VMs and we're probably going to revert part of this. The following patch ("
drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets") might no longer apply, in which case you can drop that as well until we have this sorted out upstream.
Oops, I missed this for 3.14-stable, I'll go revert that as the first patch to be queued up for the next round there.
I've dropped this from 3.17-stable, and the patch "drivers/net, ipv6:
Select IPv6 fragment idents for virtio UFO packets" still applied with some fuzz, I'll do a test build to ensure I didn't break anything there.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 24/319 drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
[ Upstream commit 5188cd44c55db3e92cd9e77a40b5baa7ed4340f7 ]
UFO is now disabled on all drivers that work with virtio net headers, but userland may try to send UFO/IPv6 packets anyway. Instead of sending with ID=0, we should select identifiers on their behalf (as we used to).
--- drivers/net/macvtap.c | 3 +++ drivers/net/tun.c | 6 +++++- include/net/ipv6.h | 2 ++ net/ipv6/output_core.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-)
drivers/net/macvtap.c +3 -0
@@ -16,6 +16,7 @@#include <linux/idr.h> #include <linux/fs.h> +#include <net/ipv6.h> #include <net/net_namespace.h> #include <net/rtnetlink.h> #include <net/sock.h>
@@ -572,6 +573,8 @@ static int macvtap_skb_from_vnet_hdr(strpr_warn_once ("macvtap: %s: using disabled UFO feature; please fix this program\n" , current->comm); gso_type =SKB_GSO_UDP ; +if (skb->protocol ==htons (ETH_P_IPV6 )) +ipv6_proxy_select_ident (skb);break ;default :return -EINVAL ;
drivers/net/tun.c +5 -1
@@ -65,6 +65,7 @@#include <linux/nsproxy.h> #include <linux/virtio_net.h> #include <linux/rcupdate.h> +#include <net/ipv6.h> #include <net/net_namespace.h> #include <net/netns/generic.h> #include <net/rtnetlink.h>
@@ -1139,6 +1140,8 @@ static ssize_t tun_get_user(struct tun_sbreak ; } +skb_reset_network_header (skb); +if (gso.gso_type !=VIRTIO_NET_HDR_GSO_NONE ) {pr_debug ("GSO!\n" );switch (gso.gso_type & ~VIRTIO_NET_HDR_GSO_ECN ) {
@@ -1159,6 +1162,8 @@ static ssize_t tun_get_user(struct tun_s current->comm); }skb_shinfo (skb)->gso_type =SKB_GSO_UDP ; +if (skb->protocol ==htons (ETH_P_IPV6 )) +ipv6_proxy_select_ident (skb);break ; }default :
@@ -1189,7 +1194,6 @@ static ssize_t tun_get_user(struct tun_sskb_shinfo (skb)->tx_flags |=SKBTX_SHARED_FRAG ; } -skb_reset_network_header (skb);skb_probe_transport_header (skb,0 ); rxhash =skb_get_hash (skb);
include/net/ipv6.h +2 -0
@@ -669,6 +669,8 @@ static inline int ipv6_addr_diff(const sreturn __ipv6_addr_diff (a1, a2,sizeof (struct in6_addr )); } +void ipv6_proxy_select_ident (struct sk_buff *skb); +int ip6_dst_hoplimit (struct dst_entry *dst); static inline int ip6_sk_dst_hoplimit(struct ipv6_pinfo *np, struct flowi6 *fl6,
net/ipv6/output_core.c +34 -0
@@ -3,11 +3,45 @@* not configured or static. These functions are needed by GSO/GRO implementation. */ #include <linux/export.h> +#include <net/ip.h> #include <net/ipv6.h> #include <net/ip6_fib.h> #include <net/addrconf.h> #include <net/secure_seq.h> +/* This function exists only for tap drivers that must support broken +* clients requesting UFO without specifying an IPv6 fragment ID. +* +* This is similar to ipv6_select_ident() but we use an independent hash +* seed to limit information leakage. +* +* The network header must be set before calling this. +*/ +void ipv6_proxy_select_ident (struct sk_buff *skb) +{ +static u32 ip6_proxy_idents_hashrnd__read_mostly ; +struct in6_addr buf[2 ]; +struct in6_addr *addrs; +u32 hash, id; + + addrs =skb_header_pointer (skb, +skb_network_offset (skb) + + offsetof(struct ipv6hdr , saddr), +sizeof (buf), buf); +if (!addrs) +return ; + +net_get_random_once (&ip6_proxy_idents_hashrnd, +sizeof (ip6_proxy_idents_hashrnd)); + + hash =__ipv6_addr_jhash (&addrs[1 ], ip6_proxy_idents_hashrnd); + hash =__ipv6_addr_jhash (&addrs[0 ], hash); + + id =ip_idents_reserve (hash,1 ); +skb_shinfo (skb)->ip6_frag_id =htonl (id); +} +EXPORT_SYMBOL_GPL (ipv6_proxy_select_ident); +int ip6_find_1stfragopt (struct sk_buff *skb,u8 **nexthdr) {u16 offset =sizeof (struct ipv6hdr );
Greg Kroah-Hartman
maintainerPATCH 25/319 drivers/net: macvtap and tun depend on INET
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
[ Upstream commit de11b0e8c569b96c2cf6a811e3805b7aeef498a3 ]
These drivers now call ipv6_proxy_select_ident(), which is defined only if CONFIG_INET is enabled. However, they have really depended on CONFIG_INET for as long as they have allowed sending GSO packets from userland.
--- drivers/net/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/Kconfig +2 -0
@@ -135,6 +135,7 @@ config MACVLAN config MACVTAP tristate "MAC-VLAN based tap driver" depends on MACVLAN + depends on INET help This adds a specialized tap character device driver that is based on the MAC-VLAN network interface, called macvtap. A macvtap device
@@ -201,6 +202,7 @@ config RIONET_RX_SIZE config TUN tristate "Universal TUN/TAP device driver support" + depends on INET select CRC32 ---help--- TUN/TAP provides packet reception and transmission for user space
Greg Kroah-Hartman
maintainerPATCH 26/319 stmmac: pci: set default of the filter bins
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit 1e19e084eae727654052339757ab7f1eaff58bad ]
The commit 3b57de958e2a brought the support for a different amount of the filter bins, but didn't update the PCI driver accordingly. This patch appends the default values when the device is enumerated via PCI bus.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +7 -0
@@ -33,6 +33,7 @@ static struct stmmac_dma_cfg dma_cfg;static void stmmac_default_data (void ) {memset (&plat_dat,0 ,sizeof (struct plat_stmmacenet_data )); + plat_dat.bus_id =1 ; plat_dat.phy_addr =0 ; plat_dat.interface =PHY_INTERFACE_MODE_GMII ;
@@ -47,6 +48,12 @@ static void stmmac_default_data(void) dma_cfg.pbl =32 ; dma_cfg.burst_len =DMA_AXI_BLEN_256 ; plat_dat.dma_cfg = &dma_cfg; + +/* Set default value for multicast hash bins */ + plat_dat.multicast_filter_bins =HASH_TABLE_SIZE ; + +/* Set default value for unicast filter entries */ + plat_dat.unicast_filter_entries =1 ; }/**
Greg Kroah-Hartman
maintainerPATCH 27/319 lockd: Try to reconnect if statd has moved
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
commit 173b3afceebe76fa2205b2c8808682d5b541fe3c upstream.
If rpc.statd is restarted, upcalls to monitor hosts can fail with ECONNREFUSED. In that case force a lookup of statd's new port and retry the upcall.
--- fs/lockd/mon.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/lockd/mon.c +6 -0
@@ -159,6 +159,12 @@ static int nsm_mon_unmon(struct nsm_hand msg.rpc_proc = &clnt->cl_procinfo[proc]; status =rpc_call_sync (clnt, &msg,RPC_TASK_SOFTCONN ); +if (status == -ECONNREFUSED ) { +dprintk ("lockd: NSM upcall RPC failed, status=%d, forcing rebind\n" , + status); +rpc_force_rebind (clnt); + status =rpc_call_sync (clnt, &msg,RPC_TASK_SOFTCONN ); + }if (status <0 )dprintk ("lockd: NSM upcall RPC failed, status=%d\n" , status);
Greg Kroah-Hartman
maintainerPATCH 28/319 SUNRPC: Dont wake tasks during connection abort
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
commit a743419f420a64d442280845c0377a915b76644f upstream.
When aborting a connection to preserve source ports, don't wake the task in xs_error_report. This allows tasks with RPC_TASK_SOFTCONN to succeed if the connection needs to be re-established since it preserves the task's status instead of setting it to the status of the aborting kernel_connect().
This may also avoid a potential conflict on the socket's lock.
--- include/linux/sunrpc/xprt.h | 1 + net/sunrpc/xprtsock.c | 4 ++++ 2 files changed, 5 insertions(+)
include/linux/sunrpc/xprt.h +1 -0
@@ -357,6 +357,7 @@ int xs_swapper(struct rpc_xprt *xprt,#define XPRT_CONNECTION_ABORT (7)#define XPRT_CONNECTION_CLOSE (8)#define XPRT_CONGESTED (9) +#define XPRT_CONNECTION_REUSE (10)static inline void xprt_set_connected (struct rpc_xprt *xprt) {
net/sunrpc/xprtsock.c +4 -0
@@ -845,6 +845,8 @@ static void xs_error_report(struct sockdprintk ("RPC: xs_error_report client %p, error=%d...\n" , xprt, -err);trace_rpc_socket_error (xprt, sk->sk_socket, err); +if (test_bit (XPRT_CONNECTION_REUSE , &xprt->state)) + goto out;xprt_wake_pending_tasks (xprt, err); out:read_unlock_bh (&sk->sk_callback_lock);
@@ -2245,7 +2247,9 @@ static void xs_tcp_setup_socket(struct w abort_and_exit =test_and_clear_bit (XPRT_CONNECTION_ABORT , &xprt->state);/* "close" the socket, preserving the local port */ +set_bit (XPRT_CONNECTION_REUSE , &xprt->state);xs_tcp_reuse_connection (transport); +clear_bit (XPRT_CONNECTION_REUSE , &xprt->state);if (abort_and_exit) goto out_eagain;
Greg Kroah-Hartman
maintainerPATCH 29/319 SUNRPC: Add missing support for RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
commit 2aca5b869ace67a63aab895659e5dc14c33a4d6e upstream.
The flag RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT was intended introduced in order to allow NFSv4 clients to disable resend timeouts. Since those cause the RPC layer to break the connection, they mess up the duplicate reply caches that remain indexed on the port number in NFSv4..
This patch includes the code that was missing in the original to set the appropriate flag in struct rpc_clnt, when the caller of rpc_create() sets RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT.
--- net/sunrpc/clnt.c | 3 +++ 1 file changed, 3 insertions(+)
net/sunrpc/clnt.c +3 -0
@@ -461,6 +461,8 @@ struct rpc_clnt *rpc_create_xprt(structif (args->flags &RPC_CLNT_CREATE_AUTOBIND ) clnt->cl_autobind =1 ; +if (args->flags &RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT ) + clnt->cl_noretranstimeo =1 ;if (args->flags &RPC_CLNT_CREATE_DISCRTRY ) clnt->cl_discrtry =1 ;if (!(args->flags &RPC_CLNT_CREATE_QUIET ))
@@ -579,6 +581,7 @@ static struct rpc_clnt *__rpc_clone_clie/* Turn off autobind on clones */ new->cl_autobind =0 ; new->cl_softrtry = clnt->cl_softrtry; + new->cl_noretranstimeo = clnt->cl_noretranstimeo; new->cl_discrtry = clnt->cl_discrtry; new->cl_chatty = clnt->cl_chatty;return new;
Greg Kroah-Hartman
maintainerPATCH 30/319 Revert "percpu: free percpu allocation info for uniprocessor system"
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
commit bb2e226b3bef596dd56be97df655d857b4603923 upstream.
This reverts commit 3189eddbcafc ("percpu: free percpu allocation info for uniprocessor system").
The commit causes a hang with a crisv32 image. This may be an architecture problem, but at least for now the revert is necessary to be able to boot a crisv32 image.
--- mm/percpu.c | 2 -- 1 file changed, 2 deletions(-)
mm/percpu.c +0 -2
@@ -1932,8 +1932,6 @@ void __init setup_per_cpu_areas(void)if (pcpu_setup_first_chunk (ai, fc) <0 ) panic("Failed to initialize percpu areas."); - - pcpu_free_alloc_info(ai); }#endif /* CONFIG_SMP */
Greg Kroah-Hartman
maintainerPATCH 31/319 pata_serverworks: disable 64-KB DMA transfers on Broadcom OSB4 IDE Controller
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Scott Carter <[email protected]>
commit 37017ac6849e772e67dd187ba2fbd056c4afa533 upstream.
The Broadcom OSB4 IDE Controller (vendor and device IDs: 1166:0211) does not support 64-KB DMA transfers.
Whenever a 64-KB DMA transfer is attempted,
the transfer fails and messages similar to the following are written to the console log:
[ 2431.851125] sr 0:0:0:0: [sr0] Unhandled sense code [ 2431.851139] sr 0:0:0:0: [sr0] Result: hostbyte=DID_OK driverbyte=DRIVER_SENSE [ 2431.851152] sr 0:0:0:0: [sr0] Sense Key : Hardware Error [current] [ 2431.851166] sr 0:0:0:0: [sr0] Add. Sense: Logical unit communication time-out [ 2431.851182] sr 0:0:0:0: [sr0] CDB: Read(10): 28 00 00 00 76 f4 00 00 40 00 [ 2431.851210] end_request: I/O error, dev sr0, sector 121808
When the libata and pata_serverworks modules
are recompiled with ATA_DEBUG and ATA_VERBOSE_DEBUG defined in libata.h, the 64-KB transfer size in the scatter-gather list can be seen in the console log:
[ 2664.897267] sr 9:0:0:0: [sr0] Send: [ 2664.897274] 0xf63d85e0 [ 2664.897283] sr 9:0:0:0: [sr0] CDB: [ 2664.897288] Read(10): 28 00 00 00 7f b4 00 00 40 00 [ 2664.897319] buffer = 0xf6d6fbc0, bufflen = 131072, queuecommand 0xf81b7700 [ 2664.897331] ata_scsi_dump_cdb: CDB (1:0,0,0) 28 00 00 00 7f b4 00 00 40 [ 2664.897338] ata_scsi_translate: ENTER [ 2664.897345] ata_sg_setup: ENTER, ata1 [ 2664.897356] ata_sg_setup: 3 sg elements mapped [ 2664.897364] ata_bmdma_fill_sg: PRD[0] = (0x66FD2000, 0xE000) [ 2664.897371] ata_bmdma_fill_sg: PRD[1] = (0x65000000, 0x10000) ------------------------------------------------------> ======= [ 2664.897378] ata_bmdma_fill_sg: PRD[2] = (0x66A10000, 0x2000) [ 2664.897386] ata1: ata_dev_select: ENTER, device 0, wait 1 [ 2664.897422] ata_sff_tf_load: feat 0x1 nsect 0x0 lba 0x0 0x0 0xFC [ 2664.897428] ata_sff_tf_load: device 0xA0 [ 2664.897448] ata_sff_exec_command: ata1: cmd 0xA0 [ 2664.897457] ata_scsi_translate: EXIT [ 2664.897462] leaving scsi_dispatch_cmnd() [ 2664.897497] Doing sr request, dev = sr0, block = 0 [ 2664.897507] sr0 : reading 64/256 512 byte blocks. [ 2664.897553] ata_sff_hsm_move: ata1: protocol 7 task_state 1 (dev_stat 0x58) [ 2664.897560] atapi_send_cdb: send cdb [ 2666.910058] ata_bmdma_port_intr: ata1: host_stat 0x64 [ 2666.910079] __ata_sff_port_intr: ata1: protocol 7 task_state 3 [ 2666.910093] ata_sff_hsm_move: ata1: protocol 7 task_state 3 (dev_stat 0x51) [ 2666.910101] ata_sff_hsm_move: ata1: protocol 7 task_state 4 (dev_stat 0x51) [ 2666.910129] sr 9:0:0:0: [sr0] Done: [ 2666.910136] 0xf63d85e0 TIMEOUT
lspci shows that the driver used for the Broadcom OSB4 IDE Controller is pata_serverworks:
00:0f.1 IDE interface: Broadcom OSB4 IDE Controller (prog-if 8e [Master SecP SecO PriP])
Flags: bus master, medium devsel, latency 64
[virtual] Memory at 000001f0 (32-bit, non-prefetchable) [size=8]
[virtual] Memory at 000003f0 (type 3, non-prefetchable) [size=1]
I/O ports at 0170 [size=8]
I/O ports at 0374 [size=4]
I/O ports at 1440 [size=16]
Kernel driver in use: pata_serverworksThe pata_serverworks driver supports five distinct device IDs, one being the OSB4 and the other four belonging to the CSB series. The CSB series appears to support 64-KB DMA transfers,
as tests on a machine with an SAI2 motherboard
containing a Broadcom CSB5 IDE Controller (vendor and device IDs: 1166:0212) showed no problems with 64-KB DMA transfers.
This problem was first discovered when attempting to install openSUSE from a DVD on a machine with an STL2 motherboard.
Using the pata_serverworks module,
older releases of openSUSE will not install at all due to the timeouts. Releases of openSUSE prior to 11.3 can be installed by disabling the pata_serverworks module using the brokenmodules boot parameter, which causes the serverworks module to be used instead.
Recent releases of openSUSE (12.2 and later) include better error recovery and will install, though very slowly.
On all openSUSE releases, the problem can be recreated
on a machine containing a Broadcom OSB4 IDE Controller
by mounting an install DVD and running a command similar to the following:
find /mnt -type f -print | xargs cat > /dev/null
The patch below corrects the problem.
Similar to the other ATA drivers that do not support 64-KB DMA transfers, the patch changes the ata_port_operations qc_prep vector to point to a routine that breaks any 64-KB segment into two 32-KB segments and
changes the scsi_host_template sg_tablesize element to reduce by half the number of scatter/gather elements allowed.
These two changes affect only the OSB4.
--- drivers/ata/pata_serverworks.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/ata/pata_serverworks.c +11 -2
@@ -251,12 +251,18 @@ static void serverworks_set_dmamode(strupci_write_config_byte (pdev,0x54 , ultra_cfg); } -static struct scsi_host_template serverworks_sht = { +static struct scsi_host_template serverworks_osb4_sht = { +ATA_BMDMA_SHT (DRV_NAME ), + .sg_tablesize =LIBATA_DUMB_MAX_PRD , +}; + +static struct scsi_host_template serverworks_csb_sht = {ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations serverworks_osb4_port_ops = { .inherits = &ata_bmdma_port_ops, + .qc_prep = ata_bmdma_dumb_qc_prep, .cable_detect = serverworks_cable_detect, .mode_filter = serverworks_osb4_filter, .set_piomode = serverworks_set_piomode,
@@ -265,6 +271,7 @@ static struct ata_port_operations serverstatic struct ata_port_operations serverworks_csb_port_ops = { .inherits = &serverworks_osb4_port_ops, + .qc_prep = ata_bmdma_qc_prep, .mode_filter = serverworks_csb_filter, };
@@ -404,6 +411,7 @@ static int serverworks_init_one(struct p } };const struct ata_port_info *ppi[] = { &info[id->driver_data],NULL }; +struct scsi_host_template *sht = &serverworks_csb_sht;int rc; rc =pcim_enable_device (pdev);
@@ -417,6 +425,7 @@ static int serverworks_init_one(struct p/* Select non UDMA capable OSB4 if we can't do fixups */ if (rc <0 ) ppi[0 ] = &info[1 ]; + sht = &serverworks_osb4_sht; }/* setup CSB5/CSB6 : South Bridge and IDE option RAID */ else if ((pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE) ||
@@ -433,7 +442,7 @@ static int serverworks_init_one(struct p ppi[1 ] = &ata_dummy_port_info; } -return ata_pci_bmdma_init_one (pdev, ppi, &serverworks_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, sht,NULL ,0 ); }#ifdef CONFIG_PM_SLEEP
Greg Kroah-Hartman
maintainerPATCH 32/319 libata-sff: Fix controllers with no ctl port
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ondrej Zary <[email protected]>
commit 6d8ca28fa688a9354bc9fbc935bdaeb3651b6677 upstream.
Currently, ata_sff_softreset is skipped for controllers with no ctl port. But that also skips ata_sff_dev_classify required for device detection. This means that libata is currently broken on controllers with no ctl port.
No device connected:
[ 1.872480] pata_isapnp 01:01.02: activated [ 1.889823] scsi2 : pata_isapnp [ 1.890109] ata3: PATA max PIO0 cmd 0x1e8 ctl 0x0 irq 11 [ 6.888110] ata3.01: qc timeout (cmd 0xec) [ 6.888179] ata3.01: failed to IDENTIFY (I/O error, err_mask=0x5) [ 16.888085] ata3.01: qc timeout (cmd 0xec) [ 16.888147] ata3.01: failed to IDENTIFY (I/O error, err_mask=0x5) [ 46.888086] ata3.01: qc timeout (cmd 0xec) [ 46.888148] ata3.01: failed to IDENTIFY (I/O error, err_mask=0x5) [ 51.888100] ata3.00: qc timeout (cmd 0xec) [ 51.888160] ata3.00: failed to IDENTIFY (I/O error, err_mask=0x5) [ 61.888079] ata3.00: qc timeout (cmd 0xec) [ 61.888141] ata3.00: failed to IDENTIFY (I/O error, err_mask=0x5) [ 91.888089] ata3.00: qc timeout (cmd 0xec) [ 91.888152] ata3.00: failed to IDENTIFY (I/O error, err_mask=0x5)
ATAPI device connected:
[ 1.882061] pata_isapnp 01:01.02: activated [ 1.893430] scsi2 : pata_isapnp [ 1.893719] ata3: PATA max PIO0 cmd 0x1e8 ctl 0x0 irq 11 [ 6.892107] ata3.01: qc timeout (cmd 0xec) [ 6.892171] ata3.01: failed to IDENTIFY (I/O error, err_mask=0x5) [ 16.892079] ata3.01: qc timeout (cmd 0xec) [ 16.892138] ata3.01: failed to IDENTIFY (I/O error, err_mask=0x5) [ 46.892079] ata3.01: qc timeout (cmd 0xec) [ 46.892138] ata3.01: failed to IDENTIFY (I/O error, err_mask=0x5) [ 46.908586] ata3.00: ATAPI: ACER CD-767E/O, V1.5X, max PIO2, CDB intr [ 46.924570] ata3.00: configured for PIO0 (device error ignored) [ 46.926295] scsi 2:0:0:0: CD-ROM ACER CD-767E/O 1.5X PQ: 0 ANSI: 5 [ 46.984519] sr0: scsi3-mmc drive: 6x/6x xa/form2 tray [ 46.984592] cdrom: Uniform CD-ROM driver Revision: 3.20
So don't skip ata_sff_softreset, just skip the reset part of ata_bus_softreset if the ctl port is not available.
This makes IDE port on ES968 behave correctly:
No device connected:
[ 4.670888] pata_isapnp 01:01.02: activated [ 4.673207] scsi host2: pata_isapnp [ 4.673675] ata3: PATA max PIO0 cmd 0x1e8 ctl 0x0 irq 11 [ 7.081840] Adding 2541652k swap on /dev/sda2. Priority:-1 extents:1 across:2541652k
ATAPI device connected:
[ 4.704362] pata_isapnp 01:01.02: activated [ 4.706620] scsi host2: pata_isapnp [ 4.706877] ata3: PATA max PIO0 cmd 0x1e8 ctl 0x0 irq 11 [ 4.872782] ata3.00: ATAPI: ACER CD-767E/O, V1.5X, max PIO2, CDB intr [ 4.888673] ata3.00: configured for PIO0 (device error ignored) [ 4.893984] scsi 2:0:0:0: CD-ROM ACER CD-767E/O 1.5X PQ: 0 ANSI: 5 [ 7.015578] Adding 2541652k swap on /dev/sda2. Priority:-1 extents:1 across:2541652k
--- drivers/ata/libata-sff.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/ata/libata-sff.c +9 -11
@@ -2008,13 +2008,15 @@ static int ata_bus_softreset(struct ata_DPRINTK ("ata%u: bus reset via SRST\n" , ap->print_id); -/* software reset. causes dev0 to be selected */ -iowrite8 (ap->ctl, ioaddr->ctl_addr); -udelay (20 );/* FIXME: flush */ -iowrite8 (ap->ctl |ATA_SRST , ioaddr->ctl_addr); -udelay (20 );/* FIXME: flush */ -iowrite8 (ap->ctl, ioaddr->ctl_addr); - ap->last_ctl = ap->ctl; +if (ap->ioaddr.ctl_addr) { +/* software reset. causes dev0 to be selected */ +iowrite8 (ap->ctl, ioaddr->ctl_addr); +udelay (20 );/* FIXME: flush */ +iowrite8 (ap->ctl |ATA_SRST , ioaddr->ctl_addr); +udelay (20 );/* FIXME: flush */ +iowrite8 (ap->ctl, ioaddr->ctl_addr); + ap->last_ctl = ap->ctl; + }/* wait the port to become ready */ return ata_sff_wait_after_reset (&ap->link, devmask, deadline);
@@ -2215,10 +2217,6 @@ void ata_sff_error_handler(struct ata_pospin_unlock_irqrestore (ap->lock, flags); -/* ignore ata_sff_softreset if ctl isn't accessible */ -if (softreset == ata_sff_softreset && !ap->ioaddr.ctl_addr) - softreset =NULL ; -/* ignore built-in hardresets if SCR access is not available */ if ((hardreset == sata_std_hardreset || hardreset == sata_sff_hardreset) && !sata_scr_valid (&ap->link))
Greg Kroah-Hartman
maintainerPATCH 33/319 ASoC: core: fix use after free in snd_soc_remove_platform()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Mack <[email protected]>
commit decc27b01d584c985c231e73d3b493de6ec07af8 upstream.
Coverity spotted an use-after-free condition in snd_soc_remove_platform(). Fix this by moving snd_soc_component_cleanup() after the debug print statement which uses the component's string.
--- sound/soc/soc-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-core.c +2 -2
@@ -4315,10 +4315,10 @@ void snd_soc_remove_platform(struct snd_snd_soc_component_del_unlocked (&platform->component);mutex_unlock (&client_mutex); -snd_soc_component_cleanup (&platform->component); -dev_dbg (platform->dev,"ASoC: Unregistered platform '%s'\n" , platform->component.name); + +snd_soc_component_cleanup (&platform->component); }EXPORT_SYMBOL_GPL (snd_soc_remove_platform);
Greg Kroah-Hartman
maintainerPATCH 34/319 ASoC: soc-dapm: fix use after free
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Mack <[email protected]>
commit e5092c96c9c28f4d12811edcd02ca8eec16e748e upstream.
Coverity spotted the following possible use-after-free condition in dapm_create_or_share_mixmux_kcontrol():
If kcontrol is NULL, and (wname_in_long_name && kcname_in_long_name) validates to true, 'name' will be set to an allocated string, and be freed a few lines later via the 'long_name' alias. 'name', however, is used by dev_err() in case snd_ctl_add() fails.
Fix this by adding a jump label that frees 'long_name' at the end of the function.
--- sound/soc/soc-dapm.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
sound/soc/soc-dapm.c +14 -11
@@ -591,9 +591,9 @@ static int dapm_create_or_share_mixmux_kint shared;struct snd_kcontrol *kcontrol;bool wname_in_long_name, kcname_in_long_name; -char *long_name; +char *long_name =NULL ;const char *name; -int ret; +int ret =0 ; prefix =soc_dapm_prefix (dapm);if (prefix)
@@ -652,15 +652,17 @@ static int dapm_create_or_share_mixmux_k kcontrol =snd_soc_cnew (&w->kcontrol_news[kci],NULL , name, prefix); -kfree (long_name); -if (!kcontrol) -return -ENOMEM ; +if (!kcontrol) { + ret = -ENOMEM ; + goto exit_free; + } + kcontrol->private_free = dapm_kcontrol_free; ret =dapm_kcontrol_data_alloc (w, kcontrol);if (ret) {snd_ctl_free_one (kcontrol); -return ret; + goto exit_free; } ret =snd_ctl_add (card, kcontrol);
@@ -668,17 +670,18 @@ static int dapm_create_or_share_mixmux_kdev_err (dapm->dev,"ASoC: failed to add widget %s dapm kcontrol %s: %d\n" , w->name, name, ret); -return ret; + goto exit_free; } } ret =dapm_kcontrol_add_widget (kcontrol, w); -if (ret) -return ret; +if (ret ==0 ) + w->kcontrols[kci] = kcontrol; - w->kcontrols[kci] = kcontrol; +exit_free: +kfree (long_name); -return 0 ; +return ret; }/* create new dapm mixer control */
Greg Kroah-Hartman
maintainerPATCH 35/319 ASoC: soc-pcm: fix sig_bits determination in soc_pcm_apply_msb()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Mack <[email protected]>
commit 5e63dfccf34d4dbf21429c4919f33c028ff49991 upstream.
In the SNDRV_PCM_STREAM_CAPTURE branch in soc_pcm_apply_msb(), look at sig_bits of the capture stream, not the playback one.
Spotted by coverity.
--- sound/soc/soc-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-pcm.c +1 -1
@@ -352,7 +352,7 @@ static void soc_pcm_apply_msb(struct snd }else {for (i =0 ; i < rtd->num_codecs; i++) { codec_dai = rtd->codec_dais[i]; -if (codec_dai->driver->playback.sig_bits ==0 ) { +if (codec_dai->driver->capture.sig_bits ==0 ) { bits =0 ;break ; }
Greg Kroah-Hartman
maintainerPATCH 36/319 ASoC: tlv320aic3x: fix PLL D configuration
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Lavnikevich <[email protected]>
commit 31d9f8faf9a54c851e835af489c82f45105a442f upstream.
Current caching implementation during regcache_sync() call bypasses all register writes of values that are already known as default (regmap reg_defaults). Same time in TLV320AIC3x codecs register 5 (AIC3X_PLL_PROGC_REG) write should be immediately followed by register 6 write (AIC3X_PLL_PROGD_REG) even if it was not changed. Otherwise both registers will not be written.
This brings to issue that appears particulary in case of 44.1kHz playback with 19.2MHz master clock. In this case AIC3X_PLL_PROGC_REG is 0x6e while AIC3X_PLL_PROGD_REG is 0x0 (same as register default). Thus AIC3X_PLL_PROGC_REG also remains not written and we get wrong playback speed.
In this patch snd_soc_read() is used to get cached pll values and snd_soc_write() (unlike regcache_sync() this function doesn't bypasses hardware default values) to write them to registers.
--- sound/soc/codecs/tlv320aic3x.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
sound/soc/codecs/tlv320aic3x.c +13 -0
@@ -1121,6 +1121,7 @@ static int aic3x_regulator_event(structstatic int aic3x_set_power (struct snd_soc_codec *codec,int power) {struct aic3x_priv *aic3x =snd_soc_codec_get_drvdata (codec); +unsigned int pll_c, pll_d;int ret;if (power) {
@@ -1138,6 +1139,18 @@ static int aic3x_set_power(struct snd_so/* Sync reg_cache with the hardware */ regcache_cache_only (aic3x->regmap, false);regcache_sync (aic3x->regmap); + +/* Rewrite paired PLL D registers in case cached sync skipped +* writing one of them and thus caused other one also not +* being written +*/ + pll_c =snd_soc_read (codec,AIC3X_PLL_PROGC_REG ); + pll_d =snd_soc_read (codec,AIC3X_PLL_PROGD_REG ); +if (pll_c == aic3x_reg[AIC3X_PLL_PROGC_REG ].def || + pll_d == aic3x_reg[AIC3X_PLL_PROGD_REG ].def) { +snd_soc_write (codec,AIC3X_PLL_PROGC_REG , pll_c); +snd_soc_write (codec,AIC3X_PLL_PROGD_REG , pll_d); + } }else {/* * Do soft reset to this codec instance in order to clear
Greg Kroah-Hartman
maintainerPATCH 37/319 ASoC: Intel: HSW/BDW only support S16 and S24 formats.
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liam Girdwood <[email protected]>
commit 2ccf3bd4f8b120936cdfc796baf40c5d3dfab68d upstream.
Fix driver with correct formats.
--- sound/soc/intel/sst-haswell-pcm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/soc/intel/sst-haswell-pcm.c +1 -3
@@ -693,9 +693,7 @@ static int hsw_pcm_new(struct snd_soc_pc }#define HSW_FORMATS \ - (SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S24_LE | \ - SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S16_LE |\ - SNDRV_PCM_FMTBIT_S8) + (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE)static struct snd_soc_dai_driver hsw_dais[] = { {
Greg Kroah-Hartman
maintainerPATCH 38/319 ASoC: adau1761: Fix input PGA volume
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <[email protected]>
commit 3b283f0893f55cb79e4507e5ec34e49c17d0a787 upstream.
For the input PGA to work correctly the ALC clock needs to be active. Otherwise volume changes are not applied.
--- sound/soc/codecs/adau1761.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/soc/codecs/adau1761.c +4 -0
@@ -405,6 +405,7 @@ static const struct snd_soc_dapm_widget 2, 0, NULL, 0),SND_SOC_DAPM_SUPPLY ("Slew Clock" ,ADAU1761_CLK_ENABLE0 ,6 ,0 ,NULL ,0 ), +SND_SOC_DAPM_SUPPLY ("ALC Clock" ,ADAU1761_CLK_ENABLE0 ,5 ,0 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY_S ("Digital Clock 0" ,1 ,ADAU1761_CLK_ENABLE1 , 0, 0, NULL, 0),
@@ -436,6 +437,9 @@ static const struct snd_soc_dapm_route a { "Right Playback Mixer", NULL, "Slew Clock" }, { "Left Playback Mixer", NULL, "Slew Clock" }, + { "Left Input Mixer", NULL, "ALC Clock" }, + { "Right Input Mixer", NULL, "ALC Clock" }, + { "Digital Clock 0", NULL, "SYSCLK" }, { "Digital Clock 1", NULL, "SYSCLK" }, };
Greg Kroah-Hartman
maintainerPATCH 39/319 mmc: core: sdio: Fix unconditional wake_up_process() on sdio thread
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fu Zhonghui <[email protected]>
commit dea67c4ec8218b301d7cac7ee6e63dac0bc566cb upstream.
781e989cf59 ("mmc: sdhci: convert to new SDIO IRQ handling") and bf3b5ec66bd ("mmc: sdio_irq: rework sdio irq handling") disabled the use of our own custom threaded IRQ handler, but left in an unconditional wake_up_process() on that handler at resume-time.
In addition, the check for MMC_CAP_SDIO_IRQ capability is added before enable sdio IRQ.
--- drivers/mmc/core/sdio.c | 12 ++++++++++-- drivers/mmc/core/sdio_irq.c | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-)
drivers/mmc/core/sdio.c +10 -2
@@ -992,8 +992,16 @@ static int mmc_sdio_resume(struct mmc_ho } } -if (!err && host->sdio_irqs) -wake_up_process (host->sdio_irq_thread); +if (!err && host->sdio_irqs) { +if (!(host->caps2 &MMC_CAP2_SDIO_IRQ_NOTHREAD )) { +wake_up_process (host->sdio_irq_thread); + }else if (host->caps &MMC_CAP_SDIO_IRQ ) { +mmc_host_clk_hold (host); + host->ops->enable_sdio_irq (host,1 ); +mmc_host_clk_release (host); + } + } +mmc_release_host (host); host->pm_flags &= ~MMC_PM_KEEP_POWER ;
drivers/mmc/core/sdio_irq.c +2 -2
@@ -208,7 +208,7 @@ static int sdio_card_irq_get(struct mmc_ host->sdio_irqs--;return err; } - }else { + }else if (host->caps &MMC_CAP_SDIO_IRQ ) {mmc_host_clk_hold (host); host->ops->enable_sdio_irq (host,1 );mmc_host_clk_release (host);
@@ -229,7 +229,7 @@ static int sdio_card_irq_put(struct mmc_if (!(host->caps2 &MMC_CAP2_SDIO_IRQ_NOTHREAD )) {atomic_set (&host->sdio_irq_thread_abort,1 );kthread_stop (host->sdio_irq_thread); - }else { + }else if (host->caps &MMC_CAP_SDIO_IRQ ) {mmc_host_clk_hold (host); host->ops->enable_sdio_irq (host,0 );mmc_host_clk_release (host);
Greg Kroah-Hartman
maintainerPATCH 40/319 mmc: sdhci-pxav3: set_uhs_signaling is initialized twice differently
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Griffin <[email protected]>
commit b315376573778b195e640a163675fb9f5937ddca upstream.
.set_uhs_signaling field is currently initialised twice once to the arch specific callback pxav3_set_uhs_signaling, and also to the generic sdhci_set_uhs_signaling callback.
This means that uhs is currently broken for this platform currently, as pxav3 has some special constriants which means it can't use the generic callback.
This happened in
commit 96d7b78cfc2f ("mmc: sdhci: convert sdhci_set_uhs_signaling() into a library function") commit a702c8abb2a9 ("mmc: host: split up sdhci-pxa, create sdhci-pxav3.c")'
Fix this and hopefully prevent it happening in the future by ensuring named initialisers always follow the declaration order in the structure definition.
--- drivers/mmc/host/sdhci-pxav3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/mmc/host/sdhci-pxav3.c +1 -2
@@ -224,12 +224,11 @@ static void pxav3_set_uhs_signaling(strustatic const struct sdhci_ops pxav3_sdhci_ops = { .set_clock = sdhci_set_clock, - .set_uhs_signaling = pxav3_set_uhs_signaling, .platform_send_init_74_clocks = pxav3_gen_init_74_clocks, .get_max_clock = sdhci_pltfm_clk_get_max_clock, .set_bus_width = sdhci_set_bus_width, .reset = pxav3_reset, - .set_uhs_signaling = sdhci_set_uhs_signaling, + .set_uhs_signaling = pxav3_set_uhs_signaling, };static struct sdhci_pltfm_data sdhci_pxav3_pdata = {
Greg Kroah-Hartman
maintainerPATCH 41/319 mmc: rtsx_usb_sdmmc: fix incorrect last byte in R2 response
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roger Tseng <[email protected]>
commit 6f67cc6fd1cf339a0f19b9d4a998ec3c0123b1b6 upstream.
Current code erroneously fill the last byte of R2 response with an undefined value. In addition, the controller actually 'offloads' the last byte (CRC7, end bit) while receiving R2 response and thus it's impossible to get the actual value. This could cause mmc stack to obtain inconsistent CID from the same card after resume and misidentify it as a different card.
Fix by assigning dummy CRC and end bit: {7'b0, 1} = 0x1 to the last byte of R2.
--- drivers/mmc/host/rtsx_usb_sdmmc.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/mmc/host/rtsx_usb_sdmmc.c +7 -0
@@ -435,6 +435,13 @@ static void sd_send_cmd_get_rsp(struct r }if (rsp_type ==SD_RSP_TYPE_R2 ) { +/* +* The controller offloads the last byte {CRC-7, end bit 1'b1} +* of response type R2. Assign dummy CRC, 0, and end bit to the +* byte(ptr[16], goes into the LSB of resp[3] later). +*/ + ptr[16 ] =1 ; +for (i =0 ; i <4 ; i++) { cmd->resp[i] =get_unaligned_be32 (ptr +1 + i *4 ); dev_dbg(sdmmc_dev(host), "cmd->resp[%d] = 0x%08x\n",
Greg Kroah-Hartman
maintainerPATCH 42/319 mmc: dont request CD IRQ until mmc_start_host()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Warren <[email protected]>
commit d4d11449088ee9aca16fd1884b852b8b73a4bda1 upstream.
As soon as the CD IRQ is requested, it can trigger, since it's an externally controlled event. If it does, delayed_work host->detect will be scheduled.
Many host controller probe()s are roughly structured as:
*_probe() {
host = sdhci_pltfm_init();
mmc_of_parse(host->mmc);
rc = sdhci_add_host(host);
if (rc) {
sdhci_pltfm_free();
return rc;
}In 3.17, CD IRQs can are enabled quite early via *_probe() -> mmc_of_parse() -> mmc_gpio_request_cd() -> mmc_gpiod_request_cd_irq().
Note that in linux-next, mmc_of_parse() calls mmc_gpio*d*_request_cd() rather than mmc_gpio_request_cd(), and mmc_gpio*d*_request_cd() doesn't call mmc_gpiod_request_cd_irq(). However, this issue still exists if mmc_gpio_request_cd() is called directly before mmc_start_host().
sdhci_add_host() may fail part way through (e.g. due to deferred probe for a vmmc regulator), and sdhci_pltfm_free() does nothing to unrequest the CD IRQ nor cancel the delayed_work. sdhci_pltfm_free() is coded to assume that if sdhci_add_host() failed, then the delayed_work cannot (or should not) have been triggered.
This can lead to the following with CONFIG_DEBUG_OBJECTS_* enabled, when kfree(host) is eventually called inside sdhci_pltfm_free():
WARNING: CPU: 2 PID: 6 at lib/debugobjects.c:263 debug_print_object+0x8c/0xb4() ODEBUG: free active (active state 0) object type: timer_list hint: delayed_work_timer_fn+0x0/0x18
The object being complained about is host->detect.
There's no need to request the CD IRQ so early; mmc_start_host() already requests it. For most SDHCI hosts at least, the typical call path that does this is: *_probe() -> sdhci_add_host() -> mmc_add_host() -> mmc_start_host(). Therefore, remove the call to mmc_gpiod_request_cd_irq() from mmc_gpio_request_cd(). This also matches mmc_gpio*d*_request_cd(), which already doesn't call mmc_gpiod_request_cd_irq().
However, some host controller drivers call mmc_gpio_request_cd() after mmc_start_host() has already been called, and assume that this will also call mmc_gpiod_request_cd_irq(). Update those drivers to explicitly call mmc_gpiod_request_cd_irq() themselves. Ideally, these drivers should be modified to move their call to mmc_gpio_request_cd() before their call to mmc_add_host(). However that's too large a change for stable.
This solves the problem (eliminates the kernel error message above), since it guarantees that the IRQ can't trigger before mmc_start_host() is called.
The critical point here is that once sdhci_add_host() calls mmc_add_host() -> mmc_start_host(), sdhci_add_host() is coded not to fail. In other words, if there's a chance that mmc_start_host() may have been called, and CD IRQs triggered, and the delayed_work scheduled, sdhci_add_host() won't fail, and so cleanup is no longer via sdhci_pltfm_free() (which doesn't free the IRQ or cancel the work queue) but instead must be via sdhci_remove_host(), which calls mmc_remove_host() -> mmc_stop_host(), which does free the IRQ and cancel the work queue.
--- drivers/mmc/core/slot-gpio.c | 2 -- drivers/mmc/host/mmc_spi.c | 1 + drivers/mmc/host/sdhci-sirf.c | 1 + drivers/mmc/host/tmio_mmc_pio.c | 1 + 4 files changed, 3 insertions(+), 2 deletions(-)
drivers/mmc/core/slot-gpio.c +0 -2
@@ -221,8 +221,6 @@ int mmc_gpio_request_cd(struct mmc_host ctx->override_cd_active_level = true; ctx->cd_gpio =gpio_to_desc (gpio); -mmc_gpiod_request_cd_irq (host); -return 0 ; }EXPORT_SYMBOL (mmc_gpio_request_cd);
drivers/mmc/host/mmc_spi.c +1 -0
@@ -1436,6 +1436,7 @@ static int mmc_spi_probe(struct spi_devi host->pdata->cd_debounce);if (status !=0 ) goto fail_add_host; +mmc_gpiod_request_cd_irq (mmc); }if (host->pdata && host->pdata->flags &MMC_SPI_USE_RO_GPIO ) {
drivers/mmc/host/sdhci-sirf.c +1 -0
@@ -94,6 +94,7 @@ static int sdhci_sirf_probe(struct platf ret); goto err_request_cd; } +mmc_gpiod_request_cd_irq (host->mmc); }return 0 ;
drivers/mmc/host/tmio_mmc_pio.c +1 -0
@@ -1103,6 +1103,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_tmio_mmc_host_remove (_host);return ret; } +mmc_gpiod_request_cd_irq (mmc); } *host = _host;
Greg Kroah-Hartman
maintainerPATCH 43/319 mmc: rtsx_pci_sdmmc: fix incorrect last byte in R2 response
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roger Tseng <[email protected]>
commit d1419d50c1bf711e9fd27b516a739c86b23f7cf9 upstream.
Current code erroneously fill the last byte of R2 response with an undefined value. In addition, the controller actually 'offloads' the last byte (CRC7, end bit) while receiving R2 response and thus it's impossible to get the actual value. This could cause mmc stack to obtain inconsistent CID from the same card after resume and misidentify it as a different card.
Fix by assigning dummy CRC and end bit: {7'b0, 1} = 0x1 to the last byte of R2.
--- drivers/mmc/host/rtsx_pci_sdmmc.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/mmc/host/rtsx_pci_sdmmc.c +7 -0
@@ -412,6 +412,13 @@ static void sd_send_cmd_get_rsp(struct r }if (rsp_type ==SD_RSP_TYPE_R2 ) { +/* +* The controller offloads the last byte {CRC-7, end bit 1'b1} +* of response type R2. Assign dummy CRC, 0, and end bit to the +* byte(ptr[16], goes into the LSB of resp[3] later). +*/ + ptr[16 ] =1 ; +for (i =0 ; i <4 ; i++) { cmd->resp[i] =get_unaligned_be32 (ptr +1 + i *4 ); dev_dbg(sdmmc_dev(host), "cmd->resp[%d] = 0x%08x\n",
Greg Kroah-Hartman
maintainerPATCH 44/319 mmc: sdhci-s3c: fix runtime PM handling on sdhci_add_host() failure
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bartlomiej Zolnierkiewicz <[email protected]>
commit 221414db1934c1c883501998f510bb75acfbaa51 upstream.
Runtime Power Management handling for the sdhci_add_host() failure case in sdhci_s3c_probe() should match the code in sdhci_s3c_remove() (which uses pm_runtime_disable() call which matches the earlier pm_runtime_enable() one). Fix it.
This patch fixes "BUG: spinlock bad magic on CPU#0, swapper/0/1" and "Unbalanced pm_runtime_enable!" warnings.
Quoted 1 line
Quoted 1 line
From the kernel log:
...
[ 1.659631] s3c-sdhci 12530000.sdhci: sdhci_add_host() failed [ 1.665096] BUG: spinlock bad magic on CPU#0, swapper/0/1 [ 1.670433] lock: 0xea01e484, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0 [ 1.677895] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.16.0-next-20140804-00008-ga59480f-dirty #707 [ 1.687037] [<c0013ae4>] (unwind_backtrace) from [<c0010d70>] (show_stack+0x10/0x14) [ 1.694740] [<c0010d70>] (show_stack) from [<c04050c8>] (dump_stack+0x68/0xb8) [ 1.701948] [<c04050c8>] (dump_stack) from [<c0052558>] (do_raw_spin_lock+0x15c/0x1a4) [ 1.709848] [<c0052558>] (do_raw_spin_lock) from [<c040a630>] (_raw_spin_lock_irqsave+0x20/0x28) [ 1.718619] [<c040a630>] (_raw_spin_lock_irqsave) from [<c030d7d0>] (sdhci_do_set_ios+0x1c/0x5cc) [ 1.727464] [<c030d7d0>] (sdhci_do_set_ios) from [<c030ddfc>] (sdhci_runtime_resume_host+0x50/0x104) [ 1.736574] [<c030ddfc>] (sdhci_runtime_resume_host) from [<c02462dc>] (pm_generic_runtime_resume+0x2c/0x40) [ 1.746383] [<c02462dc>] (pm_generic_runtime_resume) from [<c0247898>] (__rpm_callback+0x34/0x70) [ 1.755233] [<c0247898>] (__rpm_callback) from [<c02478fc>] (rpm_callback+0x28/0x88) [ 1.762958] [<c02478fc>] (rpm_callback) from [<c02486f0>] (rpm_resume+0x384/0x4ec) [ 1.770511] [<c02486f0>] (rpm_resume) from [<c02488b0>] (pm_runtime_forbid+0x58/0x64) [ 1.778325] [<c02488b0>] (pm_runtime_forbid) from [<c030ea70>] (sdhci_s3c_probe+0x4a4/0x540) [ 1.786749] [<c030ea70>] (sdhci_s3c_probe) from [<c02429cc>] (platform_drv_probe+0x2c/0x5c) [ 1.795076] [<c02429cc>] (platform_drv_probe) from [<c02415f0>] (driver_probe_device+0x114/0x234) [ 1.803929] [<c02415f0>] (driver_probe_device) from [<c024179c>] (__driver_attach+0x8c/0x90) [ 1.812347] [<c024179c>] (__driver_attach) from [<c023ffb4>] (bus_for_each_dev+0x54/0x88) [ 1.820506] [<c023ffb4>] (bus_for_each_dev) from [<c0240df8>] (bus_add_driver+0xd8/0x1cc) [ 1.828665] [<c0240df8>] (bus_add_driver) from [<c0241db8>] (driver_register+0x78/0xf4) [ 1.836652] [<c0241db8>] (driver_register) from [<c00088a4>] (do_one_initcall+0x80/0x1d0) [ 1.844816] [<c00088a4>] (do_one_initcall) from [<c059ac94>] (kernel_init_freeable+0x108/0x1d4) [ 1.853503] [<c059ac94>] (kernel_init_freeable) from [<c0401300>] (kernel_init+0x8/0xe4) [ 1.861568] [<c0401300>] (kernel_init) from [<c000e538>] (ret_from_fork+0x14/0x3c) [ 1.869582] platform 12530000.sdhci: Driver s3c-sdhci requests probe deferral ... [ 1.997047] s3c-sdhci 12530000.sdhci: Unbalanced pm_runtime_enable! ... [ 2.027235] s3c-sdhci 12530000.sdhci: sdhci_add_host() failed [ 2.032884] platform 12530000.sdhci: Driver s3c-sdhci requests probe deferral
...
Tested on Hardkernel's Exynos4412 based ODROID-U3 board.
--- drivers/mmc/host/sdhci-s3c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-s3c.c +2 -2
@@ -606,8 +606,6 @@ static int sdhci_s3c_probe(struct platfo ret =sdhci_add_host (host);if (ret) {dev_err (dev,"sdhci_add_host() failed\n" ); -pm_runtime_forbid (&pdev->dev); -pm_runtime_get_noresume (&pdev->dev); goto err_req_regs; }
@@ -618,6 +616,8 @@ static int sdhci_s3c_probe(struct platforeturn 0 ; err_req_regs: +pm_runtime_disable (&pdev->dev); + err_no_busclks:clk_disable_unprepare (sc->clk_io);
Greg Kroah-Hartman
maintainerPATCH 45/319 fs: make cont_expand_zero interruptible
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit c2ca0fcd202863b14bd041a7fece2e789926c225 upstream.
This patch makes it possible to kill a process looping in cont_expand_zero. A process may spend a lot of time in this function, so it is desirable to be able to kill it.
It happened to me that I wanted to copy a piece data from the disk to a file. By mistake, I used the "seek" parameter to dd instead of "skip". Due to the "seek" parameter, dd attempted to extend the file and became stuck doing so - the only possibility was to reset the machine or wait many hours until the filesystem runs out of space and cont_expand_zero fails. We need this patch to be able to terminate the process.
--- fs/buffer.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/buffer.c +5 -0
@@ -2318,6 +2318,11 @@ static int cont_expand_zero(struct file err =0 ;balance_dirty_pages_ratelimited (mapping); + +if (unlikely (fatal_signal_pending (current))) { + err = -EINTR ; + goto out; + } }/* page covers the boundary, find the boundary offset */
Greg Kroah-Hartman
maintainerPATCH 46/319 fs: Fix theoretical division by 0 in super_cache_scan().
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tetsuo Handa <[email protected]>
commit 475d0db742e3755c6b267f48577ff7cbb7dfda0d upstream.
total_objects could be 0 and is used as a denom.
While total_objects is a "long", total_objects == 0 unlikely happens for 3.12 and later kernels because 32-bit architectures would not be able to hold (1 << 32) objects. However, total_objects == 0 may happen for kernels between 3.1 and 3.11 because total_objects in prune_super() was an "int" and (e.g.) x86_64 architecture might be able to hold (1 << 32) objects.
--- fs/super.c | 2 ++ 1 file changed, 2 insertions(+)
fs/super.c +2 -0
@@ -80,6 +80,8 @@ static unsigned long super_cache_scan(st inodes =list_lru_count_node (&sb->s_inode_lru, sc->nid); dentries =list_lru_count_node (&sb->s_dentry_lru, sc->nid); total_objects = dentries + inodes + fs_objects +1 ; +if (!total_objects) + total_objects =1 ;/* proportion the scan between the caches */ dentries =mult_frac (sc->nr_to_scan, dentries, total_objects);
Greg Kroah-Hartman
maintainerPATCH 47/319 fs: allow open(dir, O_TMPFILE|..., 0) with mode 0
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Rannaud <[email protected]>
commit 69a91c237ab0ebe4e9fdeaf6d0090c85275594ec upstream.
The man page for open(2) indicates that when O_CREAT is specified, the 'mode' argument applies only to future accesses to the file:
Note that this mode applies only to future accesses of the newly created file; the open() call that creates a read-only file may well return a read/write file descriptor.
The man page for open(2) implies that 'mode' is treated identically by O_CREAT and O_TMPFILE.
O_TMPFILE, however, behaves differently:
int fd = open("/tmp", O_TMPFILE | O_RDWR, 0);
assert(fd == -1);
assert(errno == EACCES);
int fd = open("/tmp", O_TMPFILE | O_RDWR, 0600);
assert(fd > 0);For O_CREAT, do_last() sets acc_mode to MAY_OPEN only:
if (*opened & FILE_CREATED) {
/* Don't check for write permission, don't truncate */
open_flag &= ~O_TRUNC;
will_truncate = false;
acc_mode = MAY_OPEN;
path_to_nameidata(path, nd);
goto finish_open_created;
}But for O_TMPFILE, do_tmpfile() passes the full op->acc_mode to may_open().
This patch lines up the behavior of O_TMPFILE with O_CREAT. After the inode is created, may_open() is called with acc_mode = MAY_OPEN, in do_tmpfile().
A different, but related glibc bug revealed the discrepancy:
https://sourceware.org/bugzilla/show_bug.cgi?id=17523
The glibc lazily loads the 'mode' argument of open() and openat() using va_arg() only if O_CREAT is present in 'flags' (to support both the 2 argument and the 3 argument forms of open; same idea for openat()). However, the glibc ignores the 'mode' argument if O_TMPFILE is in 'flags'.
On x86_64, for open(), it magically works anyway, as 'mode' is in RDX when entering open(), and is still in RDX on SYSCALL, which is where the kernel looks for the 3rd argument of a syscall.
But openat() is not quite so lucky: 'mode' is in RCX when entering the glibc wrapper for openat(), while the kernel looks for the 4th argument of a syscall in R10. Indeed, the syscall calling convention differs from the regular calling convention in this respect on x86_64. So the kernel sees mode = 0 when trying to use glibc openat() with O_TMPFILE, and fails with EACCES.
--- fs/namei.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/namei.c +2 -1
@@ -3154,7 +3154,8 @@ static int do_tmpfile(int dfd, struct fiif (error) goto out2;audit_inode (pathname, nd->path.dentry,0 ); - error =may_open (&nd->path, op->acc_mode, op->open_flag); +/* Don't check for other permissions, the inode was just created */ + error =may_open (&nd->path,MAY_OPEN , op->open_flag);if (error) goto out2; file->f_path.mnt = nd->path.mnt;
Greg Kroah-Hartman
maintainerPATCH 48/319 UBIFS: fix a race condition
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Artem Bityutskiy <[email protected]>
commit 052c28073ff26f771d44ef33952a41d18dadd255 upstream.
Hu ([email protected]) discovered a race condition which may lead to a situation when UBIFS is unable to mount the file-system after an unclean reboot. The problem is theoretical, though.
In UBIFS, we have the log, which basically a set of LEBs in a certain area. The log has the tail and the head.
Every time user writes data to the file-system, the UBIFS journal grows, and the log grows as well, because we append new reference nodes to the head of the log. So the head moves forward all the time, while the log tail stays at the same position.
At any time, the UBIFS master node points to the tail of the log. When we mount the file-system, we scan the log, and we always start from its tail, because this is where the master node points to. The only occasion when the tail of the log changes is the commit operation.
The commit operation has 2 phases - "commit start" and "commit end". The former is relatively short, and does not involve much I/O. During this phase we mostly just build various in-memory lists of the things which have to be written to the flash media during "commit end" phase.
During the commit start phase, what we do is we "clean" the log. Indeed, the commit operation will index all the data in the journal, so the entire journal "disappears", and therefore the data in the log become unneeded. So we just move the head of the log to the next LEB, and write the CS node there. This LEB will be the tail of the new log when the commit operation finishes.
When the "commit start" phase finishes, users may write more data to the file-system, in parallel with the ongoing "commit end" operation. At this point the log tail was not changed yet, it is the same as it had been before we started the commit. The log head keeps moving forward, though.
The commit operation now needs to write the new master node, and the new master node should point to the new log tail. After this the LEBs between the old log tail and the new log tail can be unmapped and re-used again.
And here is the possible problem. We do 2 operations: (a) We first update the log tail position in memory (see 'ubifs_log_end_commit()'). (b) And then we write the master node (see the big lock of code in 'do_commit()').
But nothing prevents the log head from moving forward between (a) and (b), and the log head may "wrap" now to the old log tail. And when the "wrap" happens, the contends of the log tail gets erased. Now a power cut happens and we are in trouble. We end up with the old master node pointing to the old tail, which was erased. And replay fails because it expects the master node to point to the correct log tail at all times.
This patch merges the abovementioned (a) and (b) operations by moving the master node change code to the 'ubifs_log_end_commit()' function, so that it runs with the log mutex locked, which will prevent the log from being changed benween operations (a) and (b).
--- fs/ubifs/commit.c | 8 +++----- fs/ubifs/log.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 8 deletions(-)
fs/ubifs/commit.c +3 -5
@@ -166,10 +166,6 @@ static int do_commit(struct ubifs_info * err =ubifs_orphan_end_commit (c);if (err) goto out; - old_ltail_lnum = c->ltail_lnum; - err =ubifs_log_end_commit (c, new_ltail_lnum); -if (err) - goto out; err =dbg_check_old_index (c, &zroot);if (err) goto out;
@@ -202,7 +198,9 @@ static int do_commit(struct ubifs_info * c->mst_node->flags |=cpu_to_le32 (UBIFS_MST_NO_ORPHS ); else c->mst_node->flags &= ~cpu_to_le32(UBIFS_MST_NO_ORPHS); - err =ubifs_write_master (c); + + old_ltail_lnum = c->ltail_lnum; + err =ubifs_log_end_commit (c, new_ltail_lnum);if (err) goto out;
fs/ubifs/log.c +8 -3
@@ -447,9 +447,9 @@ out:* @ltail_lnum: new log tail LEB number * * This function is called on when the commit operation was finished. It -* moves log tail to new position and unmaps LEBs which contain obsolete data. -* Returns zero in case of success and a negative error code in case of -* failure. +* moves log tail to new position and updates the master node so that it stores +* the new log tail LEB number. Returns zero in case of success and a negative +* error code in case of failure. */ int ubifs_log_end_commit (struct ubifs_info *c,int ltail_lnum) {
@@ -477,7 +477,12 @@ int ubifs_log_end_commit(struct ubifs_inspin_unlock (&c->buds_lock); err =dbg_check_bud_bytes (c); +if (err) + goto out; + err =ubifs_write_master (c); + +out:mutex_unlock (&c->log_mutex);return err; }
Greg Kroah-Hartman
maintainerPATCH 49/319 UBIFS: fix free log space calculation
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Artem Bityutskiy <[email protected]>
commit ba29e721eb2df6df8f33c1f248388bb037a47914 upstream.
Hu (hujianyang <[email protected]>) discovered an issue in the 'empty_log_bytes()' function, which calculates how many bytes are left in the log:
"
If 'c->lhead_lnum + 1 == c->ltail_lnum' and 'c->lhead_offs == c->leb_size', 'h' would equalent to 't' and 'empty_log_bytes()' would return 'c->log_bytes' instead of 0.
"
At this point it is not clear what would be the consequences of this, and whether this may lead to any problems, but this patch addresses the issue just in case.
--- fs/ubifs/log.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/ubifs/log.c +6 -2
@@ -106,10 +106,14 @@ static inline long long empty_log_bytes( h = (long long )c->lhead_lnum * c->leb_size + c->lhead_offs; t = (long long )c->ltail_lnum * c->leb_size; -if (h >= t) +if (h > t)return c->log_bytes - h + t; -else +else if (h != t)return t - h; +else if (c->lhead_lnum != c->ltail_lnum) +return 0 ; +else +return c->log_bytes; }/**
Greg Kroah-Hartman
maintainerPATCH 50/319 vfs: fix data corruption when blocksize < pagesize for mmaped data
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 90a8020278c1598fafd071736a0846b38510309c upstream.
->page_mkwrite() is used by filesystems to allocate blocks under a page which is becoming writeably mmapped in some process' address space. This allows a filesystem to return a page fault if there is not enough space available, user exceeds quota or similar problem happens, rather than silently discarding data later when writepage is called.
However VFS fails to call ->page_mkwrite() in all the cases where filesystems need it when blocksize < pagesize. For example when blocksize = 1024, pagesize = 4096 the following is problematic:
ftruncate(fd, 0);
pwrite(fd, buf, 1024, 0);
map = mmap(NULL, 1024, PROT_WRITE, MAP_SHARED, fd, 0);
map[0] = 'a'; ----> page_mkwrite() for index 0 is called
ftruncate(fd, 10000); /* or even pwrite(fd, buf, 1, 10000) */ mremap(map, 1024, 10000, 0);
map[4095] = 'a'; ----> no page_mkwrite() called
At the moment ->page_mkwrite() is called, filesystem can allocate only one block for the page because i_size == 1024. Otherwise it would create blocks beyond i_size which is generally undesirable. But later at ->writepage() time, we also need to store data at offset 4095 but we don't have block allocated for it.
This patch introduces a helper function filesystems can use to have ->page_mkwrite() called at all the necessary moments.
--- fs/buffer.c | 3 ++ include/linux/mm.h | 1 mm/truncate.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+)
fs/buffer.c +3 -0
@@ -2082,6 +2082,7 @@ int generic_write_end(struct file *file, struct page *page, void *fsdata) { struct inode *inode = mapping->host; +loff_t old_size = inode->i_size;int i_size_changed =0 ; copied =block_write_end (file, mapping, pos, len, copied, page, fsdata);
@@ -2101,6 +2102,8 @@ int generic_write_end(struct file *file,unlock_page (page);page_cache_release (page); +if (old_size < pos) +pagecache_isize_extended (inode, old_size, pos);/* * Don't mark the inode dirty under page lock. First, it unnecessarily * makes the holding time of page lock longer. Second, it forces lock
include/linux/mm.h +1 -0
@@ -1174,6 +1174,7 @@ static inline void unmap_shared_mapping_extern void truncate_pagecache (struct inode *inode,loff_t new);extern void truncate_setsize (struct inode *inode,loff_t newsize); +void pagecache_isize_extended (struct inode *inode,loff_t from,loff_t to);void truncate_pagecache_range (struct inode *inode,loff_t offset,loff_t end);int truncate_inode_page (struct address_space *mapping,struct page *page);int generic_error_remove_page (struct address_space *mapping,struct page *page);
mm/truncate.c +57 -0
75 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 51/319 x86: Reject x32 executables if x32 ABI not supported
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
commit 0e6d3112a4e95d55cf6dca88f298d5f4b8f29bd1 upstream.
It is currently possible to execve() an x32 executable on an x86_64 kernel that has only ia32 compat enabled. However all its syscalls will fail, even _exit(). This usually causes it to segfault.
Change the ELF compat architecture check so that x32 executables are rejected if we don't support the x32 ABI.
--- arch/x86/include/asm/elf.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/include/asm/elf.h +3 -2
@@ -160,8 +160,9 @@ do { \#define elf_check_arch (x) \ ((x)->e_machine == EM_X86_64) -#define compat_elf_check_arch (x) \ - (elf_check_arch_ia32(x) || (x)->e_machine == EM_X86_64) +#define compat_elf_check_arch (x) \ + (elf_check_arch_ia32(x) || \ + (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64))#if __USER32_DS != __USER_DS# error "The following code assumes __USER32_DS == __USER_DS"
Greg Kroah-Hartman
maintainerPATCH 52/319 x86, fpu: __restore_xstate_sig()->math_state_restore() needs preempt_disable()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
commit df24fb859a4e200d9324e2974229fbb7adf00aef upstream.
Add preempt_disable() + preempt_enable() around math_state_restore() in __restore_xstate_sig(). Otherwise __switch_to() after __thread_fpu_begin() can overwrite fpu->state we are going to restore.
--- arch/x86/kernel/xsave.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/kernel/xsave.c +4 -1
@@ -402,8 +402,11 @@ int __restore_xstate_sig(void __user *buset_used_math (); } -if (use_eager_fpu ()) +if (use_eager_fpu ()) { +preempt_disable ();math_state_restore (); +preempt_enable (); + }return err; }else {
Greg Kroah-Hartman
maintainerPATCH 53/319 x86, fpu: shift drop_init_fpu() from save_xstate_sig() to handle_signal()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
commit 66463db4fc5605d51c7bb81d009d5bf30a783a2c upstream.
save_xstate_sig()->drop_init_fpu() doesn't look right. setup_rt_frame() can fail after that, in this case the next setup_rt_frame() triggered by SIGSEGV won't save fpu simply because the old state was lost. This obviously mean that fpu won't be restored after sys_rt_sigreturn() from SIGSEGV handler.
Shift drop_init_fpu() into !failed branch in handle_signal().
Test-case (needs -O2):
#include <stdio.h>
#include <signal.h>
#include <unistd.h>
#include <sys/syscall.h>
#include <sys/mman.h>
#include <pthread.h>
#include <assert.h>
volatile double D;
void test(double d)
{
int pid = getpid();
for (D = d; D == d; ) {
/* sys_tkill(pid, SIGHUP); asm to avoid save/reload
* fp regs around "C" call */
asm ("" : : "a"(200), "D"(pid), "S"(1));
asm ("syscall" : : : "ax");
}
printf("ERR!!\n");
}
void sigh(int sig)
{
}
char altstack[4096 * 10] __attribute__((aligned(4096)));
void *tfunc(void *arg)
{
for (;;) {
mprotect(altstack, sizeof(altstack), PROT_READ);
mprotect(altstack, sizeof(altstack), PROT_READ|PROT_WRITE);
}
}
int main(void)
{
stack_t st = {
.ss_sp = altstack,
.ss_size = sizeof(altstack),
.ss_flags = SS_ONSTACK,
};
struct sigaction sa = {
.sa_handler = sigh,
};
pthread_t pt;
sigaction(SIGSEGV, &sa, NULL);
sigaltstack(&st, NULL);
sa.sa_flags = SA_ONSTACK;
sigaction(SIGHUP, &sa, NULL);
pthread_create(&pt, NULL, tfunc, NULL);
test(123.456);
return 0;
}--- arch/x86/kernel/signal.c | 5 +++++ arch/x86/kernel/xsave.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-)
arch/x86/kernel/signal.c +5 -0
@@ -675,6 +675,11 @@ handle_signal(struct ksignal *ksig, stru* handler too. */ regs->flags &= ~(X86_EFLAGS_DF |X86_EFLAGS_RF |X86_EFLAGS_TF ); +/* +* Ensure the signal handler starts with the new fpu state. +*/ +if (used_math ()) +drop_init_fpu (current); }signal_setup_done (failed, ksig,test_thread_flag (TIF_SINGLESTEP )); }
arch/x86/kernel/xsave.c +0 -2
@@ -271,8 +271,6 @@ int save_xstate_sig(void __user *buf, voif (use_fxsr () &&save_xstate_epilog (buf_fx, ia32_fxstate))return -1 ; -drop_init_fpu (tsk);/* trigger finit */ -return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 54/319 x86_64, entry: Filter RFLAGS.NT on entry from userspace
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Lutomirski <[email protected]>
commit 8c7aa698baca5e8f1ba9edb68081f1e7a1abf455 upstream.
The NT flag doesn't do anything in long mode other than causing IRET to #GP. Oddly, CPL3 code can still set NT using popf.
Entry via hardware or software interrupt clears NT automatically, so the only relevant entries are fast syscalls.
If user code causes kernel code to run with NT set, then there's at least some (small) chance that it could cause trouble. For example, user code could cause a call to EFI code with NT set, and who knows what would happen? Apparently some games on Wine sometimes do this (!), and, if an IRET return happens, they will segfault. That segfault cannot be handled, because signal delivery fails, too.
This patch programs the CPU to clear NT on entry via SYSCALL (both 32-bit and 64-bit, by my reading of the AMD APM), and it clears NT in software on entry via SYSENTER.
To save a few cycles, this borrows a trick from Jan Beulich in Xen:
it checks whether NT is set before trying to clear it. As a result, it seems to have very little effect on SYSENTER performance on my machine.
There's another minor bug fix in here: it looks like the CFI annotations were wrong if CONFIG_AUDITSYSCALL=n.
Testers beware: on Xen, SYSENTER with NT set turns into a GPF.
I haven't touched anything on 32-bit kernels.
The syscall mask change comes from a variant of this patch by Anish Bhatt.
Note to stable maintainers: there is no known security issue here. A misguided program can set NT and cause the kernel to try and fail to deliver SIGSEGV, crashing the program. This patch fixes Far Cry on Wine: https://bugs.winehq.org/show_bug.cgi?id=33275
--- arch/x86/ia32/ia32entry.S | 18 +++++++++++++++++- arch/x86/kernel/cpu/common.c | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-)
arch/x86/ia32/ia32entry.S +17 -1
@@ -151,6 +151,16 @@ ENTRY(ia32_sysenter_target) 1: movl (%rbp),%ebp _ASM_EXTABLE(1b,ia32_badarg) ASM_CLAC + + /* + * Sysenter doesn't filter flags, so we need to clear NT + * ourselves. To save a few cycles, we can check whether + * NT was set instead of doing an unconditional popfq. + */ + testl $X86_EFLAGS_NT,EFLAGS(%rsp) /* saved EFLAGS match cpu */ + jnz sysenter_fix_flags +sysenter_flags_fixed: + orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET) testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET) CFI_REMEMBER_STATE
@@ -184,6 +194,8 @@ sysexit_from_sys_call: TRACE_IRQS_ON ENABLE_INTERRUPTS_SYSEXIT32 + CFI_RESTORE_STATE + #ifdef CONFIG_AUDITSYSCALL .macro auditsys_entry_common movl %esi,%r9d /* 6th arg: 4th syscall arg */
@@ -226,7 +238,6 @@ sysexit_from_sys_call: .endm sysenter_auditsys: - CFI_RESTORE_STATE auditsys_entry_common movl %ebp,%r9d /* reload 6th syscall arg */ jmp sysenter_dispatch
@@ -235,6 +246,11 @@ sysexit_audit: auditsys_exit sysexit_from_sys_call #endif +sysenter_fix_flags: + pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) + popfq_cfi + jmp sysenter_flags_fixed + sysenter_tracesys: #ifdef CONFIG_AUDITSYSCALL testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
arch/x86/kernel/cpu/common.c +1 -1
@@ -1184,7 +1184,7 @@ void syscall_init(void)/* Flags to clear on syscall */ wrmsrl (MSR_SYSCALL_MASK ,X86_EFLAGS_TF |X86_EFLAGS_DF |X86_EFLAGS_IF | -X86_EFLAGS_IOPL |X86_EFLAGS_AC ); +X86_EFLAGS_IOPL |X86_EFLAGS_AC |X86_EFLAGS_NT ); }/*
Greg Kroah-Hartman
maintainerPATCH 55/319 x86_64, entry: Fix out of bounds read on sysenter
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Lutomirski <[email protected]>
commit 653bc77af60911ead1f423e588f54fc2547c4957 upstream.
Rusty noticed a Really Bad Bug (tm) in my NT fix. The entry code reads out of bounds, causing the NT fix to be unreliable. But, and this is much, much worse, if your stack is somehow just below the top of the direct map (or a hole), you read out of bounds and crash.
Excerpt from the crash:
[ 1.129513] RSP: 0018:ffff88001da4bf88 EFLAGS: 00010296
2b:* f7 84 24 90 00 00 00 testl $0x4000,0x90(%rsp)
That read is deterministically above the top of the stack. I thought I even single-stepped through this code when I wrote it to check the offset, but I clearly screwed it up.
--- arch/x86/ia32/ia32entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/ia32/ia32entry.S +1 -1
@@ -157,7 +157,7 @@ ENTRY(ia32_sysenter_target) * ourselves. To save a few cycles, we can check whether * NT was set instead of doing an unconditional popfq. */ - testl $X86_EFLAGS_NT,EFLAGS(%rsp) /* saved EFLAGS match cpu */ + testl $X86_EFLAGS_NT,EFLAGS-ARGOFFSET(%rsp) jnz sysenter_fix_flags sysenter_flags_fixed:
Greg Kroah-Hartman
maintainerPATCH 56/319 x86, pageattr: Prevent overflow in slow_virt_to_phys() for X86_PAE
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dexuan Cui <[email protected]>
commit d1cd1210834649ce1ca6bafe5ac25d2f40331343 upstream.
pte_pfn() returns a PFN of long (32 bits in 32-PAE), so "long << PAGE_SHIFT" will overflow for PFNs above 4GB.
Due to this issue, some Linux 32-PAE distros, running as guests on Hyper-V, with 5GB memory assigned, can't load the netvsc driver successfully and hence the synthetic network device can't work (we can use the kernel parameter mem=3000M to work around the issue).
Cast pte_pfn() to phys_addr_t before shifting.
--- arch/x86/mm/pageattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/mm/pageattr.c +1 -1
@@ -409,7 +409,7 @@ phys_addr_t slow_virt_to_phys(void *__vi psize =page_level_size (level); pmask =page_level_mask (level); offset = virt_addr & ~pmask; - phys_addr =pte_pfn (*pte) <<PAGE_SHIFT ; + phys_addr = (phys_addr_t )pte_pfn (*pte) <<PAGE_SHIFT ;return (phys_addr | offset); }EXPORT_SYMBOL_GPL (slow_virt_to_phys);
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Greg Kroah-Hartman
maintainerPATCH 57/319 perf: Fix unclone_ctx() vs. locking
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 211de6eba8960521e2be450a7d07db85fba4604c upstream.
The idiot who did 4a1c0f262f88 ("perf: Fix lockdep warning on process exit") forgot to pay attention and fix all similar cases. Do so now.
In particular, unclone_ctx() must be called while holding ctx->lock, therefore all such sites are broken for the same reason. Pull the put_ctx() call out from under ctx->lock.
--- kernel/events/core.c | 54 +++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 23 deletions(-)
kernel/events/core.c +31 -23
@@ -902,13 +902,23 @@ static void put_ctx(struct perf_event_co } } -static void unclone_ctx (struct perf_event_context *ctx) +/* +* This must be done under the ctx->lock, such as to serialize against +* context_equiv(), therefore we cannot call put_ctx() since that might end up +* calling scheduler related locks and ctx->lock nests inside those. +*/ +static __must_check struct perf_event_context * +unclone_ctx (struct perf_event_context *ctx) { -if (ctx->parent_ctx) { -put_ctx (ctx->parent_ctx); +struct perf_event_context *parent_ctx = ctx->parent_ctx; + +lockdep_assert_held (&ctx->lock); + +if (parent_ctx) ctx->parent_ctx =NULL ; - } ctx->generation++; + +return parent_ctx; }static u32 perf_event_pid (struct perf_event *event,struct task_struct *p)
@@ -2210,6 +2220,9 @@ static void ctx_sched_out(struct perf_evstatic int context_equiv (struct perf_event_context *ctx1,struct perf_event_context *ctx2) { +lockdep_assert_held (&ctx1->lock); +lockdep_assert_held (&ctx2->lock); +/* Pinning disables the swap optimization */ if (ctx1->pin_count || ctx2->pin_count)return 0 ;
@@ -2943,6 +2956,7 @@ static int event_enable_on_exec(struct p*/ static void perf_event_enable_on_exec (struct perf_event_context *ctx) { +struct perf_event_context *clone_ctx =NULL ;struct perf_event *event;unsigned long flags;int enabled =0 ;
@@ -2974,7 +2988,7 @@ static void perf_event_enable_on_exec(st* Unclone this context if we enabled any event. */ if (enabled) -unclone_ctx (ctx); + clone_ctx =unclone_ctx (ctx);raw_spin_unlock (&ctx->lock);
@@ -2984,6 +2998,9 @@ static void perf_event_enable_on_exec(stperf_event_context_sched_in (ctx, ctx->task); out:local_irq_restore (flags); + +if (clone_ctx) +put_ctx (clone_ctx); }void perf_event_exec (void )
@@ -3135,7 +3152,7 @@ errout:static struct perf_event_context *find_get_context (struct pmu *pmu,struct task_struct *task,int cpu) { -struct perf_event_context *ctx; +struct perf_event_context *ctx, *clone_ctx =NULL ;struct perf_cpu_context *cpuctx;unsigned long flags;int ctxn, err;
@@ -3169,9 +3186,12 @@ find_get_context(struct pmu *pmu, struct retry: ctx =perf_lock_task_context (task, ctxn, &flags);if (ctx) { -unclone_ctx (ctx); + clone_ctx =unclone_ctx (ctx); ++ctx->pin_count;raw_spin_unlock_irqrestore (&ctx->lock, flags); + +if (clone_ctx) +put_ctx (clone_ctx); }else { ctx =alloc_perf_context (pmu, task); err = -ENOMEM ;
@@ -7523,7 +7543,7 @@ __perf_event_exit_task(struct perf_eventstatic void perf_event_exit_task_context (struct task_struct *child,int ctxn) {struct perf_event *child_event, *next; -struct perf_event_context *child_ctx, *parent_ctx; +struct perf_event_context *child_ctx, *clone_ctx =NULL ;unsigned long flags;if (likely (!child->perf_event_ctxp[ctxn])) {
@@ -7550,28 +7570,16 @@ static void perf_event_exit_task_context child->perf_event_ctxp[ctxn] =NULL ;/* -* In order to avoid freeing: child_ctx->parent_ctx->task -* under perf_event_context::lock, grab another reference. -*/ - parent_ctx = child_ctx->parent_ctx; -if (parent_ctx) -get_ctx (parent_ctx); - -/* * If this context is a clone; unclone it so it can't get * swapped to another process while we're removing all * the events from it. */ -unclone_ctx (child_ctx); + clone_ctx =unclone_ctx (child_ctx);update_context_time (child_ctx);raw_spin_unlock_irqrestore (&child_ctx->lock, flags); -/* -* Now that we no longer hold perf_event_context::lock, drop -* our extra child_ctx->parent_ctx reference. -*/ -if (parent_ctx) -put_ctx (parent_ctx); +if (clone_ctx) +put_ctx (clone_ctx);/* * Report the task dead after unscheduling the events so that we
Greg Kroah-Hartman
maintainerPATCH 58/319 evm: properly handle INTEGRITY_NOXATTRS EVM status
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Kasatkin <[email protected]>
commit 3dcbad52cf18c3c379e96b992d22815439ebbe53 upstream.
Unless an LSM labels a file during d_instantiate(), newly created files are not labeled with an initial security.evm xattr, until the file closes. EVM, before allowing a protected, security xattr to be written, verifies the existing 'security.evm' value is good. For newly created files without a security.evm label, this verification prevents writing any protected, security xattrs, until the file closes.
Following is the example when this happens:
fd = open("foo", O_CREAT | O_WRONLY, 0644); setxattr("foo", "security.SMACK64", value, sizeof(value), 0); close(fd);
While INTEGRITY_NOXATTRS status is handled in other places, such as evm_inode_setattr(), it does not handle it in all cases in evm_protect_xattr(). By limiting the use of INTEGRITY_NOXATTRS to newly created files, we can now allow setting "protected" xattrs.
Changelog:
- limit the use of INTEGRITY_NOXATTRS to IMA identified new files
--- security/integrity/evm/evm_main.c | 7 +++++++ 1 file changed, 7 insertions(+)
security/integrity/evm/evm_main.c +7 -0
@@ -284,6 +284,13 @@ static int evm_protect_xattr(struct dent goto out; } evm_status =evm_verify_current_integrity (dentry); +if (evm_status ==INTEGRITY_NOXATTRS ) { +struct integrity_iint_cache *iint; + + iint =integrity_iint_find (dentry->d_inode); +if (iint && (iint->flags &IMA_NEW_FILE )) +return 0 ; + } out:if (evm_status !=INTEGRITY_PASS ) integrity_audit_msg(AUDIT_INTEGRITY_METADATA, dentry->d_inode,
Greg Kroah-Hartman
maintainerPATCH 59/319 evm: check xattr value length and type in evm_inode_setxattr()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Kasatkin <[email protected]>
commit 3b1deef6b1289a99505858a3b212c5b50adf0c2f upstream.
evm_inode_setxattr() can be called with no value. The function does not check the length so that following command can be used to produce the kernel oops: setfattr -n security.evm FOO. This patch fixes it.
Changes in v3:
* there is no reason to return different error codes for EVM_XATTR_HMAC and non EVM_XATTR_HMAC. Remove unnecessary test then.
Changes in v2:
* testing for validity of xattr type
[ 1106.396921] BUG: unable to handle kernel NULL pointer dereference at (null) [ 1106.398192] IP: [<ffffffff812af7b8>] evm_inode_setxattr+0x2a/0x48 [ 1106.399244] PGD 29048067 PUD 290d7067 PMD 0 [ 1106.399953] Oops: 0000 [#1] SMP [ 1106.400020] Modules linked in: bridge stp llc evdev serio_raw i2c_piix4 button fuse [ 1106.400020] CPU: 0 PID: 3635 Comm: setxattr Not tainted 3.16.0-kds+ #2936 [ 1106.400020] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 [ 1106.400020] task: ffff8800291a0000 ti: ffff88002917c000 task.ti: ffff88002917c000 [ 1106.400020] RIP: 0010:[<ffffffff812af7b8>] [<ffffffff812af7b8>] evm_inode_setxattr+0x2a/0x48 [ 1106.400020] RSP: 0018:ffff88002917fd50 EFLAGS: 00010246 [ 1106.400020] RAX: 0000000000000000 RBX: ffff88002917fdf8 RCX: 0000000000000000 [ 1106.400020] RDX: 0000000000000000 RSI: ffffffff818136d3 RDI: ffff88002917fdf8 [ 1106.400020] RBP: ffff88002917fd68 R08: 0000000000000000 R09: 00000000003ec1df [ 1106.400020] R10: 0000000000000000 R11: 0000000000000000 R12: ffff8800438a0a00 [ 1106.400020] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 [ 1106.400020] FS: 00007f7dfa7d7740(0000) GS:ffff88005da00000(0000) knlGS:0000000000000000 [ 1106.400020] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1106.400020] CR2: 0000000000000000 CR3: 000000003763e000 CR4: 00000000000006f0 [ 1106.400020] Stack: [ 1106.400020] ffff8800438a0a00 ffff88002917fdf8 0000000000000000 ffff88002917fd98 [ 1106.400020] ffffffff812a1030 ffff8800438a0a00 ffff88002917fdf8 0000000000000000 [ 1106.400020] 0000000000000000 ffff88002917fde0 ffffffff8116d08a ffff88002917fdc8 [ 1106.400020] Call Trace: [ 1106.400020] [<ffffffff812a1030>] security_inode_setxattr+0x5d/0x6a [ 1106.400020] [<ffffffff8116d08a>] vfs_setxattr+0x6b/0x9f [ 1106.400020] [<ffffffff8116d1e0>] setxattr+0x122/0x16c [ 1106.400020] [<ffffffff811687e8>] ? mnt_want_write+0x21/0x45 [ 1106.400020] [<ffffffff8114d011>] ? __sb_start_write+0x10f/0x143 [ 1106.400020] [<ffffffff811687e8>] ? mnt_want_write+0x21/0x45 [ 1106.400020] [<ffffffff811687c0>] ? __mnt_want_write+0x48/0x4f [ 1106.400020] [<ffffffff8116d3e6>] SyS_setxattr+0x6e/0xb0 [ 1106.400020] [<ffffffff81529da9>] system_call_fastpath+0x16/0x1b [ 1106.400020] Code: c3 0f 1f 44 00 00 55 48 89 e5 41 55 49 89 d5 41 54 49 89 fc 53 48 89 f3 48 c7 c6 d3 36 81 81 48 89 df e8 18 22 04 00 85 c0 75 07 <41> 80 7d 00 02 74 0d 48 89 de 4c 89 e7 e8 5a fe ff ff eb 03 83 [ 1106.400020] RIP [<ffffffff812af7b8>] evm_inode_setxattr+0x2a/0x48 [ 1106.400020] RSP <ffff88002917fd50> [ 1106.400020] CR2: 0000000000000000 [ 1106.428061] ---[ end trace ae08331628ba3050 ]---
--- security/integrity/evm/evm_main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
security/integrity/evm/evm_main.c +6 -3
@@ -318,9 +318,12 @@ int evm_inode_setxattr(struct dentry *de {const struct evm_ima_xattr_data *xattr_data = xattr_value; -if ((strcmp (xattr_name,XATTR_NAME_EVM ) ==0 ) - && (xattr_data->type ==EVM_XATTR_HMAC )) -return -EPERM ; +if (strcmp (xattr_name,XATTR_NAME_EVM ) ==0 ) { +if (!xattr_value_len) +return -EINVAL ; +if (xattr_data->type !=EVM_IMA_XATTR_DIGSIG ) +return -EPERM ; + }return evm_protect_xattr (dentry, xattr_name, xattr_value, xattr_value_len); }
Greg Kroah-Hartman
maintainerPATCH 60/319 ALSA: hda - Add workaround for CMI8888 snoop behavior
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 3b70bdba2fcb374a2235a56ab73334348d819579 upstream.
CMI8888 shows the stuttering playback when the snooping is disabled on the audio buffer. Meanwhile, we've got reports that CORB/RIRB doesn't work in the snooped mode. So, as a compromise, disable the snoop only for CORB/RIRB and enable the snoop for the stream buffers.
The resultant patch became a bit ugly, unfortunately, but we still can live with it.
--- sound/pci/hda/hda_intel.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/pci/hda/hda_intel.c +3 -1
@@ -373,6 +373,8 @@ static void __mark_pages_wc(struct azx *#ifdef CONFIG_SND_DMA_SGBUF if (dmab->dev.type ==SNDRV_DMA_TYPE_DEV_SG ) {struct snd_sg_buf *sgbuf = dmab->private_data; +if (chip->driver_type ==AZX_DRIVER_CMEDIA ) +return ;/* deal with only CORB/RIRB buffers */ if (on)set_pages_array_wc (sgbuf->page_table, sgbuf->pages);else
@@ -1768,7 +1770,7 @@ static void pcm_mmap_prepare(struct snd_#ifdef CONFIG_X86 struct azx_pcm *apcm =snd_pcm_substream_chip (substream);struct azx *chip = apcm->chip; -if (!azx_snoop (chip)) +if (!azx_snoop (chip) && chip->driver_type !=AZX_DRIVER_CMEDIA ) area->vm_page_prot =pgprot_writecombine (area->vm_page_prot);#endif }
Greg Kroah-Hartman
maintainerPATCH 61/319 ALSA: bebob: Uninitialized id returned by saffirepro_both_clk_src_get
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Vogel <[email protected]>
commit d1d0b6b668818571122d30d68a0b3f768bd83a52 upstream.
snd_bebob_stream_check_internal_clock() may get an id from saffirepro_both_clk_src_get (via clk_src->get()) that was uninitialized.
a) make logic in saffirepro_both_clk_src_get explicit
b) test if id used in snd_bebob_stream_check_internal_clock matches array size
[fixed missing signed prefix to *_maps[] by tiwai]
--- sound/firewire/bebob/bebob_focusrite.c | 62 +++++++++++++++++++++++++-------- sound/firewire/bebob/bebob_stream.c | 18 +++++++-- 2 files changed, 63 insertions(+), 17 deletions(-)
sound/firewire/bebob/bebob_focusrite.c +48 -14
@@ -27,12 +27,14 @@#define SAFFIRE_CLOCK_SOURCE_INTERNAL 0#define SAFFIRE_CLOCK_SOURCE_SPDIF 1 -/* '1' is absent, why... */ +/* clock sources as returned from register of Saffire Pro 10 and 26 */ #define SAFFIREPRO_CLOCK_SOURCE_INTERNAL 0 +#define SAFFIREPRO_CLOCK_SOURCE_SKIP 1/* never used on hardware */ #define SAFFIREPRO_CLOCK_SOURCE_SPDIF 2 -#define SAFFIREPRO_CLOCK_SOURCE_ADAT1 3 -#define SAFFIREPRO_CLOCK_SOURCE_ADAT2 4 +#define SAFFIREPRO_CLOCK_SOURCE_ADAT1 3/* not used on s.pro. 10 */ +#define SAFFIREPRO_CLOCK_SOURCE_ADAT2 4/* not used on s.pro. 10 */ #define SAFFIREPRO_CLOCK_SOURCE_WORDCLOCK 5 +#define SAFFIREPRO_CLOCK_SOURCE_COUNT 6/* S/PDIF, ADAT1, ADAT2 is enabled or not. three quadlets */ #define SAFFIREPRO_ENABLE_DIG_IFACES 0x01a4
@@ -101,13 +103,34 @@ saffire_write_quad(struct snd_bebob *beb &data, sizeof(__be32), 0); } +static char *const saffirepro_10_clk_src_labels[] = { +SND_BEBOB_CLOCK_INTERNAL ,"S/PDIF" ,"Word Clock" +};static char *const saffirepro_26_clk_src_labels[] = {SND_BEBOB_CLOCK_INTERNAL ,"S/PDIF" ,"ADAT1" ,"ADAT2" ,"Word Clock" }; - -static char *const saffirepro_10_clk_src_labels[] = { -SND_BEBOB_CLOCK_INTERNAL ,"S/PDIF" ,"Word Clock" +/* Value maps between registers and labels for SaffirePro 10/26. */ +static const signed char saffirepro_clk_maps[][SAFFIREPRO_CLOCK_SOURCE_COUNT ] = { +/* SaffirePro 10 */ + [0 ] = { + [SAFFIREPRO_CLOCK_SOURCE_INTERNAL ] =0 , + [SAFFIREPRO_CLOCK_SOURCE_SKIP ] =-1 ,/* not supported */ + [SAFFIREPRO_CLOCK_SOURCE_SPDIF ] =1 , + [SAFFIREPRO_CLOCK_SOURCE_ADAT1 ] =-1 ,/* not supported */ + [SAFFIREPRO_CLOCK_SOURCE_ADAT2 ] =-1 ,/* not supported */ + [SAFFIREPRO_CLOCK_SOURCE_WORDCLOCK ] =2 , + }, +/* SaffirePro 26 */ + [1 ] = { + [SAFFIREPRO_CLOCK_SOURCE_INTERNAL ] =0 , + [SAFFIREPRO_CLOCK_SOURCE_SKIP ] =-1 ,/* not supported */ + [SAFFIREPRO_CLOCK_SOURCE_SPDIF ] =1 , + [SAFFIREPRO_CLOCK_SOURCE_ADAT1 ] =2 , + [SAFFIREPRO_CLOCK_SOURCE_ADAT2 ] =3 , + [SAFFIREPRO_CLOCK_SOURCE_WORDCLOCK ] =4 , + } }; +static int saffirepro_both_clk_freq_get (struct snd_bebob *bebob,unsigned int *rate) {
@@ -138,24 +161,35 @@ saffirepro_both_clk_freq_set(struct snd_return saffire_write_quad (bebob,SAFFIREPRO_RATE_NOREBOOT , id); } + +/* +* query hardware for current clock source, return our internally +* used clock index in *id, depending on hardware. +*/ static int saffirepro_both_clk_src_get (struct snd_bebob *bebob,unsigned int *id) {int err; -u32 value; +u32 value;/* clock source read from hw register */ +const signed char *map; err =saffire_read_quad (bebob,SAFFIREPRO_OFFSET_CLOCK_SOURCE , &value);if (err <0 ) goto end; -if (bebob->spec->clock->labels == saffirepro_10_clk_src_labels) { -if (value ==SAFFIREPRO_CLOCK_SOURCE_WORDCLOCK ) - *id =2 ; -else if (value ==SAFFIREPRO_CLOCK_SOURCE_SPDIF ) - *id =1 ; - }else if (value >1 ) { - *id = value -1 ; +/* depending on hardware, use a different mapping */ +if (bebob->spec->clock->labels == saffirepro_10_clk_src_labels) + map = saffirepro_clk_maps[0 ]; +else + map = saffirepro_clk_maps[1 ]; + +/* In a case that this driver cannot handle the value of register. */ +if (value >=SAFFIREPRO_CLOCK_SOURCE_COUNT || map[value] <0 ) { + err = -EIO ; + goto end; } + + *id = (unsigned int )map[value]; end:return err; }
sound/firewire/bebob/bebob_stream.c +15 -3
@@ -129,12 +129,24 @@ snd_bebob_stream_check_internal_clock(st/* 1.The device has its own operation to switch source of clock */ if (clk_spec) { err = clk_spec->get (bebob, &id); -if (err <0 ) +if (err <0 ) {dev_err (&bebob->unit->device,"fail to get clock source: %d\n" , err); -else if (strncmp (clk_spec->labels[id],SND_BEBOB_CLOCK_INTERNAL , -strlen (SND_BEBOB_CLOCK_INTERNAL )) ==0 ) + goto end; + } + +if (id >= clk_spec->num) { +dev_err (&bebob->unit->device, +"clock source %d out of range 0..%d\n" , + id, clk_spec->num -1 ); + err = -EIO ; + goto end; + } + +if (strncmp (clk_spec->labels[id],SND_BEBOB_CLOCK_INTERNAL , +strlen (SND_BEBOB_CLOCK_INTERNAL )) ==0 ) *internal = true; + goto end; }
Greg Kroah-Hartman
maintainerPATCH 62/319 ALSA: pcm: Zero-clear reserved fields of PCM status ioctl in compat mode
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 317168d0c766defd14b3d0e9c2c4a9a258b803ee upstream.
In compat mode, we copy each field of snd_pcm_status struct but don't touch the reserved fields, and this leaves uninitialized values there. Meanwhile the native ioctl does zero-clear the whole structure, so we should follow the same rule in compat mode, too.
--- sound/core/pcm_compat.c | 2 ++ 1 file changed, 2 insertions(+)
sound/core/pcm_compat.c +2 -0
@@ -210,6 +210,8 @@ static int snd_pcm_status_user_compat(stif (err <0 )return err; +if (clear_user (src,sizeof (*src))) +return -EFAULT ; if (put_user(status.state, &src->state) || compat_put_timespec(&status.trigger_tstamp, &src->trigger_tstamp) || compat_put_timespec(&status.tstamp, &src->tstamp) ||
Greg Kroah-Hartman
maintainerPATCH 63/319 missing data dependency barrier in prepend_name()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
commit 6d13f69444bd3d4888e43f7756449748f5a98bad upstream.
AFAICS, prepend_name() is broken on SMP alpha. Disclaimer: I don't have SMP alpha boxen to reproduce it on. However, it really looks like the race is real.
CPU1: d_path() on /mnt/ramfs/<255-character>/foo
CPU2: mv /mnt/ramfs/<255-character> /mnt/ramfs/<63-character>
CPU2 does d_alloc(), which allocates an external name, stores the name there including terminating NUL, does smp_wmb() and stores its address in dentry->d_name.name. It proceeds to d_add(dentry, NULL) and d_move() old dentry over to that. ->d_name.name value ends up in that dentry.
In the meanwhile, CPU1 gets to prepend_name() for that dentry. It fetches ->d_name.name and ->d_name.len; the former ends up pointing to new name (64-byte kmalloc'ed array), the latter - 255 (length of the old name). Nothing to force the ordering there, and normally that would be OK, since we'd run into the terminating NUL and stop. Except that it's alpha, and we'd need a data dependency barrier to guarantee that we see that store of NUL __d_alloc() has done. In a similar situation dentry_cmp() would survive; it does explicit smp_read_barrier_depends() after fetching ->d_name.name. prepend_name() doesn't and it risks walking past the end of kmalloc'ed object and possibly oops due to taking a page fault in kernel mode.
--- fs/dcache.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/dcache.c +5 -0
@@ -2810,6 +2810,9 @@ static int prepend(char **buffer, int *b* the beginning of the name. The sequence number check at the caller will * retry it again when a d_move() does happen. So any garbage in the buffer * due to mismatched pointer and length will be discarded. +* +* Data dependency barrier is needed to make sure that we see that terminating +* NUL. Alpha strikes again, film at 11... */ static int prepend_name (char **buffer,int *buflen,struct qstr *name) {
@@ -2817,6 +2820,8 @@ static int prepend_name(char **buffer, iu32 dlen =ACCESS_ONCE (name->len);char *p; +smp_read_barrier_depends (); + *buflen -= dlen +1 ;if (*buflen <0 )return -ENAMETOOLONG ;
Greg Kroah-Hartman
maintainerPATCH 64/319 kill wbuf_queued/wbuf_dwork_lock
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
commit 99358a1ca53e8e6ce09423500191396f0e6584d2 upstream.
schedule_delayed_work() happening when the work is already pending is a cheap no-op. Don't bother with ->wbuf_queued logics - it's both broken (cancelling ->wbuf_dwork leaves it set, as spotted by Jeff Harris) and pointless. It's cheaper to let schedule_delayed_work() handle that case.
--- fs/jffs2/jffs2_fs_sb.h | 2 -- fs/jffs2/wbuf.c | 17 ++--------------- 2 files changed, 2 insertions(+), 17 deletions(-)
fs/jffs2/jffs2_fs_sb.h +0 -2
@@ -134,8 +134,6 @@ struct jffs2_sb_info {struct rw_semaphore wbuf_sem;/* Protects the write buffer */ struct delayed_work wbuf_dwork;/* write-buffer write-out work */ -int wbuf_queued;/* non-zero delayed work is queued */ -spinlock_t wbuf_dwork_lock;/* protects wbuf_dwork and and wbuf_queued */ unsigned char *oobbuf;int oobavail;/* How many bytes are available for JFFS2 in OOB */
fs/jffs2/wbuf.c +2 -15
@@ -1162,10 +1162,6 @@ static void delayed_wbuf_sync(struct worstruct jffs2_sb_info *c =work_to_sb (work);struct super_block *sb =OFNI_BS_2SFFJ (c); -spin_lock (&c->wbuf_dwork_lock); - c->wbuf_queued =0 ; -spin_unlock (&c->wbuf_dwork_lock); -if (!(sb->s_flags &MS_RDONLY )) {jffs2_dbg (1 ,"%s()\n" , __func__);jffs2_flush_wbuf_gc (c,0 );
@@ -1180,14 +1176,9 @@ void jffs2_dirty_trigger(struct jffs2_sbif (sb->s_flags &MS_RDONLY )return ; -spin_lock (&c->wbuf_dwork_lock); -if (!c->wbuf_queued) { + delay =msecs_to_jiffies (dirty_writeback_interval *10 ); +if (queue_delayed_work (system_long_wq, &c->wbuf_dwork, delay))jffs2_dbg (1 ,"%s()\n" , __func__); - delay =msecs_to_jiffies (dirty_writeback_interval *10 ); -queue_delayed_work (system_long_wq, &c->wbuf_dwork, delay); - c->wbuf_queued =1 ; - } -spin_unlock (&c->wbuf_dwork_lock); }int jffs2_nand_flash_setup (struct jffs2_sb_info *c)
@@ -1211,7 +1202,6 @@ int jffs2_nand_flash_setup(struct jffs2_/* Initialise write buffer */ init_rwsem (&c->wbuf_sem); -spin_lock_init (&c->wbuf_dwork_lock);INIT_DELAYED_WORK (&c->wbuf_dwork, delayed_wbuf_sync); c->wbuf_pagesize = c->mtd->writesize; c->wbuf_ofs =0xFFFFFFFF ;
@@ -1251,7 +1241,6 @@ int jffs2_dataflash_setup(struct jffs2_s/* Initialize write buffer */ init_rwsem (&c->wbuf_sem); -spin_lock_init (&c->wbuf_dwork_lock);INIT_DELAYED_WORK (&c->wbuf_dwork, delayed_wbuf_sync); c->wbuf_pagesize = c->mtd->erasesize;
@@ -1311,7 +1300,6 @@ int jffs2_nor_wbuf_flash_setup(struct jf/* Initialize write buffer */ init_rwsem (&c->wbuf_sem); -spin_lock_init (&c->wbuf_dwork_lock);INIT_DELAYED_WORK (&c->wbuf_dwork, delayed_wbuf_sync); c->wbuf_pagesize = c->mtd->writesize;
@@ -1346,7 +1334,6 @@ int jffs2_ubivol_setup(struct jffs2_sb_ireturn 0 ;init_rwsem (&c->wbuf_sem); -spin_lock_init (&c->wbuf_dwork_lock);INIT_DELAYED_WORK (&c->wbuf_dwork, delayed_wbuf_sync); c->wbuf_pagesize = c->mtd->writesize;
Greg Kroah-Hartman
maintainerPATCH 65/319 fix misuses of f_count() in ppp and netlink
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
commit 24dff96a37a2ca319e75a74d3929b2de22447ca6 upstream.
we used to check for "nobody else could start doing anything with that opened file" by checking that refcount was 2 or less - one for descriptor table and one we'd acquired in fget() on the way to wherever we are. That was race-prone (somebody else might have had a reference to descriptor table and do fget() just as we'd been checking) and it had become flat-out incorrect back when we switched to fget_light() on those codepaths - unlike fget(), it doesn't grab an extra reference unless the descriptor table is shared. The same change allowed a race-free check, though - we are safe exactly when refcount is less than 2.
It was a long time ago; pre-2.6.12 for ioctl() (the codepath leading to ppp one) and 2.6.17 for sendmsg() (netlink one). OTOH, netlink hadn't grown that check until 3.9 and ppp used to live in drivers/net, not drivers/net/ppp until 3.1. The bug existed well before that, though, and the same fix used to apply in old location of file.
--- drivers/net/ppp/ppp_generic.c | 2 +- net/netlink/af_netlink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ppp/ppp_generic.c +1 -1
@@ -594,7 +594,7 @@ static long ppp_ioctl(struct file *file,if (file == ppp->owner)ppp_shutdown_interface (ppp); } -if (atomic_long_read (&file->f_count) <=2 ) { +if (atomic_long_read (&file->f_count) <2 ) {ppp_release (NULL , file); err =0 ; }else
net/netlink/af_netlink.c +1 -1
@@ -723,7 +723,7 @@ static int netlink_mmap_sendmsg(struct s* after validation, the socket and the ring may only be used by a * single process, otherwise we fall back to copying. */ -if (atomic_long_read (&sk->sk_socket->file->f_count) >2 || +if (atomic_long_read (&sk->sk_socket->file->f_count) >1 ||atomic_read (&nlk->mapped) >1 ) excl = false;
Greg Kroah-Hartman
maintainerPATCH 66/319 rbd: rbd workqueues need a resque worker
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Dryomov <[email protected]>
commit 792c3a914910bd34302c5345578f85cfcb5e2c01 upstream.
Need to use WQ_MEM_RECLAIM for our workqueues to prevent I/O lockups under memory pressure - we sit on the memory reclaim path.
--- drivers/block/rbd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/rbd.c +2 -1
@@ -5087,7 +5087,8 @@ static int rbd_dev_device_setup(struct rset_capacity (rbd_dev->disk, rbd_dev->mapping.size /SECTOR_SIZE );set_disk_ro (rbd_dev->disk, rbd_dev->mapping.read_only); - rbd_dev->rq_wq =alloc_workqueue ("%s" ,0 ,0 , rbd_dev->disk->disk_name); + rbd_dev->rq_wq =alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,0 , + rbd_dev->disk->disk_name);if (!rbd_dev->rq_wq) { ret = -ENOMEM ; goto err_out_mapping;
Greg Kroah-Hartman
maintainerPATCH 67/319 libceph: ceph-msgr workqueue needs a resque worker
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Dryomov <[email protected]>
commit f9865f06f7f18c6661c88d0511f05c48612319cc upstream.
Commit f363e45fd118 ("net/ceph: make ceph_msgr_wq non-reentrant") effectively removed WQ_MEM_RECLAIM flag from ceph_msgr_wq. This is wrong - libceph is very much a memory reclaim path, so restore it.
--- net/ceph/messenger.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/ceph/messenger.c +5 -1
@@ -292,7 +292,11 @@ int ceph_msgr_init(void)if (ceph_msgr_slab_init ())return -ENOMEM ; - ceph_msgr_wq =alloc_workqueue ("ceph-msgr" ,0 ,0 ); +/* +* The number of active work items is limited by the number of +* connections, so leave @max_active at default. +*/ + ceph_msgr_wq =alloc_workqueue ("ceph-msgr" ,WQ_MEM_RECLAIM ,0 );if (ceph_msgr_wq)return 0 ;
Greg Kroah-Hartman
maintainerPATCH 68/319 sched: Use dl_bw_of() under RCU read lock
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kirill Tkhai <[email protected]>
commit 66339c31bc3978d5fff9c4b4cb590a861def4db2 upstream.
dl_bw_of() dereferences rq->rd which has to have RCU read lock held. Probability of use-after-free isn't zero here.
Also add lockdep assert into dl_bw_cpus().
--- kernel/sched/core.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
kernel/sched/core.c +10 -0
@@ -1977,6 +1977,8 @@ unsigned long to_ratio(u64 period, u64 r#ifdef CONFIG_SMP inline struct dl_bw *dl_bw_of (int i) { +rcu_lockdep_assert (rcu_read_lock_sched_held (), +"sched RCU must be held" );return &cpu_rq (i)->rd->dl_bw; }
@@ -1985,6 +1987,8 @@ static inline int dl_bw_cpus(int i)struct root_domain *rd =cpu_rq (i)->rd;int cpus =0 ; +rcu_lockdep_assert (rcu_read_lock_sched_held (), +"sched RCU must be held" );for_each_cpu_and (i, rd->span, cpu_active_mask) cpus++;
@@ -7580,6 +7584,8 @@ static int sched_dl_global_constraints(vint cpu, ret =0 ;unsigned long flags; +rcu_read_lock (); +/* * Here we want to check the bandwidth not being set to some * value smaller than the currently allocated bandwidth in
@@ -7601,6 +7607,8 @@ static int sched_dl_global_constraints(vbreak ; } +rcu_read_unlock (); +return ret; }
@@ -7616,6 +7624,7 @@ static void sched_dl_do_global(void)if (global_rt_runtime () !=RUNTIME_INF ) new_bw =to_ratio (global_rt_period (),global_rt_runtime ()); +rcu_read_lock ();/* * FIXME: As above... */
@@ -7626,6 +7635,7 @@ static void sched_dl_do_global(void) dl_b->bw = new_bw;raw_spin_unlock_irqrestore (&dl_b->lock, flags); } +rcu_read_unlock (); }static int sched_rt_global_validate (void )
Greg Kroah-Hartman
maintainerPATCH 69/319 um: ubd: Fix for processes stuck in D state forever
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Knabe <[email protected]>
commit 2a2361228c5e6d8c1733f00653481de918598e50 upstream.
Starting with Linux 3.12 processes get stuck in D state forever in UserModeLinux under sync heavy workloads. This bug was introduced by commit 805f11a0d5 (um: ubd: Add REQ_FLUSH suppport).
Fix bug by adding a check if FLUSH request was successfully submitted to the I/O thread and keeping the FLUSH request on the request queue on submission failures.
--- arch/um/drivers/ubd_kern.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/um/drivers/ubd_kern.c +3 -2
@@ -1277,7 +1277,7 @@ static void do_ubd_request(struct requeswhile (1 ){struct ubd *dev = q->queuedata; -if (dev->end_sg ==0 ){ +if (dev->request ==NULL ){struct request *req =blk_fetch_request (q);if (req ==NULL )return ;
@@ -1299,7 +1299,8 @@ static void do_ubd_request(struct requesreturn ; }prepare_flush_request (req, io_req); -submit_request (io_req, dev); +if (submit_request (io_req, dev) == false) +return ; }while (dev->start_sg < dev->end_sg){
Greg Kroah-Hartman
maintainerPATCH 70/319 random: add and use memzero_explicit() for clearing data
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
commit d4c5efdb97773f59a2b711754ca0953f24516739 upstream.
zatimend has reported that in his environment (3.16/gcc4.8.3/corei7) memset() calls which clear out sensitive data in extract_{buf,entropy, entropy_user}() in random driver are being optimized away by gcc.
Add a helper memzero_explicit() (similarly as explicit_bzero() variants) that can be used in such cases where a variable with sensitive data is being cleared out in the end. Other use cases might also be in crypto code. [ I have put this into lib/string.c though, as it's always built-in and doesn't need any dependencies then. ]
Fixes kernel bugzilla: 82041
--- drivers/char/random.c | 8 ++++---- include/linux/string.h | 5 +++-- lib/string.c | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 6 deletions(-)
drivers/char/random.c +4 -4
@@ -1106,7 +1106,7 @@ static void extract_buf(struct entropy_s__mix_pool_bytes (r, hash.w,sizeof (hash.w));spin_unlock_irqrestore (&r->lock, flags); -memset (workspace,0 ,sizeof (workspace)); +memzero_explicit (workspace,sizeof (workspace));/* * In case the hash function has some recognizable output
@@ -1118,7 +1118,7 @@ static void extract_buf(struct entropy_s hash.w[2 ] ^=rol32 (hash.w[2 ],16 );memcpy (out, &hash,EXTRACT_SIZE ); -memset (&hash,0 ,sizeof (hash)); +memzero_explicit (&hash,sizeof (hash)); }/*
@@ -1175,7 +1175,7 @@ static ssize_t extract_entropy(struct en }/* Wipe data just returned from memory */ -memset (tmp,0 ,sizeof (tmp)); +memzero_explicit (tmp,sizeof (tmp));return ret; }
@@ -1218,7 +1218,7 @@ static ssize_t extract_entropy_user(stru }/* Wipe data just returned from memory */ -memset (tmp,0 ,sizeof (tmp)); +memzero_explicit (tmp,sizeof (tmp));return ret; }
include/linux/string.h +3 -2
@@ -132,7 +132,7 @@ int bprintf(u32 *bin_buf, size_t size, c#endif extern ssize_t memory_read_from_buffer (void *to,size_t count,loff_t *ppos, -const void *from,size_t available); +const void *from,size_t available);/** * strstarts - does @str start with @prefix?
@@ -144,7 +144,8 @@ static inline bool strstarts(const charreturn strncmp (str, prefix,strlen (prefix)) ==0 ; } -extern size_t memweight (const void *ptr,size_t bytes); +size_t memweight (const void *ptr,size_t bytes); +void memzero_explicit (void *s,size_t count);/** * kbasename - return the last part of a pathname.
lib/string.c +16 -0
@@ -604,6 +604,22 @@ void *memset(void *s, int c, size_t counEXPORT_SYMBOL (memset);#endif +/** +* memzero_explicit - Fill a region of memory (e.g. sensitive +* keying data) with 0s. +* @s: Pointer to the start of the area. +* @count: The size of the area. +* +* memzero_explicit() doesn't need an arch-specific version as +* it just invokes the one of memset() implicitly. +*/ +void memzero_explicit (void *s,size_t count) +{ +memset (s,0 , count); +OPTIMIZER_HIDE_VAR (s); +} +EXPORT_SYMBOL (memzero_explicit); +#ifndef __HAVE_ARCH_MEMCPY/** * memcpy - Copy one area of memory to another
Greg Kroah-Hartman
maintainerPATCH 71/319 s390/topology: call set_sched_topology early
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Schwidefsky <[email protected]>
commit 48e9a6c1f54695609b709bf674aac133794ada00 upstream.
The call to topology_init is too late for the set_sched_topology call. The initial scheduling domain structure has already been established with default topology array. Use the smp_cpus_done() call to get the s390 specific topology array registered early enough.
--- arch/s390/kernel/topology.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
arch/s390/kernel/topology.c +10 -8
@@ -464,15 +464,17 @@ static struct sched_domain_topology_levestatic int __init topology_init (void ) { -if (!MACHINE_HAS_TOPOLOGY ) { +if (MACHINE_HAS_TOPOLOGY ) +set_topology_timer (); +else topology_update_polarization_simple (); - goto out; - } -set_topology_timer (); -out: - -set_sched_topology (s390_topology); -return device_create_file (cpu_subsys.dev_root, &dev_attr_dispatching); }device_initcall (topology_init); + +static int __init early_topology_init (void ) +{ +set_sched_topology (s390_topology); +return 0 ; +} +early_initcall (early_topology_init);
Greg Kroah-Hartman
maintainerPATCH 72/319 UBI: block: Fix block device size setting
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ezequiel Garcia <[email protected]>
commit 978d6496758d19de2431ebf163337fc7b92f8c45 upstream.
We are currently taking the block device size from the ubi_volume_info.size field. However, this is not the amount of data in the volume, but the number of reserved physical eraseblocks, and hence leads to an incorrect representation of the volume.
In particular, this produces I/O errors on static volumes as the block interface may attempt to read unmapped PEBs:
$ cat /dev/ubiblock0_0 > /dev/null UBI error: ubiblock_read_to_buf: ubiblock0_0 ubi_read error -22 end_request: I/O error, dev ubiblock0_0, sector 9536 Buffer I/O error on device ubiblock0_0, logical block 2384 [snip]
Fix this by using the ubi_volume_info.used_bytes field which is set to the actual number of data bytes for both static and dynamic volumes.
While here, improve the error message to be less stupid and more useful:
UBI error: ubiblock_read_to_buf: ubiblock0_1 ubi_read error -9 on LEB=0, off=15872, len=512
It's worth noticing that the 512-byte sector representation of the volume is only correct if the volume size is multiple of 512-bytes. This is true for virtually any NAND device, given eraseblocks and pages are 512-byte multiple and hence so is the LEB size.
Artem: tweak the error message and make it look more like other UBI error messages.
--- drivers/mtd/ubi/block.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/mtd/ubi/block.c +6 -5
@@ -188,8 +188,9 @@ static int ubiblock_read_to_buf(struct u ret =ubi_read (dev->desc, leb, buffer, offset, len);if (ret) { -ubi_err ("%s ubi_read error %d" , - dev->gd->disk_name, ret); +ubi_err ("%s: error %d while reading from LEB %d (offset %d, " +"length %d)" , dev->gd->disk_name, ret, leb, offset, + len);return ret; }return 0 ;
@@ -378,7 +379,7 @@ int ubiblock_create(struct ubi_volume_in {struct ubiblock *dev;struct gendisk *gd; -u64 disk_capacity = ((u64 )vi->size * vi->usable_leb_size) >>9 ; +u64 disk_capacity = vi->used_bytes >>9 ;int ret;if ((sector_t )disk_capacity != disk_capacity)
@@ -502,7 +503,7 @@ int ubiblock_remove(struct ubi_volume_instatic int ubiblock_resize (struct ubi_volume_info *vi) {struct ubiblock *dev; -u64 disk_capacity = ((u64 )vi->size * vi->usable_leb_size) >>9 ; +u64 disk_capacity = vi->used_bytes >>9 ;if ((sector_t )disk_capacity != disk_capacity) { ubi_warn("%s: the volume is too big, cannot resize (%d LEBs)",
@@ -523,7 +524,7 @@ static int ubiblock_resize(struct ubi_vomutex_lock (&dev->dev_mutex);set_capacity (dev->gd, disk_capacity); -ubi_msg ("%s resized to %d LEBs" , dev->gd->disk_name, vi->size); +ubi_msg ("%s resized to %lld bytes" , dev->gd->disk_name, vi->used_bytes);mutex_unlock (&dev->dev_mutex);mutex_unlock (&devices_mutex);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 73/319 UBI: block: Add support for the UBI_VOLUME_UPDATED notification
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ezequiel Garcia <[email protected]>
commit 06d9c2905f745c8b1920a335cbb366ba6b0fc754 upstream.
Static volumes can change its 'used_bytes' when they get updated, and so the block interface must listen to the UBI_VOLUME_UPDATED notification to resize the block device accordingly.
--- drivers/mtd/ubi/block.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/mtd/ubi/block.c +14 -2
@@ -523,8 +523,12 @@ static int ubiblock_resize(struct ubi_vo }mutex_lock (&dev->dev_mutex); -set_capacity (dev->gd, disk_capacity); -ubi_msg ("%s resized to %lld bytes" , dev->gd->disk_name, vi->used_bytes); + +if (get_capacity (dev->gd) != disk_capacity) { +set_capacity (dev->gd, disk_capacity); +ubi_msg ("%s resized to %lld bytes" , dev->gd->disk_name, + vi->used_bytes); + }mutex_unlock (&dev->dev_mutex);mutex_unlock (&devices_mutex);return 0 ;
@@ -548,6 +552,14 @@ static int ubiblock_notify(struct notificase UBI_VOLUME_RESIZED :ubiblock_resize (&nt->vi);break ; +case UBI_VOLUME_UPDATED : +/* +* If the volume is static, a content update might mean the +* size (i.e. used_bytes) was also changed. +*/ +if (nt->vi.vol_type ==UBI_STATIC_VOLUME ) +ubiblock_resize (&nt->vi); +break ;default :break ; }
Greg Kroah-Hartman
maintainerPATCH 74/319 UBI: Dispatch update notification if the volume is updated
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ezequiel Garcia <[email protected]>
commit fda322a1b3b9e8ee231913c500f73c6988b1aff5 upstream.
The UBI_IOCVOLUP ioctl is used to start an update and also to truncate a volume. In the first case, a "volume updated" notification is dispatched when the update is done.
This commit adds the "volume updated" notification to be also sent when the volume is truncated. This is required for UBI block and gluebi to get notified about the new volume size.
--- drivers/mtd/ubi/cdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mtd/ubi/cdev.c +3 -1
@@ -425,8 +425,10 @@ static long vol_cdev_ioctl(struct file *break ; err =ubi_start_update (ubi, vol, bytes); -if (bytes ==0 ) +if (bytes ==0 ) { +ubi_volume_notify (ubi, vol,UBI_VOLUME_UPDATED );revoke_exclusive (desc,UBI_READWRITE ); + }break ; }
Greg Kroah-Hartman
maintainerPATCH 75/319 UBI: add missing kmem_cache_free() in process_pool_aeb error path
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Genoud <[email protected]>
commit 1bf1890e86869032099b539bc83b098be12fc5a7 upstream.
I ran into this error after a ubiupdatevol, because I forgot to backport e9110361a9a4 UBI: fix the volumes tree sorting criteria.
UBI error: process_pool_aeb: orphaned volume in fastmap pool UBI error: ubi_scan_fastmap: Attach by fastmap failed, doing a full scan! kmem_cache_destroy ubi_ainf_peb_slab: Slab cache still has objects
CPU: 0 PID: 1 Comm: swapper Not tainted 3.14.18-00053-gf05cac8dbf85 #1 [<c000d298>] (unwind_backtrace) from [<c000baa8>] (show_stack+0x10/0x14) [<c000baa8>] (show_stack) from [<c01b7a68>] (destroy_ai+0x230/0x244) [<c01b7a68>] (destroy_ai) from [<c01b8fd4>] (ubi_attach+0x98/0x1ec) [<c01b8fd4>] (ubi_attach) from [<c01ade90>] (ubi_attach_mtd_dev+0x2b8/0x868) [<c01ade90>] (ubi_attach_mtd_dev) from [<c038b510>] (ubi_init+0x1dc/0x2ac) [<c038b510>] (ubi_init) from [<c0008860>] (do_one_initcall+0x94/0x140) [<c0008860>] (do_one_initcall) from [<c037aadc>] (kernel_init_freeable+0xe8/0x1b0) [<c037aadc>] (kernel_init_freeable) from [<c02730ac>] (kernel_init+0x8/0xe4) [<c02730ac>] (kernel_init) from [<c00093f0>] (ret_from_fork+0x14/0x24)
UBI: scanning is finished
Freeing the cache in the error path fixes the Slab error.
Tested on at91sam9g35 (3.14.18+fastmap backports)
--- drivers/mtd/ubi/fastmap.c | 1 + 1 file changed, 1 insertion(+)
drivers/mtd/ubi/fastmap.c +1 -0
@@ -330,6 +330,7 @@ static int process_pool_aeb(struct ubi_d av = tmp_av; else {ubi_err ("orphaned volume in fastmap pool!" ); +kmem_cache_free (ai->aeb_slab_cache, new_aeb);return UBI_BAD_FASTMAP ; }
Greg Kroah-Hartman
maintainerPATCH 76/319 mnt: Prevent pivot_root from creating a loop in the mount tree
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Eric W. Biederman" <[email protected]>
commit 0d0826019e529f21c84687521d03f60cd241ca7d upstream.
Andy Lutomirski recently demonstrated that when chroot is used to set the root path below the path for the new ``root'' passed to pivot_root the pivot_root system call succeeds and leaks mounts.
In examining the code I see that starting with a new root that is below the current root in the mount tree will result in a loop in the mount tree after the mounts are detached and then reattached to one another. Resulting in all kinds of ugliness including a leak of that mounts involved in the leak of the mount loop.
Prevent this problem by ensuring that the new mount is reachable from the current root of the mount tree.
[Added stable cc. Fixes CVE-2014-7970. --Andy]
--- fs/namespace.c | 3 +++ 1 file changed, 3 insertions(+)
fs/namespace.c +3 -0
@@ -2822,6 +2822,9 @@ SYSCALL_DEFINE2(pivot_root, const char _/* make sure we can reach put_old from new_root */ if (!is_path_reachable (old_mnt, old.dentry, &new)) goto out4; +/* make certain new is below the root */ +if (!is_path_reachable (new_mnt, new.dentry, &root)) + goto out4; root_mp->m_count++;/* pin it so it won't go away */ lock_mount_hash ();detach_mnt (new_mnt, &parent_path);
Greg Kroah-Hartman
maintainerPATCH 77/319 mfd: ti_am335x_tscadc: Fix TSC operation after ADC continouous mode
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vignesh R <[email protected]>
commit 6ac734d2242949f41eb1346ca0fd4ed010c937aa upstream.
After enabling and disabling ADC continuous mode via sysfs, ts_print_raw fails to return any data. This is because when ADC is configured for continuous mode, it disables touch screen steps.These steps are not re-enabled when ADC continuous mode is disabled. Therefore existing values of REG_SE needs to be cached before enabling continuous mode and disabling touch screen steps and enabling ADC steps. The cached value are to be restored to REG_SE once ADC is disabled.
--- drivers/mfd/ti_am335x_tscadc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mfd/ti_am335x_tscadc.c +2 -1
@@ -53,7 +53,7 @@ void am335x_tsc_se_set_cache(struct ti_tunsigned long flags;spin_lock_irqsave (&tsadc->reg_lock, flags); - tsadc->reg_se_cache = val; + tsadc->reg_se_cache |= val;if (tsadc->adc_waiting)wake_up (&tsadc->reg_se_wait);else if (!tsadc->adc_in_use)
@@ -96,6 +96,7 @@ static void am335x_tscadc_need_adc(strucvoid am335x_tsc_se_set_once (struct ti_tscadc_dev *tsadc,u32 val) {spin_lock_irq (&tsadc->reg_lock); + tsadc->reg_se_cache |= val;am335x_tscadc_need_adc (tsadc);tscadc_writel (tsadc,REG_SE , val);
Greg Kroah-Hartman
maintainerPATCH 78/319 mfd: ti_am335x_tscadc: Fix TSC resume
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
commit 6a71f38dd87f255a0586104ce2a14d5a3ddf3401 upstream.
In the resume path, the ADC invokes am335x_tsc_se_set_cache() with 0 as the steps argument if continous mode is not in use. This in turn disables all steps and so the TSC is not working until one ADC sampling is performed.
This patch fixes it by writing the current cached mask instead of the passed steps.
synchronization")
--- drivers/mfd/ti_am335x_tscadc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/ti_am335x_tscadc.c +1 -1
@@ -57,7 +57,7 @@ void am335x_tsc_se_set_cache(struct ti_tif (tsadc->adc_waiting)wake_up (&tsadc->reg_se_wait);else if (!tsadc->adc_in_use) -tscadc_writel (tsadc,REG_SE , val); +tscadc_writel (tsadc,REG_SE , tsadc->reg_se_cache);spin_unlock_irqrestore (&tsadc->reg_lock, flags); }
Greg Kroah-Hartman
maintainerPATCH 79/319 mfd: rtsx_pcr: Fix MSI enable error handling
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Ball <[email protected]>
commit 5152970538a5e16c03bbcb9f1c780489a795ed40 upstream.
pci_enable_msi() can return failure with both positive and negative integers -- it returns 0 for success -- but is only tested here for "if (ret < 0)". This causes us to try to use MSI on the RTS5249 SD reader in the Dell XPS 11 when enabling MSI failed, causing:
[ 1.737110] rtsx_pci: probe of 0000:05:00.0 failed with error -110
--- drivers/mfd/rtsx_pcr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/rtsx_pcr.c +1 -1
@@ -1197,7 +1197,7 @@ static int rtsx_pci_probe(struct pci_dev pcr->msi_en = msi_en;if (pcr->msi_en) { ret =pci_enable_msi (pcidev); -if (ret <0 ) +if (ret) pcr->msi_en = false; }
Greg Kroah-Hartman
maintainerPATCH 80/319 iommu: Rework iommu_group_get_for_pci_dev()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit f096c061f5525d1b35a65b793057b52061dcb486 upstream.
It turns out that our assumption that aliases are always to the same slot isn't true. One particular platform reports an IVRS alias of the SATA controller (00:11.0) for the legacy IDE controller (00:14.1). When we hit this, we attempt to use a single IOMMU group for everything on the same bus, which in this case is the root complex. We already have multiple groups defined for the root complex by this point, resulting in multiple WARN_ON hits.
This patch makes these sorts of aliases work again with IOMMU groups by reworking how we search through the PCI address space to find existing groups. This should also now handle looped dependencies and all sorts of crazy inter-dependencies that we'll likely never see.
The recursion used here should never be very deep. It's unlikely to have individual aliases and only theoretical that we'd ever see a chain where one alias causes us to search through to yet another alias. We're also only dealing with PCIe device on a single bus, which means we'll typically only see multiple slots in use on the root complex. Loops are also a theoretically possibility, which I've tested using fake DMA alias quirks and prevent from causing problems using a bitmap of the devfn space that's been visited.
--- drivers/iommu/iommu.c | 163 +++++++++++++++++++++++++++++--------------------- 1 file changed, 96 insertions(+), 67 deletions(-)
drivers/iommu/iommu.c +96 -67
@@ -30,6 +30,7 @@#include <linux/notifier.h> #include <linux/err.h> #include <linux/pci.h> +#include <linux/bitops.h> #include <trace/events/iommu.h> static struct kset *iommu_group_kset;
@@ -519,6 +520,9 @@ int iommu_group_id(struct iommu_group *g }EXPORT_SYMBOL_GPL (iommu_group_id); +static struct iommu_group *get_pci_alias_group (struct pci_dev *pdev, +unsigned long *devfns); +/* * To consider a PCI device isolated, we require ACS to support Source * Validation, Request Redirection, Completer Redirection, and Upstream
@@ -529,6 +533,86 @@ EXPORT_SYMBOL_GPL(iommu_group_id);*/ #define REQ_ACS_FLAGS (PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF) +/* +* For multifunction devices which are not isolated from each other, find +* all the other non-isolated functions and look for existing groups. For +* each function, we also need to look for aliases to or from other devices +* that may already have a group. +*/ +static struct iommu_group *get_pci_function_alias_group (struct pci_dev *pdev, +unsigned long *devfns) +{ +struct pci_dev *tmp =NULL ; +struct iommu_group *group; + +if (!pdev->multifunction ||pci_acs_enabled (pdev,REQ_ACS_FLAGS )) +return NULL ; + +for_each_pci_dev (tmp) { +if (tmp == pdev || tmp->bus != pdev->bus || +PCI_SLOT (tmp->devfn) !=PCI_SLOT (pdev->devfn) || +pci_acs_enabled (tmp,REQ_ACS_FLAGS )) +continue ; + + group =get_pci_alias_group (tmp, devfns); +if (group) { +pci_dev_put (tmp); +return group; + } + } + +return NULL ; +} + +/* +* Look for aliases to or from the given device for exisiting groups. The +* dma_alias_devfn only supports aliases on the same bus, therefore the search +* space is quite small (especially since we're really only looking at pcie +* device, and therefore only expect multiple slots on the root complex or +* downstream switch ports). It's conceivable though that a pair of +* multifunction devices could have aliases between them that would cause a +* loop. To prevent this, we use a bitmap to track where we've been. +*/ +static struct iommu_group *get_pci_alias_group (struct pci_dev *pdev, +unsigned long *devfns) +{ +struct pci_dev *tmp =NULL ; +struct iommu_group *group; + +if (test_and_set_bit (pdev->devfn &0xff , devfns)) +return NULL ; + + group =iommu_group_get (&pdev->dev); +if (group) +return group; + +for_each_pci_dev (tmp) { +if (tmp == pdev || tmp->bus != pdev->bus) +continue ; + +/* We alias them or they alias us */ +if (((pdev->dev_flags &PCI_DEV_FLAGS_DMA_ALIAS_DEVFN ) && + pdev->dma_alias_devfn == tmp->devfn) || + ((tmp->dev_flags &PCI_DEV_FLAGS_DMA_ALIAS_DEVFN ) && + tmp->dma_alias_devfn == pdev->devfn)) { + + group =get_pci_alias_group (tmp, devfns); +if (group) { +pci_dev_put (tmp); +return group; + } + + group =get_pci_function_alias_group (tmp, devfns); +if (group) { +pci_dev_put (tmp); +return group; + } + } + } + +return NULL ; +} +struct group_for_pci_data {struct pci_dev *pdev;struct iommu_group *group;
@@ -557,7 +641,7 @@ static struct iommu_group *iommu_group_gstruct group_for_pci_data data;struct pci_bus *bus;struct iommu_group *group =NULL ; -struct pci_dev *tmp; +u64 devfns[4 ] = {0 };/* * Find the upstream DMA alias for the device. A device must not
@@ -591,76 +675,21 @@ static struct iommu_group *iommu_group_g }/* -* Next we need to consider DMA alias quirks. If one device aliases -* to another, they should be grouped together. It's theoretically -* possible that aliases could create chains of devices where each -* device aliases another device. If we then factor in multifunction -* ACS grouping requirements, each alias could incorporate a new slot -* with multiple functions, each with aliases. This is all extremely -* unlikely as DMA alias quirks are typically only used for PCIe -* devices where we usually have a single slot per bus. Furthermore, -* the alias quirk is usually to another function within the slot -* (and ACS multifunction is not supported) or to a different slot -* that doesn't physically exist. The likely scenario is therefore -* that everything on the bus gets grouped together. To reduce the -* problem space, share the IOMMU group for all devices on the bus -* if a DMA alias quirk is present on the bus. -*/ - tmp =NULL ; -for_each_pci_dev (tmp) { -if (tmp->bus != pdev->bus || - !(tmp->dev_flags &PCI_DEV_FLAGS_DMA_ALIAS_DEVFN )) -continue ; - -pci_dev_put (tmp); - tmp =NULL ; - -/* We have an alias quirk, search for an existing group */ -for_each_pci_dev (tmp) { -struct iommu_group *group_tmp; - -if (tmp->bus != pdev->bus) -continue ; - - group_tmp =iommu_group_get (&tmp->dev); -if (!group) { - group = group_tmp; -continue ; - } - -if (group_tmp) { -WARN_ON (group != group_tmp); -iommu_group_put (group_tmp); - } - } - -return group ? group :iommu_group_alloc (); - } - -/* -* Non-multifunction devices or multifunction devices supporting -* ACS get their own group. +* Look for existing groups on device aliases. If we alias another +* device or another device aliases us, use the same group. */ -if (!pdev->multifunction ||pci_acs_enabled (pdev,REQ_ACS_FLAGS )) -return iommu_group_alloc (); + group =get_pci_alias_group (pdev, (unsigned long *)devfns); +if (group) +return group;/* -* Multifunction devices not supporting ACS share a group with other -* similar devices in the same slot. +* Look for existing groups on non-isolated functions on the same +* slot and aliases of those funcions, if any. No need to clear +* the search bitmap, the tested devfns are still valid. */ - tmp =NULL ; -for_each_pci_dev (tmp) { -if (tmp == pdev || tmp->bus != pdev->bus || -PCI_SLOT (tmp->devfn) !=PCI_SLOT (pdev->devfn) || -pci_acs_enabled (tmp,REQ_ACS_FLAGS )) -continue ; - - group =iommu_group_get (&tmp->dev); -if (group) { -pci_dev_put (tmp); -return group; - } - } + group =get_pci_function_alias_group (pdev, (unsigned long *)devfns); +if (group) +return group;/* No shared group found, allocate new */ return iommu_group_alloc ();
Greg Kroah-Hartman
maintainerPATCH 81/319 iommu/amd: Split init_iommu_group() from iommu_init_device()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit 25b11ce2a3607d7c39a2ca121eea0c67c722b34e upstream.
For a PCI device, aliases from the IVRS table won't be populated into dma_alias_devfn until after iommu_init_device() is called on each device. We therefore want to split init_iommu_group() to be called from a separate loop immediately following.
--- drivers/iommu/amd_iommu.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
drivers/iommu/amd_iommu.c +13 -14
@@ -260,17 +260,13 @@ static bool check_device(struct device *return true; } -static int init_iommu_group (struct device *dev) +static void init_iommu_group (struct device *dev) {struct iommu_group *group; group =iommu_group_get_for_dev (dev); - -if (IS_ERR (group)) -return PTR_ERR (group); - -iommu_group_put (group); -return 0 ; +if (!IS_ERR (group)) +iommu_group_put (group); }static int __last_alias (struct pci_dev *pdev,u16 alias,void *data)
@@ -340,7 +336,6 @@ static int iommu_init_device(struct devistruct pci_dev *pdev =to_pci_dev (dev);struct iommu_dev_data *dev_data;u16 alias; -int ret;if (dev->archdata.iommu)return 0 ;
@@ -364,12 +359,6 @@ static int iommu_init_device(struct devi dev_data->alias_data = alias_data; } - ret =init_iommu_group (dev); -if (ret) { -free_dev_data (dev_data); -return ret; - } -if (pci_iommuv2_capable (pdev)) {struct amd_iommu *iommu;
@@ -455,6 +444,15 @@ int __init amd_iommu_init_devices(void) goto out_free; } +/* +* Initialize IOMMU groups only after iommu_init_device() has +* had a chance to populate any IVRS defined aliases. +*/ +for_each_pci_dev (pdev) { +if (check_device (&pdev->dev)) +init_iommu_group (&pdev->dev); + } +return 0 ; out_free:
@@ -2415,6 +2413,7 @@ static int device_change_notifier(structcase BUS_NOTIFY_ADD_DEVICE :iommu_init_device (dev); +init_iommu_group (dev);/* * dev_data is still NULL and
Greg Kroah-Hartman
maintainerPATCH 82/319 pstore: Fix duplicate {console,ftrace}-efi entries
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Valdis Kletnieks <[email protected]>
commit d4bf205da618bbd0b038e404d646f14e76915718 upstream.
The pstore filesystem still creates duplicate filename/inode pairs for some pstore types. Add the id to the filename to prevent that.
Before patch:
[/sys/fs/pstore] ls -li
total 0
1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi
After:
[/sys/fs/pstore] ls -li
total 0
1232 -r--r--r--. 1 root root 148 Sep 29 17:09 console-efi-141202499100000 1231 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi-141202499200000 1230 -r--r--r--. 1 root root 148 Sep 29 17:44 console-efi-141202705400000 1229 -r--r--r--. 1 root root 67 Sep 29 17:44 console-efi-141202705500000 1228 -r--r--r--. 1 root root 67 Sep 29 20:42 console-efi-141203772600000 1227 -r--r--r--. 1 root root 148 Sep 29 23:42 console-efi-141204854900000 1226 -r--r--r--. 1 root root 67 Sep 29 23:42 console-efi-141204855000000 1225 -r--r--r--. 1 root root 148 Sep 29 23:59 console-efi-141204954200000 1224 -r--r--r--. 1 root root 67 Sep 29 23:59 console-efi-141204954400000
--- fs/pstore/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/pstore/inode.c +2 -2
@@ -320,10 +320,10 @@ int pstore_mkfile(enum pstore_type_id ty compressed ? ".enc.z" : "");break ;case PSTORE_TYPE_CONSOLE : -sprintf (name,"console-%s" , psname); +sprintf (name,"console-%s-%lld" , psname, id);break ;case PSTORE_TYPE_FTRACE : -sprintf (name,"ftrace-%s" , psname); +sprintf (name,"ftrace-%s-%lld" , psname, id);break ;case PSTORE_TYPE_MCE :sprintf (name,"mce-%s-%lld" , psname, id);
Greg Kroah-Hartman
maintainerPATCH 83/319 selinux: fix inode security list corruption
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Smalley <[email protected]>
commit 923190d32de4428afbea5e5773be86bea60a9925 upstream.
sb_finish_set_opts() can race with inode_free_security() when initializing inode security structures for inodes created prior to initial policy load or by the filesystem
during ->mount(). This appears to have always been
a possible race, but commit 3dc91d4 ("SELinux: Fix possible NULL pointer dereference in selinux_inode_permission()") made it more evident by immediately reusing the unioned list/rcu element of the inode security structure for call_rcu() upon an inode_free_security(). But the underlying issue was already present before that commit as a possible use-after-free of isec.
Shivnandan Kumar reported the list corruption and proposed a patch to split the list and rcu elements out of the union as separate fields of the inode_security_struct so that setting the rcu element would not affect the list element. However, this would merely hide the issue and not truly fix the code.
This patch instead moves up the deletion of the list entry prior to dropping the sbsec->isec_lock initially. Then, if the inode is dropped subsequently, there will be no further references to the isec.
--- security/selinux/hooks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/selinux/hooks.c +1 -1
@@ -481,6 +481,7 @@ next_inode:list_entry (sbsec->isec_head.next, struct inode_security_struct, list);struct inode *inode = isec->inode; +list_del_init (&isec->list);spin_unlock (&sbsec->isec_lock); inode =igrab (inode);if (inode) {
@@ -489,7 +490,6 @@ next_inode:iput (inode); }spin_lock (&sbsec->isec_lock); -list_del_init (&isec->list); goto next_inode; }spin_unlock (&sbsec->isec_lock);
Greg Kroah-Hartman
maintainerPATCH 84/319 power: charger-manager: Fix NULL pointer exception with missing cm-fuel-gauge
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit 661a88860274e059fdb744dfaa98c045db7b5d1d upstream.
NULL pointer exception happens during charger-manager probe if 'cm-fuel-gauge' property is not present.
[ 2.448536] Unable to handle kernel NULL pointer dereference at virtual address 00000000 [ 2.456572] pgd = c0004000 [ 2.459217] [00000000] *pgd=00000000 [ 2.462759] Internal error: Oops: 5 [#1] PREEMPT SMP ARM [ 2.468047] Modules linked in: [ 2.471089] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.17.0-rc6-00251-ge44cf96cd525-dirty #969 [ 2.479765] task: ea890000 ti: ea87a000 task.ti: ea87a000 [ 2.485161] PC is at strcmp+0x4/0x30 [ 2.488719] LR is at power_supply_match_device_by_name+0x10/0x1c [ 2.494695] pc : [<c01f4220>] lr : [<c030fe38>] psr: a0000113 [ 2.494695] sp : ea87bde0 ip : 00000000 fp : eaa97010 [ 2.506150] r10: 00000004 r9 : ea97269c r8 : ea3bbfd0 [ 2.511360] r7 : eaa97000 r6 : c030fe28 r5 : 00000000 r4 : ea3b0000 [ 2.517869] r3 : 0000006d r2 : 00000000 r1 : 00000000 r0 : c057c195 [ 2.524381] Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel [ 2.531671] Control: 10c5387d Table: 4000404a DAC: 00000015 [ 2.537399] Process swapper/0 (pid: 1, stack limit = 0xea87a240) [ 2.543388] Stack: (0xea87bde0 to 0xea87c000) [ 2.547733] bde0: ea3b0210 c026b1c8 eaa97010 eaa97000 eaa97010 eabb60a8 ea3b0210 00000000 [ 2.555891] be00: 00000008 ea2db210 ea1a3410 c030fee0 ea3bbf90 c03138fc c068969c c013526c [ 2.564050] be20: eaa040c0 00000000 c068969c 00000000 eaa040c0 ea2da300 00000002 00000000 [ 2.572208] be40: 00000001 ea2da3c0 00000000 00000001 00000000 eaa97010 c068969c 00000000 [ 2.580367] be60: 00000000 c068969c 00000000 00000002 00000000 c026b71c c026b6f0 eaa97010 [ 2.588527] be80: c0e82530 c026a330 00000000 eaa97010 c068969c eaa97044 00000000 c061df50 [ 2.596686] bea0: ea87a000 c026a4dc 00000000 c068969c c026a448 c0268b5c ea8054a8 eaa8fd50 [ 2.604845] bec0: c068969c ea2db180 c06801f8 c0269b18 c0590f68 c068969c c0656c98 c068969c [ 2.613004] bee0: c0656c98 ea3bbe40 c06988c0 c026aaf0 00000000 c0656c98 c0656c98 c00088a4 [ 2.621163] bf00: 00000000 c0055f48 00000000 00000004 00000000 ea890000 c05dbc54 c062c178 [ 2.629323] bf20: c0603518 c005f674 00000001 ea87a000 eb7ff83b c0476440 00000091 c003d41c [ 2.637482] bf40: c05db344 00000007 eb7ff858 00000007 c065a76c c0647d24 00000007 c062c170 [ 2.645642] bf60: c06988c0 00000091 c062c178 c0603518 00000000 c0603cc4 00000007 00000007 [ 2.653801] bf80: c0603518 c0c0c0c0 00000000 c0453948 00000000 00000000 00000000 00000000 [ 2.661959] bfa0: 00000000 c0453950 00000000 c000e728 00000000 00000000 00000000 00000000 [ 2.670118] bfc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 2.678277] bfe0: 00000000 00000000 00000000 00000000 00000013 00000000 c0c0c0c0 c0c0c0c0 [ 2.686454] [<c01f4220>] (strcmp) from [<c030fe38>] (power_supply_match_device_by_name+0x10/0x1c) [ 2.695303] [<c030fe38>] (power_supply_match_device_by_name) from [<c026b1c8>] (class_find_device+0x54/0xac) [ 2.705106] [<c026b1c8>] (class_find_device) from [<c030fee0>] (power_supply_get_by_name+0x1c/0x30) [ 2.714137] [<c030fee0>] (power_supply_get_by_name) from [<c03138fc>] (charger_manager_probe+0x3d8/0xe58) [ 2.723683] [<c03138fc>] (charger_manager_probe) from [<c026b71c>] (platform_drv_probe+0x2c/0x5c) [ 2.732532] [<c026b71c>] (platform_drv_probe) from [<c026a330>] (driver_probe_device+0x10c/0x224) [ 2.741384] [<c026a330>] (driver_probe_device) from [<c026a4dc>] (__driver_attach+0x94/0x98) [ 2.749813] [<c026a4dc>] (__driver_attach) from [<c0268b5c>] (bus_for_each_dev+0x54/0x88) [ 2.757969] [<c0268b5c>] (bus_for_each_dev) from [<c0269b18>] (bus_add_driver+0xd4/0x1d0) [ 2.766123] [<c0269b18>] (bus_add_driver) from [<c026aaf0>] (driver_register+0x78/0xf4) [ 2.774110] [<c026aaf0>] (driver_register) from [<c00088a4>] (do_one_initcall+0x80/0x1bc) [ 2.782276] [<c00088a4>] (do_one_initcall) from [<c0603cc4>] (kernel_init_freeable+0x100/0x1cc) [ 2.790952] [<c0603cc4>] (kernel_init_freeable) from [<c0453950>] (kernel_init+0x8/0xec) [ 2.799029] [<c0453950>] (kernel_init) from [<c000e728>] (ret_from_fork+0x14/0x2c) [ 2.806572] Code: e12fff1e e1a03000 eafffff7 e4d03001 (e4d12001) [ 2.812832] ---[ end trace 7f12556111b9e7ef ]---
--- drivers/power/charger-manager.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/power/charger-manager.c +5 -0
@@ -1720,6 +1720,11 @@ static int charger_manager_probe(structreturn -EINVAL ; } +if (!desc->psy_fuel_gauge) { +dev_err (&pdev->dev,"No fuel gauge power supply defined\n" ); +return -EINVAL ; + } +/* Counting index only */ while (desc->psy_charger_stat[i]) i++;
Greg Kroah-Hartman
maintainerPATCH 85/319 virtio_pci: fix virtio spec compliance on restore
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Michael S. Tsirkin" <[email protected]>
commit 6fbc198cf623944ab60a1db6d306a4d55cdd820d upstream.
On restore, virtio pci does the following:
+ set features
+ init vqs etc - device can be used at this point!
+ set ACKNOWLEDGE,DRIVER and DRIVER_OK status bits
This is in violation of the virtio spec, which
requires the following order:
- ACKNOWLEDGE
- DRIVER
- init vqs
- DRIVER_OK
This behaviour will break with hypervisors that assume spec compliant behaviour. It seems like a good idea to have this patch applied to stable branches to reduce the support butden for the hypervisors.
--- drivers/virtio/virtio_pci.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-)
drivers/virtio/virtio_pci.c +30 -3
@@ -789,6 +789,7 @@ static int virtio_pci_restore(struct devstruct pci_dev *pci_dev =to_pci_dev (dev);struct virtio_pci_device *vp_dev =pci_get_drvdata (pci_dev);struct virtio_driver *drv; +unsigned status =0 ;int ret; drv = container_of(vp_dev->vdev.dev.driver,
@@ -799,14 +800,40 @@ static int virtio_pci_restore(struct devreturn ret;pci_set_master (pci_dev); +/* We always start by resetting the device, in case a previous +* driver messed it up. */ +vp_reset (&vp_dev->vdev); + +/* Acknowledge that we've seen the device. */ + status |=VIRTIO_CONFIG_S_ACKNOWLEDGE ; +vp_set_status (&vp_dev->vdev, status); + +/* Maybe driver failed before freeze. +* Restore the failed status, for debugging. */ + status |= vp_dev->saved_status &VIRTIO_CONFIG_S_FAILED ; +vp_set_status (&vp_dev->vdev, status); + +if (!drv) +return 0 ; + +/* We have a driver! */ + status |=VIRTIO_CONFIG_S_DRIVER ; +vp_set_status (&vp_dev->vdev, status); +vp_finalize_features (&vp_dev->vdev); -if (drv && drv->restore) +if (drv->restore) { ret = drv->restore (&vp_dev->vdev); +if (ret) { + status |=VIRTIO_CONFIG_S_FAILED ; +vp_set_status (&vp_dev->vdev, status); +return ret; + } + }/* Finally, tell the device we're all set */ -if (!ret) -vp_set_status (&vp_dev->vdev, vp_dev->saved_status); + status |=VIRTIO_CONFIG_S_DRIVER_OK ; +vp_set_status (&vp_dev->vdev, status);return ret; }
Greg Kroah-Hartman
maintainerPATCH 86/319 xen/blkback: unmap all persistent grants when frontend gets disconnected
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vitaly Kuznetsov <[email protected]>
commit 12ea729645ace01e08f9654df155622898d3aae6 upstream.
blkback does not unmap persistent grants when frontend goes to Closed state (e.g. when blkfront module is being removed). This leads to the following in guest's dmesg:
[ 343.243825] xen:grant_table: WARNING: g.e. 0x445 still in use! [ 343.243825] xen:grant_table: WARNING: g.e. 0x42a still in use!
...
When load module -> use device -> unload module sequence is performed multiple times it is possible to hit BUG() condition in blkfront module:
[ 343.243825] kernel BUG at drivers/block/xen-blkfront.c:954! [ 343.243825] invalid opcode: 0000 [#1] SMP [ 343.243825] Modules linked in: xen_blkfront(-) ata_generic pata_acpi [last unloaded: xen_blkfront] ... [ 343.243825] Call Trace: [ 343.243825] [<ffffffff814111ef>] ? unregister_xenbus_watch+0x16f/0x1e0 [ 343.243825] [<ffffffffa0016fbf>] blkfront_remove+0x3f/0x140 [xen_blkfront] ... [ 343.243825] RIP [<ffffffffa0016aae>] blkif_free+0x34e/0x360 [xen_blkfront] [ 343.243825] RSP <ffff88001eb8fdc0>
We don't need to keep these grants if we're disconnecting as frontend might already forgot about them. Solve the issue by moving xen_blkbk_free_caches() call from xen_blkif_free() to xen_blkif_disconnect().
Now we can see the following:
[ 928.590893] xen:grant_table: WARNING: g.e. 0x587 still in use! [ 928.591861] xen:grant_table: WARNING: g.e. 0x372 still in use! ... [ 929.592146] xen:grant_table: freeing g.e. 0x587 [ 929.597174] xen:grant_table: freeing g.e. 0x372
...
Backend does not keep persistent grants any more, reconnect works fine.
--- drivers/block/xen-blkback/xenbus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/block/xen-blkback/xenbus.c +3 -3
@@ -270,6 +270,9 @@ static int xen_blkif_disconnect(struct x blkif->blk_rings.common.sring =NULL ; } +/* Remove all persistent grants and the cache of ballooned pages. */ +xen_blkbk_free_caches (blkif); +return 0 ; }
@@ -281,9 +284,6 @@ static void xen_blkif_free(struct xen_blxen_blkif_disconnect (blkif);xen_vbd_free (&blkif->vbd); -/* Remove all persistent grants and the cache of ballooned pages. */ -xen_blkbk_free_caches (blkif); -/* Make sure everything is drained before shutting down */ BUG_ON (blkif->persistent_gnt_c !=0 );BUG_ON (atomic_read (&blkif->persistent_gnt_in_use) !=0 );
Greg Kroah-Hartman
maintainerPATCH 88/319 drm/cirrus: bind also to qemu-xen-traditional
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olaf Hering <[email protected]>
commit c0c3e735fa7bae29c6623511127fd021b2d6d849 upstream.
qemu as used by xend/xm toolstack uses a different subvendor id. Bind the drm driver also to this emulated card.
--- drivers/gpu/drm/cirrus/cirrus_drv.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/cirrus/cirrus_drv.c +2 -0
@@ -32,6 +32,8 @@ static struct drm_driver driver;static const struct pci_device_id pciidlist[] = { {PCI_VENDOR_ID_CIRRUS ,PCI_DEVICE_ID_CIRRUS_5446 ,0x1af4 ,0x1100 ,0 ,0 ,0 }, + {PCI_VENDOR_ID_CIRRUS ,PCI_DEVICE_ID_CIRRUS_5446 ,PCI_VENDOR_ID_XEN , +0x0001 ,0 ,0 ,0 }, {0 ,} };
Greg Kroah-Hartman
maintainerPATCH 89/319 blk-mq: fix potential hang if rolling wakeup depth is too high
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit abab13b5c4fd1fec4f9a61622548012d93dc2831 upstream.
We currently divide the queue depth by 4 as our batch wakeup count, but we split the wakeups over BT_WAIT_QUEUES number of wait queues. This defaults to 8. If the product of the resulting batch wake count and BT_WAIT_QUEUES is higher than the device queue depth, we can get into a situation where a task goes to sleep waiting for a request, but never gets woken up.
--- block/blk-mq-tag.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block/blk-mq-tag.c +2 -2
@@ -463,8 +463,8 @@ static void bt_update_count(struct blk_m } bt->wake_cnt =BT_WAIT_BATCH ; -if (bt->wake_cnt > depth /4 ) - bt->wake_cnt =max (1U , depth /4 ); +if (bt->wake_cnt > depth /BT_WAIT_QUEUES ) + bt->wake_cnt =max (1U , depth /BT_WAIT_QUEUES ); bt->depth = depth; }
Greg Kroah-Hartman
maintainerPATCH 90/319 dm bufio: update last_accessed when relinking a buffer
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joe Thornber <[email protected]>
commit eb76faf53b1ff7a77ce3f78cc98ad392ac70c2a0 upstream.
The 'last_accessed' member of the dm_buffer structure was only set when the the buffer was created. This led to each buffer being discarded after dm_bufio_max_age time even if it was used recently. In practice this resulted in all thinp metadata being evicted soon after being read -- this is particularly problematic for metadata intensive workloads like multithreaded small random IO.
'last_accessed' is now updated each time the buffer is moved to the head of the LRU list, so the buffer is now properly discarded if it was not used in dm_bufio_max_age time.
--- drivers/md/dm-bufio.c | 1 + 1 file changed, 1 insertion(+)
drivers/md/dm-bufio.c +1 -0
@@ -465,6 +465,7 @@ static void __relink_lru(struct dm_buffe c->n_buffers[dirty]++; b->list_mode = dirty;list_move (&b->lru_list, &c->lru[dirty]); + b->last_accessed = jiffies; }/*----------------------------------------------------------------
Greg Kroah-Hartman
maintainerPATCH 91/319 dm bufio: when done scanning return from __scan immediately
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit 0e825862f3c04cee40e25f55680333728a4ffa9b upstream.
When __scan frees the required number of buffer entries that the shrinker requested (nr_to_scan becomes zero) it must return. Before this fix the __scan code exited only the inner loop and continued in the outer loop -- which could result in reduced performance due to extra buffers being freed (e.g. unnecessarily evicted thinp metadata needing to be synchronously re-read into bufio's cache).
Also, move dm_bufio_cond_resched to __scan's inner loop, so that iterating the bufio client's lru lists doesn't result in scheduling latency.
--- drivers/md/dm-bufio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/dm-bufio.c +2 -2
@@ -1473,9 +1473,9 @@ static long __scan(struct dm_bufio_clienlist_for_each_entry_safe_reverse (b, tmp, &c->lru[l], lru_list) { freed +=__cleanup_old_buffer (b, gfp_mask,0 );if (!--nr_to_scan) -break ; +return freed; +dm_bufio_cond_resched (); } -dm_bufio_cond_resched (); }return freed; }
Greg Kroah-Hartman
maintainerPATCH 92/319 drbd: compute the end before rb_insert_augmented()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lai Jiangshan <[email protected]>
commit 82cfb90bc99d7b7e0ec62d0505b9d4f06805d5db upstream.
Commit 98683650 "Merge branch 'drbd-8.4_ed6' into for-3.8-drivers-drbd-8.4_ed6" switches to the new augment API, but the new API requires that the tree is augmented before rb_insert_augmented() is called, which is missing.
So we add the augment-code to drbd_insert_interval() when it travels the tree up to down before rb_insert_augmented(). See the example in include/linux/interval_tree_generic.h or Documentation/rbtree.txt.
drbd_insert_interval() may cancel the insertion when traveling, in this case, the just added augment-code does nothing before cancel since the @this node is already in the subtrees in this case.
--- drivers/block/drbd/drbd_interval.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/block/drbd/drbd_interval.c +4 -0
@@ -79,6 +79,7 @@ bool drbd_insert_interval(struct rb_root *root, struct drbd_interval *this) { struct rb_node **new = &root->rb_node, *parent = NULL; +sector_t this_end = this->sector + (this->size >>9 );BUG_ON (!IS_ALIGNED (this->size,512 ));
@@ -87,6 +88,8 @@ drbd_insert_interval(struct rb_root *roo rb_entry(*new, struct drbd_interval, rb); parent = *new; +if (here->end < this_end) + here->end = this_end;if (this->sector < here->sector) new = &(*new)->rb_left;else if (this->sector > here->sector)
@@ -99,6 +102,7 @@ drbd_insert_interval(struct rb_root *rooreturn false; } + this->end = this_end;rb_link_node (&this->rb, parent, new);rb_insert_augmented (&this->rb, root, &augment_callbacks);return true;
Greg Kroah-Hartman
maintainerPATCH 93/319 block: fix alignment_offset math that assumes io_min is a power-of-2
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Snitzer <[email protected]>
commit b8839b8c55f3fdd60dc36abcda7e0266aff7985c upstream.
The math in both blk_stack_limits() and queue_limit_alignment_offset() assume that a block device's io_min (aka minimum_io_size) is always a power-of-2. Fix the math such that it works for non-power-of-2 io_min.
This issue (of alignment_offset != 0) became apparent when testing dm-thinp with a thinp blocksize that matches a RAID6 stripesize of 1280K. Commit fdfb4c8c1 ("dm thin: set minimum_io_size to pool's data block size") unlocked the potential for alignment_offset != 0 due to the dm-thin-pool's io_min possibly being a non-power-of-2.
--- block/blk-settings.c | 4 ++-- include/linux/blkdev.h | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-)
block/blk-settings.c +2 -2
@@ -574,7 +574,7 @@ int blk_stack_limits(struct queue_limits bottom =max (b->physical_block_size, b->io_min) + alignment;/* Verify that top and bottom intervals line up */ -if (max (top, bottom) & (min (top, bottom) -1 )) { +if (max (top, bottom) %min (top, bottom)) { t->misaligned =1 ; ret =-1 ; }
@@ -619,7 +619,7 @@ int blk_stack_limits(struct queue_limits/* Find lowest common alignment_offset */ t->alignment_offset =lcm (t->alignment_offset, alignment) - & (max (t->physical_block_size, t->io_min) -1 ); + %max (t->physical_block_size, t->io_min);/* Verify that new alignment_offset is on a logical block boundary */ if (t->alignment_offset & (t->logical_block_size -1 )) {
include/linux/blkdev.h +2 -3
@@ -1285,10 +1285,9 @@ static inline int queue_alignment_offsetstatic inline int queue_limit_alignment_offset (struct queue_limits *lim,sector_t sector) {unsigned int granularity =max (lim->physical_block_size, lim->io_min); -unsigned int alignment = (sector <<9 ) & (granularity -1 ); +unsigned int alignment =sector_div (sector, granularity >>9 ) <<9 ; -return (granularity + lim->alignment_offset - alignment) - & (granularity -1 ); +return (granularity + lim->alignment_offset - alignment) % granularity; }static inline int bdev_alignment_offset (struct block_device *bdev)
Greg Kroah-Hartman
maintainerPATCH 94/319 Revert "block: all blk-mq requests are tagged"
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
commit e999dbc254044e8d2a5818d92d205f65bae28f37 upstream.
This reverts commit fb3ccb5da71273e7f0d50b50bc879e50cedd60e7.
SCSI-2/SPI actually needs the tagged/untagged flag in the request to work properly. Revert this patch and add a follow on to set it in the right place.
--- include/linux/blkdev.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
include/linux/blkdev.h +1 -2
@@ -1142,8 +1142,7 @@ static inline bool blk_needs_flush_plug(/* * tag stuff */ -#define blk_rq_tagged (rq) \ - ((rq)->mq_ctx || ((rq)->cmd_flags & REQ_QUEUED)) +#define blk_rq_tagged (rq) ((rq)->cmd_flags & REQ_QUEUED)extern int blk_queue_start_tag (struct request_queue *,struct request *);extern struct request *blk_queue_find_tag (struct request_queue *,int );extern void blk_queue_end_tag (struct request_queue *,struct request *);
Greg Kroah-Hartman
maintainerPATCH 95/319 dm log userspace: fix memory leak in dm_ulog_tfr_init failure path
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Khoroshilov <[email protected]>
commit 56ec16cb1e1ce46354de8511eef962a417c32c92 upstream.
If cn_add_callback() fails in dm_ulog_tfr_init(), it does not deallocate prealloced memory but calls cn_del_callback().
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/md/dm-log-userspace-transfer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-log-userspace-transfer.c +1 -1
@@ -272,7 +272,7 @@ int dm_ulog_tfr_init(void) r =cn_add_callback (&ulog_cn_id,"dmlogusr" , cn_ulog_callback);if (r) { -cn_del_callback (&ulog_cn_id); +kfree (prealloced_cn_msg);return r; }
Greg Kroah-Hartman
maintainerPATCH 96/319 modules, lock around setting of MODULE_STATE_UNFORMED
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prarit Bhargava <[email protected]>
commit d3051b489aa81ca9ba62af366149ef42b8dae97c upstream.
A panic was seen in the following sitation.
There are two threads running on the system. The first thread is a system monitoring thread that is reading /proc/modules. The second thread is loading and unloading a module (in this example I'm using my simple dummy-module.ko). Note, in the "real world" this occurred with the qlogic driver module.
When doing this, the following panic occurred:
------------[ cut here ]------------ kernel BUG at kernel/module.c:3739! invalid opcode: 0000 [#1] SMP Modules linked in: binfmt_misc sg nfsv3 rpcsec_gss_krb5 nfsv4 dns_resolver nfs fscache intel_powerclamp coretemp kvm_intel kvm crct10dif_pclmul crc32_pclmul crc32c_intel ghash_clmulni_intel aesni_intel lrw igb gf128mul glue_helper iTCO_wdt iTCO_vendor_support ablk_helper ptp sb_edac cryptd pps_core edac_core shpchp i2c_i801 pcspkr wmi lpc_ich ioatdma mfd_core dca ipmi_si nfsd ipmi_msghandler auth_rpcgss nfs_acl lockd sunrpc xfs libcrc32c sr_mod cdrom sd_mod crc_t10dif crct10dif_common mgag200 syscopyarea sysfillrect sysimgblt i2c_algo_bit drm_kms_helper ttm isci drm libsas ahci libahci scsi_transport_sas libata i2c_core dm_mirror dm_region_hash dm_log dm_mod [last unloaded: dummy_module] CPU: 37 PID: 186343 Comm: cat Tainted: GF O-------------- 3.10.0+ #7 Hardware name: Intel Corporation S2600CP/S2600CP, BIOS RMLSDP.86I.00.29.D696.1311111329 11/11/2013 task: ffff8807fd2d8000 ti: ffff88080fa7c000 task.ti: ffff88080fa7c000 RIP: 0010:[<ffffffff810d64c5>] [<ffffffff810d64c5>] module_flags+0xb5/0xc0 RSP: 0018:ffff88080fa7fe18 EFLAGS: 00010246 RAX: 0000000000000003 RBX: ffffffffa03b5200 RCX: 0000000000000000 RDX: 0000000000001000 RSI: ffff88080fa7fe38 RDI: ffffffffa03b5000 RBP: ffff88080fa7fe28 R08: 0000000000000010 R09: 0000000000000000 R10: 0000000000000000 R11: 000000000000000f R12: ffffffffa03b5000 R13: ffffffffa03b5008 R14: ffffffffa03b5200 R15: ffffffffa03b5000 FS: 00007f6ae57ef740(0000) GS:ffff88101e7a0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000404f70 CR3: 0000000ffed48000 CR4: 00000000001407e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Stack: ffffffffa03b5200 ffff8810101e4800 ffff88080fa7fe70 ffffffff810d666c ffff88081e807300 000000002e0f2fbf 0000000000000000 ffff88100f257b00 ffffffffa03b5008 ffff88080fa7ff48 ffff8810101e4800 ffff88080fa7fee0 Call Trace: [<ffffffff810d666c>] m_show+0x19c/0x1e0 [<ffffffff811e4d7e>] seq_read+0x16e/0x3b0 [<ffffffff812281ed>] proc_reg_read+0x3d/0x80 [<ffffffff811c0f2c>] vfs_read+0x9c/0x170 [<ffffffff811c1a58>] SyS_read+0x58/0xb0 [<ffffffff81605829>] system_call_fastpath+0x16/0x1b Code: 48 63 c2 83 c2 01 c6 04 03 29 48 63 d2 eb d9 0f 1f 80 00 00 00 00 48 63 d2 c6 04 13 2d 41 8b 0c 24 8d 50 02 83 f9 01 75 b2 eb cb <0f> 0b 66 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 55 48 89 e5 41 RIP [<ffffffff810d64c5>] module_flags+0xb5/0xc0 RSP <ffff88080fa7fe18>
Consider the two processes running on the system.
CPU 0 (/proc/modules reader)
CPU 1 (loading/unloading module)
CPU 0 opens /proc/modules, and starts displaying data for each module by traversing the modules list via fs/seq_file.c:seq_open() and fs/seq_file.c:seq_read(). For each module in the modules list, seq_read does
op->start() <-- this is a pointer to m_start()
op->show() <- this is a pointer to m_show()
op->stop() <-- this is a pointer to m_stop()
The m_start(), m_show(), and m_stop() module functions are defined in kernel/module.c. The m_start() and m_stop() functions acquire and release the module_mutex respectively.
ie) When reading /proc/modules, the module_mutex is acquired and released for each module.
m_show() is called with the module_mutex held. It accesses the module struct data and attempts to write out module data. It is in this code path that the above BUG_ON() warning is encountered, specifically m_show() calls
static char *module_flags(struct module *mod, char *buf) {
int bx = 0;
BUG_ON(mod->state == MODULE_STATE_UNFORMED);
...
The other thread, CPU 1, in unloading the module calls the syscall delete_module() defined in kernel/module.c. The module_mutex is acquired for a short time, and then released. free_module() is called without the module_mutex. free_module() then sets mod->state = MODULE_STATE_UNFORMED, also without the module_mutex. Some additional code is called and then the module_mutex is reacquired to remove the module from the modules list:
/* Now we can delete it from the lists */
mutex_lock(&module_mutex);
stop_machine(__unlink_module, mod, NULL);
mutex_unlock(&module_mutex);
This is the sequence of events that leads to the panic.
CPU 1 is removing dummy_module via delete_module(). It acquires the module_mutex, and then releases it. CPU 1 has NOT set dummy_module->state to MODULE_STATE_UNFORMED yet.
CPU 0, which is reading the /proc/modules, acquires the module_mutex and acquires a pointer to the dummy_module which is still in the modules list. CPU 0 calls m_show for dummy_module. The check in m_show() for MODULE_STATE_UNFORMED passed for dummy_module even though it is being torn down.
Meanwhile CPU 1, which has been continuing to remove dummy_module without holding the module_mutex, now calls free_module() and sets dummy_module->state to MODULE_STATE_UNFORMED.
CPU 0 now calls module_flags() with dummy_module and ...
static char *module_flags(struct module *mod, char *buf)
{
int bx = 0;
BUG_ON(mod->state == MODULE_STATE_UNFORMED);and BOOM.
Acquire and release the module_mutex lock around the setting of MODULE_STATE_UNFORMED in the teardown path, which should resolve the problem.
Testing: In the unpatched kernel I can panic the system within 1 minute by doing
while (true) do insmod dummy_module.ko; rmmod dummy_module.ko; done
and
while (true) do cat /proc/modules; done
in separate terminals.
In the patched kernel I was able to run just over one hour without seeing any issues. I also verified the output of panic via sysrq-c and the output of /proc/modules looks correct for all three states for the dummy_module.
dummy_module 12661 0 - Unloading 0xffffffffa03a5000 (OE-)
dummy_module 12661 0 - Live 0xffffffffa03bb000 (OE)
dummy_module 14015 1 - Loading 0xffffffffa03a5000 (OE+)--- kernel/module.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/module.c +2 -0
@@ -1842,7 +1842,9 @@ static void free_module(struct module *m/* We leave it in list to prevent duplicate loads, but make sure * that noone uses it while it's being deconstructed. */ +mutex_lock (&module_mutex); mod->state =MODULE_STATE_UNFORMED ; +mutex_unlock (&module_mutex);/* Remove dynamic debug info */ ddebug_remove_module (mod->name);
Greg Kroah-Hartman
maintainerPATCH 97/319 framebuffer: fix screen corruption when copying
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit 5b789da8a7fc357661fc61faaf853e9161cc9700 upstream.
The function bitcpy_rev has a bug that may result in screen corruption. The bug happens under these conditions:
* the end of the destination area of a copy operation is aligned on a long word boundary
* the end of the source area is not aligned on a long word boundary
* we are copying more than one long word
In this case, the variable shift is non-zero and the variable first is zero. The statements FB_WRITEL(comp(d0, FB_READL(dst), first), dst) reads the last long word of the destination and writes it back unchanged (because first is zero). Correctly, we should write the variable d0 to the last word of the destination in this case.
This patch fixes the bug by introducing and extra test if first is zero.
The patch also removes the references to fb_memmove in the code that is commented out because fb_memmove was removed from framebuffer subsystem.
--- drivers/video/fbdev/core/cfbcopyarea.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/video/fbdev/core/cfbcopyarea.c +8 -5
@@ -55,8 +55,8 @@ bitcpy(struct fb_info *p, unsigned long* If you suspect bug in this function, compare it with this simple * memmove implementation. */ -fb_memmove ((char *)dst + ((dst_idx & (bits -1 ))) /8 , - (char *)src + ((src_idx & (bits -1 ))) /8 , n /8 ); +memmove ((char *)dst + ((dst_idx & (bits -1 ))) /8 , + (char *)src + ((src_idx & (bits -1 ))) /8 , n /8 );return ;#endif
@@ -221,8 +221,8 @@ bitcpy_rev(struct fb_info *p, unsigned l* If you suspect bug in this function, compare it with this simple * memmove implementation. */ -fb_memmove ((char *)dst + ((dst_idx & (bits -1 ))) /8 , - (char *)src + ((src_idx & (bits -1 ))) /8 , n /8 ); +memmove ((char *)dst + ((dst_idx & (bits -1 ))) /8 , + (char *)src + ((src_idx & (bits -1 ))) /8 , n /8 );return ;#endif
@@ -324,7 +324,10 @@ bitcpy_rev(struct fb_info *p, unsigned l d0 = d0 << left | d1 >> right; } d0 =fb_rev_pixels_in_long (d0, bswapmask); -FB_WRITEL (comp (d0,FB_READL (dst), first), dst); +if (!first) +FB_WRITEL (d0, dst); +else +FB_WRITEL (comp (d0,FB_READL (dst), first), dst); d0 = d1; dst--; n -= dst_idx+1 ;
Greg Kroah-Hartman
maintainerPATCH 98/319 framebuffer: fix border color
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit f74a289b9480648a654e5afd8458c2263c03a1e1 upstream.
The framebuffer code uses the current background color to fill the border when switching consoles, however, this results in inconsistent behavior. For example:
- start Midnigh Commander
- the border is black
- switch to another console and switch back
- the border is cyan
- type something into the command line in mc
- the border is cyan
- switch to another console and switch back
- the border is black
- press F9 to go to menu
- the border is black
- switch to another console and switch back
- the border is dark blue
When switching to a console with Midnight Commander, the border is random color that was left selected by the slang subsystem.
This patch fixes this inconsistency by always using black as the background color when switching consoles.
--- drivers/video/console/bitblit.c | 3 +-- drivers/video/console/fbcon_ccw.c | 3 +-- drivers/video/console/fbcon_cw.c | 3 +-- drivers/video/console/fbcon_ud.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-)
drivers/video/console/bitblit.c +1 -2
@@ -205,7 +205,6 @@ static void bit_putcs(struct vc_data *vcstatic void bit_clear_margins (struct vc_data *vc,struct fb_info *info,int bottom_only) { -int bgshift = (vc->vc_hi_font_mask) ?13 :12 ;unsigned int cw = vc->vc_font.width;unsigned int ch = vc->vc_font.height;unsigned int rw = info->var.xres - (vc->vc_cols*cw);
@@ -214,7 +213,7 @@ static void bit_clear_margins(struct vc_unsigned int bs = info->var.yres - bh;struct fb_fillrect region; - region.color =attr_bgcol_ec (bgshift, vc, info); + region.color =0 ; region.rop =ROP_COPY ;if (rw && !bottom_only) {
drivers/video/console/fbcon_ccw.c +1 -2
@@ -197,9 +197,8 @@ static void ccw_clear_margins(struct vc_unsigned int bh = info->var.xres - (vc->vc_rows*ch);unsigned int bs = vc->vc_rows*ch;struct fb_fillrect region; -int bgshift = (vc->vc_hi_font_mask) ?13 :12 ; - region.color =attr_bgcol_ec (bgshift,vc,info); + region.color =0 ; region.rop =ROP_COPY ;if (rw && !bottom_only) {
drivers/video/console/fbcon_cw.c +1 -2
@@ -180,9 +180,8 @@ static void cw_clear_margins(struct vc_dunsigned int bh = info->var.xres - (vc->vc_rows*ch);unsigned int rs = info->var.yres - rw;struct fb_fillrect region; -int bgshift = (vc->vc_hi_font_mask) ?13 :12 ; - region.color =attr_bgcol_ec (bgshift,vc,info); + region.color =0 ; region.rop =ROP_COPY ;if (rw && !bottom_only) {
drivers/video/console/fbcon_ud.c +1 -2
@@ -227,9 +227,8 @@ static void ud_clear_margins(struct vc_dunsigned int rw = info->var.xres - (vc->vc_cols*cw);unsigned int bh = info->var.yres - (vc->vc_rows*ch);struct fb_fillrect region; -int bgshift = (vc->vc_hi_font_mask) ?13 :12 ; - region.color =attr_bgcol_ec (bgshift,vc,info); + region.color =0 ; region.rop =ROP_COPY ;if (rw && !bottom_only) {
Greg Kroah-Hartman
maintainerPATCH 99/319 Input: synaptics - gate forcepad support by DMI check
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
commit aa972409951e0675e07918620427517cad5090e0 upstream.
Unfortunately, ForcePad capability is not actually exported over PS/2, so we have to resort to DMI checks.
--- drivers/input/mouse/synaptics.c | 22 +++++++++++++++++++++- drivers/input/mouse/synaptics.h | 8 ++------ 2 files changed, 23 insertions(+), 7 deletions(-)
drivers/input/mouse/synaptics.c +21 -1
@@ -618,6 +618,8 @@ static void synaptics_parse_agm(const un priv->agm_pending = true; } +static bool is_forcepad; +static int synaptics_parse_hw_state (const unsigned char buf[],struct synaptics_data *priv,struct synaptics_hw_state *hw)
@@ -647,7 +649,7 @@ static int synaptics_parse_hw_state(cons hw->left = (buf[0 ] &0x01 ) ?1 :0 ; hw->right = (buf[0 ] &0x02 ) ?1 :0 ; -if (SYN_CAP_FORCEPAD (priv->ext_cap_0c)) { +if (is_forcepad) {/* * ForcePads, like Clickpads, use middle button * bits to report primary button clicks.
@@ -1678,11 +1680,29 @@ static const struct dmi_system_id __init { } }; +static const struct dmi_system_id forcepad_dmi_table[]__initconst = { +#if defined(CONFIG_DMI) && defined(CONFIG_X86) + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"HP EliteBook Folio 1040 G1" ), + }, + }, +#endif + { } +}; +void __init synaptics_module_init (void ) { impaired_toshiba_kbc =dmi_check_system (toshiba_dmi_table); broken_olpc_ec =dmi_check_system (olpc_dmi_table); cr48_profile_sensor =dmi_check_system (cr48_dmi_table); + +/* +* Unfortunately ForcePad capability is not exported over PS/2, +* so we have to resort to checking DMI. +*/ + is_forcepad =dmi_check_system (forcepad_dmi_table); }static int __synaptics_init (struct psmouse *psmouse,bool absolute_mode)
drivers/input/mouse/synaptics.h +2 -6
@@ -77,12 +77,9 @@* for noise. * 2 0x08 image sensor image sensor tracks 5 fingers, but only * reports 2. +* 2 0x01 uniform clickpad whole clickpad moves instead of being +* hinged at the top. * 2 0x20 report min query 0x0f gives min coord reported -* 2 0x80 forcepad forcepad is a variant of clickpad that -* does not have physical buttons but rather -* uses pressure above certain threshold to -* report primary clicks. Forcepads also have -* clickpad bit set. */ #define SYN_CAP_CLICKPAD (ex0c) ((ex0c) & 0x100000)/* 1-button ClickPad */ #define SYN_CAP_CLICKPAD2BTN (ex0c) ((ex0c) & 0x000100)/* 2-button ClickPad */
@@ -91,7 +88,6 @@#define SYN_CAP_ADV_GESTURE (ex0c) ((ex0c) & 0x080000)#define SYN_CAP_REDUCED_FILTERING (ex0c) ((ex0c) & 0x000400)#define SYN_CAP_IMAGE_SENSOR (ex0c) ((ex0c) & 0x000800) -#define SYN_CAP_FORCEPAD (ex0c) ((ex0c) & 0x008000)/* synaptics modes query bits */ #define SYN_MODE_ABSOLUTE (m) ((m) & (1 << 7))
Greg Kroah-Hartman
maintainerPATCH 100/319 Input: i8042 - add noloop quirk for Asus X750LN
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit 9ff84a17302aeb8913ff244ecc0d8f9d219fecb5 upstream.
Without this the aux port does not get detected, and consequently the touchpad will not work.
https://bugzilla.redhat.com/show_bug.cgi?id=1110011
--- drivers/input/serio/i8042-x86ia64io.h | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/input/serio/i8042-x86ia64io.h +6 -0
@@ -101,6 +101,12 @@ static const struct dmi_system_id __init }, { .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_PRODUCT_NAME, "X750LN"), + }, + }, + { + .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"Compaq" ),DMI_MATCH (DMI_PRODUCT_NAME ,"ProLiant" ), DMI_MATCH(DMI_PRODUCT_VERSION, "8500"),
Greg Kroah-Hartman
maintainerPATCH 101/319 Input: alps - fix v4 button press recognition
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Bosch <[email protected]>
commit b0cfb794a3dd1d699f3e453f9180bd06508fb8f0 upstream.
Since the change to struct input_mt_pos some variables are now bitfields instead of integers. Automatic conversion from integer to bitfield entry destroys information, therefore enforce boolean interpretation instead.
--- drivers/input/mouse/alps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/input/mouse/alps.c +2 -2
@@ -835,8 +835,8 @@ static void alps_process_packet_v4(struc f->fingers =alps_process_bitmap (priv, f); } - f->left = packet[4 ] &0x01 ; - f->right = packet[4 ] &0x02 ; + f->left = !!(packet[4 ] &0x01 ); + f->right = !!(packet[4 ] &0x02 ); f->st.x = ((packet[1 ] &0x7f ) <<4 ) | ((packet[3 ] &0x30 ) >>2 ) | ((packet[0 ] &0x30 ) >>4 );
Greg Kroah-Hartman
maintainerPATCH 102/319 Input: i8042 - quirks for Fujitsu Lifebook A544 and Lifebook AH544
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit 993b3a3f80a7842a48cd46c2b41e1b3ef6302468 upstream.
These models need i8042.notimeout, otherwise the touchpad will not work.
--- drivers/input/serio/i8042-x86ia64io.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/input/serio/i8042-x86ia64io.h +16 -0
@@ -629,6 +629,22 @@ static const struct dmi_system_id __init }, }, { +/* Fujitsu A544 laptop */ +/* https://bugzilla.redhat.com/show_bug.cgi?id=1111138 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK A544"), + }, + }, + { +/* Fujitsu AH544 laptop */ +/* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK AH544"), + }, + }, + {/* Fujitsu U574 laptop */ /* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */ .matches = {
Greg Kroah-Hartman
maintainerPATCH 103/319 HID: input: Fix TransducerSerialNumber implementation
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gerecke <[email protected]>
commit 5989a55a4c9aafba8b152c6bf52244510c2b88b9 upstream.
The commit which introduced TransducerSerialNumber (368c966) is missing two crucial implementation details. Firstly, the commit does not set the type/code/bit/max fields as expected later down the code which can cause the driver to crash when a tablet with this usage is connected. Secondly, the call to 'set_bit' causes MSC_PULSELED to be sent instead of the expected MSC_SERIAL. This commit addreses both issues.
--- drivers/hid/hid-input.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/hid/hid-input.c +4 -1
@@ -689,7 +689,10 @@ static void hidinput_configure_usage(strbreak ;case 0x5b :/* TransducerSerialNumber */ -set_bit (MSC_SERIAL , input->mscbit); + usage->type =EV_MSC ; + usage->code =MSC_SERIAL ; + bit = input->mscbit; + max =MSC_MAX ;break ;default : goto unknown;
Greg Kroah-Hartman
maintainerPATCH 104/319 drm/ast: Fix HW cursor image
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Herrenschmidt <[email protected]>
commit 1e99cfa8de0f0879091e33cd65fd60418d006ad9 upstream.
The translation from the X driver to the KMS one typo'ed a couple of array indices, causing the HW cursor to look weird (blocky with leaking edge colors). This fixes it.
--- drivers/gpu/drm/ast/ast_mode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/ast/ast_mode.c +2 -2
@@ -1080,8 +1080,8 @@ static u32 copy_cursor_image(u8 *src, u8 srcdata32[1 ].ul = *((u32 *)(srcxor +4 )) &0xf0f0f0f0 ; data32.b[0 ] = srcdata32[0 ].b[1 ] | (srcdata32[0 ].b[0 ] >>4 ); data32.b[1 ] = srcdata32[0 ].b[3 ] | (srcdata32[0 ].b[2 ] >>4 ); - data32.b[2 ] = srcdata32[0 ].b[1 ] | (srcdata32[1 ].b[0 ] >>4 ); - data32.b[3 ] = srcdata32[0 ].b[3 ] | (srcdata32[1 ].b[2 ] >>4 ); + data32.b[2 ] = srcdata32[1 ].b[1 ] | (srcdata32[1 ].b[0 ] >>4 ); + data32.b[3 ] = srcdata32[1 ].b[3 ] | (srcdata32[1 ].b[2 ] >>4 );writel (data32.ul, dstxor); csum += data32.ul;
Greg Kroah-Hartman
maintainerPATCH 105/319 drm/nouveau/gpio: rename g92 class to g94
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Emil Velikov <[email protected]>
commit b485a7005faba38286bc02ab1d80e2cbf61c1002 upstream.
nv92 hardware has only 16 interrupt lines, while nv94 and later has 32. Accessing 0xe0c{0,4} registers on nv92 can lead to incorrect PDISP setup. This is a regression introduced with
commit 9d0f5ec9ee0fd5dc5fc1cc2cf559286431e406e3
Author: Ben Skeggs <[email protected]> Date: Mon May 12 15:22:42 2014 +1000
gpio: split g92 class from nv50
--- drivers/gpu/drm/nouveau/Makefile | 2 drivers/gpu/drm/nouveau/core/engine/device/nv50.c | 22 +++--- drivers/gpu/drm/nouveau/core/engine/device/nvc0.c | 14 +-- drivers/gpu/drm/nouveau/core/include/subdev/gpio.h | 2 drivers/gpu/drm/nouveau/core/subdev/gpio/nv92.c | 74 --------------------- drivers/gpu/drm/nouveau/core/subdev/gpio/nv94.c | 74 +++++++++++++++++++++ drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c | 4 - drivers/gpu/drm/nouveau/core/subdev/gpio/priv.h | 4 - 8 files changed, 98 insertions(+), 98 deletions(-)
drivers/gpu/drm/nouveau/Makefile +1 -1
@@ -129,7 +129,7 @@ nouveau-y += core/subdev/fb/gddr5.o nouveau-y += core/subdev/gpio/base.o nouveau-y += core/subdev/gpio/nv10.o nouveau-y += core/subdev/gpio/nv50.o -nouveau-y += core/subdev/gpio/nv92.o +nouveau-y += core/subdev/gpio/nv94.o nouveau-y += core/subdev/gpio/nvd0.o nouveau-y += core/subdev/gpio/nve0.o nouveau-y += core/subdev/i2c/base.o
drivers/gpu/drm/nouveau/core/engine/device/nv50.c +11 -11
@@ -141,7 +141,7 @@ nv50_identify(struct nouveau_device *devcase 0x92 : device->cname ="G92" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv50_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
@@ -169,7 +169,7 @@ nv50_identify(struct nouveau_device *devcase 0x94 : device->cname ="G94" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
@@ -197,7 +197,7 @@ nv50_identify(struct nouveau_device *devcase 0x96 : device->cname ="G96" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
@@ -225,7 +225,7 @@ nv50_identify(struct nouveau_device *devcase 0x98 : device->cname ="G98" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
@@ -253,7 +253,7 @@ nv50_identify(struct nouveau_device *devcase 0xa0 : device->cname ="G200" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
@@ -281,7 +281,7 @@ nv50_identify(struct nouveau_device *devcase 0xaa : device->cname ="MCP77/MCP78" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = nvaa_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
@@ -309,7 +309,7 @@ nv50_identify(struct nouveau_device *devcase 0xac : device->cname ="MCP79/MCP7A" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = nvaa_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
@@ -337,7 +337,7 @@ nv50_identify(struct nouveau_device *devcase 0xa3 : device->cname ="GT215" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = &nva3_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
@@ -367,7 +367,7 @@ nv50_identify(struct nouveau_device *devcase 0xa5 : device->cname ="GT216" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = &nva3_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
@@ -396,7 +396,7 @@ nv50_identify(struct nouveau_device *devcase 0xa8 : device->cname ="GT218" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = &nva3_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
@@ -425,7 +425,7 @@ nv50_identify(struct nouveau_device *devcase 0xaf : device->cname ="MCP89" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = &nva3_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
drivers/gpu/drm/nouveau/core/engine/device/nvc0.c +7 -7
@@ -60,7 +60,7 @@ nvc0_identify(struct nouveau_device *devcase 0xc0 : device->cname ="GF100" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
@@ -92,7 +92,7 @@ nvc0_identify(struct nouveau_device *devcase 0xc4 : device->cname ="GF104" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
@@ -124,7 +124,7 @@ nvc0_identify(struct nouveau_device *devcase 0xc3 : device->cname ="GF106" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
@@ -155,7 +155,7 @@ nvc0_identify(struct nouveau_device *devcase 0xce : device->cname ="GF114" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
@@ -187,7 +187,7 @@ nvc0_identify(struct nouveau_device *devcase 0xcf : device->cname ="GF116" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
@@ -219,7 +219,7 @@ nvc0_identify(struct nouveau_device *devcase 0xc1 : device->cname ="GF108" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
@@ -250,7 +250,7 @@ nvc0_identify(struct nouveau_device *devcase 0xc8 : device->cname ="GF110" ; device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass; - device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass; + device->oclass[NVDEV_SUBDEV_GPIO ] = nv94_gpio_oclass; device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass; device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
drivers/gpu/drm/nouveau/core/include/subdev/gpio.h +1 -1
@@ -40,7 +40,7 @@ nouveau_gpio(void *obj)extern struct nouveau_oclass *nv10_gpio_oclass;extern struct nouveau_oclass *nv50_gpio_oclass; -extern struct nouveau_oclass *nv92_gpio_oclass; +extern struct nouveau_oclass *nv94_gpio_oclass;extern struct nouveau_oclass *nvd0_gpio_oclass;extern struct nouveau_oclass *nve0_gpio_oclass;
drivers/gpu/drm/nouveau/core/subdev/gpio/nv92.c deleted +0 -74
74 lines not on this page · raw message
drivers/gpu/drm/nouveau/core/subdev/gpio/nv94.c new file +74 -0
74 lines not on this page · raw message
drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c +2 -2
@@ -77,8 +77,8 @@ nvd0_gpio_oclass = &(struct nouveau_gpio .fini = _nouveau_gpio_fini, }, .lines = 32, - .intr_stat = nv92_gpio_intr_stat, - .intr_mask = nv92_gpio_intr_mask, + .intr_stat = nv94_gpio_intr_stat, + .intr_mask = nv94_gpio_intr_mask, .drive = nvd0_gpio_drive, .sense = nvd0_gpio_sense, .reset = nvd0_gpio_reset,
drivers/gpu/drm/nouveau/core/subdev/gpio/priv.h +2 -2
@@ -56,8 +56,8 @@ void nv50_gpio_reset(struct nouveau_gpioint nv50_gpio_drive (struct nouveau_gpio *,int ,int ,int );int nv50_gpio_sense (struct nouveau_gpio *,int ); -void nv92_gpio_intr_stat (struct nouveau_gpio *,u32 *,u32 *); -void nv92_gpio_intr_mask (struct nouveau_gpio *,u32 ,u32 ,u32 ); +void nv94_gpio_intr_stat (struct nouveau_gpio *,u32 *,u32 *); +void nv94_gpio_intr_mask (struct nouveau_gpio *,u32 ,u32 ,u32 );void nvd0_gpio_reset (struct nouveau_gpio *,u8 );int nvd0_gpio_drive (struct nouveau_gpio *,int ,int ,int );
Greg Kroah-Hartman
maintainerPATCH 106/319 drm/i915: Do not store the error pointer for a failed userptr registration
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Wilson <[email protected]>
commit e9681366ea9e76ab8f75e84351f2f3ca63ee542c upstream.
If we fail to create our mmu notification, we report the error back and currently store the error inside the i915_mm_struct. This not only causes subsequent registerations of the same mm to fail (an issue if the first was interrupted by a signal and needed to be restarted) but also causes us to eventually try and free the error pointer.
[ 73.419599] BUG: unable to handle kernel NULL pointer dereference at 000000000000004c [ 73.419831] IP: [<ffffffff8114af33>] mmu_notifier_unregister+0x23/0x130 [ 73.420065] PGD 8650c067 PUD 870bb067 PMD 0 [ 73.420319] Oops: 0000 [#1] SMP DEBUG_PAGEALLOC [ 73.420580] CPU: 0 PID: 42 Comm: kworker/0:1 Tainted: G W 3.17.0-rc6+ #1561 [ 73.420837] Hardware name: Intel Corporation SandyBridge Platform/LosLunas CRB, BIOS ASNBCPT1.86C.0075.P00.1106281639 06/28/2011 [ 73.421405] Workqueue: events __i915_mm_struct_free__worker [ 73.421724] task: ffff880088a81220 ti: ffff880088168000 task.ti: ffff880088168000 [ 73.422051] RIP: 0010:[<ffffffff8114af33>] [<ffffffff8114af33>] mmu_notifier_unregister+0x23/0x130 [ 73.422410] RSP: 0018:ffff88008816bd50 EFLAGS: 00010286 [ 73.422765] RAX: 0000000000000003 RBX: ffff880086485400 RCX: 0000000000000000 [ 73.423137] RDX: ffff88016d80ee90 RSI: ffff880086485400 RDI: 0000000000000044 [ 73.423513] RBP: ffff88008816bd70 R08: 0000000000000001 R09: 0000000000000000 [ 73.423895] R10: 0000000000000320 R11: 0000000000000001 R12: 0000000000000044 [ 73.424282] R13: ffff880166e5f008 R14: ffff88016d815200 R15: ffff880166e5f040 [ 73.424682] FS: 0000000000000000(0000) GS:ffff88016d800000(0000) knlGS:0000000000000000 [ 73.425099] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 73.425537] CR2: 000000000000004c CR3: 0000000087f5f000 CR4: 00000000000407f0 [ 73.426157] Stack: [ 73.426597] ffff880088a81248 ffff880166e5f038 fffffffffffffffc ffff880166e5f008 [ 73.427096] ffff88008816bd98 ffffffff814a75f2 ffff880166e5f038 ffff8800880f8a28 [ 73.427603] ffff88016d812ac0 ffff88008816be00 ffffffff8106321a ffffffff810631af [ 73.428119] Call Trace: [ 73.428606] [<ffffffff814a75f2>] __i915_mm_struct_free__worker+0x42/0x80 [ 73.429116] [<ffffffff8106321a>] process_one_work+0x1ba/0x610 [ 73.429632] [<ffffffff810631af>] ? process_one_work+0x14f/0x610 [ 73.430153] [<ffffffff810636db>] worker_thread+0x6b/0x4a0 [ 73.430671] [<ffffffff8108d67d>] ? trace_hardirqs_on+0xd/0x10 [ 73.431501] [<ffffffff81063670>] ? process_one_work+0x610/0x610 [ 73.432030] [<ffffffff8106a206>] kthread+0xf6/0x110 [ 73.432561] [<ffffffff8106a110>] ? __kthread_parkme+0x80/0x80 [ 73.433100] [<ffffffff8169c22c>] ret_from_fork+0x7c/0xb0 [ 73.433644] [<ffffffff8106a110>] ? __kthread_parkme+0x80/0x80 [ 73.434194] Code: 0f 1f 84 00 00 00 00 00 66 66 66 66 90 8b 46 4c 85 c0 0f 8e 10 01 00 00 55 48 89 e5 41 55 41 54 53 48 89 f3 49 89 fc 48 83 ec 08 <48> 83 7f 08 00 0f 84 b1 00 00 00 48 c7 c7 40 e6 ac 82 e8 26 65 [ 73.435942] RIP [<ffffffff8114af33>] mmu_notifier_unregister+0x23/0x130 [ 73.437017] RSP <ffff88008816bd50> [ 73.437704] CR2: 000000000000004c
Fixes regression from commit ad46cb533d586fdb256855437af876617c6cf609
Author: Chris Wilson <[email protected]> Date: Thu Aug 7 14:20:40 2014 +0100
drm/i915: Prevent recursive deadlock on releasing a busy userptr
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84207
Testcase: igt/gem_render_copy_redux
Testcase: igt/gem_userptr_blits/create-destroy-sync
--- drivers/gpu/drm/i915/i915_gem_userptr.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_gem_userptr.c +16 -8
@@ -293,15 +293,23 @@ i915_gem_userptr_release__mmu_notifier(sstatic struct i915_mmu_notifier *i915_mmu_notifier_find (struct i915_mm_struct *mm) { -if (mm->mn ==NULL ) { -down_write (&mm->mm->mmap_sem); -mutex_lock (&to_i915 (mm->dev)->mm_lock); -if (mm->mn ==NULL ) - mm->mn =i915_mmu_notifier_create (mm->mm); -mutex_unlock (&to_i915 (mm->dev)->mm_lock); -up_write (&mm->mm->mmap_sem); +struct i915_mmu_notifier *mn = mm->mn; + + mn = mm->mn; +if (mn) +return mn; + +down_write (&mm->mm->mmap_sem); +mutex_lock (&to_i915 (mm->dev)->mm_lock); +if ((mn = mm->mn) ==NULL ) { + mn =i915_mmu_notifier_create (mm->mm); +if (!IS_ERR (mn)) + mm->mn = mn; } -return mm->mn; +mutex_unlock (&to_i915 (mm->dev)->mm_lock); +up_write (&mm->mm->mmap_sem); + +return mn; } static int
Greg Kroah-Hartman
maintainerPATCH 107/319 drm/i915: Do not leak pages when freeing userptr objects
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tvrtko Ursulin <[email protected]>
commit c479f4383ea8940dd6f88da61798ad31feb33e51 upstream.
sg_alloc_table_from_pages() can build us a table with coalesced ranges which means we need to iterate over pages and not sg table entries when releasing page references.
--- drivers/gpu/drm/i915/i915_gem_userptr.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_gem_userptr.c +3 -4
@@ -689,16 +689,15 @@ i915_gem_userptr_get_pages(struct drm_i9static void i915_gem_userptr_put_pages (struct drm_i915_gem_object *obj) { -struct scatterlist *sg; -int i; +struct sg_page_iter sg_iter;BUG_ON (obj->userptr.work !=NULL );if (obj->madv !=I915_MADV_WILLNEED ) obj->dirty =0 ; -for_each_sg (obj->pages->sgl, sg, obj->pages->nents, i) { -struct page *page =sg_page (sg); +for_each_sg_page (obj->pages->sgl, &sg_iter, obj->pages->nents,0 ) { +struct page *page =sg_page_iter_page (&sg_iter);if (obj->dirty)set_page_dirty (page);
Greg Kroah-Hartman
maintainerPATCH 108/319 drm/vmwgfx: Fix drm.h include
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Boyer <[email protected]>
commit e351943b081f4d9e6f692ce1a6117e8d2e71f478 upstream.
The userspace drm.h include doesn't prefix the drm directory. This can lead to compile failures as /usr/include/drm/ isn't in the standard gcc include paths. Fix it to be <drm/drm.h>, which matches the rest of the driver drm header files that get installed into /usr/include/drm.
Red Hat Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1138759
--- include/uapi/drm/vmwgfx_drm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/drm/vmwgfx_drm.h +1 -1
@@ -29,7 +29,7 @@#define __VMWGFX_DRM_H__#ifndef __KERNEL__ -#include <drm.h> +#include <drm/drm.h> #endif #define DRM_VMW_MAX_SURFACE_FACES 6
Greg Kroah-Hartman
maintainerPATCH 109/319 drm/tilcdc: Fix the error path in tilcdc_load()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ezequiel Garcia <[email protected]>
commit b478e336b3e75505707a11e78ef8b964ef0a03af upstream.
The current error path calls tilcdc_unload() in case of an error to release the resources. However, this is wrong because not all resources have been allocated by the time an error occurs in tilcdc_load().
To fix it, this commit adds proper labels to bail out at the different stages in the load function, and release only the resources actually allocated.
--- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 60 ++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 10 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_drv.c +50 -10
@@ -84,6 +84,7 @@ static int modeset_init(struct drm_devicif ((priv->num_encoders ==0 ) || (priv->num_connectors ==0 )) {/* oh nos! */ dev_err (dev->dev,"no encoders/connectors found\n" ); +drm_mode_config_cleanup (dev);return -ENXIO ; }
@@ -172,33 +173,37 @@ static int tilcdc_load(struct drm_device dev->dev_private = priv; priv->wq =alloc_ordered_workqueue ("tilcdc" ,0 ); +if (!priv->wq) { + ret = -ENOMEM ; + goto fail_free_priv; + } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!res) {dev_err (dev->dev,"failed to get memory resource\n" ); ret = -EINVAL ; - goto fail; + goto fail_free_wq; } priv->mmio =ioremap_nocache (res->start,resource_size (res));if (!priv->mmio) {dev_err (dev->dev,"failed to ioremap\n" ); ret = -ENOMEM ; - goto fail; + goto fail_free_wq; } priv->clk =clk_get (dev->dev,"fck" );if (IS_ERR (priv->clk)) {dev_err (dev->dev,"failed to get functional clock\n" ); ret = -ENODEV ; - goto fail; + goto fail_iounmap; } priv->disp_clk =clk_get (dev->dev,"dpll_disp_ck" );if (IS_ERR (priv->clk)) {dev_err (dev->dev,"failed to get display clock\n" ); ret = -ENODEV ; - goto fail; + goto fail_put_clk; }#ifdef CONFIG_CPU_FREQ
@@ -208,7 +213,7 @@ static int tilcdc_load(struct drm_device CPUFREQ_TRANSITION_NOTIFIER);if (ret) {dev_err (dev->dev,"failed to register cpufreq notifier\n" ); - goto fail; + goto fail_put_disp_clk; }#endif
@@ -253,13 +258,13 @@ static int tilcdc_load(struct drm_device ret =modeset_init (dev);if (ret <0 ) {dev_err (dev->dev,"failed to initialize mode setting\n" ); - goto fail; + goto fail_cpufreq_unregister; } ret =drm_vblank_init (dev,1 );if (ret <0 ) {dev_err (dev->dev,"failed to initialize vblank\n" ); - goto fail; + goto fail_mode_config_cleanup; }pm_runtime_get_sync (dev->dev);
@@ -267,7 +272,7 @@ static int tilcdc_load(struct drm_devicepm_runtime_put_sync (dev->dev);if (ret <0 ) {dev_err (dev->dev,"failed to install IRQ handler\n" ); - goto fail; + goto fail_vblank_cleanup; }platform_set_drvdata (pdev, dev);
@@ -283,13 +288,48 @@ static int tilcdc_load(struct drm_device priv->fbdev =drm_fbdev_cma_init (dev, bpp, dev->mode_config.num_crtc, dev->mode_config.num_connector); +if (IS_ERR (priv->fbdev)) { + ret =PTR_ERR (priv->fbdev); + goto fail_irq_uninstall; + }drm_kms_helper_poll_init (dev);return 0 ; -fail: -tilcdc_unload (dev); +fail_irq_uninstall: +pm_runtime_get_sync (dev->dev); +drm_irq_uninstall (dev); +pm_runtime_put_sync (dev->dev); + +fail_vblank_cleanup: +drm_vblank_cleanup (dev); + +fail_mode_config_cleanup: +drm_mode_config_cleanup (dev); + +fail_cpufreq_unregister: +pm_runtime_disable (dev->dev); +#ifdef CONFIG_CPU_FREQ +cpufreq_unregister_notifier (&priv->freq_transition, +CPUFREQ_TRANSITION_NOTIFIER ); +fail_put_disp_clk: +clk_put (priv->disp_clk); +#endif + +fail_put_clk: +clk_put (priv->clk); + +fail_iounmap: +iounmap (priv->mmio); + +fail_free_wq: +flush_workqueue (priv->wq); +destroy_workqueue (priv->wq); + +fail_free_priv: + dev->dev_private =NULL ; +kfree (priv);return ret; }
Greg Kroah-Hartman
maintainerPATCH 110/319 drm/nouveau/bios: memset dcb struct to zero before parsing
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Skeggs <[email protected]>
commit 595d373f1e9c9ce0fc946457fdb488e8a58972cd upstream.
Fixes type/mask calculation being based on uninitialised data for VGA outputs.
--- drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c +1 -0
@@ -124,6 +124,7 @@ dcb_outp_parse(struct nouveau_bios *bios struct dcb_output *outp) {u16 dcb =dcb_outp (bios, idx, ver, len); +memset (outp,0x00 ,sizeof (*outp));if (dcb) {if (*ver >=0x20 ) {u32 conn =nv_ro32 (bios, dcb +0x00 );
Greg Kroah-Hartman
maintainerPATCH 111/319 drm/gt214-/kms: fix hda eld regression
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Skeggs <[email protected]>
commit d889c52427d48c05f163f2f39b2cfc12e17e5266 upstream.
--- drivers/gpu/drm/nouveau/nv50_display.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/gpu/drm/nouveau/nv50_display.c +10 -8
@@ -1653,15 +1653,17 @@ nv50_audio_mode_set(struct drm_encoder *struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nouveau_connector *nv_connector;struct nv50_disp *disp =nv50_disp (encoder->dev); -struct { -struct nv50_disp_mthd_v1 base; -struct nv50_disp_sor_hda_eld_v0 eld; +struct __packed { +struct { +struct nv50_disp_mthd_v1 mthd; +struct nv50_disp_sor_hda_eld_v0 eld; + } base;u8 data[sizeof (nv_connector->base.eld)]; } args = { - .base.version =1 , - .base.method =NV50_DISP_MTHD_V1_SOR_HDA_ELD , - .base.hasht = nv_encoder->dcb->hasht, - .base.hashm = nv_encoder->dcb->hashm, + .base.mthd.version =1 , + .base.mthd.method =NV50_DISP_MTHD_V1_SOR_HDA_ELD , + .base.mthd.hasht = nv_encoder->dcb->hasht, + .base.mthd.hashm = nv_encoder->dcb->hashm, }; nv_connector =nouveau_encoder_connector_get (nv_encoder);
@@ -1671,7 +1673,7 @@ nv50_audio_mode_set(struct drm_encoder *drm_edid_to_eld (&nv_connector->base, nv_connector->edid);memcpy (args.data, nv_connector->base.eld,sizeof (args.data)); -nvif_mthd (disp->disp,0 , &args,sizeof (args)); +nvif_mthd (disp->disp,0 , &args,sizeof (args.base) + args.data[2 ] *4 ); } static void
Greg Kroah-Hartman
maintainerPATCH 112/319 media: v4l2-common: fix overflow in v4l_bound_align_image()
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej Matraszek <[email protected]>
commit 3bacc10cd4a85bc70bc0b6c001d3bf995c7fe04c upstream.
Fix clamp_align() used in v4l_bound_align_image() to prevent overflow when passed large value like UINT32_MAX.
In the current implementation:
clamp_align(UINT32_MAX, 8, 8192, 3)
returns 8, because in line:
x = (x + (1 << (align - 1))) & mask;
x overflows to (-1 + 4) & 0x7 = 3, while expected value is 8192.
v4l_bound_align_image() is heavily used in VIDIOC_S_FMT and VIDIOC_SUBDEV_S_FMT ioctls handlers, and documentation of the latter explicitly states that:
"The modified format should be as close as possible to the original request."
-- http://linuxtv.org/downloads/v4l-dvb-apis/vidioc-subdev-g-fmt.html
Thus one would expect, that passing UINT32_MAX as format width and height will result in setting maximum possible resolution for the device. Particularly, when the driver doesn't support VIDIOC_ENUM_FRAMESIZES ioctl, which is common in the codebase.
Fixes changeset: b0d3159be9a3
--- drivers/media/v4l2-core/v4l2-common.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/media/v4l2-core/v4l2-common.c +3 -6
@@ -435,16 +435,13 @@ static unsigned int clamp_align(unsigned/* Bits that must be zero to be aligned */ unsigned int mask = ~((1 << align) -1 ); +/* Clamp to aligned min and max */ + x =clamp (x, (min + ~mask) & mask, max & mask); +/* Round to nearest aligned value */ if (align) x = (x + (1 << (align -1 ))) & mask; -/* Clamp to aligned value of min and max */ -if (x < min) - x = (min + ~mask) & mask; -else if (x > max) - x = max & mask; -return x; }
Greg Kroah-Hartman
maintainerPATCH 113/319 media: usb: uvc: add a quirk for Dell XPS M1330 webcam
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Fertser <[email protected]>
commit 62ea864f84fed6e04dd033d500d4c9183a83d590 upstream.
As reported on [1], this device needs this quirk to be able to reliably initialise the webcam.
[1] http://ubuntuforums.org/showthread.php?t=2145996
--- drivers/media/usb/uvc/uvc_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/media/usb/uvc/uvc_driver.c +9 -0
@@ -2229,6 +2229,15 @@ static struct usb_device_id uvc_ids[] = .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = UVC_QUIRK_PROBE_DEF }, +/* Dell XPS M1330 (OmniVision OV7670 webcam) */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor = 0x05a9, + .idProduct = 0x7670, + .bInterfaceClass = USB_CLASS_VIDEO, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 0, + .driver_info = UVC_QUIRK_PROBE_DEF }, /* Apple Built-In iSight */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
Greg Kroah-Hartman
maintainerPATCH 115/319 media: siano: add support for PCTV 77e
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 29bbb7bd0a65e01a0423e1df764676119b71ecb3 upstream.
Add support for PCTV microStick (77e) device that uses a sms1140 chipset.
--- drivers/media/common/siano/sms-cards.c | 6 ++++++ drivers/media/common/siano/sms-cards.h | 1 + drivers/media/usb/siano/smsusb.c | 2 ++ 3 files changed, 9 insertions(+)
drivers/media/common/siano/sms-cards.c +6 -0
@@ -157,6 +157,12 @@ static struct sms_board sms_boards[] = { .type = SMS_DENVER_2160, .default_mode = DEVICE_MODE_DAB_TDMB, }, + [SMS1XXX_BOARD_PCTV_77E] = { + .name = "Hauppauge microStick 77e", + .type = SMS_NOVA_B0, + .fw[DEVICE_MODE_DVBT_BDA] = SMS_FW_DVB_NOVA_12MHZ_B0, + .default_mode = DEVICE_MODE_DVBT_BDA, + }, };struct sms_board *sms_get_board (unsigned id)
drivers/media/common/siano/sms-cards.h +1 -0
@@ -45,6 +45,7 @@#define SMS1XXX_BOARD_SIANO_RIO 18#define SMS1XXX_BOARD_SIANO_DENVER_1530 19#define SMS1XXX_BOARD_SIANO_DENVER_2160 20 +#define SMS1XXX_BOARD_PCTV_77E 21struct sms_board_gpio_cfg {int lna_vhf_exist;
drivers/media/usb/siano/smsusb.c +2 -0
@@ -655,6 +655,8 @@ static const struct usb_device_id smsusb .driver_info = SMS1XXX_BOARD_ONDA_MDTV_DATA_CARD }, { USB_DEVICE(0x3275, 0x0080), .driver_info = SMS1XXX_BOARD_SIANO_RIO }, + { USB_DEVICE(0x2013, 0x0257), + .driver_info = SMS1XXX_BOARD_PCTV_77E }, { }/* Terminating entry */ };
Greg Kroah-Hartman
maintainerPATCH 116/319 media: m88ts2022: fix 32bit overflow on filter calc
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antti Palosaari <[email protected]>
commit f538e085138e519e25ae0828bd6c6e7492ce8ca4 upstream.
Maximum satellite symbol rate used is 45000000Sps which overflows when multiplied by 135. As final calculation result is fraction, we could use mult_frac macro in order to keep calculation inside 32 bit number limits and prevent overflow.
Original bug and fix was provided by Nibble Max. I decided to implement it differently as it is now.
--- drivers/media/tuners/m88ts2022.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/tuners/m88ts2022.c +1 -1
@@ -314,7 +314,7 @@ static int m88ts2022_set_params(struct d div_min = gdiv28 *78 /100 ; div_max =clamp_val (div_max,0U ,63U ); - f_3db_hz = c->symbol_rate *135UL /200UL ; + f_3db_hz =mult_frac (c->symbol_rate,135 ,200 ); f_3db_hz +=2000000U + (frequency_offset_khz *1000U ); f_3db_hz =clamp (f_3db_hz,7000000U ,40000000U );
Greg Kroah-Hartman
maintainerPATCH 119/319 media: imon: fix other RC type protocol support
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ulrich Eckhardt <[email protected]>
commit d358aefdc0cc92b16ced449f998dbad639db6809 upstream.
With kernel 3.17 the imon remote control for device 15c2:0034 does not work anymore, which uses the OTHER protocol. Only the front panel buttons which uses the RC6 protocol are working.
Adds the missing comparison for the RC_BIT_OTHER.
--- drivers/media/rc/imon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/rc/imon.c +2 -1
@@ -1579,7 +1579,8 @@ static void imon_incoming_packet(structif (press_type ==0 )rc_keyup (ictx->rdev);else { -if (ictx->rc_type ==RC_BIT_RC6_MCE ) +if (ictx->rc_type ==RC_BIT_RC6_MCE || + ictx->rc_type ==RC_BIT_OTHER )rc_keydown (ictx->rdev, ictx->rc_type ==RC_BIT_RC6_MCE ?RC_TYPE_RC6_MCE :RC_TYPE_OTHER , ictx->rc_scancode, ictx->rc_toggle);
Greg Kroah-Hartman
maintainerPATCH 120/319 media: ds3000: fix LNB supply voltage on Tevii S480 on initialization
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ulrich Eckhardt <[email protected]>
commit 8c5bcded11cb607b1bb5920de3b9c882136d27db upstream.
The Tevii S480 outputs 18V on startup for the LNB supply voltage and does not automatically power down. This blocks other receivers connected to a satellite channel router (EN50494), since the receivers can not send the required DiSEqC sequences when the Tevii card is connected to a the same SCR.
This patch switches off the LNB supply voltage on initialization of the frontend.
[[email protected]: add a comment about why we're explicitly
turning off voltage at device init]
--- drivers/media/dvb-frontends/ds3000.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/media/dvb-frontends/ds3000.c +7 -0
@@ -864,6 +864,13 @@ struct dvb_frontend *ds3000_attach(constmemcpy (&state->frontend.ops, &ds3000_ops,sizeof (struct dvb_frontend_ops )); state->frontend.demodulator_priv = state; + +/* +* Some devices like T480 starts with voltage on. Be sure +* to turn voltage off during init, as this can otherwise +* interfere with Unicable SCR systems. +*/ +ds3000_set_voltage (&state->frontend,SEC_VOLTAGE_OFF );return &state->frontend; error3:
Greg Kroah-Hartman
maintainerPATCH 122/319 media: tda7432: Fix setting TDA7432_MUTE bit for TDA7432_RF register
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Axel Lin <[email protected]>
commit 91ba0e59babdb3c7aca836a65f1095b3eaff7b06 upstream.
Fix a copy-paste bug when converting to the control framework.
--- drivers/media/i2c/tda7432.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/tda7432.c +1 -1
@@ -293,7 +293,7 @@ static int tda7432_s_ctrl(struct v4l2_ctif (t->mute->val) { lf |=TDA7432_MUTE ; lr |=TDA7432_MUTE ; - lf |=TDA7432_MUTE ; + rf |=TDA7432_MUTE ; rr |=TDA7432_MUTE ; }/* Mute & update balance*/
Greg Kroah-Hartman
maintainerPATCH 123/319 media: vmalloc_sg: off by one in error handling
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 23d3090f8b44ab42162e99e8584445bc25b8922f upstream.
The "i--" needs to happen at the start of the loop or it will try to release something bogus (probably it will crash) and it won't release the first ->vaddr_page[].
--- drivers/media/v4l2-core/videobuf-dma-sg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/media/v4l2-core/videobuf-dma-sg.c +4 -2
@@ -253,9 +253,11 @@ int videobuf_dma_init_kernel(struct videreturn 0 ; out_free_pages:while (i >0 ) { -void *addr =page_address (dma->vaddr_pages[i]); -dma_free_coherent (dma->dev,PAGE_SIZE , addr, dma->dma_addr[i]); +void *addr; + i--; + addr =page_address (dma->vaddr_pages[i]); +dma_free_coherent (dma->dev,PAGE_SIZE , addr, dma->dma_addr[i]); }kfree (dma->dma_addr); dma->dma_addr =NULL ;
Greg Kroah-Hartman
maintainerPATCH 124/319 KVM: emulate: avoid accessing NULL ctxt->memopp
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Bonzini <[email protected]>
commit a430c9166312e1aa3d80bce32374233bdbfeba32 upstream.
A failure to decode the instruction can cause a NULL pointer access. This is fixed simply by moving the "done" label as close as possible to the return.
This fixes CVE-2014-8481.
--- arch/x86/kvm/emulate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/emulate.c +1 -1
@@ -4481,10 +4481,10 @@ done_prefixes:/* Decode and fetch the destination operand: register or memory. */ rc =decode_operand (ctxt, &ctxt->dst, (ctxt->d >> DstShift) & OpMask); -done:if (ctxt->rip_relative) ctxt->memopp->addr.mem.ea += ctxt->_eip; +done:return (rc !=X86EMUL_CONTINUE ) ?EMULATION_FAILED :EMULATION_OK ; }
Greg Kroah-Hartman
maintainerPATCH 125/319 kvm: fix excessive pages un-pinning in kvm_iommu_map error path.
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quentin Casasnovas <[email protected]>
commit 3d32e4dbe71374a6780eaf51d719d76f9a9bf22f upstream.
The third parameter of kvm_unpin_pages() when called from kvm_iommu_map_pages() is wrong, it should be the number of pages to un-pin and not the page size.
This error was facilitated with an inconsistent API: kvm_pin_pages() takes a size, but kvn_unpin_pages() takes a number of pages, so fix the problem by matching the two.
This was introduced by commit 350b8bd ("kvm: iommu: fix the third parameter of kvm_iommu_put_pages (CVE-2014-3601)"), which fixes the lack of un-pinning for pages intended to be un-pinned (i.e. memory leak) but unfortunately potentially aggravated the number of pages we un-pin that should have stayed pinned. As far as I understand though, the same practical mitigations apply.
This issue was found during review of Red Hat 6.6 patches to prepare Ksplice rebootless updates.
Thanks to Vegard for his time on a late Friday evening to help me in understanding this code.
--- virt/kvm/iommu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
virt/kvm/iommu.c +4 -4
@@ -43,13 +43,13 @@ static void kvm_iommu_put_pages(struct k gfn_t base_gfn, unsigned long npages);static pfn_t kvm_pin_pages (struct kvm_memory_slot *slot,gfn_t gfn, -unsigned long size) +unsigned long npages) {gfn_t end_gfn;pfn_t pfn; pfn =gfn_to_pfn_memslot (slot, gfn); - end_gfn = gfn + (size >>PAGE_SHIFT ); + end_gfn = gfn + npages; gfn +=1 ;if (is_error_noslot_pfn (pfn))
@@ -119,7 +119,7 @@ int kvm_iommu_map_pages(struct kvm *kvm,* Pin all pages we are about to map in memory. This is * important because we unmap and unpin in 4kb steps later. */ - pfn =kvm_pin_pages (slot, gfn, page_size); + pfn =kvm_pin_pages (slot, gfn, page_size >>PAGE_SHIFT );if (is_error_noslot_pfn (pfn)) { gfn +=1 ;continue ;
@@ -131,7 +131,7 @@ int kvm_iommu_map_pages(struct kvm *kvm,if (r) {printk (KERN_ERR "kvm_iommu_map_address:" "iommu failed to map pfn=%llx\n" , pfn); -kvm_unpin_pages (kvm, pfn, page_size); +kvm_unpin_pages (kvm, pfn, page_size >>PAGE_SHIFT ); goto unmap_pages; }
Greg Kroah-Hartman
maintainerPATCH 126/319 KVM: x86: Decoding guest instructions which cross page boundary may fail
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nadav Amit <[email protected]>
commit 08da44aedba0f493e10695fa334348a7a4f72eb3 upstream.
Once an instruction crosses a page boundary, the size read from the second page disregards the common case that part of the operand resides on the first page. As a result, fetch of long insturctions may fail, and thereby cause the decoding to fail as well.
--- arch/x86/kvm/emulate.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/kvm/emulate.c +4 -2
@@ -773,8 +773,10 @@ static int __do_insn_fetch_bytes(struct static __always_inline int do_insn_fetch_bytes(struct x86_emulate_ctxt *ctxt,unsigned size) { -if (unlikely (ctxt->fetch.end - ctxt->fetch.ptr < size)) -return __do_insn_fetch_bytes (ctxt, size); +unsigned done_size = ctxt->fetch.end - ctxt->fetch.ptr; + +if (unlikely (done_size < size)) +return __do_insn_fetch_bytes (ctxt, size - done_size);else return X86EMUL_CONTINUE ; }
Greg Kroah-Hartman
maintainerPATCH 127/319 KVM: x86: Emulator does not decode clflush well
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nadav Amit <[email protected]>
commit 13e457e0eebf0a0c82c38ceb890d93eb826d62a6 upstream.
Currently, all group15 instructions are decoded as clflush (e.g., mfence, xsave). In addition, the clflush instruction requires no prefix (66/f2/f3) would exist. If prefix exists it may encode a different instruction (e.g., clflushopt).
Creating a group for clflush, and different group for each prefix.
This has been the case forever, but the next patch needs the cflush group in order to fix a bug introduced in 3.17.
--- arch/x86/kvm/emulate.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
arch/x86/kvm/emulate.c +17 -3
@@ -3376,6 +3376,12 @@ static int em_bswap(struct x86_emulate_creturn X86EMUL_CONTINUE ; } +static int em_clflush (struct x86_emulate_ctxt *ctxt) +{ +/* emulating clflush regardless of cpuid */ +return X86EMUL_CONTINUE ; +} +static bool valid_cr (int nr) {switch (nr) {
@@ -3708,6 +3714,16 @@ static const struct opcode group11[] = { X7(D(Undefined)), }; +static const struct gprefix pfx_0f_ae_7 = { +I (0 , em_clflush),N ,N ,N , +}; + +static const struct group_dual group15 = { { +N ,N ,N ,N ,N ,N ,N ,GP (0 , &pfx_0f_ae_7), +}, { +N ,N ,N ,N ,N ,N ,N ,N , +} }; +static const struct gprefix pfx_0f_6f_0f_7f = {I (Mmx, em_mov),I (Sse | Aligned, em_mov),N ,I (Sse | Unaligned, em_mov), };
@@ -3967,7 +3983,7 @@ static const struct opcode twobyte_tableF (DstMem | SrcReg | ModRM | BitOp | Lock | PageTable, em_bts),F (DstMem | SrcReg | Src2ImmByte | ModRM, em_shrd),F (DstMem | SrcReg | Src2CL | ModRM, em_shrd), -D (ModRM),F (DstReg | SrcMem | ModRM, em_imul), +GD (0 , &group15),F (DstReg | SrcMem | ModRM, em_imul),/* 0xB0 - 0xB7 */ I2bv (DstMem | SrcReg | ModRM | Lock | PageTable, em_cmpxchg), I(DstReg | SrcMemFAddr | ModRM | Src2SS, em_lseg),
@@ -4894,8 +4910,6 @@ twobyte_insn: case 0x90 ... 0x9f: /* setcc r/m8 */ ctxt->dst.val =test_cc (ctxt->b, ctxt->eflags);break ; -case 0xae :/* clflush */ -break ; case 0xb6 ... 0xb7: /* movzx */ ctxt->dst.bytes = ctxt->op_bytes; ctxt->dst.val = (ctxt->src.bytes == 1) ? (u8) ctxt->src.val
Greg Kroah-Hartman
maintainerPATCH 128/319 KVM: x86: PREFETCH and HINT_NOP should have SrcMem flag
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nadav Amit <[email protected]>
commit 3f6f1480d86bf9fc16c160d803ab1d006e3058d5 upstream.
The decode phase of the x86 emulator assumes that every instruction with the ModRM flag, and which can be used with RIP-relative addressing, has either SrcMem or DstMem. This is not the case for several instructions - prefetch, hint-nop and clflush.
Adding SrcMem|NoAccess for prefetch and hint-nop and SrcMem for clflush.
This fixes CVE-2014-8480.
--- arch/x86/kvm/emulate.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/x86/kvm/emulate.c +4 -3
@@ -3715,7 +3715,7 @@ static const struct opcode group11[] = { };static const struct gprefix pfx_0f_ae_7 = { -I (0 , em_clflush),N ,N ,N , +I (SrcMem | ByteOp, em_clflush),N ,N ,N , };static const struct group_dual group15 = { {
@@ -3928,10 +3928,11 @@ static const struct opcode twobyte_tableN ,I (ImplicitOps | EmulateOnUD, em_syscall),II (ImplicitOps | Priv, em_clts, clts),N ,DI (ImplicitOps | Priv, invd),DI (ImplicitOps | Priv, wbinvd),N ,N , -N ,D (ImplicitOps | ModRM),N ,N , +N ,D (ImplicitOps | ModRM | SrcMem | NoAccess),N ,N ,/* 0x10 - 0x1F */ N ,N ,N ,N ,N ,N ,N ,N , -D (ImplicitOps | ModRM),N ,N ,N ,N ,N ,N ,D (ImplicitOps | ModRM), +D (ImplicitOps | ModRM | SrcMem | NoAccess), +N ,N ,N ,N ,N ,N ,D (ImplicitOps | ModRM | SrcMem | NoAccess),/* 0x20 - 0x2F */ DIP (ModRM | DstMem | Priv | Op3264 | NoMod, cr_read, check_cr_read), DIP(ModRM | DstMem | Priv | Op3264 | NoMod, dr_read, check_dr_read),
Greg Kroah-Hartman
maintainerPATCH 129/319 KVM: x86: Prevent host from panicking on shared MSR writes.
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Honig <[email protected]>
commit 8b3c3104c3f4f706e99365c3e0d2aa61b95f969f upstream.
The previous patch blocked invalid writes directly when the MSR is written. As a precaution, prevent future similar mistakes by gracefulling handle GPs caused by writes to shared MSRs.
--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/vmx.c | 7 +++++-- arch/x86/kvm/x86.c | 11 ++++++++--- 3 files changed, 14 insertions(+), 6 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -1049,7 +1049,7 @@ int kvm_cpu_get_interrupt(struct kvm_vcpvoid kvm_vcpu_reset (struct kvm_vcpu *vcpu);void kvm_define_shared_msr (unsigned index,u32 msr); -void kvm_set_shared_msr (unsigned index,u64 val,u64 mask); +int kvm_set_shared_msr (unsigned index,u64 val,u64 mask);bool kvm_is_linear_rip (struct kvm_vcpu *vcpu,unsigned long linear_rip);
arch/x86/kvm/vmx.c +5 -2
@@ -2632,12 +2632,15 @@ static int vmx_set_msr(struct kvm_vcpu *default : msr =find_msr_entry (vmx, msr_index);if (msr) { +u64 old_msr_data = msr->data; msr->data = data;if (msr - vmx->guest_msrs < vmx->save_nmsrs) {preempt_disable (); -kvm_set_shared_msr (msr->index, msr->data, - msr->mask); + ret =kvm_set_shared_msr (msr->index, msr->data, + msr->mask);preempt_enable (); +if (ret) + msr->data = old_msr_data; }break ; }
arch/x86/kvm/x86.c +8 -3
@@ -229,20 +229,25 @@ static void kvm_shared_msr_cpu_online(voshared_msr_update (i, shared_msrs_global.msrs[i]); } -void kvm_set_shared_msr (unsigned slot,u64 value,u64 mask) +int kvm_set_shared_msr (unsigned slot,u64 value,u64 mask) {unsigned int cpu =smp_processor_id ();struct kvm_shared_msrs *smsr =per_cpu_ptr (shared_msrs, cpu); +int err;if (((value ^ smsr->values[slot].curr) & mask) ==0 ) -return ; +return 0 ; smsr->values[slot].curr = value; -wrmsrl (shared_msrs_global.msrs[slot], value); + err =wrmsrl_safe (shared_msrs_global.msrs[slot], value); +if (err) +return 1 ; +if (!smsr->registered) { smsr->urn.on_user_return = kvm_on_user_return;user_return_notifier_register (&smsr->urn); smsr->registered = true; } +return 0 ; }EXPORT_SYMBOL_GPL (kvm_set_shared_msr);
Greg Kroah-Hartman
maintainerPATCH 130/319 KVM: x86: Improve thread safety in pit
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Honig <[email protected]>
commit 2febc839133280d5a5e8e1179c94ea674489dae2 upstream.
There's a race condition in the PIT emulation code in KVM. In __kvm_migrate_pit_timer the pit_timer object is accessed without synchronization. If the race condition occurs at the wrong time this can crash the host kernel.
This fixes CVE-2014-3611.
--- arch/x86/kvm/i8254.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kvm/i8254.c +2 -0
@@ -262,8 +262,10 @@ void __kvm_migrate_pit_timer(struct kvm_return ; timer = &pit->pit_state.timer; +mutex_lock (&pit->pit_state.lock);if (hrtimer_cancel (timer))hrtimer_start_expires (timer,HRTIMER_MODE_ABS ); +mutex_unlock (&pit->pit_state.lock); }static void destroy_pit_timer (struct kvm_pit *pit)
Greg Kroah-Hartman
maintainerPATCH 131/319 KVM: x86: Check non-canonical addresses upon WRMSR
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nadav Amit <[email protected]>
commit 854e8bb1aa06c578c2c9145fa6bfe3680ef63b23 upstream.
Upon WRMSR, the CPU should inject #GP if a non-canonical value (address) is written to certain MSRs. The behavior is "almost" identical for AMD and Intel (ignoring MSRs that are not implemented in either architecture since they would anyhow #GP). However, IA32_SYSENTER_ESP and IA32_SYSENTER_EIP cause #GP if non-canonical address is written on Intel but not on AMD (which ignores the top 32-bits).
Accordingly, this patch injects a #GP on the MSRs which behave identically on Intel and AMD. To eliminate the differences between the architecutres, the value which is written to IA32_SYSENTER_ESP and IA32_SYSENTER_EIP is turned to canonical value before writing instead of injecting a #GP.
Some references from Intel and AMD manuals:
According to Intel SDM description of WRMSR instruction #GP is expected on WRMSR "If the source register contains a non-canonical address and ECX specifies one of the following MSRs: IA32_DS_AREA, IA32_FS_BASE, IA32_GS_BASE, IA32_KERNEL_GS_BASE, IA32_LSTAR, IA32_SYSENTER_EIP, IA32_SYSENTER_ESP."
According to AMD manual instruction manual:
LSTAR/CSTAR (SYSCALL): "The WRMSR instruction loads the target RIP into the LSTAR and CSTAR registers. If an RIP written by WRMSR is not in canonical form, a general-protection exception (#GP) occurs."IA32_GS_BASE and IA32_FS_BASE (WRFSBASE/WRGSBASE): "The address written to the base field must be in canonical form or a #GP fault will occur." IA32_KERNEL_GS_BASE (SWAPGS): "The address stored in the KernelGSbase MSR must be in canonical form."
This patch fixes CVE-2014-3610.
--- arch/x86/include/asm/kvm_host.h | 14 ++++++++++++++ arch/x86/kvm/svm.c | 2 +- arch/x86/kvm/vmx.c | 2 +- arch/x86/kvm/x86.c | 27 ++++++++++++++++++++++++++- 4 files changed, 42 insertions(+), 3 deletions(-)
arch/x86/include/asm/kvm_host.h +14 -0
@@ -991,6 +991,20 @@ static inline void kvm_inject_gp(structkvm_queue_exception_e (vcpu,GP_VECTOR , error_code); } +static inline u64 get_canonical (u64 la) +{ +return ((int64_t )la <<16 ) >>16 ; +} + +static inline bool is_noncanonical_address (u64 la) +{ +#ifdef CONFIG_X86_64 +return get_canonical (la) != la; +#else +return false; +#endif +} +#define TSS_IOPB_BASE_OFFSET 0x66#define TSS_BASE_SIZE 0x68#define TSS_IOPB_SIZE (65536 / 8)
arch/x86/kvm/svm.c +1 -1
@@ -3234,7 +3234,7 @@ static int wrmsr_interception(struct vcp msr.host_initiated = false; svm->next_rip =kvm_rip_read (&svm->vcpu) +2 ; -if (svm_set_msr (&svm->vcpu, &msr)) { +if (kvm_set_msr (&svm->vcpu, &msr)) {trace_kvm_msr_write_ex (ecx, data);kvm_inject_gp (&svm->vcpu,0 ); }else {
arch/x86/kvm/vmx.c +1 -1
@@ -5266,7 +5266,7 @@ static int handle_wrmsr(struct kvm_vcpu msr.data = data; msr.index = ecx; msr.host_initiated = false; -if (vmx_set_msr (vcpu, &msr) !=0 ) { +if (kvm_set_msr (vcpu, &msr) !=0 ) {trace_kvm_msr_write_ex (ecx, data);kvm_inject_gp (vcpu,0 );return 1 ;
arch/x86/kvm/x86.c +26 -1
@@ -989,7 +989,6 @@ void kvm_enable_efer_bits(u64 mask) }EXPORT_SYMBOL_GPL (kvm_enable_efer_bits); -/* * Writes msr value into into the appropriate "register". * Returns 0 on success, non-0 otherwise.
@@ -997,8 +996,34 @@ EXPORT_SYMBOL_GPL(kvm_enable_efer_bits);*/ int kvm_set_msr (struct kvm_vcpu *vcpu,struct msr_data *msr) { +switch (msr->index) { +case MSR_FS_BASE : +case MSR_GS_BASE : +case MSR_KERNEL_GS_BASE : +case MSR_CSTAR : +case MSR_LSTAR : +if (is_noncanonical_address (msr->data)) +return 1 ; +break ; +case MSR_IA32_SYSENTER_EIP : +case MSR_IA32_SYSENTER_ESP : +/* +* IA32_SYSENTER_ESP and IA32_SYSENTER_EIP cause #GP if +* non-canonical address is written on Intel but not on +* AMD (which ignores the top 32-bits, because it does +* not implement 64-bit SYSENTER). +* +* 64-bit code should hence be able to write a non-canonical +* value on AMD. Making the address canonical ensures that +* vmentry does not fail on Intel after writing a non-canonical +* value, and that something deterministic happens if the guest +* invokes 64-bit SYSENTER. +*/ + msr->data =get_canonical (msr->data); + }return kvm_x86_ops->set_msr (vcpu, msr); } +EXPORT_SYMBOL_GPL (kvm_set_msr);/* * Adapt set_msr() to msr_io()'s calling convention
Greg Kroah-Hartman
maintainerPATCH 132/319 kvm: x86: dont kill guest on unknown exit reason
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Michael S. Tsirkin" <[email protected]>
commit 2bc19dc3754fc066c43799659f0d848631c44cfe upstream.
KVM_EXIT_UNKNOWN is a kvm bug, we don't really know whether it was triggered by a priveledged application. Let's not kill the guest: WARN and inject #UD instead.
--- arch/x86/kvm/svm.c | 6 +++--- arch/x86/kvm/vmx.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/kvm/svm.c +3 -3
@@ -3534,9 +3534,9 @@ static int handle_exit(struct kvm_vcpu *if (exit_code >=ARRAY_SIZE (svm_exit_handlers) || !svm_exit_handlers[exit_code]) { - kvm_run->exit_reason =KVM_EXIT_UNKNOWN ; - kvm_run->hw.hardware_exit_reason = exit_code; -return 0 ; +WARN_ONCE (1 ,"vmx: unexpected exit reason 0x%x\n" , exit_code); +kvm_queue_exception (vcpu,UD_VECTOR ); +return 1 ; }return svm_exit_handlers[exit_code](svm);
arch/x86/kvm/vmx.c +3 -3
@@ -7058,10 +7058,10 @@ static int vmx_handle_exit(struct kvm_vc && kvm_vmx_exit_handlers[exit_reason]) return kvm_vmx_exit_handlers[exit_reason](vcpu); else { - vcpu->run->exit_reason =KVM_EXIT_UNKNOWN ; - vcpu->run->hw.hardware_exit_reason = exit_reason; +WARN_ONCE (1 ,"vmx: unexpected exit reason 0x%x\n" , exit_reason); +kvm_queue_exception (vcpu,UD_VECTOR ); +return 1 ; } -return 0 ; }static void update_cr8_intercept (struct kvm_vcpu *vcpu,int tpr,int irr)
Greg Kroah-Hartman
maintainerPATCH 133/319 KVM: x86: Fix wrong masking on relative jump/call
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nadav Amit <[email protected]>
commit 05c83ec9b73c8124555b706f6af777b10adf0862 upstream.
Relative jumps and calls do the masking according to the operand size, and not according to the address size as the KVM emulator does today.
This patch fixes KVM behavior.
--- arch/x86/kvm/emulate.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-)
arch/x86/kvm/emulate.c +22 -5
@@ -504,11 +504,6 @@ static void rsp_increment(struct x86_emumasked_increment (reg_rmw (ctxt,VCPU_REGS_RSP ),stack_mask (ctxt), inc); } -static inline void jmp_rel (struct x86_emulate_ctxt *ctxt,int rel) -{ -register_address_increment (ctxt, &ctxt->_eip, rel); -} -static u32 desc_limit_scaled (struct desc_struct *desc) {u32 limit =get_desc_limit (desc);
@@ -568,6 +563,28 @@ static int emulate_nm(struct x86_emulatereturn emulate_exception (ctxt,NM_VECTOR ,0 , false); } +static inline void assign_eip_near (struct x86_emulate_ctxt *ctxt,ulong dst) +{ +switch (ctxt->op_bytes) { +case 2 : + ctxt->_eip = (u16 )dst; +break ; +case 4 : + ctxt->_eip = (u32 )dst; +break ; +case 8 : + ctxt->_eip = dst; +break ; +default : +WARN (1 ,"unsupported eip assignment size\n" ); + } +} + +static inline void jmp_rel (struct x86_emulate_ctxt *ctxt,int rel) +{ +assign_eip_near (ctxt, ctxt->_eip + rel); +} +static u16 get_segment_selector (struct x86_emulate_ctxt *ctxt,unsigned seg) {u16 selector;
Greg Kroah-Hartman
maintainerPATCH 134/319 KVM: x86: Emulator fixes for eip canonical checks on near branches
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nadav Amit <[email protected]>
commit 234f3ce485d54017f15cf5e0699cff4100121601 upstream.
Before changing rip (during jmp, call, ret, etc.) the target should be asserted to be canonical one, as real CPUs do. During sysret, both target rsp and rip should be canonical. If any of these values is noncanonical, a #GP exception should occur. The exception to this rule are syscall and sysenter instructions in which the assigned rip is checked during the assignment to the relevant MSRs.
This patch fixes the emulator to behave as real CPUs do for near branches. Far branches are handled by the next patch.
This fixes CVE-2014-3647.
--- arch/x86/kvm/emulate.c | 78 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 54 insertions(+), 24 deletions(-)
arch/x86/kvm/emulate.c +54 -24
@@ -563,7 +563,8 @@ static int emulate_nm(struct x86_emulatereturn emulate_exception (ctxt,NM_VECTOR ,0 , false); } -static inline void assign_eip_near (struct x86_emulate_ctxt *ctxt,ulong dst) +static inline int assign_eip_far (struct x86_emulate_ctxt *ctxt,ulong dst, +int cs_l) {switch (ctxt->op_bytes) {case 2 :
@@ -573,16 +574,25 @@ static inline void assign_eip_near(struc ctxt->_eip = (u32 )dst;break ;case 8 : +if ((cs_l &&is_noncanonical_address (dst)) || + (!cs_l && (dst & ~(u32)-1 ))) +return emulate_gp (ctxt,0 ); ctxt->_eip = dst;break ;default :WARN (1 ,"unsupported eip assignment size\n" ); } +return X86EMUL_CONTINUE ; +} + +static inline int assign_eip_near (struct x86_emulate_ctxt *ctxt,ulong dst) +{ +return assign_eip_far (ctxt, dst, ctxt->mode ==X86EMUL_MODE_PROT64 ); } -static inline void jmp_rel (struct x86_emulate_ctxt *ctxt,int rel) +static inline int jmp_rel (struct x86_emulate_ctxt *ctxt,int rel) { -assign_eip_near (ctxt, ctxt->_eip + rel); +return assign_eip_near (ctxt, ctxt->_eip + rel); }static u16 get_segment_selector (struct x86_emulate_ctxt *ctxt,unsigned seg)
@@ -2014,13 +2024,15 @@ static int em_grp45(struct x86_emulate_ccase 2 :/* call near abs */ {long int old_eip; old_eip = ctxt->_eip; - ctxt->_eip = ctxt->src.val; + rc =assign_eip_near (ctxt, ctxt->src.val); +if (rc !=X86EMUL_CONTINUE ) +break ; ctxt->src.val = old_eip; rc =em_push (ctxt);break ; }case 4 :/* jmp abs */ - ctxt->_eip = ctxt->src.val; + rc =assign_eip_near (ctxt, ctxt->src.val);break ;case 5 :/* jmp far */ rc =em_jmp_far (ctxt);
@@ -2055,10 +2067,14 @@ static int em_cmpxchg8b(struct x86_emulastatic int em_ret (struct x86_emulate_ctxt *ctxt) { - ctxt->dst.type =OP_REG ; - ctxt->dst.addr.reg = &ctxt->_eip; - ctxt->dst.bytes = ctxt->op_bytes; -return em_pop (ctxt); +int rc; +unsigned long eip; + + rc =emulate_pop (ctxt, &eip, ctxt->op_bytes); +if (rc !=X86EMUL_CONTINUE ) +return rc; + +return assign_eip_near (ctxt, eip); }static int em_ret_far (struct x86_emulate_ctxt *ctxt)
@@ -2339,7 +2355,7 @@ static int em_sysexit(struct x86_emulate {const struct x86_emulate_ops *ops = ctxt->ops;struct desc_struct cs, ss; -u64 msr_data; +u64 msr_data, rcx, rdx;int usermode;u16 cs_sel =0 , ss_sel =0 ;
@@ -2355,6 +2371,9 @@ static int em_sysexit(struct x86_emulateelse usermode =X86EMUL_MODE_PROT32 ; + rcx =reg_read (ctxt,VCPU_REGS_RCX ); + rdx =reg_read (ctxt,VCPU_REGS_RDX ); + cs.dpl =3 ; ss.dpl =3 ; ops->get_msr (ctxt,MSR_IA32_SYSENTER_CS , &msr_data);
@@ -2372,6 +2391,9 @@ static int em_sysexit(struct x86_emulate ss_sel = cs_sel +8 ; cs.d =0 ; cs.l =1 ; +if (is_noncanonical_address (rcx) || +is_noncanonical_address (rdx)) +return emulate_gp (ctxt,0 );break ; } cs_sel |=SELECTOR_RPL_MASK ;
@@ -2380,8 +2402,8 @@ static int em_sysexit(struct x86_emulate ops->set_segment (ctxt, cs_sel, &cs,0 ,VCPU_SREG_CS ); ops->set_segment (ctxt, ss_sel, &ss,0 ,VCPU_SREG_SS ); - ctxt->_eip =reg_read (ctxt,VCPU_REGS_RDX ); - *reg_write (ctxt,VCPU_REGS_RSP ) =reg_read (ctxt,VCPU_REGS_RCX ); + ctxt->_eip = rdx; + *reg_write (ctxt,VCPU_REGS_RSP ) = rcx;return X86EMUL_CONTINUE ; }
@@ -2922,10 +2944,13 @@ static int em_aad(struct x86_emulate_ctxstatic int em_call (struct x86_emulate_ctxt *ctxt) { +int rc;long rel = ctxt->src.val; ctxt->src.val = (unsigned long )ctxt->_eip; -jmp_rel (ctxt, rel); + rc =jmp_rel (ctxt, rel); +if (rc !=X86EMUL_CONTINUE ) +return rc;return em_push (ctxt); }
@@ -2957,11 +2982,12 @@ static int em_call_far(struct x86_emulatstatic int em_ret_near_imm (struct x86_emulate_ctxt *ctxt) {int rc; +unsigned long eip; - ctxt->dst.type =OP_REG ; - ctxt->dst.addr.reg = &ctxt->_eip; - ctxt->dst.bytes = ctxt->op_bytes; - rc =emulate_pop (ctxt, &ctxt->dst.val, ctxt->op_bytes); + rc =emulate_pop (ctxt, &eip, ctxt->op_bytes); +if (rc !=X86EMUL_CONTINUE ) +return rc; + rc =assign_eip_near (ctxt, eip);if (rc !=X86EMUL_CONTINUE )return rc;rsp_increment (ctxt, ctxt->src.val);
@@ -3292,20 +3318,24 @@ static int em_lmsw(struct x86_emulate_ctstatic int em_loop (struct x86_emulate_ctxt *ctxt) { +int rc =X86EMUL_CONTINUE ; +register_address_increment (ctxt,reg_rmw (ctxt,VCPU_REGS_RCX ),-1 );if ((address_mask (ctxt,reg_read (ctxt,VCPU_REGS_RCX )) !=0 ) && (ctxt->b ==0xe2 ||test_cc (ctxt->b ^0x5 , ctxt->eflags))) -jmp_rel (ctxt, ctxt->src.val); + rc =jmp_rel (ctxt, ctxt->src.val); -return X86EMUL_CONTINUE ; +return rc; }static int em_jcxz (struct x86_emulate_ctxt *ctxt) { +int rc =X86EMUL_CONTINUE ; +if (address_mask (ctxt,reg_read (ctxt,VCPU_REGS_RCX )) ==0 ) -jmp_rel (ctxt, ctxt->src.val); + rc =jmp_rel (ctxt, ctxt->src.val); -return X86EMUL_CONTINUE ; +return rc; }static int em_in (struct x86_emulate_ctxt *ctxt)
@@ -4770,7 +4800,7 @@ special_insn:break ; case 0x70 ... 0x7f: /* jcc (short) */if (test_cc (ctxt->b, ctxt->eflags)) -jmp_rel (ctxt, ctxt->src.val); + rc =jmp_rel (ctxt, ctxt->src.val);break ;case 0x8d :/* lea r16/r32, m */ ctxt->dst.val = ctxt->src.addr.mem.ea;
@@ -4800,7 +4830,7 @@ special_insn:break ;case 0xe9 :/* jmp rel */ case 0xeb :/* jmp rel short */ -jmp_rel (ctxt, ctxt->src.val); + rc =jmp_rel (ctxt, ctxt->src.val); ctxt->dst.type =OP_NONE ;/* Disable writeback. */ break ;case 0xf4 :/* hlt */
@@ -4923,7 +4953,7 @@ twobyte_insn:break ; case 0x80 ... 0x8f: /* jnz rel, etc*/if (test_cc (ctxt->b, ctxt->eflags)) -jmp_rel (ctxt, ctxt->src.val); + rc =jmp_rel (ctxt, ctxt->src.val);break ; case 0x90 ... 0x9f: /* setcc r/m8 */ ctxt->dst.val =test_cc (ctxt->b, ctxt->eflags);
Greg Kroah-Hartman
maintainerPATCH 135/319 KVM: x86: Handle errors when RIP is set during far jumps
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nadav Amit <[email protected]>
commit d1442d85cc30ea75f7d399474ca738e0bc96f715 upstream.
Far jmp/call/ret may fault while loading a new RIP. Currently KVM does not handle this case, and may result in failed vm-entry once the assignment is done. The tricky part of doing so is that loading the new CS affects the VMCS/VMCB state, so if we fail during loading the new RIP, we are left in unconsistent state. Therefore, this patch saves on 64-bit the old CS descriptor and restores it if loading RIP failed.
This fixes CVE-2014-3647.
--- arch/x86/kvm/emulate.c | 118 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 88 insertions(+), 30 deletions(-)
arch/x86/kvm/emulate.c +88 -30
@@ -1467,7 +1467,9 @@ static int write_segment_descriptor(stru/* Does not support long mode */ static int __load_segment_descriptor (struct x86_emulate_ctxt *ctxt, -u16 selector,int seg,u8 cpl,bool in_task_switch) +u16 selector,int seg,u8 cpl, +bool in_task_switch, +struct desc_struct *desc) {struct desc_struct seg_desc, old_desc;u8 dpl, rpl;
@@ -1599,6 +1601,8 @@ static int __load_segment_descriptor(str } load: ctxt->ops->set_segment (ctxt, selector, &seg_desc, base3, seg); +if (desc) + *desc = seg_desc;return X86EMUL_CONTINUE ; exception:emulate_exception (ctxt, err_vec, err_code, true);
@@ -1609,7 +1613,7 @@ static int load_segment_descriptor(struc u16 selector, int seg) {u8 cpl = ctxt->ops->cpl (ctxt); -return __load_segment_descriptor (ctxt, selector, seg, cpl, false); +return __load_segment_descriptor (ctxt, selector, seg, cpl, false,NULL ); }static void write_register_operand (struct operand *op)
@@ -2003,17 +2007,31 @@ static int em_iret(struct x86_emulate_ctstatic int em_jmp_far (struct x86_emulate_ctxt *ctxt) {int rc; -unsigned short sel; +unsigned short sel, old_sel; +struct desc_struct old_desc, new_desc; +const struct x86_emulate_ops *ops = ctxt->ops; +u8 cpl = ctxt->ops->cpl (ctxt); + +/* Assignment of RIP may only fail in 64-bit mode */ +if (ctxt->mode ==X86EMUL_MODE_PROT64 ) + ops->get_segment (ctxt, &old_sel, &old_desc,NULL , +VCPU_SREG_CS );memcpy (&sel, ctxt->src.valptr + ctxt->op_bytes,2 ); - rc =load_segment_descriptor (ctxt, sel,VCPU_SREG_CS ); + rc =__load_segment_descriptor (ctxt, sel,VCPU_SREG_CS , cpl, false, + &new_desc);if (rc !=X86EMUL_CONTINUE )return rc; - ctxt->_eip =0 ; -memcpy (&ctxt->_eip, ctxt->src.valptr, ctxt->op_bytes); -return X86EMUL_CONTINUE ; + rc =assign_eip_far (ctxt, ctxt->src.val, new_desc.l); +if (rc !=X86EMUL_CONTINUE ) { +WARN_ON (!ctxt->mode !=X86EMUL_MODE_PROT64 ); +/* assigning eip failed; restore the old cs */ + ops->set_segment (ctxt, old_sel, &old_desc,0 ,VCPU_SREG_CS ); +return rc; + } +return rc; }static int em_grp45 (struct x86_emulate_ctxt *ctxt)
@@ -2080,21 +2098,34 @@ static int em_ret(struct x86_emulate_ctxstatic int em_ret_far (struct x86_emulate_ctxt *ctxt) {int rc; -unsigned long cs; +unsigned long eip, cs; +u16 old_cs;int cpl = ctxt->ops->cpl (ctxt); +struct desc_struct old_desc, new_desc; +const struct x86_emulate_ops *ops = ctxt->ops; + +if (ctxt->mode ==X86EMUL_MODE_PROT64 ) + ops->get_segment (ctxt, &old_cs, &old_desc,NULL , +VCPU_SREG_CS ); - rc =emulate_pop (ctxt, &ctxt->_eip, ctxt->op_bytes); + rc =emulate_pop (ctxt, &eip, ctxt->op_bytes);if (rc !=X86EMUL_CONTINUE )return rc; -if (ctxt->op_bytes ==4 ) - ctxt->_eip = (u32 )ctxt->_eip; rc =emulate_pop (ctxt, &cs, ctxt->op_bytes);if (rc !=X86EMUL_CONTINUE )return rc;/* Outer-privilege level return is not implemented */ if (ctxt->mode >=X86EMUL_MODE_PROT16 && (cs &3 ) > cpl)return X86EMUL_UNHANDLEABLE ; - rc =load_segment_descriptor (ctxt, (u16 )cs,VCPU_SREG_CS ); + rc =__load_segment_descriptor (ctxt, (u16 )cs,VCPU_SREG_CS ,0 , false, + &new_desc); +if (rc !=X86EMUL_CONTINUE ) +return rc; + rc =assign_eip_far (ctxt, eip, new_desc.l); +if (rc !=X86EMUL_CONTINUE ) { +WARN_ON (!ctxt->mode !=X86EMUL_MODE_PROT64 ); + ops->set_segment (ctxt, old_cs, &old_desc,0 ,VCPU_SREG_CS ); + }return rc; }
@@ -2521,19 +2552,24 @@ static int load_state_from_tss16(struct* Now load segment descriptors. If fault happens at this stage * it is handled in a context of new task */ - ret =__load_segment_descriptor (ctxt, tss->ldt,VCPU_SREG_LDTR , cpl, true); + ret =__load_segment_descriptor (ctxt, tss->ldt,VCPU_SREG_LDTR , cpl, + true,NULL );if (ret !=X86EMUL_CONTINUE )return ret; - ret =__load_segment_descriptor (ctxt, tss->es,VCPU_SREG_ES , cpl, true); + ret =__load_segment_descriptor (ctxt, tss->es,VCPU_SREG_ES , cpl, + true,NULL );if (ret !=X86EMUL_CONTINUE )return ret; - ret =__load_segment_descriptor (ctxt, tss->cs,VCPU_SREG_CS , cpl, true); + ret =__load_segment_descriptor (ctxt, tss->cs,VCPU_SREG_CS , cpl, + true,NULL );if (ret !=X86EMUL_CONTINUE )return ret; - ret =__load_segment_descriptor (ctxt, tss->ss,VCPU_SREG_SS , cpl, true); + ret =__load_segment_descriptor (ctxt, tss->ss,VCPU_SREG_SS , cpl, + true,NULL );if (ret !=X86EMUL_CONTINUE )return ret; - ret =__load_segment_descriptor (ctxt, tss->ds,VCPU_SREG_DS , cpl, true); + ret =__load_segment_descriptor (ctxt, tss->ds,VCPU_SREG_DS , cpl, + true,NULL );if (ret !=X86EMUL_CONTINUE )return ret;
@@ -2658,25 +2694,32 @@ static int load_state_from_tss32(struct* Now load segment descriptors. If fault happenes at this stage * it is handled in a context of new task */ - ret =__load_segment_descriptor (ctxt, tss->ldt_selector,VCPU_SREG_LDTR , cpl, true); + ret =__load_segment_descriptor (ctxt, tss->ldt_selector,VCPU_SREG_LDTR , + cpl, true,NULL );if (ret !=X86EMUL_CONTINUE )return ret; - ret =__load_segment_descriptor (ctxt, tss->es,VCPU_SREG_ES , cpl, true); + ret =__load_segment_descriptor (ctxt, tss->es,VCPU_SREG_ES , cpl, + true,NULL );if (ret !=X86EMUL_CONTINUE )return ret; - ret =__load_segment_descriptor (ctxt, tss->cs,VCPU_SREG_CS , cpl, true); + ret =__load_segment_descriptor (ctxt, tss->cs,VCPU_SREG_CS , cpl, + true,NULL );if (ret !=X86EMUL_CONTINUE )return ret; - ret =__load_segment_descriptor (ctxt, tss->ss,VCPU_SREG_SS , cpl, true); + ret =__load_segment_descriptor (ctxt, tss->ss,VCPU_SREG_SS , cpl, + true,NULL );if (ret !=X86EMUL_CONTINUE )return ret; - ret =__load_segment_descriptor (ctxt, tss->ds,VCPU_SREG_DS , cpl, true); + ret =__load_segment_descriptor (ctxt, tss->ds,VCPU_SREG_DS , cpl, + true,NULL );if (ret !=X86EMUL_CONTINUE )return ret; - ret =__load_segment_descriptor (ctxt, tss->fs,VCPU_SREG_FS , cpl, true); + ret =__load_segment_descriptor (ctxt, tss->fs,VCPU_SREG_FS , cpl, + true,NULL );if (ret !=X86EMUL_CONTINUE )return ret; - ret =__load_segment_descriptor (ctxt, tss->gs,VCPU_SREG_GS , cpl, true); + ret =__load_segment_descriptor (ctxt, tss->gs,VCPU_SREG_GS , cpl, + true,NULL );if (ret !=X86EMUL_CONTINUE )return ret;
@@ -2959,24 +3002,39 @@ static int em_call_far(struct x86_emulatu16 sel, old_cs;ulong old_eip;int rc; +struct desc_struct old_desc, new_desc; +const struct x86_emulate_ops *ops = ctxt->ops; +int cpl = ctxt->ops->cpl (ctxt); - old_cs =get_segment_selector (ctxt,VCPU_SREG_CS ); old_eip = ctxt->_eip; + ops->get_segment (ctxt, &old_cs, &old_desc,NULL ,VCPU_SREG_CS );memcpy (&sel, ctxt->src.valptr + ctxt->op_bytes,2 ); -if (load_segment_descriptor (ctxt, sel,VCPU_SREG_CS )) + rc =__load_segment_descriptor (ctxt, sel,VCPU_SREG_CS , cpl, false, + &new_desc); +if (rc !=X86EMUL_CONTINUE )return X86EMUL_CONTINUE ; - ctxt->_eip =0 ; -memcpy (&ctxt->_eip, ctxt->src.valptr, ctxt->op_bytes); + rc =assign_eip_far (ctxt, ctxt->src.val, new_desc.l); +if (rc !=X86EMUL_CONTINUE ) + goto fail; ctxt->src.val = old_cs; rc =em_push (ctxt);if (rc !=X86EMUL_CONTINUE ) -return rc; + goto fail; ctxt->src.val = old_eip; -return em_push (ctxt); + rc =em_push (ctxt); +/* If we failed, we tainted the memory, but the very least we should +restore cs */ +if (rc !=X86EMUL_CONTINUE ) + goto fail; +return rc; +fail: + ops->set_segment (ctxt, old_cs, &old_desc,0 ,VCPU_SREG_CS ); +return rc; + }static int em_ret_near_imm (struct x86_emulate_ctxt *ctxt)
Greg Kroah-Hartman
maintainerPATCH 136/319 kvm: vmx: handle invvpid vm exit gracefully
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Matousek <[email protected]>
commit a642fc305053cc1c6e47e4f4df327895747ab485 upstream.
On systems with invvpid instruction support (corresponding bit in IA32_VMX_EPT_VPID_CAP MSR is set) guest invocation of invvpid causes vm exit, which is currently not handled and results in propagation of unknown exit to userspace.
Fix this by installing an invvpid vm exit handler.
This is CVE-2014-3646.
--- arch/x86/include/uapi/asm/vmx.h | 2 ++ arch/x86/kvm/vmx.c | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-)
arch/x86/include/uapi/asm/vmx.h +2 -0
@@ -67,6 +67,7 @@#define EXIT_REASON_EPT_MISCONFIG 49#define EXIT_REASON_INVEPT 50#define EXIT_REASON_PREEMPTION_TIMER 52 +#define EXIT_REASON_INVVPID 53#define EXIT_REASON_WBINVD 54#define EXIT_REASON_XSETBV 55#define EXIT_REASON_APIC_WRITE 56
@@ -114,6 +115,7 @@ { EXIT_REASON_EOI_INDUCED, "EOI_INDUCED" }, \ { EXIT_REASON_INVALID_STATE, "INVALID_STATE" }, \ { EXIT_REASON_INVD, "INVD" }, \ + { EXIT_REASON_INVVPID, "INVVPID" }, \ { EXIT_REASON_INVPCID, "INVPCID" } #endif /* _UAPIVMX_H */
arch/x86/kvm/vmx.c +8 -1
@@ -6639,6 +6639,12 @@ static int handle_invept(struct kvm_vcpureturn 1 ; } +static int handle_invvpid (struct kvm_vcpu *vcpu) +{ +kvm_queue_exception (vcpu,UD_VECTOR ); +return 1 ; +} +/* * The exit handlers return 1 if the exit was handled fully and guest execution * may resume. Otherwise they set the kvm_run parameter to indicate what needs
@@ -6684,6 +6690,7 @@ static int (*const kvm_vmx_exit_handlers [EXIT_REASON_MWAIT_INSTRUCTION] = handle_mwait, [EXIT_REASON_MONITOR_INSTRUCTION] = handle_monitor, [EXIT_REASON_INVEPT] = handle_invept, + [EXIT_REASON_INVVPID] = handle_invvpid, }; static const int kvm_vmx_max_exit_handlers =
@@ -6917,7 +6924,7 @@ static bool nested_vmx_exit_handled(strucase EXIT_REASON_VMPTRST :case EXIT_REASON_VMREAD :case EXIT_REASON_VMRESUME :case EXIT_REASON_VMWRITE :case EXIT_REASON_VMOFF :case EXIT_REASON_VMON : -case EXIT_REASON_INVEPT : +case EXIT_REASON_INVEPT :case EXIT_REASON_INVVPID :/* * VMX instructions trap unconditionally. This allows L1 to * emulate them for its L2 guest, i.e., allows 3-level nesting!
Greg Kroah-Hartman
maintainerPATCH 137/319 ARC: [nsimosci] Allow "headless" models to boot
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vineet Gupta <[email protected]>
commit 5c05483e2db91890faa9a7be0a831701a3f442d6 upstream.
There are certain test configuration of virtual platform which don't have any real console device (uart/pgu). So add tty0 as a fallback console device to allow system to boot and be accessible via telnet
Otherwise with ttyS0 as only console, but 8250 disabled in kernel build, init chokes.
--- arch/arc/boot/dts/nsimosci.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arc/boot/dts/nsimosci.dts +1 -1
@@ -20,7 +20,7 @@ /* this is for console on PGU */ /* bootargs = "console=tty0 consoleblank=0"; */ /* this is for console on serial */ - bootargs = "earlycon=uart8250,mmio32,0xc0000000,115200n8 console=ttyS0,115200n8 consoleblank=0 debug"; + bootargs = "earlycon=uart8250,mmio32,0xc0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug"; }; aliases {
Greg Kroah-Hartman
maintainerPATCH 138/319 ARC: Update order of registers in KGDB to match GDB 7.5
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anton Kolesov <[email protected]>
commit ebc0c74e76cec9c4dd860eb0ca1c0b39dc63c482 upstream.
Order of registers has changed in GDB moving from 6.8 to 7.5. This patch updates KGDB to work properly with GDB 7.5, though makes it incompatible with 6.8.
--- arch/arc/include/asm/kgdb.h | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)
arch/arc/include/asm/kgdb.h +18 -14
@@ -19,7 +19,7 @@* register API yet */ #undef DBG_MAX_REG_NUM -#define GDB_MAX_REGS 39 +#define GDB_MAX_REGS 87#define BREAK_INSTR_SIZE 2#define CACHE_FLUSH_IS_SAFE 1
@@ -33,23 +33,27 @@ static inline void arch_kgdb_breakpoint(extern void kgdb_trap (struct pt_regs *regs); -enum arc700_linux_regnums { +/* This is the numbering of registers according to the GDB. See GDB's +* arc-tdep.h for details. +* +* Registers are ordered for GDB 7.5. It is incompatible with GDB 6.8. */ +enum arc_linux_regnums { _R0 =0 , _R1, _R2, _R3, _R4, _R5, _R6, _R7, _R8, _R9, _R10, _R11, _R12, _R13, _R14, _R15, _R16, _R17, _R18, _R19, _R20, _R21, _R22, _R23, _R24, _R25, _R26, - _BTA =27 , - _LP_START =28 , - _LP_END =29 , - _LP_COUNT =30 , - _STATUS32 =31 , - _BLINK =32 , - _FP =33 , - __SP =34 , - _EFA =35 , - _RET =36 , - _ORIG_R8 =37 , - _STOP_PC =38 + _FP =27 , + __SP =28 , + _R30 =30 , + _BLINK =31 , + _LP_COUNT =60 , + _STOP_PC =64 , + _RET =64 , + _LP_START =65 , + _LP_END =66 , + _STATUS32 =67 , + _ECR =76 , + _BTA =82 , };#else
Greg Kroah-Hartman
maintainerPATCH 139/319 ARC: unbork FPU save/restore
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vineet Gupta <[email protected]>
commit 52e9bae93802bd29c33be11e9e758ad7daac805f upstream.
--- arch/arc/include/asm/arcregs.h | 8 -------- arch/arc/include/asm/processor.h | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-)
arch/arc/include/asm/arcregs.h +0 -8
@@ -191,14 +191,6 @@#define PAGES_TO_KB (n_pages) ((n_pages) << (PAGE_SHIFT - 10))#define PAGES_TO_MB (n_pages) (PAGES_TO_KB(n_pages) >> 10) -#ifdef CONFIG_ARC_FPU_SAVE_RESTORE -/* These DPFP regs need to be saved/restored across ctx-sw */ -struct arc_fpu { -struct { -unsigned int l, h; - } aux_dpfp[2 ]; -}; -#endif /* ***************************************************************
arch/arc/include/asm/processor.h +9 -0
@@ -20,6 +20,15 @@#include <asm/ptrace.h> +#ifdef CONFIG_ARC_FPU_SAVE_RESTORE +/* These DPFP regs need to be saved/restored across ctx-sw */ +struct arc_fpu { +struct { +unsigned int l, h; + } aux_dpfp[2 ]; +}; +#endif +/* Arch specific stuff which needs to be saved per task. * However these items are not so important so as to earn a place in * struct thread_info
Greg Kroah-Hartman
maintainerPATCH 140/319 qla_target: dont delete changed nacls
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joern Engel <[email protected]>
commit f4c24db1b7ad0ce84409e15744d26c6f86a96840 upstream.
The code is currently riddled with "drop the hardware_lock to avoid a deadlock" bugs that expose races. One of those races seems to expose a valid warning in tcm_qla2xxx_clear_nacl_from_fcport_map. Add some bandaid to it.
--- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/tcm_qla2xxx.c +10 -1
@@ -757,7 +757,16 @@ static void tcm_qla2xxx_clear_nacl_from_pr_debug ("fc_rport domain: port_id 0x%06x\n" , nacl->nport_id); node =btree_remove32 (&lport->lport_fcport_map, nacl->nport_id); -WARN_ON (node && (node != se_nacl)); +if (WARN_ON (node && (node != se_nacl))) { +/* +* The nacl no longer matches what we think it should be. +* Most likely a new dynamic acl has been added while +* someone dropped the hardware lock. It clearly is a +* bug elsewhere, but this bit can't make things worse. +*/ +btree_insert32 (&lport->lport_fcport_map, nacl->nport_id, + node,GFP_ATOMIC ); + }pr_debug ("Removed from fcport_map: %p for WWNN: 0x%016LX, port_id: 0x%06x\n" , se_nacl, nacl->nport_wwnn, nacl->nport_id);
Greg Kroah-Hartman
maintainerPATCH 141/319 iser-target: Disable TX completion interrupt coalescing
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit 0d0f660d882c1c02748ced13966a2413aa5d6cc2 upstream.
This patch explicitly disables TX completion interrupt coalescing logic in isert_put_response() and isert_put_datain() that was originally added as an efficiency optimization in commit 95b60f07.
It has been reported that this change can trigger ABORT_TASK timeouts under certain small block workloads, where disabling coalescing was required for stability. According to Sagi, this doesn't impact overall performance, so go ahead and disable it for now.
--- drivers/infiniband/ulp/isert/ib_isert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/ulp/isert/ib_isert.c +2 -2
@@ -2185,7 +2185,7 @@ isert_put_response(struct iscsi_conn *co isert_cmd->tx_desc.num_sge =2 ; } -isert_init_send_wr (isert_conn, isert_cmd, send_wr, true); +isert_init_send_wr (isert_conn, isert_cmd, send_wr, false);pr_debug ("Posting SCSI Response IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n" );
@@ -2884,7 +2884,7 @@ isert_put_datain(struct iscsi_conn *conn &isert_cmd->tx_desc.iscsi_header);isert_init_tx_hdrs (isert_conn, &isert_cmd->tx_desc);isert_init_send_wr (isert_conn, isert_cmd, - &isert_cmd->tx_desc.send_wr, true); + &isert_cmd->tx_desc.send_wr, false); isert_cmd->rdma_wr.s_send_wr.next = &isert_cmd->tx_desc.send_wr; wr->send_wr_num +=1 ; }
Greg Kroah-Hartman
maintainerPATCH 142/319 target: Fix queue full status NULL pointer for SCF_TRANSPORT_TASK_SENSE
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quinn Tran <[email protected]>
commit 082f58ac4a48d3f5cb4597232cb2ac6823a96f43 upstream.
During temporary resource starvation at lower transport layer, command is placed on queue full retry path, which expose this problem. The TCM queue full handling of SCF_TRANSPORT_TASK_SENSE currently sends the same cmd twice to lower layer. The 1st time led to cmd normal free path. The 2nd time cause Null pointer access.
This regression bug was originally introduced v3.1-rc code in the following commit:
commit e057f53308a5f071556ee80586b99ee755bf07f5
Author: Christoph Hellwig <[email protected]> Date: Mon Oct 17 13:56:41 2011 -0400
target: remove the transport_qf_callback se_cmd callback
--- drivers/target/target_core_transport.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/target/target_core_transport.c +1 -2
@@ -1877,8 +1877,7 @@ static void transport_complete_qf(structif (cmd->se_cmd_flags &SCF_TRANSPORT_TASK_SENSE ) {trace_target_cmd_complete (cmd); ret = cmd->se_tfo->queue_status (cmd); -if (ret) - goto out; + goto out; }switch (cmd->data_direction) {
Greg Kroah-Hartman
maintainerPATCH 143/319 target: Fix APTPL metadata handling for dynamic MappedLUNs
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit e24805637d2d270d7975502e9024d473de86afdb upstream.
This patch fixes a bug in handling of SPC-3 PR Activate Persistence across Target Power Loss (APTPL) logic where re-creation of state for MappedLUNs from dynamically generated NodeACLs did not occur during I_T Nexus establishment.
It adds the missing core_scsi3_check_aptpl_registration() call during core_tpg_check_initiator_node_acl() -> core_tpg_add_node_to_devs() in order to replay any pre-loaded APTPL metadata state associated with the newly connected SCSI Initiator Port.
--- drivers/target/target_core_device.c | 3 ++- drivers/target/target_core_pr.c | 6 +++--- drivers/target/target_core_pr.h | 2 +- drivers/target/target_core_tpg.c | 8 ++++++++ 4 files changed, 14 insertions(+), 5 deletions(-)
drivers/target/target_core_device.c +2 -1
@@ -1409,7 +1409,8 @@ int core_dev_add_initiator_node_lun_acl(* Check to see if there are any existing persistent reservation APTPL * pre-registrations that need to be enabled for this LUN ACL.. */ -core_scsi3_check_aptpl_registration (lun->lun_se_dev, tpg, lun, lacl); +core_scsi3_check_aptpl_registration (lun->lun_se_dev, tpg, lun, nacl, + lacl->mapped_lun);return 0 ; }
drivers/target/target_core_pr.c +3 -3
@@ -944,10 +944,10 @@ int core_scsi3_check_aptpl_registration(struct se_device *dev, struct se_portal_group *tpg, struct se_lun *lun, - struct se_lun_acl *lun_acl) + struct se_node_acl *nacl, + u32 mapped_lun) { - struct se_node_acl *nacl = lun_acl->se_lun_nacl; -struct se_dev_entry *deve = nacl->device_list[lun_acl->mapped_lun]; + struct se_dev_entry *deve = nacl->device_list[mapped_lun];if (dev->dev_reservation_flags &DRF_SPC2_RESERVATIONS )return 0 ;
drivers/target/target_core_pr.h +1 -1
@@ -60,7 +60,7 @@ extern int core_scsi3_alloc_aptpl_regist unsigned char *, u16, u32, int, int, u8);extern int core_scsi3_check_aptpl_registration (struct se_device *,struct se_portal_group *,struct se_lun *, -struct se_lun_acl *); +struct se_node_acl *,u32 );extern void core_scsi3_free_pr_reg_from_nacl (struct se_device *,struct se_node_acl *);extern void core_scsi3_free_all_registrations (struct se_device *);
drivers/target/target_core_tpg.c +8 -0
@@ -40,6 +40,7 @@#include <target/target_core_fabric.h> #include "target_core_internal.h" +#include "target_core_pr.h" extern struct se_device *g_lun0_dev;
@@ -166,6 +167,13 @@ void core_tpg_add_node_to_devs(core_enable_device_list_for_node (lun,NULL , lun->unpacked_lun, lun_access, acl, tpg); +/* +* Check to see if there are any existing persistent reservation +* APTPL pre-registrations that need to be enabled for this dynamic +* LUN ACL now.. +*/ +core_scsi3_check_aptpl_registration (dev, tpg, lun, acl, + lun->unpacked_lun);spin_lock (&tpg->tpg_lun_lock); }spin_unlock (&tpg->tpg_lun_lock);
Greg Kroah-Hartman
maintainerPATCH 144/319 MIPS: ptrace.h: Add a missing include
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaro Koskinen <[email protected]>
commit cdb685ad44996e9a113a10002cb42d40ff29db99 upstream.
Commit a79ebea62010 (MIPS: ptrace: Fix user pt_regs definition, use in ptrace_{get, set}regs()) converted struct pt_regs to use __u64. Some userspace applications (e.g. GDB) include this file directly, and fail to see this type. Fix by including <linux/types.h>.
The patch fixes the following build failure with GDB 7.8 when using GLIBC headers created against Linux 3.17:
In file included from /home/aaro/los/work/shared/gdb-7.8/gdb/mips-linux-nat.c:37:0:/home/aaro/los/work/mips/rootfs/mips-linux-gnu/usr/include/asm/ptrace.h:32:2: error: unknown type name '__u64'
__u64 regs[32];
^/home/aaro/los/work/mips/rootfs/mips-linux-gnu/usr/include/asm/ptrace.h:35:2: error: unknown type name '__u64'
__u64 lo;
^/home/aaro/los/work/mips/rootfs/mips-linux-gnu/usr/include/asm/ptrace.h:36:2: error: unknown type name '__u64'
__u64 hi;
^
Patchwork: https://patchwork.linux-mips.org/patch/8067/
--- arch/mips/include/uapi/asm/ptrace.h | 2 ++ 1 file changed, 2 insertions(+)
arch/mips/include/uapi/asm/ptrace.h +2 -0
@@ -9,6 +9,8 @@#ifndef _UAPI_ASM_PTRACE_H#define _UAPI_ASM_PTRACE_H +#include <linux/types.h> +/* 0 - 31 are integer registers, 32 - 63 are fp registers. */ #define FPR_BASE 32#define PC 64
Greg Kroah-Hartman
maintainerPATCH 145/319 MIPS: loongson2_cpufreq: Fix CPU clock rate setting mismerge
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaro Koskinen <[email protected]>
commit aa08ed55442ac6f9810c055e1474be34e785e556 upstream.
During 3.16 merge window, parts of the commit 8e8acb32960f (MIPS/loongson2_cpufreq: Fix CPU clock rate setting) seem to have been deleted probably due to a mismerge, and as a result cpufreq is broken again on Loongson2 boards in 3.16 and newer kernels. Fix by repeating the fix.
Patchwork: https://patchwork.linux-mips.org/patch/7835/
--- arch/mips/loongson/lemote-2f/clock.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/mips/loongson/lemote-2f/clock.c +3 -2
@@ -91,6 +91,7 @@ EXPORT_SYMBOL(clk_put);int clk_set_rate (struct clk *clk,unsigned long rate) { +unsigned int rate_khz = rate /1000 ;struct cpufreq_frequency_table *pos;int ret =0 ;int regval;
@@ -107,9 +108,9 @@ int clk_set_rate(struct clk *clk, unsignpropagate_rate (clk);cpufreq_for_each_valid_entry (pos, loongson2_clockmod_table) -if (rate == pos->frequency) +if (rate_khz == pos->frequency)break ; -if (rate != pos->frequency) +if (rate_khz != pos->frequency)return -ENOTSUPP ; clk->rate = rate;
Greg Kroah-Hartman
maintainerPATCH 146/319 MIPS: cp1emu: Fix ISA restrictions for cop1x_op instructions
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Markos Chandras <[email protected]>
commit a5466d7bba9af83a82cc7c081b2a7d557cde3204 upstream.
Commit 08a07904e1828 ("MIPS: math-emu: Remove most ifdefery") removed the #ifdef ISA conditions and switched to runtime detection. However, according to the instruction set manual, the cop1x_op instructions are available in >=MIPS32r2 as well. This fixes a problem on MIPS32r2 with the ntpd package which failed to execute with a SIGILL exit code due to the fact that a madd.d instruction was not being emulated.
Patchwork: https://patchwork.linux-mips.org/patch/8173/
--- arch/mips/math-emu/cp1emu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/math-emu/cp1emu.c +2 -2
@@ -1023,7 +1023,7 @@ emul: goto emul;case cop1x_op: -if (cpu_has_mips_4_5 || cpu_has_mips64) +if (cpu_has_mips_4_5 || cpu_has_mips64 || cpu_has_mips32r2)/* its one of ours */ goto emul;
@@ -1068,7 +1068,7 @@ emul:break ;case cop1x_op: -if (!cpu_has_mips_4_5 && !cpu_has_mips64) +if (!cpu_has_mips_4_5 && !cpu_has_mips64 && !cpu_has_mips32r2)return SIGILL ; sig =fpux_emu (xcp, ctx, ir, fault_addr);
Greg Kroah-Hartman
maintainerPATCH 147/319 MIPS: ftrace: Fix a microMIPS build problem
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Markos Chandras <[email protected]>
commit aedd153f5bb5b1f1d6d9142014f521ae2ec294cc upstream.
Code before the .fixup section needs to have the .insn directive. This has no side effects on MIPS32/64 but it affects the way microMIPS loads the address for the return label.
Fixes the following build problem:
mips-linux-gnu-ld: arch/mips/built-in.o: .fixup+0x4a0: Unsupported jump between ISA modes; consider recompiling with interlinking enabled.
mips-linux-gnu-ld: final link failed: Bad value
Makefile:819: recipe for target 'vmlinux' failed
The fix is similar to 1658f914ff91c3bf ("MIPS: microMIPS:
Disable LL/SC and fix linker bug.")
Patchwork: https://patchwork.linux-mips.org/patch/8117/
--- arch/mips/include/asm/ftrace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/include/asm/ftrace.h +2 -2
@@ -24,7 +24,7 @@ do { \ asmvolatile ( \"1: " load" %[tmp_dst], 0(%[tmp_src])\n" \" li %[tmp_err], 0\n" \ -"2:\n" \ +"2: .insn\n" \ \".section .fixup, \"ax\"\n" \ "3: li %[tmp_err], 1\n" \
@@ -46,7 +46,7 @@ do { \ asmvolatile ( \"1: " store" %[tmp_src], 0(%[tmp_dst])\n" \" li %[tmp_err], 0\n" \ -"2:\n" \ +"2: .insn\n" \ \".section .fixup, \"ax\"\n" \ "3: li %[tmp_err], 1\n" \
Greg Kroah-Hartman
maintainerPATCH 148/319 MIPS: tlbex: Properly fix HUGE TLB Refill exception handler
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Daney <[email protected]>
commit 9e0f162a36914937a937358fcb45e0609ef2bfc4 upstream.
In commit 8393c524a25609 (MIPS: tlbex: Fix a missing statement for HUGETLB), the TLB Refill handler was fixed so that non-OCTEON targets would work properly with huge pages. The change was incorrect in that it broke the OCTEON case.
The problem is shown here:
xxx0: df7a0000 ld k0,0(k1)
.
.
.
xxxc0: df610000 ld at,0(k1)
xxxc4: 335a0ff0 andi k0,k0,0xff0
xxxc8: e825ffcd bbit1 at,0x5,0x0
xxxcc: 003ad82d daddu k1,at,k0
.
.
.In the non-octeon case there is a destructive test for the huge PTE bit, and then at 0, $k0 is reloaded (that is what the 8393c524a25609 patch added).
In the octeon case, we modify k1 in the branch delay slot, but we never need k0 again, so the new load is not needed, but since k1 is modified, if we do the load, we load from a garbage location and then get a nested TLB Refill, which is seen in userspace as either SIGBUS or SIGSEGV (depending on the garbage).
The real fix is to only do this reloading if it is needed, and never where it is harmful.
Patchwork: https://patchwork.linux-mips.org/patch/8151/
--- arch/mips/mm/tlbex.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/mips/mm/tlbex.c +5 -1
@@ -1062,6 +1062,7 @@ static void build_update_entries(u32 **pstruct mips_huge_tlb_info {int huge_pte;int restore_scratch; +bool need_reload_pte; }; static struct mips_huge_tlb_info
@@ -1076,6 +1077,7 @@ build_fast_tlb_refill_handler (u32 **p, rv.huge_pte = scratch; rv.restore_scratch =0 ; + rv.need_reload_pte = false;if (check_for_high_segbits) {UASM_i_MFC0 (p, tmp,C0_BADVADDR );
@@ -1264,6 +1266,7 @@ static void build_r4000_tlb_refill_handl }else { htlb_info.huge_pte =K0 ; htlb_info.restore_scratch =0 ; + htlb_info.need_reload_pte = true; vmalloc_mode = refill_noscratch;/* * create the plain linear handler
@@ -1300,7 +1303,8 @@ static void build_r4000_tlb_refill_handl }#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT uasm_l_tlb_huge_update (&l, p); -UASM_i_LW (&p,K0 ,0 ,K1 ); +if (htlb_info.need_reload_pte) +UASM_i_LW (&p, htlb_info.huge_pte,0 ,K1 );build_huge_update_entries (&p, htlb_info.huge_pte,K1 );build_huge_tlb_write_entry (&p, &l, &r,K0 , tlb_random, htlb_info.restore_scratch);
Greg Kroah-Hartman
maintainerPATCH 150/319 jbd2: free bh when descriptor block checksum fails
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Darrick J. Wong" <[email protected]>
commit 064d83892e9ba547f7d4eae22cbca066d95210ce upstream.
Free the buffer head if the journal descriptor block fails checksum verification.
This is the jbd2 port of the e2fsprogs patch "e2fsck: free bh on csum verify error in do_one_pass".
--- fs/jbd2/recovery.c | 1 + 1 file changed, 1 insertion(+)
fs/jbd2/recovery.c +1 -0
@@ -525,6 +525,7 @@ static int do_one_pass(journal_t *journa !jbd2_descr_block_csum_verify(journal, bh->b_data)) { err = -EIO ; +brelse (bh); goto failed; }
Greg Kroah-Hartman
maintainerPATCH 151/319 ext4: check EA value offset when loading
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Darrick J. Wong" <[email protected]>
commit a0626e75954078cfacddb00a4545dde821170bc5 upstream.
When loading extended attributes, check each entry's value offset to make sure it doesn't collide with the entries.
Without this check it is easy to crash the kernel by mounting a malicious FS containing a file with an EA wherein e_value_offs = 0 and e_value_size > 0 and then deleting the EA, which corrupts the name list.
(See the f_ea_value_crash test's FS image in e2fsprogs for an example.)
--- fs/ext4/xattr.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)
fs/ext4/xattr.c +24 -8
@@ -190,14 +190,28 @@ ext4_listxattr(struct dentry *dentry, ch }static int -ext4_xattr_check_names (struct ext4_xattr_entry *entry,void *end) +ext4_xattr_check_names (struct ext4_xattr_entry *entry,void *end, +void *value_start) { -while (!IS_LAST_ENTRY (entry)) { -struct ext4_xattr_entry *next =EXT4_XATTR_NEXT (entry); +struct ext4_xattr_entry *e = entry; + +while (!IS_LAST_ENTRY (e)) { +struct ext4_xattr_entry *next =EXT4_XATTR_NEXT (e);if ((void *)next >= end)return -EIO ; - entry = next; + e = next; } + +while (!IS_LAST_ENTRY (entry)) { +if (entry->e_value_size !=0 && + (value_start +le16_to_cpu (entry->e_value_offs) < + (void *)e +sizeof (__u32) || + value_start +le16_to_cpu (entry->e_value_offs) + +le32_to_cpu (entry->e_value_size) > end)) +return -EIO ; + entry =EXT4_XATTR_NEXT (entry); + } +return 0 ; }
@@ -214,7 +228,8 @@ ext4_xattr_check_block(struct inode *inoreturn -EIO ;if (!ext4_xattr_block_csum_verify (inode, bh->b_blocknr,BHDR (bh)))return -EIO ; - error =ext4_xattr_check_names (BFIRST (bh), bh->b_data + bh->b_size); + error =ext4_xattr_check_names (BFIRST (bh), bh->b_data + bh->b_size, + bh->b_data);if (!error)set_buffer_verified (bh);return error;
@@ -331,7 +346,7 @@ ext4_xattr_ibody_get(struct inode *inode header =IHDR (inode, raw_inode); entry =IFIRST (header); end = (void *)raw_inode +EXT4_SB (inode->i_sb)->s_inode_size; - error =ext4_xattr_check_names (entry, end); + error =ext4_xattr_check_names (entry, end, entry);if (error) goto cleanup; error = ext4_xattr_find_entry(&entry, name_index, name,
@@ -463,7 +478,7 @@ ext4_xattr_ibody_list(struct dentry *den raw_inode =ext4_raw_inode (&iloc); header =IHDR (inode, raw_inode); end = (void *)raw_inode +EXT4_SB (inode->i_sb)->s_inode_size; - error =ext4_xattr_check_names (IFIRST (header), end); + error =ext4_xattr_check_names (IFIRST (header), end,IFIRST (header));if (error) goto cleanup; error = ext4_xattr_list_entries(dentry, IFIRST(header),
@@ -986,7 +1001,8 @@ int ext4_xattr_ibody_find(struct inode * is->s.here = is->s.first; is->s.end = (void *)raw_inode +EXT4_SB (inode->i_sb)->s_inode_size;if (ext4_test_inode_state (inode,EXT4_STATE_XATTR )) { - error =ext4_xattr_check_names (IFIRST (header), is->s.end); + error =ext4_xattr_check_names (IFIRST (header), is->s.end, +IFIRST (header));if (error)return error;/* Find the named attribute. */
Greg Kroah-Hartman
maintainerPATCH 152/319 ext4: dont check quota format when there are no quota files
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 279bf6d390933d5353ab298fcc306c391a961469 upstream.
The check whether quota format is set even though there are no quota files with journalled quota is pointless and it actually makes it impossible to turn off journalled quotas (as there's no way to unset journalled quota format). Just remove the check.
--- fs/ext4/super.c | 7 ------- 1 file changed, 7 deletions(-)
fs/ext4/super.c +0 -7
@@ -1712,13 +1712,6 @@ static int parse_options(char *options, "not specified"); return 0; } - }else { -if (sbi->s_jquota_fmt) { -ext4_msg (sb,KERN_ERR ,"journaled quota format " -"specified with no journaling " -"enabled" ); -return 0 ; - } }#endif if (test_opt (sb,DIOREAD_NOLOCK )) {
Greg Kroah-Hartman
maintainerPATCH 153/319 ext4: fix mmap data corruption when blocksize < pagesize
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit d6320cbfc92910a3e5f10c42d98c231c98db4f60 upstream.
Use truncate_isize_extended() when hole is being created in a file so that ->page_mkwrite() will get called for the partial tail page if it is mmaped (see the first patch in the series for details).
--- fs/ext4/inode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/ext4/inode.c +5 -1
@@ -4536,8 +4536,12 @@ int ext4_setattr(struct dentry *dentry,ext4_orphan_del (NULL , inode); goto err_out; } - }else + }else { +loff_t oldsize = inode->i_size; +i_size_write (inode, attr->ia_size); +pagecache_isize_extended (inode, oldsize, inode->i_size); + }/* * Blocks are going to be removed from the inode. Wait
Greg Kroah-Hartman
maintainerPATCH 154/319 ext4: grab missed write_count for EXT4_IOC_SWAP_BOOT
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Monakhov <[email protected]>
commit 3e67cfad22230ebed85c56cbe413876f33fea82b upstream.
Otherwise this provokes complain like follows:
WARNING: CPU: 12 PID: 5795 at fs/ext4/ext4_jbd2.c:48 ext4_journal_check_start+0x4e/0xa0() Modules linked in: brd iTCO_wdt lpc_ich mfd_core igb ptp dm_mirror dm_region_hash dm_log dm_mod CPU: 12 PID: 5795 Comm: python Not tainted 3.17.0-rc2-00175-gae5344f #158 Hardware name: Intel Corporation W2600CR/W2600CR, BIOS SE5C600.86B.99.99.x028.061320111235 06/13/2011 0000000000000030 ffff8808116cfd28 ffffffff815c7dfc 0000000000000030 0000000000000000 ffff8808116cfd68 ffffffff8106ce8c ffff8808116cfdc8 ffff880813b16000 ffff880806ad6ae8 ffffffff81202008 0000000000000000 Call Trace: [<ffffffff815c7dfc>] dump_stack+0x51/0x6d [<ffffffff8106ce8c>] warn_slowpath_common+0x8c/0xc0 [<ffffffff81202008>] ? ext4_ioctl+0x9e8/0xeb0 [<ffffffff8106ceda>] warn_slowpath_null+0x1a/0x20 [<ffffffff8122867e>] ext4_journal_check_start+0x4e/0xa0 [<ffffffff81228c10>] __ext4_journal_start_sb+0x90/0x110 [<ffffffff81202008>] ext4_ioctl+0x9e8/0xeb0 [<ffffffff8107b0bd>] ? ptrace_stop+0x24d/0x2f0 [<ffffffff81088530>] ? alloc_pid+0x480/0x480 [<ffffffff8107b1f2>] ? ptrace_do_notify+0x92/0xb0 [<ffffffff81186545>] do_vfs_ioctl+0x4e5/0x550 [<ffffffff815cdbcb>] ? _raw_spin_unlock_irq+0x2b/0x40 [<ffffffff81186603>] SyS_ioctl+0x53/0x80 [<ffffffff815ce2ce>] tracesys+0xd0/0xd5
--- fs/ext4/ioctl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
fs/ext4/ioctl.c +9 -1
@@ -532,9 +532,17 @@ group_add_out: }case EXT4_IOC_SWAP_BOOT : + { +int err;if (!(filp->f_mode &FMODE_WRITE ))return -EBADF ; -return swap_inode_boot_loader (sb, inode); + err =mnt_want_write_file (filp); +if (err) +return err; + err =swap_inode_boot_loader (sb, inode); +mnt_drop_write_file (filp); +return err; + }case EXT4_IOC_RESIZE_FS : {ext4_fsblk_t n_blocks_count;
Greg Kroah-Hartman
maintainerPATCH 155/319 ext4: add ext4_iget_normal() which is to be used for dir tree lookups
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit f4bb2981024fc91b23b4d09a8817c415396dbabb upstream.
If there is a corrupted file system which has directory entries that point at reserved, metadata inodes, prohibit them from being used by treating them the same way we treat Boot Loader inodes --- that is, mark them to be bad inodes. This prohibits them from being opened, deleted, or modified via chmod, chown, utimes, etc.
In particular, this prevents a corrupted file system which has a directory entry which points at the journal inode from being deleted and its blocks released, after which point Much Hilarity Ensues.
--- fs/ext4/ext4.h | 1 + fs/ext4/inode.c | 7 +++++++ fs/ext4/namei.c | 4 ++-- fs/ext4/super.c | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-)
fs/ext4/ext4.h +1 -0
@@ -2109,6 +2109,7 @@ int do_journal_get_write_access(handle_t#define CONVERT_INLINE_DATA 2extern struct inode *ext4_iget (struct super_block *,unsigned long ); +extern struct inode *ext4_iget_normal (struct super_block *,unsigned long );extern int ext4_write_inode (struct inode *,struct writeback_control *);extern int ext4_setattr (struct dentry *,struct iattr *); extern int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry,
fs/ext4/inode.c +7 -0
@@ -4127,6 +4127,13 @@ bad_inode:return ERR_PTR (ret); } +struct inode *ext4_iget_normal (struct super_block *sb,unsigned long ino) +{ +if (ino <EXT4_FIRST_INO (sb) && ino !=EXT4_ROOT_INO ) +return ERR_PTR (-EIO ); +return ext4_iget (sb, ino); +} +static int ext4_inode_blocks_set (handle_t *handle,struct ext4_inode *raw_inode,struct ext4_inode_info *ei)
fs/ext4/namei.c +2 -2
@@ -1441,7 +1441,7 @@ static struct dentry *ext4_lookup(struct dentry);return ERR_PTR (-EIO ); } - inode =ext4_iget (dir->i_sb, ino); + inode =ext4_iget_normal (dir->i_sb, ino);if (inode ==ERR_PTR (-ESTALE )) { EXT4_ERROR_INODE(dir, "deleted inode referenced: %u",
@@ -1474,7 +1474,7 @@ struct dentry *ext4_get_parent(struct dereturn ERR_PTR (-EIO ); } -return d_obtain_alias (ext4_iget (child->d_inode->i_sb, ino)); +return d_obtain_alias (ext4_iget_normal (child->d_inode->i_sb, ino)); }/*
fs/ext4/super.c +1 -1
@@ -1002,7 +1002,7 @@ static struct inode *ext4_nfs_get_inode(* Currently we don't know the generation for parent directory, so * a generation of 0 means "accept any" */ - inode =ext4_iget (sb, ino); + inode =ext4_iget_normal (sb, ino);if (IS_ERR (inode))return ERR_CAST (inode);if (generation && inode->i_generation != generation) {
Greg Kroah-Hartman
maintainerPATCH 156/319 ext4: dont orphan or truncate the boot loader inode
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit e2bfb088fac03c0f621886a04cffc7faa2b49b1d upstream.
The boot loader inode (inode #5) should never be visible in the directory hierarchy, but it's possible if the file system is corrupted that there will be a directory entry that points at inode #5. In order to avoid accidentally trashing it, when such a directory inode is opened, the inode will be marked as a bad inode, so that it's not possible to modify (or read) the inode from userspace.
Unfortunately, when we unlink this (invalid/illegal) directory entry, we will put the bad inode on the ophan list, and then when try to unlink the directory, we don't actually remove the bad inode from the orphan list before freeing in-memory inode structure. This means the in-memory orphan list is corrupted, leading to a kernel oops.
In addition, avoid truncating a bad inode in ext4_destroy_inode(), since truncating the boot loader inode is not a smart thing to do.
--- fs/ext4/inode.c | 7 +++---- fs/ext4/namei.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-)
fs/ext4/inode.c +3 -4
@@ -224,16 +224,15 @@ void ext4_evict_inode(struct inode *inod goto no_delete; } -if (!is_bad_inode (inode)) -dquot_initialize (inode); +if (is_bad_inode (inode)) + goto no_delete; +dquot_initialize (inode);if (ext4_should_order_data (inode))ext4_begin_ordered_truncate (inode,0 );truncate_inode_pages_final (&inode->i_data);WARN_ON (atomic_read (&EXT4_I (inode)->i_ioend_count)); -if (is_bad_inode (inode)) - goto no_delete;/* * Protect us against freezing - iput() caller didn't have to have any
fs/ext4/namei.c +1 -1
@@ -2573,7 +2573,7 @@ int ext4_orphan_add(handle_t *handle, stint err =0 , rc;bool dirty = false; -if (!sbi->s_journal) +if (!sbi->s_journal ||is_bad_inode (inode))return 0 ; WARN_ON_ONCE(!(inode->i_state & (I_NEW | I_FREEING)) &&
Greg Kroah-Hartman
maintainerPATCH 157/319 ext4: fix reservation overflow in ext4_da_write_begin
In reply to Greg Kroah-Hartman3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Sandeen <[email protected]>
commit 0ff8947fc5f700172b37cbca811a38eb9cb81e08 upstream.
Delalloc write journal reservations only reserve 1 credit, to update the inode if necessary. However, it may happen once in a filesystem's lifetime that a file will cross the 2G threshold, and require the LARGE_FILE feature to be set in the superblock as well, if it was not set already.
This overruns the transaction reservation, and can be demonstrated simply on any ext4 filesystem without the LARGE_FILE feature already set:
dd if=/dev/zero of=testfile bs=1 seek=2147483646 count=1 \
conv=notrunc of=testfile
sync
dd if=/dev/zero of=testfile bs=1 seek=2147483647 count=1 \
conv=notrunc of=testfile
leads to:
EXT4-fs: ext4_do_update_inode:4296: aborting transaction: error 28 in __ext4_handle_dirty_super EXT4-fs error (device loop0) in ext4_do_update_inode:4301: error 28
EXT4-fs error (device loop0) in ext4_reserve_inode_write:4757: Readonly filesystem EXT4-fs error (device loop0) in ext4_dirty_inode:4876: error 28
EXT4-fs error (device loop0) in ext4_da_write_end:2685: error 28
Adjust the number of credits based on whether the flag is already set, and whether the current write may extend past the LARGE_FILE limit.
--- fs/ext4/inode.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
fs/ext4/inode.c +16 -1
@@ -2514,6 +2514,20 @@ static int ext4_nonda_switch(struct supereturn 0 ; } +/* We always reserve for an inode update; the superblock could be there too */ +static int ext4_da_write_credits (struct inode *inode,loff_t pos,unsigned len) +{ +if (likely (EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, +EXT4_FEATURE_RO_COMPAT_LARGE_FILE ))) +return 1 ; + +if (pos + len <=0x7fffffffULL ) +return 1 ; + +/* We might need to update the superblock to set LARGE_FILE */ +return 2 ; +} +static int ext4_da_write_begin (struct file *file,struct address_space *mapping,loff_t pos,unsigned len,unsigned flags,struct page **pagep,void **fsdata)
@@ -2564,7 +2578,8 @@ retry_grab:* of file which has an already mapped buffer. */ retry_journal: - handle =ext4_journal_start (inode,EXT4_HT_WRITE_PAGE ,1 ); + handle =ext4_journal_start (inode,EXT4_HT_WRITE_PAGE , +ext4_da_write_credits (inode, pos, len));if (IS_ERR (handle)) {page_cache_release (page);return PTR_ERR (handle);