3.14.24-stable review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 3.14.24-stable review
This is the start of the stable review cycle for the 3.14.24 release. There are 203 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:15:14 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.14.24-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 3.14.24-rc1
Johannes Weiner <[email protected]>
mm: page_alloc: fix zone allocation fairness on UP
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
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
Krzysztof Kozlowski <[email protected]>
regulator: max77693: Fix use of uninitialized regulator config
Dan Streetman <[email protected]>
powerpc: use device_online/offline() instead of cpu_up/down()
David Cohen <[email protected]>
pinctrl: baytrail: show output gpio state correctly on Intel Baytrail
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()
Alex Deucher <[email protected]>
drm/radeon: remove invalid pci id
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.
Kirill Tkhai <[email protected]>
sched: Use rq->rd in sched_setaffinity() under RCU read lock
Robert Baldyga <[email protected]>
usb: gadget: f_fs: remove redundant ffs_data_get()
Felipe Balbi <[email protected]>
usb: gadget: udc: core: fix kernel oops with soft-connect
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
Ondrej Kozina <[email protected]>
crypto: algif - avoid excessive use of socket buffer in skcipher
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()
Karl Beldan <[email protected]>
mac80211: fix typo in starting baserate for rts_cts_rate_idx
Imre Deak <[email protected]>
PM / Sleep: fix recovery during resuming from hibernation
Peter Hurley <[email protected]>
tty: Fix high cpu load if tty is unreleaseable
Eric Sandeen <[email protected]>
xfs: avoid false quotacheck after unclean shutdown
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"
J. Bruce Fields <[email protected]>
nfsd4: fix crash on unknown operation number
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
Jan Kara <[email protected]>
scsi: Fix error handling in SCSI_IOCTL_SEND_COMMAND
Jan Kara <[email protected]>
lib/bitmap.c: fix undefined shift in __bitmap_shift_{left|right}()
Johannes Weiner <[email protected]>
mm: memcontrol: do not iterate uninitialized memcgs
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
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
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
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
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
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
Cyril Brulebois <[email protected]>
wireless: rt2x00: add new rt2800usb device
Xose Vazquez Perez <[email protected]>
wireless: rt2x00: add new rt2800usb devices
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
Arjun Sreedharan <[email protected]>
usb: phy: return -ENODEV on failure of try_module_get
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()
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
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
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
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
Libin Yang <[email protected]>
ALSA: hda - add codec ID for Braswell display audio codec
Libin Yang <[email protected]>
ALSA: hda - add PCI IDs for Intel Braswell
David E. Box <[email protected]>
x86/platform/intel/iosf: Add Braswell PCI ID
Derek Browne <[email protected]>
mmc: sdhci-pci: SDIO host controller support for Intel Quark X1000
Bryan O'Donoghue <[email protected]>
x86: Add cpu_detect_cache_sizes to init_intel() add Quark legacy_cache()
Ong Boon Leong <[email protected]>
x86, iosf: Add PCI ID macros for better readability
Ong Boon Leong <[email protected]>
x86, iosf: Add Quark X1000 PCI ID
Ong Boon Leong <[email protected]>
x86, iosf: Added Quark MBI identifiers
David E. Box <[email protected]>
x86, iosf: Make IOSF driver modular and usable by more drivers
Mika Westerberg <[email protected]>
cpufreq: intel_pstate: Add CPU ID for Braswell processor
Dirk Brandewie <[email protected]>
intel_pstate: Add CPU IDs for Broadwell processors
Pali Rohár <[email protected]>
cpufreq: intel_pstate: Fix setting max_perf_pct in performance policy
Dirk Brandewie <[email protected]>
cpufreq: expose scaling_cur_freq sysfs file for set_policy() drivers
Jan Kara <[email protected]>
ext4: fix oops when loading block bitmap failed
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
Darrick J. Wong <[email protected]>
ext4: check s_chksum_driver when looking for bg csum presence
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: 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
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
Joern Engel <[email protected]>
qla_target: don't delete changed nacls
Vineet Gupta <[email protected]>
ARC: Disable caches in early boot if so configured
Vineet Gupta <[email protected]>
ARC: fix mmuv2 warning
Vineet Gupta <[email protected]>
ARC: [SMP] General Fixes
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: 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.
Quentin Casasnovas <[email protected]>
kvm: fix excessive pages un-pinning in kvm_iommu_map error path.
Axel Lin <[email protected]>
media: tda7432: Fix setting TDA7432_MUTE bit for TDA7432_RF register
Ulrich Eckhardt <[email protected]>
media: ds3000: fix LNB supply voltage on Tevii S480 on initialization
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
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/nouveau/bios: memset dcb struct to zero before parsing
Scot Doyle <[email protected]>
drm/i915: don't warn if backlight unexpectedly enabled
Ezequiel Garcia <[email protected]>
drm/tilcdc: Fix the error path in tilcdc_load()
Josh Boyer <[email protected]>
drm/vmwgfx: Fix drm.h include
Benjamin Herrenschmidt <[email protected]>
drm/ast: Fix HW cursor image
Hans de Goede <[email protected]>
Input: i8042 - quirks for Fujitsu Lifebook A544 and Lifebook AH544
Hans de Goede <[email protected]>
Input: i8042 - add noloop quirk for Asus X750LN
Mikulas Patocka <[email protected]>
framebuffer: fix border color
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
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
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
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
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
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
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
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
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
Artem Bityutskiy <[email protected]>
UBIFS: remove mst_mutex
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
Roger Tseng <[email protected]>
mmc: rtsx_pci_sdmmc: fix incorrect last byte in R2 response
Dmitry Lavnikevich <[email protected]>
ASoC: tlv320aic3x: fix PLL D configuration
Daniel Mack <[email protected]>
ASoC: soc-dapm: fix use after free
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
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
Vasily Averin <[email protected]>
ipv4: dst_entry leak in ip_send_unicast_reply()
Tom Herbert <[email protected]>
gre: Use inner mac length when computing tunnel length
Eric Dumazet <[email protected]>
tcp: md5: do not use alloc_percpu()
Ian Morgan <[email protected]>
ax88179_178a: fix bonding failure
Li RongQing <[email protected]>
ipv4: fix a potential use after free in ip_tunnel_core.c
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
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/cache.h | 27 ++++++ arch/arc/include/asm/kgdb.h | 32 +++--- arch/arc/kernel/head.S | 45 +++++++-- arch/arc/mm/cache_arc700.c | 113 ++++++---------------- arch/mips/include/asm/ftrace.h | 4 +- arch/mips/mm/tlbex.c | 6 +- arch/powerpc/platforms/pseries/dlpar.c | 4 +- arch/sh/kernel/cpu/sh3/setup-sh770x.c | 6 +- arch/um/drivers/ubd_kern.c | 5 +- arch/x86/Kconfig | 7 +- arch/x86/ia32/ia32entry.S | 18 +++- arch/x86/include/asm/elf.h | 5 +- arch/x86/include/asm/iosf_mbi.h | 55 +++++++++++ arch/x86/include/asm/kvm_host.h | 16 ++- arch/x86/include/uapi/asm/vmx.h | 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 | 15 ++- arch/x86/kernel/signal.c | 5 + arch/x86/kernel/tsc.c | 5 +- arch/x86/kernel/xsave.c | 7 +- arch/x86/kvm/emulate.c | 99 ++++++++++++++----- 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 +- block/blk-settings.c | 4 +- block/scsi_ioctl.c | 3 +- crypto/algif_skcipher.c | 2 +- drivers/ata/libata-sff.c | 20 ++-- drivers/ata/pata_serverworks.c | 13 ++- drivers/base/core.c | 4 +- drivers/block/drbd/drbd_interval.c | 4 + drivers/block/rbd.c | 2 +- drivers/block/xen-blkback/blkback.c | 1 + drivers/char/random.c | 10 +- drivers/cpufreq/cpufreq.c | 23 +++-- drivers/cpufreq/intel_pstate.c | 60 ++++++++++-- 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/intel_panel.c | 8 +- drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c | 1 + drivers/gpu/drm/qxl/qxl_display.c | 16 +-- 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-ids.h | 5 + drivers/hid/usbhid/hid-core.c | 26 ++++- drivers/hid/usbhid/hid-quirks.c | 3 + drivers/i2c/busses/i2c-at91.c | 2 +- drivers/iio/common/st_sensors/st_sensors_buffer.c | 2 +- drivers/input/serio/i8042-x86ia64io.h | 22 +++++ drivers/md/dm-bufio.c | 5 +- drivers/md/dm-log-userspace-transfer.c | 2 +- drivers/media/dvb-frontends/ds3000.c | 7 ++ drivers/media/i2c/tda7432.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 | 10 +- drivers/media/usb/uvc/uvc_driver.c | 9 ++ drivers/media/v4l2-core/v4l2-common.c | 9 +- drivers/mfd/rtsx_pcr.c | 2 +- drivers/mfd/ti_am335x_tscadc.c | 5 +- drivers/mmc/host/rtsx_pci_sdmmc.c | 7 ++ drivers/mmc/host/sdhci-pci.c | 12 +++ drivers/mmc/host/sdhci-pci.h | 1 + drivers/mtd/ubi/fastmap.c | 1 + drivers/net/Kconfig | 2 + 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/mvm/tx.c | 8 +- drivers/net/wireless/rt2x00/rt2800.h | 4 +- drivers/net/wireless/rt2x00/rt2800lib.c | 6 ++ drivers/net/wireless/rt2x00/rt2800usb.c | 5 + drivers/of/base.c | 88 +++++------------ drivers/of/selftest.c | 64 +++++++++++- drivers/of/testcase-data/tests-phandle.dtsi | 2 + drivers/pci/pci-sysfs.c | 14 +-- drivers/pinctrl/pinctrl-baytrail.c | 2 +- drivers/platform/x86/acer-wmi.c | 11 +++ drivers/power/charger-manager.c | 5 + drivers/regulator/max77693.c | 2 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 11 ++- drivers/spi/spi-fsl-dspi.c | 4 +- drivers/spi/spi-pl022.c | 2 +- drivers/spi/spi-pxa2xx.c | 7 +- 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/serial_core.c | 2 +- drivers/tty/tty_io.c | 7 +- drivers/usb/class/cdc-acm.c | 6 +- drivers/usb/core/hcd.c | 2 + drivers/usb/core/hub.c | 3 + drivers/usb/core/quirks.c | 10 ++ drivers/usb/dwc3/ep0.c | 4 +- drivers/usb/dwc3/gadget.c | 19 ++-- drivers/usb/dwc3/gadget.h | 2 +- drivers/usb/gadget/f_acm.c | 7 +- drivers/usb/gadget/f_fs.c | 2 - drivers/usb/gadget/udc-core.c | 5 + drivers/usb/musb/musb_cppi41.c | 3 +- drivers/usb/musb/musb_dsps.c | 4 +- drivers/usb/phy/phy.c | 3 + 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/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/virtio/virtio_pci.c | 33 ++++++- fs/btrfs/file-item.c | 2 +- fs/buffer.c | 8 ++ fs/dcache.c | 5 + fs/ext3/super.c | 7 -- fs/ext4/bitmap.c | 12 +-- fs/ext4/ext4.h | 13 ++- fs/ext4/extents.c | 6 +- fs/ext4/ialloc.c | 7 +- fs/ext4/inline.c | 3 +- fs/ext4/inode.c | 39 ++++++-- fs/ext4/ioctl.c | 13 ++- fs/ext4/mmp.c | 6 +- fs/ext4/namei.c | 43 +++----- 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 | 3 +- fs/pstore/inode.c | 4 +- fs/quota/dquot.c | 2 +- fs/super.c | 2 + fs/ubifs/commit.c | 10 +- fs/ubifs/log.c | 19 +++- fs/ubifs/master.c | 7 +- fs/ubifs/super.c | 1 - fs/ubifs/ubifs.h | 2 - fs/xfs/xfs_mount.c | 1 - fs/xfs/xfs_sb.c | 24 ++++- include/drm/drm_pciids.h | 1 - include/linux/blkdev.h | 5 +- include/linux/hid.h | 1 + include/linux/mm.h | 1 + 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/uapi/drm/vmwgfx_drm.h | 2 +- kernel/freezer.c | 3 + kernel/module.c | 2 + kernel/posix-timers.c | 1 + kernel/power/hibernate.c | 8 +- kernel/power/process.c | 40 +++++++- kernel/sched/core.c | 19 +++- kernel/trace/trace_syscalls.c | 8 +- lib/bitmap.c | 8 +- lib/string.c | 16 +++ mm/huge_memory.c | 4 +- mm/memcontrol.c | 35 ++++++- mm/oom_kill.c | 17 ++++ mm/page_alloc.c | 15 ++- mm/page_cgroup.c | 1 + mm/percpu.c | 2 - mm/truncate.c | 56 +++++++++++ net/ceph/messenger.c | 6 +- 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/tcp.c | 59 ++++------- net/ipv6/output_core.c | 33 +++++++ net/mac80211/rate.c | 2 +- net/netlink/af_netlink.c | 2 +- net/sunrpc/clnt.c | 3 + net/sunrpc/xprtsock.c | 4 + security/integrity/evm/evm_main.c | 16 ++- security/selinux/hooks.c | 2 +- sound/core/pcm_compat.c | 2 + sound/pci/hda/hda_intel.c | 3 + sound/pci/hda/patch_hdmi.c | 2 + sound/soc/codecs/tlv320aic3x.c | 13 +++ sound/soc/soc-dapm.c | 25 ++--- sound/usb/card.c | 9 +- virt/kvm/iommu.c | 8 +- 216 files changed, 1740 insertions(+), 773 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/203 tracing/syscalls: Ignore numbers outside NR_syscalls range
3.14-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/203 ipv4: fix nexthop attlen check in fib_nh_match
In reply to Greg Kroah-Hartman3.14-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 3/203 vxlan: fix a use after free in vxlan_encap_bypass
In reply to Greg Kroah-Hartman3.14-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
@@ -1770,6 +1770,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);
@@ -1793,16 +1795,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 4/203 vxlan: using pskb_may_pull as early as possible
In reply to Greg Kroah-Hartman3.14-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
@@ -1447,9 +1447,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;
@@ -1979,7 +1976,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 5/203 vxlan: fix a free after use
In reply to Greg Kroah-Hartman3.14-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
@@ -1986,6 +1986,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 6/203 ipv4: fix a potential use after free in ip_tunnel_core.c
In reply to Greg Kroah-Hartman3.14-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 7/203 ax88179_178a: fix bonding failure
In reply to Greg Kroah-Hartman3.14-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
@@ -696,6 +696,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 ;
@@ -705,8 +706,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 8/203 tcp: md5: do not use alloc_percpu()
In reply to Greg Kroah-Hartman3.14-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
@@ -2954,61 +2954,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);
@@ -3022,13 +3003,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 9/203 gre: Use inner mac length when computing tunnel length
In reply to Greg Kroah-Hartman3.14-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
@@ -50,7 +50,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 10/203 ipv4: dst_entry leak in ip_send_unicast_reply()
In reply to Greg Kroah-Hartman3.14-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
@@ -1487,6 +1487,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 ;
@@ -1525,8 +1526,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 )
@@ -1538,7 +1544,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 11/203 drivers/net: Disable UFO through virtio
In reply to Greg Kroah-Hartman3.14-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;
@@ -1150,8 +1150,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);
@@ -1252,8 +1262,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",
@@ -1783,11 +1791,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
@@ -496,8 +496,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 ;
@@ -836,8 +845,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 )
@@ -1657,7 +1664,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? */
@@ -1667,11 +1674,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 ))
@@ -1711,8 +1716,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 ))
@@ -1903,9 +1907,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 ,
Greg Kroah-Hartman
maintainerPATCH 12/203 drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets
In reply to Greg Kroah-Hartman3.14-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 | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 43 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>
@@ -1140,6 +1141,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 ) {
@@ -1160,6 +1163,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 :
@@ -1190,7 +1195,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
@@ -660,6 +660,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);/*
net/ipv6/output_core.c +33 -0
@@ -3,10 +3,43 @@* 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> +/* 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) {
Greg Kroah-Hartman
maintainerPATCH 13/203 drivers/net: macvtap and tun depend on INET
In reply to Greg Kroah-Hartman3.14-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
@@ -205,6 +206,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 14/203 lockd: Try to reconnect if statd has moved
In reply to Greg Kroah-Hartman3.14-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 15/203 SUNRPC: Dont wake tasks during connection abort
In reply to Greg Kroah-Hartman3.14-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
@@ -340,6 +340,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
@@ -842,6 +842,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);
@@ -2251,7 +2253,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 16/203 SUNRPC: Add missing support for RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT
In reply to Greg Kroah-Hartman3.14-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
@@ -533,6 +533,8 @@ struct rpc_clnt *rpc_create(struct rpc_cif (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 ))
@@ -571,6 +573,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 17/203 Revert "percpu: free percpu allocation info for uniprocessor system"
In reply to Greg Kroah-Hartman3.14-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
@@ -1917,8 +1917,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 18/203 pata_serverworks: disable 64-KB DMA transfers on Broadcom OSB4 IDE Controller
In reply to Greg Kroah-Hartman3.14-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
@@ -252,12 +252,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,
@@ -266,6 +272,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, };
@@ -405,6 +412,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);
@@ -418,6 +426,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) ||
@@ -434,7 +443,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
Greg Kroah-Hartman
maintainerPATCH 19/203 libata-sff: Fix controllers with no ctl port
In reply to Greg Kroah-Hartman3.14-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 20/203 ASoC: soc-dapm: fix use after free
In reply to Greg Kroah-Hartman3.14-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
@@ -689,9 +689,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 ;if (dapm->codec) prefix = dapm->codec->name_prefix;
@@ -756,15 +756,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);
@@ -772,17 +774,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 21/203 ASoC: tlv320aic3x: fix PLL D configuration
In reply to Greg Kroah-Hartman3.14-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 22/203 mmc: rtsx_pci_sdmmc: fix incorrect last byte in R2 response
In reply to Greg Kroah-Hartman3.14-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
@@ -342,6 +342,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 23/203 fs: make cont_expand_zero interruptible
In reply to Greg Kroah-Hartman3.14-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
@@ -2313,6 +2313,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 24/203 fs: Fix theoretical division by 0 in super_cache_scan().
In reply to Greg Kroah-Hartman3.14-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
@@ -81,6 +81,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 25/203 fs: allow open(dir, O_TMPFILE|..., 0) with mode 0
In reply to Greg Kroah-Hartman3.14-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
@@ -3128,7 +3128,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 26/203 UBIFS: remove mst_mutex
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Artem Bityutskiy <[email protected]>
commit 07e19dff63e3d5d6500d831e36554ac9b1b0560e upstream.
The 'mst_mutex' is not needed since because 'ubifs_write_master()' is only called on the mount path and commit path. The mount path is sequential and there is no parallelism, and the commit path is also serialized - there is only one commit going on at a time.
--- fs/ubifs/commit.c | 2 -- fs/ubifs/master.c | 7 +++---- fs/ubifs/super.c | 1 - fs/ubifs/ubifs.h | 2 -- 4 files changed, 3 insertions(+), 9 deletions(-)
fs/ubifs/commit.c +0 -2
@@ -174,7 +174,6 @@ static int do_commit(struct ubifs_info *if (err) goto out; -mutex_lock (&c->mst_mutex); c->mst_node->cmt_no =cpu_to_le64 (c->cmt_no); c->mst_node->log_lnum =cpu_to_le32 (new_ltail_lnum); c->mst_node->root_lnum =cpu_to_le32 (zroot.lnum);
@@ -204,7 +203,6 @@ static int do_commit(struct ubifs_info *else c->mst_node->flags &= ~cpu_to_le32 (UBIFS_MST_NO_ORPHS ); err =ubifs_write_master (c); -mutex_unlock (&c->mst_mutex);if (err) goto out;
fs/ubifs/master.c +3 -4
@@ -352,10 +352,9 @@ int ubifs_read_master(struct ubifs_info* ubifs_write_master - write master node. * @c: UBIFS file-system description object * -* This function writes the master node. The caller has to take the -* @c->mst_mutex lock before calling this function. Returns zero in case of -* success and a negative error code in case of failure. The master node is -* written twice to enable recovery. +* This function writes the master node. Returns zero in case of success and a +* negative error code in case of failure. The master node is written twice to +* enable recovery. */ int ubifs_write_master (struct ubifs_info *c) {
fs/ubifs/super.c +0 -1
@@ -1957,7 +1957,6 @@ static struct ubifs_info *alloc_ubifs_inmutex_init (&c->lp_mutex);mutex_init (&c->tnc_mutex);mutex_init (&c->log_mutex); -mutex_init (&c->mst_mutex);mutex_init (&c->umount_mutex);mutex_init (&c->bu_mutex);mutex_init (&c->write_reserve_mutex);
fs/ubifs/ubifs.h +0 -2
@@ -1042,7 +1042,6 @@ struct ubifs_debug_info;* * @mst_node: master node * @mst_offs: offset of valid master node -* @mst_mutex: protects the master node area, @mst_node, and @mst_offs * * @max_bu_buf_len: maximum bulk-read buffer length * @bu_mutex: protects the pre-allocated bulk-read buffer and @c->bu
@@ -1282,7 +1281,6 @@ struct ubifs_info {struct ubifs_mst_node *mst_node;int mst_offs; -struct mutex mst_mutex;int max_bu_buf_len;struct mutex bu_mutex;
Greg Kroah-Hartman
maintainerPATCH 27/203 UBIFS: fix a race condition
In reply to Greg Kroah-Hartman3.14-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 28/203 UBIFS: fix free log space calculation
In reply to Greg Kroah-Hartman3.14-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 29/203 vfs: fix data corruption when blocksize < pagesize for mmaped data
In reply to Greg Kroah-Hartman3.14-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
@@ -2077,6 +2077,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);
@@ -2096,6 +2097,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
@@ -1123,6 +1123,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 30/203 x86: Reject x32 executables if x32 ABI not supported
In reply to Greg Kroah-Hartman3.14-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
@@ -155,8 +155,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 31/203 x86, fpu: __restore_xstate_sig()->math_state_restore() needs preempt_disable()
In reply to Greg Kroah-Hartman3.14-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
@@ -399,8 +399,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 32/203 x86, fpu: shift drop_init_fpu() from save_xstate_sig() to handle_signal()
In reply to Greg Kroah-Hartman3.14-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
@@ -673,6 +673,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
@@ -268,8 +268,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 33/203 x86_64, entry: Filter RFLAGS.NT on entry from userspace
In reply to Greg Kroah-Hartman3.14-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
@@ -1141,7 +1141,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 34/203 x86_64, entry: Fix out of bounds read on sysenter
In reply to Greg Kroah-Hartman3.14-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 35/203 x86, pageattr: Prevent overflow in slow_virt_to_phys() for X86_PAE
In reply to Greg Kroah-Hartman3.14-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
@@ -405,7 +405,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 36/203 evm: properly handle INTEGRITY_NOXATTRS EVM status
In reply to Greg Kroah-Hartman3.14-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
@@ -269,6 +269,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 37/203 evm: check xattr value length and type in evm_inode_setxattr()
In reply to Greg Kroah-Hartman3.14-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
@@ -303,9 +303,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 38/203 ALSA: pcm: Zero-clear reserved fields of PCM status ioctl in compat mode
In reply to Greg Kroah-Hartman3.14-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
@@ -206,6 +206,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 39/203 missing data dependency barrier in prepend_name()
In reply to Greg Kroah-Hartman3.14-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
@@ -2824,6 +2824,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) {
@@ -2831,6 +2834,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 40/203 kill wbuf_queued/wbuf_dwork_lock
In reply to Greg Kroah-Hartman3.14-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 41/203 fix misuses of f_count() in ppp and netlink
In reply to Greg Kroah-Hartman3.14-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
@@ -601,7 +601,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
@@ -707,7 +707,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 42/203 libceph: ceph-msgr workqueue needs a resque worker
In reply to Greg Kroah-Hartman3.14-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
@@ -291,7 +291,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 43/203 sched: Use dl_bw_of() under RCU read lock
In reply to Greg Kroah-Hartman3.14-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
@@ -1895,6 +1895,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; }
@@ -1903,6 +1905,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++;
@@ -7458,6 +7462,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
@@ -7479,6 +7485,8 @@ static int sched_dl_global_constraints(vbreak ; } +rcu_read_unlock (); +return ret; }
@@ -7494,6 +7502,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... */
@@ -7504,6 +7513,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 44/203 um: ubd: Fix for processes stuck in D state forever
In reply to Greg Kroah-Hartman3.14-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 45/203 random: add and use memzero_explicit() for clearing data
In reply to Greg Kroah-Hartman3.14-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 | 10 +++++----- include/linux/string.h | 5 +++-- lib/string.c | 16 ++++++++++++++++ 3 files changed, 24 insertions(+), 7 deletions(-)
drivers/char/random.c +5 -5
@@ -1063,8 +1063,8 @@ static void extract_buf(struct entropy_s* pool while mixing, and hash one final time. */ sha_transform (hash.w, extract, workspace); -memset (extract,0 ,sizeof (extract)); -memset (workspace,0 ,sizeof (workspace)); +memzero_explicit (extract,sizeof (extract)); +memzero_explicit (workspace,sizeof (workspace));/* * In case the hash function has some recognizable output
@@ -1076,7 +1076,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)); } static ssize_t extract_entropy(struct entropy_store *r, void *buf,
@@ -1124,7 +1124,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; }
@@ -1162,7 +1162,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
@@ -129,7 +129,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?
@@ -141,7 +141,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
@@ -586,6 +586,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 46/203 UBI: add missing kmem_cache_free() in process_pool_aeb error path
In reply to Greg Kroah-Hartman3.14-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 47/203 mnt: Prevent pivot_root from creating a loop in the mount tree
In reply to Greg Kroah-Hartman3.14-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
@@ -2831,6 +2831,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 48/203 mfd: ti_am335x_tscadc: Fix TSC operation after ADC continouous mode
In reply to Greg Kroah-Hartman3.14-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
@@ -54,7 +54,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)
@@ -97,6 +97,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 49/203 mfd: ti_am335x_tscadc: Fix TSC resume
In reply to Greg Kroah-Hartman3.14-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
@@ -58,7 +58,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 50/203 mfd: rtsx_pcr: Fix MSI enable error handling
In reply to Greg Kroah-Hartman3.14-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
@@ -1177,7 +1177,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 51/203 pstore: Fix duplicate {console,ftrace}-efi entries
In reply to Greg Kroah-Hartman3.14-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
@@ -319,10 +319,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 52/203 selinux: fix inode security list corruption
In reply to Greg Kroah-Hartman3.14-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
@@ -470,6 +470,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) {
@@ -478,7 +479,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 53/203 power: charger-manager: Fix NULL pointer exception with missing cm-fuel-gauge
In reply to Greg Kroah-Hartman3.14-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 54/203 virtio_pci: fix virtio spec compliance on restore
In reply to Greg Kroah-Hartman3.14-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
@@ -791,6 +791,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,
@@ -801,14 +802,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 56/203 drm/cirrus: bind also to qemu-xen-traditional
In reply to Greg Kroah-Hartman3.14-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 DEFINE_PCI_DEVICE_TABLE (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 57/203 dm bufio: update last_accessed when relinking a buffer
In reply to Greg Kroah-Hartman3.14-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 58/203 dm bufio: when done scanning return from __scan immediately
In reply to Greg Kroah-Hartman3.14-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
@@ -1486,9 +1486,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 59/203 drbd: compute the end before rb_insert_augmented()
In reply to Greg Kroah-Hartman3.14-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 60/203 block: fix alignment_offset math that assumes io_min is a power-of-2
In reply to Greg Kroah-Hartman3.14-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
@@ -553,7 +553,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 ; }
@@ -598,7 +598,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
@@ -1232,10 +1232,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 61/203 dm log userspace: fix memory leak in dm_ulog_tfr_init failure path
In reply to Greg Kroah-Hartman3.14-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 62/203 modules, lock around setting of MODULE_STATE_UNFORMED
In reply to Greg Kroah-Hartman3.14-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
@@ -1841,7 +1841,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 63/203 framebuffer: fix border color
In reply to Greg Kroah-Hartman3.14-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 64/203 Input: i8042 - add noloop quirk for Asus X750LN
In reply to Greg Kroah-Hartman3.14-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 65/203 Input: i8042 - quirks for Fujitsu Lifebook A544 and Lifebook AH544
In reply to Greg Kroah-Hartman3.14-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
@@ -615,6 +615,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 66/203 drm/ast: Fix HW cursor image
In reply to Greg Kroah-Hartman3.14-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
@@ -1012,8 +1012,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 67/203 drm/vmwgfx: Fix drm.h include
In reply to Greg Kroah-Hartman3.14-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 68/203 drm/tilcdc: Fix the error path in tilcdc_load()
In reply to Greg Kroah-Hartman3.14-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 ; }
@@ -178,33 +179,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
@@ -214,7 +219,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
@@ -259,13 +264,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);
@@ -273,7 +278,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);
@@ -289,13 +294,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 69/203 drm/i915: dont warn if backlight unexpectedly enabled
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Scot Doyle <[email protected]>
commit 813008cd3e93ea8a571b2b7d5b9360a3105b50f7 upstream.
BIOS or firmware can modify hardware state during suspend/resume, for example on the Toshiba CB35 or Lenovo T400, so log a debug message instead of a warning if the backlight is unexpectedly enabled.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80930
--- drivers/gpu/drm/i915/intel_panel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_panel.c +4 -4
@@ -645,7 +645,7 @@ static void pch_enable_backlight(struct cpu_ctl2 =I915_READ (BLC_PWM_CPU_CTL2 );if (cpu_ctl2 &BLM_PWM_ENABLE ) { -WARN (1 ,"cpu backlight already enabled\n" ); +DRM_DEBUG_KMS ("cpu backlight already enabled\n" ); cpu_ctl2 &= ~BLM_PWM_ENABLE ;I915_WRITE (BLC_PWM_CPU_CTL2 , cpu_ctl2); }
@@ -693,7 +693,7 @@ static void i9xx_enable_backlight(struct ctl =I915_READ (BLC_PWM_CTL );if (ctl &BACKLIGHT_DUTY_CYCLE_MASK_PNV ) { -WARN (1 ,"backlight already enabled\n" ); +DRM_DEBUG_KMS ("backlight already enabled\n" );I915_WRITE (BLC_PWM_CTL ,0 ); }
@@ -724,7 +724,7 @@ static void i965_enable_backlight(struct ctl2 =I915_READ (BLC_PWM_CTL2 );if (ctl2 &BLM_PWM_ENABLE ) { -WARN (1 ,"backlight already enabled\n" ); +DRM_DEBUG_KMS ("backlight already enabled\n" ); ctl2 &= ~BLM_PWM_ENABLE ;I915_WRITE (BLC_PWM_CTL2 , ctl2); }
@@ -758,7 +758,7 @@ static void vlv_enable_backlight(struct ctl2 =I915_READ (VLV_BLC_PWM_CTL2 (pipe));if (ctl2 &BLM_PWM_ENABLE ) { -WARN (1 ,"backlight already enabled\n" ); +DRM_DEBUG_KMS ("backlight already enabled\n" ); ctl2 &= ~BLM_PWM_ENABLE ;I915_WRITE (VLV_BLC_PWM_CTL2 (pipe), ctl2); }
Greg Kroah-Hartman
maintainerPATCH 70/203 drm/nouveau/bios: memset dcb struct to zero before parsing
In reply to Greg Kroah-Hartman3.14-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 71/203 media: v4l2-common: fix overflow in v4l_bound_align_image()
In reply to Greg Kroah-Hartman3.14-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
@@ -431,16 +431,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 72/203 media: usb: uvc: add a quirk for Dell XPS M1330 webcam
In reply to Greg Kroah-Hartman3.14-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
@@ -2210,6 +2210,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 74/203 media: m88ts2022: fix 32bit overflow on filter calc
In reply to Greg Kroah-Hartman3.14-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 76/203 media: ds3000: fix LNB supply voltage on Tevii S480 on initialization
In reply to Greg Kroah-Hartman3.14-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 77/203 media: tda7432: Fix setting TDA7432_MUTE bit for TDA7432_RF register
In reply to Greg Kroah-Hartman3.14-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 78/203 kvm: fix excessive pages un-pinning in kvm_iommu_map error path.
In reply to Greg Kroah-Hartman3.14-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 79/203 KVM: x86: Prevent host from panicking on shared MSR writes.
In reply to Greg Kroah-Hartman3.14-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
@@ -1042,7 +1042,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
@@ -2582,12 +2582,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
@@ -225,20 +225,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 80/203 KVM: x86: Improve thread safety in pit
In reply to Greg Kroah-Hartman3.14-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 81/203 KVM: x86: Check non-canonical addresses upon WRMSR
In reply to Greg Kroah-Hartman3.14-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
@@ -984,6 +984,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
@@ -3213,7 +3213,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
@@ -5172,7 +5172,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
@@ -951,7 +951,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.
@@ -959,8 +958,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 82/203 kvm: x86: dont kill guest on unknown exit reason
In reply to Greg Kroah-Hartman3.14-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
@@ -3495,9 +3495,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
@@ -6887,10 +6887,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 83/203 KVM: x86: Fix wrong masking on relative jump/call
In reply to Greg Kroah-Hartman3.14-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
@@ -498,11 +498,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);
@@ -576,6 +571,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 84/203 KVM: x86: Emulator fixes for eip canonical checks on near branches
In reply to Greg Kroah-Hartman3.14-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
@@ -571,7 +571,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 :
@@ -581,16 +582,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)
@@ -1975,13 +1985,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);
@@ -2013,10 +2025,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)
@@ -2294,7 +2310,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 ;
@@ -2310,6 +2326,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);
@@ -2327,6 +2346,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 ;
@@ -2335,8 +2357,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 ; }
@@ -2875,10 +2897,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); }
@@ -2910,11 +2935,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);
@@ -3244,20 +3270,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)
@@ -4654,7 +4684,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;
@@ -4683,7 +4713,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 */
@@ -4803,7 +4833,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 85/203 kvm: vmx: handle invvpid vm exit gracefully
In reply to Greg Kroah-Hartman3.14-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
@@ -6444,6 +6444,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
@@ -6489,6 +6495,7 @@ static int (*const kvm_vmx_exit_handlers [EXIT_REASON_MWAIT_INSTRUCTION] = handle_invalid_op, [EXIT_REASON_MONITOR_INSTRUCTION] = handle_invalid_op, [EXIT_REASON_INVEPT] = handle_invept, + [EXIT_REASON_INVVPID] = handle_invvpid, }; static const int kvm_vmx_max_exit_handlers =
@@ -6722,7 +6729,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 86/203 ARC: [nsimosci] Allow "headless" models to boot
In reply to Greg Kroah-Hartman3.14-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 87/203 ARC: Update order of registers in KGDB to match GDB 7.5
In reply to Greg Kroah-Hartman3.14-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 88/203 ARC: [SMP] General Fixes
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vineet Gupta <[email protected]>
commit c3441edd2dea83923421fd6050d2ffdc57696323 upstream.
-Pass the expected arg to non-boot park'ing routine
(It worked so far because existing SMP backends don't use the arg)
-CONFIG_DEBUG_PREEMPT warning
--- arch/arc/kernel/head.S | 7 ++++--- arch/arc/mm/cache_arc700.c | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arc/kernel/head.S +4 -3
@@ -24,13 +24,13 @@ .globl stext stext: ;------------------------------------------------------------------- - ; Don't clobber r0-r4 yet. It might have bootloader provided info + ; Don't clobber r0-r2 yet. It might have bootloader provided info ;------------------------------------------------------------------- sr @_int_vec_base_lds, [AUX_INTR_VEC_BASE] #ifdef CONFIG_SMP - ; Only Boot (Master) proceeds. Others wait in platform dependent way + ; Ensure Boot (Master) proceeds. Others wait in platform dependent way ; IDENTITY Reg [ 3 2 1 0 ] ; (cpu-id) ^^^ => Zero for UP ARC700 ; => #Core-ID if SMP (Master 0)
@@ -39,7 +39,8 @@ stext: ; need to make sure only boot cpu takes this path. GET_CPU_ID r5 cmp r5, 0 - jnz arc_platform_smp_wait_to_boot + mov.ne r0, r5 + jne arc_platform_smp_wait_to_boot #endif ; Clear BSS before updating any globals ; XXX: use ZOL here
arch/arc/mm/cache_arc700.c +1 -2
@@ -100,10 +100,9 @@#define DC_CTRL_INV_MODE_FLUSH 0x40#define DC_CTRL_FLUSH_STATUS 0x100 -char *arc_cache_mumbojumbo (int cpu_id,char *buf,int len) +char *arc_cache_mumbojumbo (int c,char *buf,int len) {int n =0 ; -unsigned int c =smp_processor_id ();#define PR_CACHE (p, enb, str) \ { \
Greg Kroah-Hartman
maintainerPATCH 89/203 ARC: fix mmuv2 warning
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vineet Gupta <[email protected]>
commit d75386363ee60eb51c933c7b5e536f3a502ad7d7 upstream.
--- arch/arc/mm/cache_arc700.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/arc/mm/cache_arc700.c +4 -0
@@ -253,12 +253,16 @@ static inline void __cache_line_loop(unsif (cacheop ==OP_INV_IC ) { aux_cmd =ARC_REG_IC_IVIL ; +#if (CONFIG_ARC_MMU_VER >2 ) aux_tag =ARC_REG_IC_PTAG ; +#endif }else {/* d$ cmd: INV (discard or wback-n-discard) OR FLUSH (wback) */ aux_cmd = cacheop &OP_INV ?ARC_REG_DC_IVDL :ARC_REG_DC_FLDL ; +#if (CONFIG_ARC_MMU_VER >2 ) aux_tag =ARC_REG_DC_PTAG ; +#endif }/* Ensure we properly floor/ceil the non-line aligned/sized requests
Greg Kroah-Hartman
maintainerPATCH 90/203 ARC: Disable caches in early boot if so configured
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vineet Gupta <[email protected]>
commit ef680cdc24376f394841a3f19b3a7ef6d57a009d upstream.
--- arch/arc/include/asm/cache.h | 27 ++++++++++ arch/arc/kernel/head.S | 38 +++++++++++++- arch/arc/mm/cache_arc700.c | 112 ++++++++++--------------------------------- 3 files changed, 90 insertions(+), 87 deletions(-)
arch/arc/include/asm/cache.h +27 -0
@@ -55,4 +55,31 @@ extern void read_decode_cache_bcr(void);#endif /* !__ASSEMBLY__ */ +/* Instruction cache related Auxiliary registers */ +#define ARC_REG_IC_BCR 0x77/* Build Config reg */ +#define ARC_REG_IC_IVIC 0x10 +#define ARC_REG_IC_CTRL 0x11 +#define ARC_REG_IC_IVIL 0x19 +#if defined(CONFIG_ARC_MMU_V3 ) || defined (CONFIG_ARC_MMU_V4 ) +#define ARC_REG_IC_PTAG 0x1E +#endif + +/* Bit val in IC_CTRL */ +#define IC_CTRL_CACHE_DISABLE 0x1 + +/* Data cache related Auxiliary registers */ +#define ARC_REG_DC_BCR 0x72/* Build Config reg */ +#define ARC_REG_DC_IVDC 0x47 +#define ARC_REG_DC_CTRL 0x48 +#define ARC_REG_DC_IVDL 0x4A +#define ARC_REG_DC_FLSH 0x4B +#define ARC_REG_DC_FLDL 0x4C +#if defined(CONFIG_ARC_MMU_V3 ) || defined (CONFIG_ARC_MMU_V4 ) +#define ARC_REG_DC_PTAG 0x5C +#endif + +/* Bit val in DC_CTRL */ +#define DC_CTRL_INV_MODE_FLUSH 0x40 +#define DC_CTRL_FLUSH_STATUS 0x100 +#endif /* _ASM_CACHE_H */
arch/arc/kernel/head.S +35 -3
@@ -12,10 +12,42 @@ * to skip certain things during boot on simulator */ +#include <linux/linkage.h> #include <asm/asm-offsets.h> #include <asm/entry.h> -#include <linux/linkage.h> #include <asm/arcregs.h> +#include <asm/cache.h> + +.macro CPU_EARLY_SETUP + + ; Setting up Vectror Table (in case exception happens in early boot + sr @_int_vec_base_lds, [AUX_INTR_VEC_BASE] + + ; Disable I-cache/D-cache if kernel so configured + lr r5, [ARC_REG_IC_BCR] + breq r5, 0, 1f ; I$ doesn't exist + lr r5, [ARC_REG_IC_CTRL] +#ifdef CONFIG_ARC_HAS_ICACHE + bclr r5, r5, 0 ; 0 - Enable, 1 is Disable +#else + bset r5, r5, 0 ; I$ exists, but is not used +#endif + sr r5, [ARC_REG_IC_CTRL] + +1: + lr r5, [ARC_REG_DC_BCR] + breq r5, 0, 1f ; D$ doesn't exist + lr r5, [ARC_REG_DC_CTRL] + bclr r5, r5, 6 ; Invalidate (discard w/o wback) +#ifdef CONFIG_ARC_HAS_DCACHE + bclr r5, r5, 0 ; Enable (+Inv) +#else + bset r5, r5, 0 ; Disable (+Inv) +#endif + sr r5, [ARC_REG_DC_CTRL] + +1: +.endm .cpu A7
@@ -27,7 +59,7 @@ stext: ; Don't clobber r0-r2 yet. It might have bootloader provided info ;------------------------------------------------------------------- - sr @_int_vec_base_lds, [AUX_INTR_VEC_BASE] + CPU_EARLY_SETUP #ifdef CONFIG_SMP ; Ensure Boot (Master) proceeds. Others wait in platform dependent way
@@ -90,7 +122,7 @@ stext: first_lines_of_secondary: - sr @_int_vec_base_lds, [AUX_INTR_VEC_BASE] + CPU_EARLY_SETUP ; setup per-cpu idle task as "current" on this CPU ld r0, [@secondary_idle_tsk]
arch/arc/mm/cache_arc700.c +28 -84
133 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 91/203 qla_target: dont delete changed nacls
In reply to Greg Kroah-Hartman3.14-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
@@ -707,7 +707,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 92/203 target: Fix queue full status NULL pointer for SCF_TRANSPORT_TASK_SENSE
In reply to Greg Kroah-Hartman3.14-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
@@ -1855,8 +1855,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 93/203 target: Fix APTPL metadata handling for dynamic MappedLUNs
In reply to Greg Kroah-Hartman3.14-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 94/203 MIPS: ftrace: Fix a microMIPS build problem
In reply to Greg Kroah-Hartman3.14-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 95/203 MIPS: tlbex: Properly fix HUGE TLB Refill exception handler
In reply to Greg Kroah-Hartman3.14-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
@@ -1057,6 +1057,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
@@ -1071,6 +1072,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 );
@@ -1259,6 +1261,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
@@ -1295,7 +1298,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 97/203 jbd2: free bh when descriptor block checksum fails
In reply to Greg Kroah-Hartman3.14-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 98/203 ext4: check EA value offset when loading
In reply to Greg Kroah-Hartman3.14-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
@@ -189,14 +189,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 ; }
@@ -213,7 +227,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;
@@ -329,7 +344,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,
@@ -457,7 +472,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),
@@ -972,7 +987,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 99/203 ext4: dont check quota format when there are no quota files
In reply to Greg Kroah-Hartman3.14-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
@@ -1706,13 +1706,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 100/203 ext4: fix mmap data corruption when blocksize < pagesize
In reply to Greg Kroah-Hartman3.14-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
@@ -4645,8 +4645,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 101/203 ext4: grab missed write_count for EXT4_IOC_SWAP_BOOT
In reply to Greg Kroah-Hartman3.14-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
@@ -544,9 +544,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 102/203 ext4: add ext4_iget_normal() which is to be used for dir tree lookups
In reply to Greg Kroah-Hartman3.14-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
@@ -2110,6 +2110,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
@@ -4250,6 +4250,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
@@ -1429,7 +1429,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",
@@ -1460,7 +1460,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
@@ -996,7 +996,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 103/203 ext4: fix reservation overflow in ext4_da_write_begin
In reply to Greg Kroah-Hartman3.14-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
@@ -2633,6 +2633,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)
@@ -2683,7 +2697,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);
Greg Kroah-Hartman
maintainerPATCH 104/203 ext4: Replace open coded mdata csum feature to helper function
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Monakhov <[email protected]>
commit 9aa5d32ba269bec0e7eaba2697a986a7b0bc8528 upstream.
Besides the fact that this replacement improves code readability it also protects from errors caused direct EXT4_S(sb)->s_es manipulation which may result attempt to use uninitialized csum machinery.
#Testcase_BEGIN
IMG=/dev/ram0
MNT=/mnt
mkfs.ext4 $IMG
mount $IMG $MNT
#Enable feature directly on disk, on mounted fs
tune2fs -O metadata_csum $IMG
# Provoke metadata update, likey result in OOPS
touch $MNT/test
umount $MNT
#Testcase_END
# Replacement script
@@
expression E;
@@
- EXT4_HAS_RO_COMPAT_FEATURE(E, EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)
+ ext4_has_metadata_csum(E)
https://bugzilla.kernel.org/show_bug.cgi?id=82201
--- fs/ext4/bitmap.c | 12 ++++-------- fs/ext4/ext4.h | 8 ++++++++ fs/ext4/extents.c | 6 ++---- fs/ext4/ialloc.c | 3 +-- fs/ext4/inline.c | 3 +-- fs/ext4/inode.c | 9 +++------ fs/ext4/ioctl.c | 3 +-- fs/ext4/mmp.c | 6 ++---- fs/ext4/namei.c | 39 +++++++++++++-------------------------- fs/ext4/resize.c | 3 +-- fs/ext4/super.c | 15 +++++---------- fs/ext4/xattr.c | 6 ++---- 12 files changed, 43 insertions(+), 70 deletions(-)
fs/ext4/bitmap.c +4 -8
@@ -24,8 +24,7 @@ int ext4_inode_bitmap_csum_verify(struct__u32 provided, calculated;struct ext4_sb_info *sbi =EXT4_SB (sb); -if (!EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (sb))return 1 ; provided =le16_to_cpu (gdp->bg_inode_bitmap_csum_lo);
@@ -46,8 +45,7 @@ void ext4_inode_bitmap_csum_set(struct s__u32 csum;struct ext4_sb_info *sbi =EXT4_SB (sb); -if (!EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (sb))return ; csum =ext4_chksum (sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz);
@@ -65,8 +63,7 @@ int ext4_block_bitmap_csum_verify(structstruct ext4_sb_info *sbi =EXT4_SB (sb);int sz =EXT4_CLUSTERS_PER_GROUP (sb) /8 ; -if (!EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (sb))return 1 ; provided =le16_to_cpu (gdp->bg_block_bitmap_csum_lo);
@@ -91,8 +88,7 @@ void ext4_block_bitmap_csum_set(struct s__u32 csum;struct ext4_sb_info *sbi =EXT4_SB (sb); -if (!EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (sb))return ; csum =ext4_chksum (sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz);
fs/ext4/ext4.h +8 -0
@@ -2345,6 +2345,14 @@ static inline int ext4_has_group_desc_cs EXT4_FEATURE_RO_COMPAT_METADATA_CSUM); } +static inline int ext4_has_metadata_csum (struct super_block *sb) +{ +WARN_ON_ONCE (EXT4_HAS_RO_COMPAT_FEATURE (sb, +EXT4_FEATURE_RO_COMPAT_METADATA_CSUM ) && + !EXT4_SB (sb)->s_chksum_driver); + +return (EXT4_SB (sb)->s_chksum_driver !=NULL ); +}static inline ext4_fsblk_t ext4_blocks_count (struct ext4_super_block *es) { return ((ext4_fsblk_t)le32_to_cpu(es->s_blocks_count_hi) << 32) |
fs/ext4/extents.c +2 -4
@@ -74,8 +74,7 @@ static int ext4_extent_block_csum_verify {struct ext4_extent_tail *et; -if (!EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (inode->i_sb))return 1 ; et =find_ext4_extent_tail (eh);
@@ -89,8 +88,7 @@ static void ext4_extent_block_csum_set(s {struct ext4_extent_tail *et; -if (!EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (inode->i_sb))return ; et =find_ext4_extent_tail (eh);
fs/ext4/ialloc.c +1 -2
@@ -988,8 +988,7 @@ got:spin_unlock (&sbi->s_next_gen_lock);/* Precompute checksum seed for inode metadata */ -if (EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) { +if (ext4_has_metadata_csum (sb)) {__u32 csum;__le32 inum =cpu_to_le32 (inode->i_ino);__le32 gen =cpu_to_le32 (inode->i_generation);
fs/ext4/inline.c +1 -2
@@ -1128,8 +1128,7 @@ static int ext4_finish_convert_inline_dimemcpy ((void *)de, buf +EXT4_INLINE_DOTDOT_SIZE , inline_size -EXT4_INLINE_DOTDOT_SIZE ); -if (EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (ext4_has_metadata_csum (inode->i_sb)) csum_size =sizeof (struct ext4_dir_entry_tail ); inode->i_size = inode->i_sb->s_blocksize;
fs/ext4/inode.c +3 -6
@@ -83,8 +83,7 @@ static int ext4_inode_csum_verify(structif (EXT4_SB (inode->i_sb)->s_es->s_creator_os !=cpu_to_le32 (EXT4_OS_LINUX ) || - !EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) + !ext4_has_metadata_csum (inode->i_sb))return 1 ; provided =le16_to_cpu (raw->i_checksum_lo);
@@ -105,8 +104,7 @@ static void ext4_inode_csum_set(struct iif (EXT4_SB (inode->i_sb)->s_es->s_creator_os !=cpu_to_le32 (EXT4_OS_LINUX ) || - !EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) + !ext4_has_metadata_csum (inode->i_sb))return ; csum =ext4_inode_csum (inode, raw, ei);
@@ -4076,8 +4074,7 @@ struct inode *ext4_iget(struct super_blo ei->i_extra_isize =0 ;/* Precompute checksum seed for inode metadata */ -if (EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) { +if (ext4_has_metadata_csum (sb)) {struct ext4_sb_info *sbi =EXT4_SB (inode->i_sb);__u32 csum;__le32 inum =cpu_to_le32 (inode->i_ino);
fs/ext4/ioctl.c +1 -2
@@ -343,8 +343,7 @@ flags_out:if (!inode_owner_or_capable (inode))return -EPERM ; -if (EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) { +if (ext4_has_metadata_csum (inode->i_sb)) {ext4_warning (sb,"Setting inode version is not " "supported with metadata_csum enabled." );return -ENOTTY ;
fs/ext4/mmp.c +2 -4
@@ -20,8 +20,7 @@ static __le32 ext4_mmp_csum(struct superint ext4_mmp_csum_verify (struct super_block *sb,struct mmp_struct *mmp) { -if (!EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (sb))return 1 ;return mmp->mmp_checksum ==ext4_mmp_csum (sb, mmp);
@@ -29,8 +28,7 @@ int ext4_mmp_csum_verify(struct super_blvoid ext4_mmp_csum_set (struct super_block *sb,struct mmp_struct *mmp) { -if (!EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (sb))return ; mmp->mmp_checksum =ext4_mmp_csum (sb, mmp);
fs/ext4/namei.c +13 -26
@@ -123,8 +123,7 @@ static struct buffer_head *__ext4_read_d "directory leaf block found instead of index block");return ERR_PTR (-EIO ); } -if (!EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM ) || +if (!ext4_has_metadata_csum (inode->i_sb) ||buffer_verified (bh))return bh;
@@ -339,8 +338,7 @@ int ext4_dirent_csum_verify(struct inode {struct ext4_dir_entry_tail *t; -if (!EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (inode->i_sb))return 1 ; t =get_dirent_tail (inode, dirent);
@@ -361,8 +359,7 @@ static void ext4_dirent_csum_set(struct {struct ext4_dir_entry_tail *t; -if (!EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (inode->i_sb))return ; t =get_dirent_tail (inode, dirent);
@@ -437,8 +434,7 @@ static int ext4_dx_csum_verify(struct instruct dx_tail *t;int count_offset, limit, count; -if (!EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (inode->i_sb))return 1 ; c =get_dx_countlimit (inode, dirent, &count_offset);
@@ -467,8 +463,7 @@ static void ext4_dx_csum_set(struct inodstruct dx_tail *t;int count_offset, limit, count; -if (!EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (inode->i_sb))return ; c =get_dx_countlimit (inode, dirent, &count_offset);
@@ -556,8 +551,7 @@ static inline unsigned dx_root_limit(strunsigned entry_space = dir->i_sb->s_blocksize -EXT4_DIR_REC_LEN (1 ) -EXT4_DIR_REC_LEN (2 ) - infosize; -if (EXT4_HAS_RO_COMPAT_FEATURE (dir->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (ext4_has_metadata_csum (dir->i_sb)) entry_space -=sizeof (struct dx_tail );return entry_space /sizeof (struct dx_entry ); }
@@ -566,8 +560,7 @@ static inline unsigned dx_node_limit(str {unsigned entry_space = dir->i_sb->s_blocksize -EXT4_DIR_REC_LEN (0 ); -if (EXT4_HAS_RO_COMPAT_FEATURE (dir->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (ext4_has_metadata_csum (dir->i_sb)) entry_space -=sizeof (struct dx_tail );return entry_space /sizeof (struct dx_entry ); }
@@ -1534,8 +1527,7 @@ static struct ext4_dir_entry_2 *do_splitint csum_size =0 ;int err =0 , i; -if (EXT4_HAS_RO_COMPAT_FEATURE (dir->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (ext4_has_metadata_csum (dir->i_sb)) csum_size =sizeof (struct ext4_dir_entry_tail ); bh2 =ext4_append (handle, dir, &newblock);
@@ -1704,8 +1696,7 @@ static int add_dirent_to_buf(handle_t *hint csum_size =0 ;int err; -if (EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (ext4_has_metadata_csum (inode->i_sb)) csum_size =sizeof (struct ext4_dir_entry_tail );if (!de) {
@@ -1772,8 +1763,7 @@ static int make_indexed_dir(handle_t *hastruct fake_dirent *fde;int csum_size =0 ; -if (EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (ext4_has_metadata_csum (inode->i_sb)) csum_size =sizeof (struct ext4_dir_entry_tail ); blocksize = dir->i_sb->s_blocksize;
@@ -1889,8 +1879,7 @@ static int ext4_add_entry(handle_t *handext4_lblk_t block, blocks;int csum_size =0 ; -if (EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (ext4_has_metadata_csum (inode->i_sb)) csum_size =sizeof (struct ext4_dir_entry_tail ); sb = dir->i_sb;
@@ -2152,8 +2141,7 @@ static int ext4_delete_entry(handle_t *hreturn err; } -if (EXT4_HAS_RO_COMPAT_FEATURE (dir->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (ext4_has_metadata_csum (dir->i_sb)) csum_size =sizeof (struct ext4_dir_entry_tail );BUFFER_TRACE (bh,"get_write_access" );
@@ -2372,8 +2360,7 @@ static int ext4_init_new_dir(handle_t *hint csum_size =0 ;int err; -if (EXT4_HAS_RO_COMPAT_FEATURE (dir->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (ext4_has_metadata_csum (dir->i_sb)) csum_size =sizeof (struct ext4_dir_entry_tail );if (ext4_test_inode_state (inode,EXT4_STATE_MAY_INLINE_DATA )) {
fs/ext4/resize.c +1 -2
@@ -1200,8 +1200,7 @@ static int ext4_set_bitmap_checksums(str {struct buffer_head *bh; -if (!EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (sb))return 0 ; bh =ext4_get_bitmap (sb, group_data->inode_bitmap);
fs/ext4/super.c +5 -10
@@ -140,8 +140,7 @@ static __le32 ext4_superblock_csum(strucint ext4_superblock_csum_verify (struct super_block *sb,struct ext4_super_block *es) { -if (!EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (sb))return 1 ;return es->s_checksum ==ext4_superblock_csum (sb, es);
@@ -151,8 +150,7 @@ void ext4_superblock_csum_set(struct sup {struct ext4_super_block *es =EXT4_SB (sb)->s_es; -if (!EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (sb))return ; es->s_checksum =ext4_superblock_csum (sb, es);
@@ -2003,8 +2001,7 @@ static __le16 ext4_group_desc_csum(struc__u16 crc =0 ;__le32 le_group =cpu_to_le32 (block_group); -if ((sbi->s_es->s_feature_ro_compat & -cpu_to_le32 (EXT4_FEATURE_RO_COMPAT_METADATA_CSUM ))) { +if (ext4_has_metadata_csum (sbi->s_sb)) {/* Use new metadata_csum algorithm */ __le16 save_csum;__u32 csum32;
@@ -3160,8 +3157,7 @@ static int set_journal_csum_feature_set(int compat, incompat;struct ext4_sb_info *sbi =EXT4_SB (sb); -if (EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) { +if (ext4_has_metadata_csum (sb)) {/* journal checksum v3 */ compat =0 ; incompat =JBD2_FEATURE_INCOMPAT_CSUM_V3 ;
@@ -3468,8 +3464,7 @@ static int ext4_fill_super(struct super_ }/* Precompute checksum seed for all metadata */ -if (EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (ext4_has_metadata_csum (sb)) sbi->s_csum_seed =ext4_chksum (sbi, ~0 , es->s_uuid,sizeof (es->s_uuid));
fs/ext4/xattr.c +2 -4
@@ -141,8 +141,7 @@ static int ext4_xattr_block_csum_verify( sector_t block_nr, struct ext4_xattr_header *hdr) { - if (EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb, - EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) && + if (ext4_has_metadata_csum(inode->i_sb) && (hdr->h_checksum != ext4_xattr_block_csum(inode, block_nr, hdr))) return 0;return 1 ;
@@ -152,8 +151,7 @@ static void ext4_xattr_block_csum_set(st sector_t block_nr, struct ext4_xattr_header *hdr) { -if (!EXT4_HAS_RO_COMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM )) +if (!ext4_has_metadata_csum (inode->i_sb))return ; hdr->h_checksum =ext4_xattr_block_csum (inode, block_nr, hdr);
Greg Kroah-Hartman
maintainerPATCH 105/203 ext4: check s_chksum_driver when looking for bg csum presence
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Darrick J. Wong" <[email protected]>
commit 813d32f91333e4c33d5a19b67167c4bae42dae75 upstream.
Convert the ext4_has_group_desc_csum predicate to look for a checksum driver instead of the metadata_csum flag and change the bg checksum calculation function to look for GDT_CSUM before taking the crc16 path.
Without this patch, if we mount with ^uninit_bg,^metadata_csum and later metadata_csum gets turned on by accident, the block group checksum functions will incorrectly assume that checksumming is enabled (metadata_csum) but that crc16 should be used (!s_chksum_driver). This is totally wrong, so fix the predicate and the checksum formula selection.
(Granted, if the metadata_csum feature bit gets enabled on a live FS then something underhanded is going on, but we could at least avoid writing garbage into the on-disk fields.)
--- fs/ext4/ext4.h | 4 ++-- fs/ext4/super.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)
fs/ext4/ext4.h +2 -2
@@ -2341,8 +2341,8 @@ extern int ext4_register_li_request(strustatic inline int ext4_has_group_desc_csum (struct super_block *sb) {return EXT4_HAS_RO_COMPAT_FEATURE (sb, -EXT4_FEATURE_RO_COMPAT_GDT_CSUM | -EXT4_FEATURE_RO_COMPAT_METADATA_CSUM ); +EXT4_FEATURE_RO_COMPAT_GDT_CSUM ) || + (EXT4_SB (sb)->s_chksum_driver !=NULL ); }static inline int ext4_has_metadata_csum (struct super_block *sb)
fs/ext4/super.c +4 -0
@@ -2019,6 +2019,10 @@ static __le16 ext4_group_desc_csum(struc }/* old crc16 code */ +if (!(sbi->s_es->s_feature_ro_compat & +cpu_to_le32 (EXT4_FEATURE_RO_COMPAT_GDT_CSUM ))) +return 0 ; + offset = offsetof(struct ext4_group_desc , bg_checksum); crc =crc16 (~0 , sbi->s_es->s_uuid,sizeof (sbi->s_es->s_uuid));
Greg Kroah-Hartman
maintainerPATCH 106/203 ext4: fix overflow when updating superblock backups after resize
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 9378c6768e4fca48971e7b6a9075bc006eda981d upstream.
When there are no meta block groups update_backups() will compute the backup block in 32-bit arithmetics thus possibly overflowing the block number and corrupting the filesystem. OTOH filesystems without meta block groups larger than 16 TB should be rare. Fix the problem by doing the counting in 64-bit arithmetics.
Coverity-id: 741252
--- fs/ext4/resize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/resize.c +1 -1
@@ -1071,7 +1071,7 @@ static void update_backups(struct super_break ;if (meta_bg ==0 ) - backup_block = group * bpg + blk_off; + backup_block = ((ext4_fsblk_t )group) * bpg + blk_off;else backup_block = (ext4_group_first_block_no (sb, group) +ext4_bg_has_super (sb, group));
Greg Kroah-Hartman
maintainerPATCH 107/203 ext4: enable journal checksum when metadata checksum feature enabled
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Darrick J. Wong" <[email protected]>
commit 98c1a7593fa355fda7f5a5940c8bf5326ca964ba upstream.
If metadata checksumming is turned on for the FS, we need to tell the journal to use checksumming too.
--- fs/ext4/super.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/ext4/super.c +4 -0
@@ -3486,6 +3486,10 @@ static int ext4_fill_super(struct super_#ifdef CONFIG_EXT4_FS_POSIX_ACL set_opt (sb,POSIX_ACL );#endif +/* don't forget to enable journal_csum when metadata_csum is enabled. */ +if (ext4_has_metadata_csum (sb)) +set_opt (sb,JOURNAL_CHECKSUM ); +if ((def_mount_opts &EXT4_DEFM_JMODE ) ==EXT4_DEFM_JMODE_DATA )set_opt (sb,JOURNAL_DATA );else if ((def_mount_opts &EXT4_DEFM_JMODE ) ==EXT4_DEFM_JMODE_ORDERED )
Greg Kroah-Hartman
maintainerPATCH 108/203 ext4: fix oops when loading block bitmap failed
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 599a9b77ab289d85c2d5c8607624efbe1f552b0f upstream.
When we fail to load block bitmap in __ext4_new_inode() we will dereference NULL pointer in ext4_journal_get_write_access(). So check for error from ext4_read_block_bitmap().
Coverity-id: 989065
--- fs/ext4/ialloc.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/ext4/ialloc.c +4 -0
@@ -864,6 +864,10 @@ got:struct buffer_head *block_bitmap_bh; block_bitmap_bh =ext4_read_block_bitmap (sb, group); +if (!block_bitmap_bh) { + err = -EIO ; + goto out; + }BUFFER_TRACE (block_bitmap_bh,"get block bitmap access" ); err =ext4_journal_get_write_access (handle, block_bitmap_bh);if (err) {
Greg Kroah-Hartman
maintainerPATCH 109/203 cpufreq: expose scaling_cur_freq sysfs file for set_policy() drivers
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dirk Brandewie <[email protected]>
commit c034b02e213d271b98c45c4a7b54af8f69aaac1e upstream.
Currently the core does not expose scaling_cur_freq for set_policy() drivers this breaks some userspace monitoring tools.
Change the core to expose this file for all drivers and if the set_policy() driver supports the get() callback use it to retrieve the current frequency.
--- drivers/cpufreq/cpufreq.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/cpufreq/cpufreq.c +17 -6
@@ -460,7 +460,18 @@ show_one(cpuinfo_max_freq, cpuinfo.max_fshow_one (cpuinfo_transition_latency, cpuinfo.transition_latency);show_one (scaling_min_freq, min);show_one (scaling_max_freq, max); -show_one (scaling_cur_freq, cur); + +static ssize_t show_scaling_cur_freq ( +struct cpufreq_policy *policy,char *buf) +{ +ssize_t ret; + +if (cpufreq_driver && cpufreq_driver->setpolicy && cpufreq_driver->get) + ret =sprintf (buf,"%u\n" , cpufreq_driver->get (policy->cpu)); +else + ret =sprintf (buf,"%u\n" , policy->cur); +return ret; +}static int cpufreq_set_policy (struct cpufreq_policy *policy,struct cpufreq_policy *new_policy);
@@ -854,11 +865,11 @@ static int cpufreq_add_dev_interface(strif (ret) goto err_out_kobj_put; } -if (has_target ()) { - ret =sysfs_create_file (&policy->kobj, &scaling_cur_freq.attr); -if (ret) - goto err_out_kobj_put; - } + + ret =sysfs_create_file (&policy->kobj, &scaling_cur_freq.attr); +if (ret) + goto err_out_kobj_put; +if (cpufreq_driver->bios_limit) { ret =sysfs_create_file (&policy->kobj, &bios_limit.attr);if (ret)
Greg Kroah-Hartman
maintainerPATCH 111/203 intel_pstate: Add CPU IDs for Broadwell processors
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dirk Brandewie <[email protected]>
commit c7e241df5970171e3e86a516f91ca8a30ca516e8 upstream.
Add support for Broadwell processors.
--- drivers/cpufreq/intel_pstate.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/cpufreq/intel_pstate.c +3 -0
@@ -685,10 +685,13 @@ static const struct x86_cpu_id intel_pstICPU (0x37 , byt_params),ICPU (0x3a , core_params),ICPU (0x3c , core_params), +ICPU (0x3d , core_params),ICPU (0x3e , core_params),ICPU (0x3f , core_params),ICPU (0x45 , core_params),ICPU (0x46 , core_params), +ICPU (0x4f , core_params), + ICPU(0x56, core_params), {} };MODULE_DEVICE_TABLE (x86cpu, intel_pstate_cpu_ids);
Greg Kroah-Hartman
maintainerPATCH 112/203 cpufreq: intel_pstate: Add CPU ID for Braswell processor
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mika Westerberg <[email protected]>
commit 16405f98bca8eb39a23b3ce03e241ca19e7af370 upstream.
This is pretty much the same as Intel Baytrail, only the CPU ID is different. Add the new ID to the supported CPU list.
--- drivers/cpufreq/intel_pstate.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/intel_pstate.c +1 -0
@@ -690,6 +690,7 @@ static const struct x86_cpu_id intel_pstICPU (0x3f , core_params),ICPU (0x45 , core_params),ICPU (0x46 , core_params), +ICPU (0x4c , byt_params),ICPU (0x4f , core_params), ICPU(0x56, core_params), {}
Greg Kroah-Hartman
maintainerPATCH 113/203 x86, iosf: Make IOSF driver modular and usable by more drivers
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: "David E. Box" <[email protected]>
commit 6b8f0c8780c71d78624f736d7849645b64cc88b7 upstream.
Currently drivers that run on non-IOSF systems (Core/Xeon) can't use the IOSF driver on SOC's without selecting it which forces an unnecessary and limiting dependency. Provides dummy functions to allow these modules to conditionally use the driver on IOSF equipped platforms without impacting their ability to compile and load on non-IOSF platforms. Build default m to ensure availability on x86 SOC's.
--- arch/x86/Kconfig | 7 ++----- arch/x86/include/asm/iosf_mbi.h | 33 +++++++++++++++++++++++++++++++++ arch/x86/kernel/iosf_mbi.c | 7 +++++++ 3 files changed, 42 insertions(+), 5 deletions(-)
arch/x86/Kconfig +2 -5
@@ -2436,12 +2436,9 @@ config X86_DMA_REMAP depends on STA2X11 config IOSF_MBI - bool + tristate + default m depends on PCI - ---help--- - To be selected by modules requiring access to the Intel OnChip System - Fabric (IOSF) Sideband MailBox Interface (MBI). For MBI platforms - enumerable by PCI. source "net/Kconfig"
arch/x86/include/asm/iosf_mbi.h +33 -0
@@ -50,6 +50,10 @@#define BT_MBI_PCIE_READ 0x00#define BT_MBI_PCIE_WRITE 0x01 +#if IS_ENABLED (CONFIG_IOSF_MBI ) + +bool iosf_mbi_available (void ); +/** * iosf_mbi_read() - MailBox Interface read command * @port: port indicating subunit being accessed
@@ -87,4 +91,33 @@ int iosf_mbi_write(u8 port, u8 opcode, u*/ int iosf_mbi_modify (u8 port,u8 opcode,u32 offset,u32 mdr,u32 mask); +#else /* CONFIG_IOSF_MBI is not enabled */ +static inline +bool iosf_mbi_available (void ) +{ +return false; +} + +static inline +int iosf_mbi_read (u8 port,u8 opcode,u32 offset,u32 *mdr) +{ +WARN (1 ,"IOSF_MBI driver not available" ); +return -EPERM ; +} + +static inline +int iosf_mbi_write (u8 port,u8 opcode,u32 offset,u32 mdr) +{ +WARN (1 ,"IOSF_MBI driver not available" ); +return -EPERM ; +} + +static inline +int iosf_mbi_modify (u8 port,u8 opcode,u32 offset,u32 mdr,u32 mask) +{ +WARN (1 ,"IOSF_MBI driver not available" ); +return -EPERM ; +} +#endif /* CONFIG_IOSF_MBI */ +#endif /* IOSF_MBI_SYMS_H */
arch/x86/kernel/iosf_mbi.c +7 -0
@@ -177,6 +177,13 @@ int iosf_mbi_modify(u8 port, u8 opcode, }EXPORT_SYMBOL (iosf_mbi_modify); +bool iosf_mbi_available (void ) +{ +/* Mbi isn't hot-pluggable. No remove routine is provided */ +return mbi_pdev; +} +EXPORT_SYMBOL (iosf_mbi_available); +static int iosf_mbi_probe (struct pci_dev *pdev,const struct pci_device_id *unused) {
Greg Kroah-Hartman
maintainerPATCH 114/203 x86, iosf: Added Quark MBI identifiers
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ong Boon Leong <[email protected]>
commit 7ef1def800e907edd28ddb1a5c64bae6b8749cdd upstream.
Added all the MBI units below and their associated read/write opcodes:
- Host Bridge Arbiter
- Host Bridge
- Remote Management Unit
- Memory Manager & eSRAM
- SoC Unit
--- arch/x86/include/asm/iosf_mbi.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/x86/include/asm/iosf_mbi.h +22 -0
@@ -50,6 +50,28 @@#define BT_MBI_PCIE_READ 0x00#define BT_MBI_PCIE_WRITE 0x01 +/* Quark available units */ +#define QRK_MBI_UNIT_HBA 0x00 +#define QRK_MBI_UNIT_HB 0x03 +#define QRK_MBI_UNIT_RMU 0x04 +#define QRK_MBI_UNIT_MM 0x05 +#define QRK_MBI_UNIT_MMESRAM 0x05 +#define QRK_MBI_UNIT_SOC 0x31 + +/* Quark read/write opcodes */ +#define QRK_MBI_HBA_READ 0x10 +#define QRK_MBI_HBA_WRITE 0x11 +#define QRK_MBI_HB_READ 0x10 +#define QRK_MBI_HB_WRITE 0x11 +#define QRK_MBI_RMU_READ 0x10 +#define QRK_MBI_RMU_WRITE 0x11 +#define QRK_MBI_MM_READ 0x10 +#define QRK_MBI_MM_WRITE 0x11 +#define QRK_MBI_MMESRAM_READ 0x12 +#define QRK_MBI_MMESRAM_WRITE 0x13 +#define QRK_MBI_SOC_READ 0x06 +#define QRK_MBI_SOC_WRITE 0x07 +#if IS_ENABLED (CONFIG_IOSF_MBI )bool iosf_mbi_available (void );
Greg Kroah-Hartman
maintainerPATCH 115/203 x86, iosf: Add Quark X1000 PCI ID
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ong Boon Leong <[email protected]>
commit 90916e048c1e0c1d379577e43ab9b8e331490cfb upstream.
Add PCI device ID, i.e. that of the Host Bridge,
for IOSF MBI driver.
--- arch/x86/kernel/iosf_mbi.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/iosf_mbi.c +1 -0
@@ -201,6 +201,7 @@ static int iosf_mbi_probe(struct pci_devstatic DEFINE_PCI_DEVICE_TABLE (iosf_mbi_pci_ids) = { {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x0F00 ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x0958 ) }, {0 , }, };MODULE_DEVICE_TABLE (pci, iosf_mbi_pci_ids);
Greg Kroah-Hartman
maintainerPATCH 116/203 x86, iosf: Add PCI ID macros for better readability
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ong Boon Leong <[email protected]>
commit 04725ad59474d24553d526fa774179ecd2922342 upstream.
Introduce PCI IDs macro for the list of supported product:
BayTrail & Quark X1000.
--- arch/x86/kernel/iosf_mbi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kernel/iosf_mbi.c +5 -2
@@ -25,6 +25,9 @@#include <asm/iosf_mbi.h> +#define PCI_DEVICE_ID_BAYTRAIL 0x0F00 +#define PCI_DEVICE_ID_QUARK_X1000 0x0958 +static DEFINE_SPINLOCK (iosf_mbi_lock);static inline u32 iosf_mbi_form_mcr (u8 op,u8 port,u8 offset)
@@ -200,8 +203,8 @@ static int iosf_mbi_probe(struct pci_dev }static DEFINE_PCI_DEVICE_TABLE (iosf_mbi_pci_ids) = { - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x0F00 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x0958 ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_BAYTRAIL ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_QUARK_X1000 ) }, {0 , }, };MODULE_DEVICE_TABLE (pci, iosf_mbi_pci_ids);
Greg Kroah-Hartman
maintainerPATCH 117/203 x86: Add cpu_detect_cache_sizes to init_intel() add Quark legacy_cache()
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bryan O'Donoghue <[email protected]>
commit aece118e487a744eafcdd0c77fe32b55ee2092a1 upstream.
Intel processors which don't report cache information via cpuid(2) or cpuid(4) need quirk code in the legacy_cache_size callback to report this data. For Intel that callback is is intel_size_cache().
This patch enables calling of cpu_detect_cache_sizes() inside of init_intel() and hence the calling of the legacy_cache callback in intel_size_cache(). Adding this call will ensure that PIII Tualatin currently in intel_size_cache() and Quark SoC X1000 being added to intel_size_cache() in this patch will report their respective cache sizes.
This model of calling cpu_detect_cache_sizes() is consistent with AMD/Via/Cirix/Transmeta and Centaur.
Also added is a string to idenitfy the Quark as Quark SoC X1000 giving better and more descriptive output via /proc/cpuinfo
Adding cpu_detect_cache_sizes to init_intel() will enable calling of intel_size_cache() on Intel processors which currently no code can reach. Therefore this patch will also re-enable reporting of PIII Tualatin cache size information as well as add Quark SoC X1000 support.
Comment text and cache flow logic suggested by Thomas Gleixner
--- arch/x86/kernel/cpu/intel.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/intel.c +16 -1
@@ -383,6 +383,13 @@ static void init_intel(struct cpuinfo_x8detect_extended_topology (c); l2 =init_intel_cacheinfo (c); + +/* Detect legacy cache sizes if init_intel_cacheinfo did not */ +if (l2 ==0 ) { +cpu_detect_cache_sizes (c); + l2 = c->x86_cache_size; + } +if (c->cpuid_level >9 ) {unsigned eax =cpuid_eax (10 );/* Check for version and the number of counters */
@@ -497,6 +504,13 @@ static unsigned int intel_size_cache(str*/ if ((c->x86 ==6 ) && (c->x86_model ==11 ) && (size ==0 )) size =256 ; + +/* +* Intel Quark SoC X1000 contains a 4-way set associative +* 16K cache with a 16 byte cache line and 256 lines per tag +*/ +if ((c->x86 ==5 ) && (c->x86_model ==9 )) + size =16 ; return size; }#endif
@@ -724,7 +738,8 @@ static const struct cpu_dev intel_cpu_de [3] = "OverDrive PODP5V83", [4] = "Pentium MMX", [7] = "Mobile Pentium 75 - 200", - [8] = "Mobile Pentium MMX" + [8] = "Mobile Pentium MMX", + [9 ] ="Quark SoC X1000" , } }, { .family = 6, .model_names =
Greg Kroah-Hartman
maintainerPATCH 118/203 mmc: sdhci-pci: SDIO host controller support for Intel Quark X1000
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Derek Browne <[email protected]>
commit 43e968cec79b6334cf7cb3e11184cce720541712 upstream.
This patch is to enable SDIO host controller for Intel Quark X1000.
--- drivers/mmc/host/sdhci-pci.c | 12 ++++++++++++ drivers/mmc/host/sdhci-pci.h | 1 + 2 files changed, 13 insertions(+)
drivers/mmc/host/sdhci-pci.c +12 -0
@@ -103,6 +103,10 @@ static const struct sdhci_pci_fixes sdhc SDHCI_QUIRK_BROKEN_TIMEOUT_VAL, }; +static const struct sdhci_pci_fixes sdhci_intel_qrk = { + .quirks =SDHCI_QUIRK_NO_HISPD_BIT , +}; +static int mrst_hc_probe_slot (struct sdhci_pci_slot *slot) { slot->host->mmc->caps |=MMC_CAP_8_BIT_DATA ;
@@ -732,6 +736,14 @@ static const struct pci_device_id pci_id }, { + .vendor = PCI_VENDOR_ID_INTEL, + .device = PCI_DEVICE_ID_INTEL_QRK_SD, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .driver_data = (kernel_ulong_t)&sdhci_intel_qrk, + }, + + { .vendor = PCI_VENDOR_ID_INTEL, .device = PCI_DEVICE_ID_INTEL_MRST_SD0, .subvendor = PCI_ANY_ID,
drivers/mmc/host/sdhci-pci.h +1 -0
@@ -17,6 +17,7 @@#define PCI_DEVICE_ID_INTEL_CLV_SDIO2 0x08fb#define PCI_DEVICE_ID_INTEL_CLV_EMMC0 0x08e5#define PCI_DEVICE_ID_INTEL_CLV_EMMC1 0x08e6 +#define PCI_DEVICE_ID_INTEL_QRK_SD 0x08A7/* * PCI registers
Greg Kroah-Hartman
maintainerPATCH 119/203 x86/platform/intel/iosf: Add Braswell PCI ID
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: "David E. Box" <[email protected]>
commit 849f5d894383d25c49132437aa289c9a9c98d5df upstream.
Add Braswell PCI ID to list of supported ID's for the IOSF driver.
--- arch/x86/kernel/iosf_mbi.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/iosf_mbi.c +2 -0
@@ -26,6 +26,7 @@#include <asm/iosf_mbi.h> #define PCI_DEVICE_ID_BAYTRAIL 0x0F00 +#define PCI_DEVICE_ID_BRASWELL 0x2280#define PCI_DEVICE_ID_QUARK_X1000 0x0958static DEFINE_SPINLOCK (iosf_mbi_lock);
@@ -204,6 +205,7 @@ static int iosf_mbi_probe(struct pci_devstatic DEFINE_PCI_DEVICE_TABLE (iosf_mbi_pci_ids) = { {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_BAYTRAIL ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_BRASWELL ) }, {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_QUARK_X1000 ) }, {0 , }, };
Greg Kroah-Hartman
maintainerPATCH 120/203 ALSA: hda - add PCI IDs for Intel Braswell
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Libin Yang <[email protected]>
commit f31b2ffcad2b8c57cee5ffc634928bcbc8c6a558 upstream.
Add HD Audio Device PCI ID for the Intel Braswell platform. It is an HDA Intel PCH controller.
AZX_DCAPS_ALIGN_BUFSIZE is not necessary for this controller.
--- sound/pci/hda/hda_intel.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/hda_intel.c +3 -0
@@ -4027,6 +4027,9 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids)/* BayTrail */ { PCI_DEVICE(0x8086, 0x0f04), .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM }, + /* Braswell */ + { PCI_DEVICE(0x8086, 0x2284), + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, /* ICH */ { PCI_DEVICE(0x8086, 0x2668), .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |
Greg Kroah-Hartman
maintainerPATCH 121/203 ALSA: hda - add codec ID for Braswell display audio codec
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Libin Yang <[email protected]>
commit d1585c89cecdb513f68045e47ab76976524b5961 upstream.
This patch adds codec ID (0x80862883) and module alias for Braswell display codec.
--- sound/pci/hda/patch_hdmi.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_hdmi.c +2 -0
@@ -3317,6 +3317,7 @@ static const struct hda_codec_preset snd { .id = 0x80862808, .name = "Broadwell HDMI", .patch = patch_generic_hdmi }, { .id = 0x80862880, .name = "CedarTrail HDMI", .patch = patch_generic_hdmi }, { .id = 0x80862882, .name = "Valleyview2 HDMI", .patch = patch_generic_hdmi }, +{ .id = 0x80862883, .name = "Braswell HDMI", .patch = patch_generic_hdmi }, { .id = 0x808629fb, .name = "Crestline HDMI", .patch = patch_generic_hdmi }, {}/* terminator */ };
@@ -3373,6 +3374,7 @@ MODULE_ALIAS("snd-hda-codec-id:80862807"MODULE_ALIAS ("snd-hda-codec-id:80862808" );MODULE_ALIAS ("snd-hda-codec-id:80862880" );MODULE_ALIAS ("snd-hda-codec-id:80862882" ); +MODULE_ALIAS ("snd-hda-codec-id:80862883" );MODULE_ALIAS ("snd-hda-codec-id:808629fb" );MODULE_LICENSE ("GPL" );
Greg Kroah-Hartman
maintainerPATCH 122/203 intel_pstate: Fix BYT frequency reporting
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dirk Brandewie <[email protected]>
commit b27580b05e6f5253228debc60b8ff4a786ff573a upstream.
BYT has a different conversion from P state to frequency than the core processors. This causes the min/max and current frequency to be misreported on some BYT SKUs. Tested on BYT N2820, Ivybridge and Haswell processors.
--- drivers/cpufreq/intel_pstate.c | 42 +++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-)
drivers/cpufreq/intel_pstate.c +36 -6
@@ -67,6 +67,7 @@ struct pstate_data {int current_pstate;int min_pstate;int max_pstate; +int scaling;int turbo_pstate; };
@@ -118,6 +119,7 @@ struct pstate_funcs {int (*get_max)(void );int (*get_min)(void );int (*get_turbo)(void ); +int (*get_scaling)(void );void (*set)(struct cpudata *,int pstate);void (*get_vid)(struct cpudata *); };
@@ -407,6 +409,22 @@ static void byt_set_pstate(struct cpudatwrmsrl (MSR_IA32_PERF_CTL , val); } +#define BYT_BCLK_FREQS 5 +static int byt_freq_table[BYT_BCLK_FREQS ] = {833 ,1000 ,1333 ,1167 ,800 }; + +static int byt_get_scaling (void ) +{ +u64 value; +int i; + +rdmsrl (MSR_FSB_FREQ , value); + i = value &0x3 ; + +BUG_ON (i >BYT_BCLK_FREQS ); + +return byt_freq_table[i] *100 ; +} +static void byt_get_vid (struct cpudata *cpudata) {u64 value;
@@ -451,6 +469,11 @@ static int core_get_turbo_pstate(void)return ret; } +static inline int core_get_scaling (void ) +{ +return 100000 ; +} +static void core_set_pstate (struct cpudata *cpudata,int pstate) {u64 val;
@@ -475,6 +498,7 @@ static struct cpu_defaults core_params = .get_max = core_get_max_pstate, .get_min = core_get_min_pstate, .get_turbo = core_get_turbo_pstate, + .get_scaling = core_get_scaling, .set = core_set_pstate, }, };
@@ -493,6 +517,7 @@ static struct cpu_defaults byt_params = .get_min = byt_get_min_pstate, .get_turbo = byt_get_turbo_pstate, .set = byt_set_pstate, + .get_scaling = byt_get_scaling, .get_vid = byt_get_vid, }, };
@@ -526,7 +551,7 @@ static void intel_pstate_set_pstate(struif (pstate == cpu->pstate.current_pstate)return ; -trace_cpu_frequency (pstate *100000 , cpu->cpu); +trace_cpu_frequency (pstate * cpu->pstate.scaling, cpu->cpu); cpu->pstate.current_pstate = pstate;
@@ -555,6 +580,7 @@ static void intel_pstate_get_cpu_pstates cpu->pstate.min_pstate = pstate_funcs.get_min (); cpu->pstate.max_pstate = pstate_funcs.get_max (); cpu->pstate.turbo_pstate = pstate_funcs.get_turbo (); + cpu->pstate.scaling = pstate_funcs.get_scaling ();if (pstate_funcs.get_vid) pstate_funcs.get_vid (cpu);
@@ -574,7 +600,9 @@ static inline void intel_pstate_calc_bus core_pct +=1 ; sample->freq =fp_toint ( -mul_fp (int_tofp (cpu->pstate.max_pstate *1000 ), core_pct)); +mul_fp (int_tofp ( + cpu->pstate.max_pstate * cpu->pstate.scaling /100 ), + core_pct)); sample->core_pct_busy = (int32_t )core_pct; }
@@ -817,12 +845,13 @@ static int intel_pstate_cpu_init(structelse policy->policy =CPUFREQ_POLICY_POWERSAVE ; - policy->min = cpu->pstate.min_pstate *100000 ; - policy->max = cpu->pstate.turbo_pstate *100000 ; + policy->min = cpu->pstate.min_pstate * cpu->pstate.scaling; + policy->max = cpu->pstate.turbo_pstate * cpu->pstate.scaling;/* cpuinfo and default policy values */ - policy->cpuinfo.min_freq = cpu->pstate.min_pstate *100000 ; - policy->cpuinfo.max_freq = cpu->pstate.turbo_pstate *100000 ; + policy->cpuinfo.min_freq = cpu->pstate.min_pstate * cpu->pstate.scaling; + policy->cpuinfo.max_freq = + cpu->pstate.turbo_pstate * cpu->pstate.scaling; policy->cpuinfo.transition_latency =CPUFREQ_ETERNAL ;cpumask_set_cpu (policy->cpu, policy->cpus);
@@ -880,6 +909,7 @@ static void copy_cpu_funcs(struct pstate pstate_funcs.get_max = funcs->get_max; pstate_funcs.get_min = funcs->get_min; pstate_funcs.get_turbo = funcs->get_turbo; + pstate_funcs.get_scaling = funcs->get_scaling; pstate_funcs.set = funcs->set; pstate_funcs.get_vid = funcs->get_vid; }
Greg Kroah-Hartman
maintainerPATCH 123/203 intel_pstate: Correct BYT VID values.
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dirk Brandewie <[email protected]>
commit d022a65ed2473fac4a600e3424503dc571160a3e upstream.
Using a VID value that is not high enough for the requested P state can cause machine checks. Add a ceiling function to ensure calulated VIDs with fractional values are set to the next highest integer VID value.
The algorythm for calculating the non-trubo VID from the BIOS writers guide is:
vid_ratio = (vid_max - vid_min) / (max_pstate - min_pstate) vid = ceiling(vid_min + (req_pstate - min_pstate) * vid_ratio)
--- drivers/cpufreq/intel_pstate.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/cpufreq/intel_pstate.c +12 -1
@@ -55,6 +55,17 @@ static inline int32_t div_fp(int32_t x,return div_s64 ((int64_t )x <<FRAC_BITS , (int64_t )y); } +static inline int ceiling_fp (int32_t x) +{ +int mask, ret; + + ret =fp_toint (x); + mask = (1 <<FRAC_BITS ) -1 ; +if (x & mask) + ret +=1 ; +return ret; +} +struct sample {int32_t core_pct_busy;u64 aperf;
@@ -399,7 +410,7 @@ static void byt_set_pstate(struct cpudat cpudata->vid.ratio); vid_fp =clamp_t (int32_t, vid_fp, cpudata->vid.min, cpudata->vid.max); - vid =fp_toint (vid_fp); + vid =ceiling_fp (vid_fp);if (pstate > cpudata->pstate.max_pstate) vid = cpudata->vid.turbo;
Greg Kroah-Hartman
maintainerPATCH 124/203 freezer: Do not freeze tasks killed by OOM killer
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
commit 51fae6da640edf9d266c94f36bc806c63c301991 upstream.
Since f660daac474c6f (oom: thaw threads if oom killed thread is frozen before deferring) OOM killer relies on being able to thaw a frozen task to handle OOM situation but a3201227f803 (freezer: make freezing() test freeze conditions in effect instead of TIF_FREEZE) has reorganized the code and stopped clearing freeze flag in __thaw_task. This means that the target task only wakes up and goes into the fridge again because the freezing condition hasn't changed for it. This reintroduces the bug fixed by f660daac474c6f.
Fix the issue by checking for TIF_MEMDIE thread flag in freezing_slow_path and exclude the task from freezing completely. If a task was already frozen it would get woken by __thaw_task from OOM killer and get out of freezer after rechecking freezing().
Changes since v1
- put TIF_MEMDIE check into freezing_slowpath rather than in __refrigerator as per Oleg
- return __thaw_task into oom_scan_process_thread because oom_kill_process will not wake task in the fridge because it is sleeping uninterruptible
--- kernel/freezer.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/freezer.c +3 -0
@@ -42,6 +42,9 @@ bool freezing_slow_path(struct task_struif (p->flags & (PF_NOFREEZE |PF_SUSPEND_TASK ))return false; +if (test_thread_flag (TIF_MEMDIE )) +return false; +if (pm_nosig_freezing ||cgroup_freezing (p))return true;
Greg Kroah-Hartman
maintainerPATCH 125/203 OOM, PM: OOM killed task shouldnt escape PM suspend
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Hocko <[email protected]>
commit 5695be142e203167e3cb515ef86a88424f3524eb upstream.
PM freezer relies on having all tasks frozen by the time devices are getting frozen so that no task will touch them while they are getting frozen. But OOM killer is allowed to kill an already frozen task in order to handle OOM situtation. In order to protect from late wake ups OOM killer is disabled after all tasks are frozen. This, however, still keeps a window open when a killed task didn't manage to die by the time freeze_processes finishes.
Reduce the race window by checking all tasks after OOM killer has been disabled. This is still not race free completely unfortunately because oom_killer_disable cannot stop an already ongoing OOM killer so a task might still wake up from the fridge and get killed without freeze_processes noticing. Full synchronization of OOM and freezer is, however, too heavy weight for this highly unlikely case.
Introduce and check oom_kills counter which gets incremented early when the allocator enters __alloc_pages_may_oom path and only check all the tasks if the counter changes during the freezing attempt. The counter is updated so early to reduce the race window since allocator checked oom_killer_disabled which is set by PM-freezing code. A false positive will push the PM-freezer into a slow path but that is not a big deal.
Changes since v1
- push the re-check loop out of freeze_processes into check_frozen_processes and invert the condition to make the code more readable as per Rafael
--- include/linux/oom.h | 3 +++ kernel/power/process.c | 40 +++++++++++++++++++++++++++++++++++++++- mm/oom_kill.c | 17 +++++++++++++++++ mm/page_alloc.c | 8 ++++++++ 4 files changed, 67 insertions(+), 1 deletion(-)
include/linux/oom.h +3 -0
@@ -50,6 +50,9 @@ static inline bool oom_task_origin(constextern unsigned long oom_badness (struct task_struct *p,struct mem_cgroup *memcg,const nodemask_t *nodemask,unsigned long totalpages); + +extern int oom_kills_count (void ); +extern void note_oom_kill (void ); extern void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, unsigned int points, unsigned long totalpages, struct mem_cgroup *memcg, nodemask_t *nodemask,
kernel/power/process.c +39 -1
@@ -107,6 +107,28 @@ static int try_to_freeze_tasks(bool userreturn todo ? -EBUSY :0 ; } +/* +* Returns true if all freezable tasks (except for current) are frozen already +*/ +static bool check_frozen_processes (void ) +{ +struct task_struct *g, *p; +bool ret = true; + +read_lock (&tasklist_lock); +for_each_process_thread (g, p) { +if (p != current && !freezer_should_skip (p) && + !frozen (p)) { + ret = false; + goto done; + } + } +done: +read_unlock (&tasklist_lock); + +return ret; +} +/** * freeze_processes - Signal user space processes to enter the refrigerator. * The current thread will not be frozen. The same process that calls
@@ -117,6 +139,7 @@ static int try_to_freeze_tasks(bool userint freeze_processes (void ) {int error; +int oom_kills_saved; error =__usermodehelper_disable (UMH_FREEZING );if (error)
@@ -130,12 +153,27 @@ int freeze_processes(void)printk ("Freezing user space processes ... " ); pm_freezing = true; + oom_kills_saved =oom_kills_count (); error =try_to_freeze_tasks (true);if (!error) { -printk ("done." );__usermodehelper_set_disable_depth (UMH_DISABLED );oom_killer_disable (); + +/* +* There might have been an OOM kill while we were +* freezing tasks and the killed task might be still +* on the way out so we have to double check for race. +*/ +if (oom_kills_count () != oom_kills_saved && + !check_frozen_processes ()) { +__usermodehelper_set_disable_depth (UMH_ENABLED ); +printk ("OOM in progress." ); + error = -EBUSY ; + goto done; + } +printk ("done." ); } +done:printk ("\n" );BUG_ON (in_atomic ());
mm/oom_kill.c +17 -0
@@ -406,6 +406,23 @@ static void dump_header(struct task_strudump_tasks (memcg, nodemask); } +/* +* Number of OOM killer invocations (including memcg OOM killer). +* Primarily used by PM freezer to check for potential races with +* OOM killed frozen task. +*/ +static atomic_t oom_kills =ATOMIC_INIT (0 ); + +int oom_kills_count (void ) +{ +return atomic_read (&oom_kills); +} + +void note_oom_kill (void ) +{ +atomic_inc (&oom_kills); +} +#define K (x) ((x) << (PAGE_SHIFT-10))/* * Must be called while holding a reference to p, which will be released upon
mm/page_alloc.c +8 -0
@@ -2196,6 +2196,14 @@ __alloc_pages_may_oom(gfp_t gfp_mask, un }/* +* PM-freezer should be notified that there might be an OOM killer on +* its way to kill and wake somebody up. This is too early and we might +* end up not killing anything but false positives are acceptable. +* See freeze_processes. +*/ +note_oom_kill (); + +/* * Go through the zonelist yet one more time, keep very high watermark * here, this is only to catch a parallel oom killing, we must fail if * we're still under heavy pressure.
Greg Kroah-Hartman
maintainerPATCH 126/203 iio: st_sensors: Fix buffer copy
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robin van der Gracht <[email protected]>
commit 4250c90b30b8bf2a1a21122ba0484f8f351f152d upstream.
Use byte_for_channel as iterator to properly initialize the buffer.
--- drivers/iio/common/st_sensors/st_sensors_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/common/st_sensors/st_sensors_buffer.c +1 -1
@@ -71,7 +71,7 @@ int st_sensors_get_buffer_element(struct goto st_sensors_free_memory; } -for (i =0 ; i < n * num_data_channels; i++) { +for (i =0 ; i < n * byte_for_channel; i++) {if (i < n) buf[i] = rx_array[i];else
Greg Kroah-Hartman
maintainerPATCH 127/203 staging:iio:ad5933: Fix NULL pointer deref when enabling buffer
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <[email protected]>
commit 824269c5868d2a7a26417e5ef3841a27d42c6139 upstream.
In older versions of the IIO framework it was possible to pass a completely different set of channels to iio_buffer_register() as the one that is assigned to the IIO device. Commit 959d2952d124 ("staging:iio: make iio_sw_buffer_preenable much more general.") introduced a restriction that requires that the set of channels that is passed to iio_buffer_register() is a subset of the channels assigned to the IIO device as the IIO core will use the list of channels that is assigned to the device to lookup a channel by scan index in iio_compute_scan_bytes(). If it can not find the channel the function will crash. This patch fixes the issue by making sure that the same set of channels is assigned to the IIO device and passed to iio_buffer_register().
Fixes the follow NULL pointer derefernce kernel crash:
Unable to handle kernel NULL pointer dereference at virtual address 00000016 pgd = d53d0000 [00000016] *pgd=1534e831, *pte=00000000, *ppte=00000000 Internal error: Oops: 17 [#1] PREEMPT SMP ARM Modules linked in: CPU: 1 PID: 1626 Comm: bash Not tainted 3.15.0-19969-g2a180eb-dirty #9545 task: d6c124c0 ti: d539a000 task.ti: d539a000 PC is at iio_compute_scan_bytes+0x34/0xa8 LR is at iio_compute_scan_bytes+0x34/0xa8 pc : [<c03052e4>] lr : [<c03052e4>] psr: 60070013 sp : d539beb8 ip : 00000001 fp : 00000000 r10: 00000002 r9 : 00000000 r8 : 00000001 r7 : 00000000 r6 : d6dc8800 r5 : d7571000 r4 : 00000002 r3 : d7571000 r2 : 00000044 r1 : 00000001 r0 : 00000000 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user Control: 18c5387d Table: 153d004a DAC: 00000015 Process bash (pid: 1626, stack limit = 0xd539a240) Stack: (0xd539beb8 to 0xd539c000) bea0: c02fc0e4 d7571000 bec0: d76c1640 d6dc8800 d757117c 00000000 d757112c c0305b04 d76c1690 d76c1640 bee0: d7571188 00000002 00000000 d7571000 d539a000 00000000 000dd1c8 c0305d54 bf00: d7571010 0160b868 00000002 c69d3900 d7573278 d7573308 c69d3900 c01ece90 bf20: 00000002 c0103fac c0103f6c d539bf88 00000002 c69d3b00 c69d3b0c c0103468 bf40: 00000000 00000000 d7694a00 00000002 000af408 d539bf88 c000dd84 c00b2f94 bf60: d7694a00 000af408 00000002 d7694a00 d7694a00 00000002 000af408 c000dd84 bf80: 00000000 c00b32d0 00000000 00000000 00000002 b6f1aa78 00000002 000af408 bfa0: 00000004 c000dc00 b6f1aa78 00000002 00000001 000af408 00000002 00000000 bfc0: b6f1aa78 00000002 000af408 00000004 be806a4c 000a6094 00000000 000dd1c8 bfe0: 00000000 be8069cc b6e8ab77 b6ec125c 40070010 00000001 22940489 154a5007 [<c03052e4>] (iio_compute_scan_bytes) from [<c0305b04>] (__iio_update_buffers+0x248/0x438) [<c0305b04>] (__iio_update_buffers) from [<c0305d54>] (iio_buffer_store_enable+0x60/0x7c) [<c0305d54>] (iio_buffer_store_enable) from [<c01ece90>] (dev_attr_store+0x18/0x24) [<c01ece90>] (dev_attr_store) from [<c0103fac>] (sysfs_kf_write+0x40/0x4c) [<c0103fac>] (sysfs_kf_write) from [<c0103468>] (kernfs_fop_write+0x110/0x154) [<c0103468>] (kernfs_fop_write) from [<c00b2f94>] (vfs_write+0xd0/0x160) [<c00b2f94>] (vfs_write) from [<c00b32d0>] (SyS_write+0x40/0x78) [<c00b32d0>] (SyS_write) from [<c000dc00>] (ret_fast_syscall+0x0/0x30) Code: ea00000e e1a01008 e1a00005 ebfff6fc (e5d0a016)
--- drivers/staging/iio/impedance-analyzer/ad5933.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/staging/iio/impedance-analyzer/ad5933.c +4 -7
@@ -115,6 +115,7 @@ static const struct iio_chan_spec ad5933 .channel = 0, .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), .address = AD5933_REG_TEMP_DATA, + .scan_index = -1, .scan_type = { .sign = 's', .realbits = 14,
@@ -125,8 +126,6 @@ static const struct iio_chan_spec ad5933 .indexed = 1, .channel = 0, .extend_name = "real_raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | - BIT(IIO_CHAN_INFO_SCALE), .address = AD5933_REG_REAL_DATA, .scan_index = 0, .scan_type = {
@@ -139,8 +138,6 @@ static const struct iio_chan_spec ad5933 .indexed = 1, .channel = 0, .extend_name = "imag_raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | - BIT(IIO_CHAN_INFO_SCALE), .address = AD5933_REG_IMAG_DATA, .scan_index = 1, .scan_type = {
@@ -748,14 +745,14 @@ static int ad5933_probe(struct i2c_clien indio_dev->name = id->name; indio_dev->modes =INDIO_DIRECT_MODE ; indio_dev->channels = ad5933_channels; - indio_dev->num_channels =1 ;/* only register temp0_input */ + indio_dev->num_channels =ARRAY_SIZE (ad5933_channels); ret =ad5933_register_ring_funcs_and_init (indio_dev);if (ret) goto error_disable_reg; -/* skip temp0_input, register in0_(real|imag)_raw */ - ret =iio_buffer_register (indio_dev, &ad5933_channels[1 ],2 ); + ret =iio_buffer_register (indio_dev, ad5933_channels, +ARRAY_SIZE (ad5933_channels));if (ret) goto error_unreg_ring;
Greg Kroah-Hartman
maintainerPATCH 128/203 staging:iio:ad5933: Drop "raw" from channel names
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <[email protected]>
commit 6822ee34ad57b29a3b44df2c2829910f03c34fa4 upstream.
"raw" is the name of a channel property, but should not be part of the channel name itself.
--- drivers/staging/iio/impedance-analyzer/ad5933.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/iio/impedance-analyzer/ad5933.c +2 -2
@@ -125,7 +125,7 @@ static const struct iio_chan_spec ad5933 .type = IIO_VOLTAGE, .indexed = 1, .channel = 0, - .extend_name = "real_raw", + .extend_name = "real", .address = AD5933_REG_REAL_DATA, .scan_index = 0, .scan_type = {
@@ -137,7 +137,7 @@ static const struct iio_chan_spec ad5933 .type = IIO_VOLTAGE, .indexed = 1, .channel = 0, - .extend_name = "imag_raw", + .extend_name = "imag", .address = AD5933_REG_IMAG_DATA, .scan_index = 1, .scan_type = {
Greg Kroah-Hartman
maintainerPATCH 129/203 staging:iio:ade7758: Fix NULL pointer deref when enabling buffer
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <[email protected]>
commit e10554738cab4224e097c2f9d975ea781a4fcde4 upstream.
In older versions of the IIO framework it was possible to pass a completely different set of channels to iio_buffer_register() as the one that is assigned to the IIO device. Commit 959d2952d124 ("staging:iio: make iio_sw_buffer_preenable much more general.") introduced a restriction that requires that the set of channels that is passed to iio_buffer_register() is a subset of the channels assigned to the IIO device as the IIO core will use the list of channels that is assigned to the device to lookup a channel by scan index in iio_compute_scan_bytes(). If it can not find the channel the function will crash. This patch fixes the issue by making sure that the same set of channels is assigned to the IIO device and passed to iio_buffer_register().
Note that we need to remove the IIO_CHAN_INFO_RAW and IIO_CHAN_INFO_SCALE info attributes from the channels since we don't actually want those to be registered.
Fixes the following crash:
Unable to handle kernel NULL pointer dereference at virtual address 00000016 pgd = d2094000 [00000016] *pgd=16e39831, *pte=00000000, *ppte=00000000 Internal error: Oops: 17 [#1] PREEMPT SMP ARM Modules linked in: CPU: 1 PID: 1695 Comm: bash Not tainted 3.17.0-06329-g29461ee #9686 task: d7768040 ti: d5bd4000 task.ti: d5bd4000 PC is at iio_compute_scan_bytes+0x38/0xc0 LR is at iio_compute_scan_bytes+0x34/0xc0 pc : [<c0316de8>] lr : [<c0316de4>] psr: 60070013 sp : d5bd5ec0 ip : 00000000 fp : 00000000 r10: d769f934 r9 : 00000000 r8 : 00000001 r7 : 00000000 r6 : c8fc6240 r5 : d769f800 r4 : 00000000 r3 : d769f800 r2 : 00000000 r1 : ffffffff r0 : 00000000 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user Control: 18c5387d Table: 1209404a DAC: 00000015 Process bash (pid: 1695, stack limit = 0xd5bd4240) Stack: (0xd5bd5ec0 to 0xd5bd6000) 5ec0: d769f800 d7435640 c8fc6240 d769f984 00000000 c03175a4 d7435690 d7435640 5ee0: d769f990 00000002 00000000 d769f800 d5bd4000 00000000 000b43a8 c03177f4 5f00: d769f810 0162b8c8 00000002 c8fc7e00 d77f1d08 d77f1da8 c8fc7e00 c01faf1c 5f20: 00000002 c010694c c010690c d5bd5f88 00000002 c8fc6840 c8fc684c c0105e08 5f40: 00000000 00000000 d20d1580 00000002 000af408 d5bd5f88 c000de84 c00b76d4 5f60: d20d1580 000af408 00000002 d20d1580 d20d1580 00000002 000af408 c000de84 5f80: 00000000 c00b7a44 00000000 00000000 00000002 b6ebea78 00000002 000af408 5fa0: 00000004 c000dd00 b6ebea78 00000002 00000001 000af408 00000002 00000000 5fc0: b6ebea78 00000002 000af408 00000004 bee96a4c 000a6094 00000000 000b43a8 5fe0: 00000000 bee969cc b6e2eb77 b6e6525c 40070010 00000001 00000000 00000000 [<c0316de8>] (iio_compute_scan_bytes) from [<c03175a4>] (__iio_update_buffers+0x248/0x438) [<c03175a4>] (__iio_update_buffers) from [<c03177f4>] (iio_buffer_store_enable+0x60/0x7c) [<c03177f4>] (iio_buffer_store_enable) from [<c01faf1c>] (dev_attr_store+0x18/0x24) [<c01faf1c>] (dev_attr_store) from [<c010694c>] (sysfs_kf_write+0x40/0x4c) [<c010694c>] (sysfs_kf_write) from [<c0105e08>] (kernfs_fop_write+0x110/0x154) [<c0105e08>] (kernfs_fop_write) from [<c00b76d4>] (vfs_write+0xbc/0x170) [<c00b76d4>] (vfs_write) from [<c00b7a44>] (SyS_write+0x40/0x78) [<c00b7a44>] (SyS_write) from [<c000dd00>] (ret_fast_syscall+0x0/0x30)
--- drivers/staging/iio/meter/ade7758.h | 1 drivers/staging/iio/meter/ade7758_core.c | 33 +------------------------------ drivers/staging/iio/meter/ade7758_ring.c | 3 -- 3 files changed, 3 insertions(+), 34 deletions(-)
drivers/staging/iio/meter/ade7758.h +0 -1
@@ -119,7 +119,6 @@ struct ade7758_state {u8 *tx;u8 *rx;struct mutex buf_lock; -const struct iio_chan_spec *ade7758_ring_channels;struct spi_transfer ring_xfer[4 ];struct spi_message ring_msg;/*
drivers/staging/iio/meter/ade7758_core.c +2 -31
@@ -631,8 +631,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 0, .extend_name = "raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_A, AD7758_VOLTAGE), .scan_index = 0, .scan_type = {
@@ -645,8 +643,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 0, .extend_name = "raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_A, AD7758_CURRENT), .scan_index = 1, .scan_type = {
@@ -659,8 +655,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 0, .extend_name = "apparent_raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_A, AD7758_APP_PWR), .scan_index = 2, .scan_type = {
@@ -673,8 +667,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 0, .extend_name = "active_raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_A, AD7758_ACT_PWR), .scan_index = 3, .scan_type = {
@@ -687,8 +679,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 0, .extend_name = "reactive_raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_A, AD7758_REACT_PWR), .scan_index = 4, .scan_type = {
@@ -701,8 +691,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 1, .extend_name = "raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_B, AD7758_VOLTAGE), .scan_index = 5, .scan_type = {
@@ -715,8 +703,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 1, .extend_name = "raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_B, AD7758_CURRENT), .scan_index = 6, .scan_type = {
@@ -729,8 +715,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 1, .extend_name = "apparent_raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_B, AD7758_APP_PWR), .scan_index = 7, .scan_type = {
@@ -743,8 +727,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 1, .extend_name = "active_raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_B, AD7758_ACT_PWR), .scan_index = 8, .scan_type = {
@@ -757,8 +739,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 1, .extend_name = "reactive_raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_B, AD7758_REACT_PWR), .scan_index = 9, .scan_type = {
@@ -771,8 +751,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 2, .extend_name = "raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_C, AD7758_VOLTAGE), .scan_index = 10, .scan_type = {
@@ -785,8 +763,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 2, .extend_name = "raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_C, AD7758_CURRENT), .scan_index = 11, .scan_type = {
@@ -799,8 +775,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 2, .extend_name = "apparent_raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_C, AD7758_APP_PWR), .scan_index = 12, .scan_type = {
@@ -813,8 +787,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 2, .extend_name = "active_raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_C, AD7758_ACT_PWR), .scan_index = 13, .scan_type = {
@@ -827,8 +799,6 @@ static const struct iio_chan_spec ade775 .indexed = 1, .channel = 2, .extend_name = "reactive_raw", - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .address = AD7758_WT(AD7758_PHASE_C, AD7758_REACT_PWR), .scan_index = 14, .scan_type = {
@@ -869,13 +839,14 @@ static int ade7758_probe(struct spi_devi goto error_free_rx; } st->us = spi; - st->ade7758_ring_channels = &ade7758_channels[0 ];mutex_init (&st->buf_lock); indio_dev->name = spi->dev.driver->name; indio_dev->dev.parent = &spi->dev; indio_dev->info = &ade7758_info; indio_dev->modes =INDIO_DIRECT_MODE ; + indio_dev->channels = ade7758_channels; + indio_dev->num_channels =ARRAY_SIZE (ade7758_channels); ret =ade7758_configure_ring (indio_dev);if (ret)
drivers/staging/iio/meter/ade7758_ring.c +1 -2
@@ -85,7 +85,6 @@ static irqreturn_t ade7758_trigger_handl**/ static int ade7758_ring_preenable (struct iio_dev *indio_dev) { -struct ade7758_state *st =iio_priv (indio_dev);unsigned channel;if (!bitmap_empty (indio_dev->active_scan_mask, indio_dev->masklength))
@@ -95,7 +94,7 @@ static int ade7758_ring_preenable(struct indio_dev->masklength);ade7758_write_waveform_type (&indio_dev->dev, - st->ade7758_ring_channels[channel].address); + indio_dev->channels[channel].address);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 130/203 staging:iio:ade7758: Fix check if channels are enabled in prenable
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <[email protected]>
commit 79fa64eb2ee8ccb4bcad7f54caa2699730b10b22 upstream.
We should check if a channel is enabled, not if no channels are enabled.
--- drivers/staging/iio/meter/ade7758_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/iio/meter/ade7758_ring.c +1 -1
@@ -87,7 +87,7 @@ static int ade7758_ring_preenable(struct {unsigned channel; -if (!bitmap_empty (indio_dev->active_scan_mask, indio_dev->masklength)) +if (bitmap_empty (indio_dev->active_scan_mask, indio_dev->masklength))return -EINVAL ; channel = find_first_bit(indio_dev->active_scan_mask,
Greg Kroah-Hartman
maintainerPATCH 131/203 staging:iio:ade7758: Remove "raw" from channel name
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <[email protected]>
commit b598aacc29331e7e638cd509108600e916c6331b upstream.
"raw" is a property of a channel, but should not be part of the name of channel.
--- drivers/staging/iio/meter/ade7758_core.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-)
drivers/staging/iio/meter/ade7758_core.c +9 -15
@@ -630,7 +630,6 @@ static const struct iio_chan_spec ade775 .type = IIO_VOLTAGE, .indexed = 1, .channel = 0, - .extend_name = "raw", .address = AD7758_WT(AD7758_PHASE_A, AD7758_VOLTAGE), .scan_index = 0, .scan_type = {
@@ -642,7 +641,6 @@ static const struct iio_chan_spec ade775 .type = IIO_CURRENT, .indexed = 1, .channel = 0, - .extend_name = "raw", .address = AD7758_WT(AD7758_PHASE_A, AD7758_CURRENT), .scan_index = 1, .scan_type = {
@@ -654,7 +652,7 @@ static const struct iio_chan_spec ade775 .type = IIO_POWER, .indexed = 1, .channel = 0, - .extend_name = "apparent_raw", + .extend_name = "apparent", .address = AD7758_WT(AD7758_PHASE_A, AD7758_APP_PWR), .scan_index = 2, .scan_type = {
@@ -666,7 +664,7 @@ static const struct iio_chan_spec ade775 .type = IIO_POWER, .indexed = 1, .channel = 0, - .extend_name = "active_raw", + .extend_name = "active", .address = AD7758_WT(AD7758_PHASE_A, AD7758_ACT_PWR), .scan_index = 3, .scan_type = {
@@ -678,7 +676,7 @@ static const struct iio_chan_spec ade775 .type = IIO_POWER, .indexed = 1, .channel = 0, - .extend_name = "reactive_raw", + .extend_name = "reactive", .address = AD7758_WT(AD7758_PHASE_A, AD7758_REACT_PWR), .scan_index = 4, .scan_type = {
@@ -690,7 +688,6 @@ static const struct iio_chan_spec ade775 .type = IIO_VOLTAGE, .indexed = 1, .channel = 1, - .extend_name = "raw", .address = AD7758_WT(AD7758_PHASE_B, AD7758_VOLTAGE), .scan_index = 5, .scan_type = {
@@ -702,7 +699,6 @@ static const struct iio_chan_spec ade775 .type = IIO_CURRENT, .indexed = 1, .channel = 1, - .extend_name = "raw", .address = AD7758_WT(AD7758_PHASE_B, AD7758_CURRENT), .scan_index = 6, .scan_type = {
@@ -714,7 +710,7 @@ static const struct iio_chan_spec ade775 .type = IIO_POWER, .indexed = 1, .channel = 1, - .extend_name = "apparent_raw", + .extend_name = "apparent", .address = AD7758_WT(AD7758_PHASE_B, AD7758_APP_PWR), .scan_index = 7, .scan_type = {
@@ -726,7 +722,7 @@ static const struct iio_chan_spec ade775 .type = IIO_POWER, .indexed = 1, .channel = 1, - .extend_name = "active_raw", + .extend_name = "active", .address = AD7758_WT(AD7758_PHASE_B, AD7758_ACT_PWR), .scan_index = 8, .scan_type = {
@@ -738,7 +734,7 @@ static const struct iio_chan_spec ade775 .type = IIO_POWER, .indexed = 1, .channel = 1, - .extend_name = "reactive_raw", + .extend_name = "reactive", .address = AD7758_WT(AD7758_PHASE_B, AD7758_REACT_PWR), .scan_index = 9, .scan_type = {
@@ -750,7 +746,6 @@ static const struct iio_chan_spec ade775 .type = IIO_VOLTAGE, .indexed = 1, .channel = 2, - .extend_name = "raw", .address = AD7758_WT(AD7758_PHASE_C, AD7758_VOLTAGE), .scan_index = 10, .scan_type = {
@@ -762,7 +757,6 @@ static const struct iio_chan_spec ade775 .type = IIO_CURRENT, .indexed = 1, .channel = 2, - .extend_name = "raw", .address = AD7758_WT(AD7758_PHASE_C, AD7758_CURRENT), .scan_index = 11, .scan_type = {
@@ -774,7 +768,7 @@ static const struct iio_chan_spec ade775 .type = IIO_POWER, .indexed = 1, .channel = 2, - .extend_name = "apparent_raw", + .extend_name = "apparent", .address = AD7758_WT(AD7758_PHASE_C, AD7758_APP_PWR), .scan_index = 12, .scan_type = {
@@ -786,7 +780,7 @@ static const struct iio_chan_spec ade775 .type = IIO_POWER, .indexed = 1, .channel = 2, - .extend_name = "active_raw", + .extend_name = "active", .address = AD7758_WT(AD7758_PHASE_C, AD7758_ACT_PWR), .scan_index = 13, .scan_type = {
@@ -798,7 +792,7 @@ static const struct iio_chan_spec ade775 .type = IIO_POWER, .indexed = 1, .channel = 2, - .extend_name = "reactive_raw", + .extend_name = "reactive", .address = AD7758_WT(AD7758_PHASE_C, AD7758_REACT_PWR), .scan_index = 14, .scan_type = {
Greg Kroah-Hartman
maintainerPATCH 133/203 USB: serial: cp210x: add Silicon Labs 358x VID and PID
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathaniel Ting <[email protected]>
commit 35cc83eab097e5720a9cc0ec12bdc3a726f58381 upstream.
Enable Silicon Labs Ember VID chips to enumerate with the cp210x usb serial driver. EM358x devices operating with the Ember Z-Net 5.1.2 stack may now connect to host PCs over a USB serial link.
--- drivers/usb/serial/cp210x.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/cp210x.c +1 -0
@@ -155,6 +155,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */ { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */ + { USB_DEVICE(0x1BA4, 0x0002) }, /* Silicon Labs 358x factory default */ { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */ { USB_DEVICE(0x1D6F, 0x0010) }, /* Seluxit ApS RF Dongle */ { USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */
Greg Kroah-Hartman
maintainerPATCH 134/203 usb: serial: ftdi_sio: add Awinda Station and Dongle products
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frans Klaver <[email protected]>
commit edd74ffab1f6909eee400c7de8ce621870aacac9 upstream.
Add new IDs for the Xsens Awinda Station and Awinda Dongle.
While at it, order the definitions by PID and add a logical separation between devices using Xsens' VID and those using FTDI's VID.
--- drivers/usb/serial/ftdi_sio.c | 2 ++ drivers/usb/serial/ftdi_sio_ids.h | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/usb/serial/ftdi_sio.c +2 -0
@@ -674,6 +674,8 @@ static const struct usb_device_id id_tab { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) }, { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) }, { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) }, + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) }, + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) }, { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) }, { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) }, { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
drivers/usb/serial/ftdi_sio_ids.h +5 -1
@@ -143,8 +143,12 @@* Xsens Technologies BV products (http://www.xsens.com). */ #define XSENS_VID 0x2639 -#define XSENS_CONVERTER_PID 0xD00D/* Xsens USB-serial converter */ +#define XSENS_AWINDA_STATION_PID 0x0101 +#define XSENS_AWINDA_DONGLE_PID 0x0102#define XSENS_MTW_PID 0x0200/* Xsens MTw */ +#define XSENS_CONVERTER_PID 0xD00D/* Xsens USB-serial converter */ + +/* Xsens devices using FTDI VID */ #define XSENS_CONVERTER_0_PID 0xD388/* Xsens USB converter */ #define XSENS_CONVERTER_1_PID 0xD389/* Xsens Wireless Receiver */ #define XSENS_CONVERTER_2_PID 0xD38A
Greg Kroah-Hartman
maintainerPATCH 135/203 usb: serial: ftdi_sio: add "bricked" FTDI device PID
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Perry Hung <[email protected]>
commit 7f2719f0003da1ad13124ef00f48d7514c79e30d upstream.
An official recent Windows driver from FTDI detects counterfeit devices and reprograms the internal EEPROM containing the USB PID to 0, effectively bricking the device.
Add support for this VID/PID pair to correctly bind the driver on these devices.
See:
http://hackaday.com/2014/10/22/watch-that-windows-update-ftdi-drivers-are-killing-fake-chips/
--- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++ 2 files changed, 7 insertions(+)
drivers/usb/serial/ftdi_sio.c +1 -0
@@ -145,6 +145,7 @@ static struct ftdi_sio_quirk ftdi_8u2232* /sys/bus/usb-serial/drivers/ftdi_sio/new_id and send a patch or report. */ static const struct usb_device_id id_table_combined[] = { + {USB_DEVICE (FTDI_VID ,FTDI_BRICK_PID ) }, {USB_DEVICE (FTDI_VID ,FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID ) }, {USB_DEVICE (FTDI_VID ,FTDI_CTI_MINI_PID ) }, {USB_DEVICE (FTDI_VID ,FTDI_CTI_NANO_PID ) },
drivers/usb/serial/ftdi_sio_ids.h +6 -0
@@ -30,6 +30,12 @@/*** third-party PIDs (using FTDI_VID) ***/ +/* +* Certain versions of the official Windows FTDI driver reprogrammed +* counterfeit FTDI devices to PID 0. Support these devices anyway. +*/ +#define FTDI_BRICK_PID 0x0000 +#define FTDI_LUMEL_PD12_PID 0x6002/*
Greg Kroah-Hartman
maintainerPATCH 136/203 USB: cdc-acm: add device id for GW Instek AFG-2225
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit cf84a691a61606a2e7269907d3727e2d9fa148ee upstream.
Add device-id entry for GW Instek AFG-2225, which has a byte swapped bInterfaceSubClass (0x20).
--- drivers/usb/class/cdc-acm.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/class/cdc-acm.c +1 -0
@@ -1672,6 +1672,7 @@ static const struct usb_device_id acm_id { USB_DEVICE(0x0572, 0x1328), /* Shiro / Aztech USB MODEM UM-3100 */ .driver_info =NO_UNION_NORMAL ,/* has no union descriptor */ }, + { USB_DEVICE(0x2184, 0x001c) }, /* GW Instek AFG-2225 */ { USB_DEVICE(0x22b8, 0x6425), /* Motorola MOTOMAGX phones */ },/* Motorola H24 HSPA module: */
Greg Kroah-Hartman
maintainerPATCH 137/203 USB: cdc-acm: only raise DTR on transitions from B0
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 4473d054ceb572557954f9536731d39b20937b0c upstream.
Make sure to only raise DTR on transitions from B0 in set_termios.
Also allow set_termios to be called from open with a termios_old of NULL. Note that DTR will not be raised prematurely in this case.
--- drivers/usb/class/cdc-acm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/class/cdc-acm.c +3 -2
@@ -965,11 +965,12 @@ static void acm_tty_set_termios(struct t/* FIXME: Needs to clear unsupported bits in the termios */ acm->clocal = ((termios->c_cflag &CLOCAL ) !=0 ); -if (!newline.dwDTERate) { +if (C_BAUD (tty) ==B0 ) { newline.dwDTERate = acm->line.dwDTERate; newctrl &= ~ACM_CTRL_DTR ; - }else + }else if (termios_old && (termios_old->c_cflag &CBAUD ) ==B0 ) { newctrl |=ACM_CTRL_DTR ; + }if (newctrl != acm->ctrlout)acm_set_control (acm, acm->ctrlout = newctrl);
Greg Kroah-Hartman
maintainerPATCH 138/203 usb: phy: return -ENODEV on failure of try_module_get
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arjun Sreedharan <[email protected]>
commit 2c4e3dbf63b39d44a291db70016c718f45d9cd46 upstream.
When __usb_find_phy_dev() does not return error and try_module_get() fails, return -ENODEV.
--- drivers/usb/phy/phy.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/phy/phy.c +3 -0
@@ -229,6 +229,9 @@ struct usb_phy *usb_get_phy_dev(struct d phy =__usb_find_phy_dev (dev, &phy_bind_list, index);if (IS_ERR (phy) || !try_module_get (phy->dev->driver->owner)) {dev_dbg (dev,"unable to find transceiver\n" ); +if (!IS_ERR (phy)) + phy =ERR_PTR (-ENODEV ); + goto err0; }
Greg Kroah-Hartman
maintainerPATCH 139/203 usb: option: add support for Telit LE910
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniele Palmas <[email protected]>
commit 2d0eb862dd477c3c4f32b201254ca0b40e6f465c upstream.
Add VID/PID for Telit LE910 modem. Interfaces description is almost the same than LE920, except that the qmi interface is number 2 (instead than 5).
--- drivers/usb/serial/option.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/usb/serial/option.c +8 -0
@@ -269,6 +269,7 @@ static void option_instat_callback(struc#define TELIT_PRODUCT_DE910_DUAL 0x1010#define TELIT_PRODUCT_UE910_V2 0x1012#define TELIT_PRODUCT_LE920 0x1200 +#define TELIT_PRODUCT_LE910 0x1201/* ZTE PRODUCTS */ #define ZTE_VENDOR_ID 0x19d2
@@ -588,6 +589,11 @@ static const struct option_blacklist_inf .reserved = BIT(3) | BIT(4), }; +static const struct option_blacklist_info telit_le910_blacklist = { + .sendsetup =BIT (0 ), + .reserved =BIT (1 ) |BIT (2 ), +}; +static const struct option_blacklist_info telit_le920_blacklist = { .sendsetup =BIT (0 ), .reserved =BIT (1 ) |BIT (5 ),
@@ -1137,6 +1143,8 @@ static const struct usb_device_id option { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_SINGLE) }, { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_DE910_DUAL) }, { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UE910_V2) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910), + .driver_info = (kernel_ulong_t)&telit_le910_blacklist }, { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920), .driver_info = (kernel_ulong_t)&telit_le920_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
Greg Kroah-Hartman
maintainerPATCH 140/203 USB: option: add Haier CE81B CDMA modem
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Williams <[email protected]>
commit 012eee1522318b5ccd64d277d50ac32f7e9974fe upstream.
Port layout:
0: QCDM/DIAG
1: NMEA
2: AT
3: AT/PPP
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -362,6 +362,7 @@ static void option_instat_callback(struc/* Haier products */ #define HAIER_VENDOR_ID 0x201e +#define HAIER_PRODUCT_CE81B 0x10f8#define HAIER_PRODUCT_CE100 0x2009/* Cinterion (formerly Siemens) products */
@@ -1620,6 +1621,7 @@ static const struct usb_device_id option { USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) }, { USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) }, { USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) }, + { USB_DEVICE_AND_INTERFACE_INFO(HAIER_VENDOR_ID, HAIER_PRODUCT_CE81B, 0xff, 0xff, 0xff) },/* Pirelli */ { USB_DEVICE_INTERFACE_CLASS(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_C100_1, 0xff) }, { USB_DEVICE_INTERFACE_CLASS(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_C100_2, 0xff) },
Greg Kroah-Hartman
maintainerPATCH 142/203 wireless: rt2x00: add new rt2800usb devices
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xose Vazquez Perez <[email protected]>
commit 6a06e554daef86c4e8d290284927b081fedb249e upstream.
0x0b05 0x17e8 RT5372 USB 2.0 bgn 2x2 ASUS USB-N14 0x0411 0x0253 RT5572 USB 2.0 abgn 2x2 BUFFALO WLP-U2-300D 0x0df6 0x0078 RT???? Sitecom N300
--- drivers/net/wireless/rt2x00/rt2800usb.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/rt2x00/rt2800usb.c +4 -0
@@ -1235,6 +1235,8 @@ static struct usb_device_id rt2800usb_de/* Arcadyan */ { USB_DEVICE(0x043e, 0x7a12) }, { USB_DEVICE(0x043e, 0x7a32) }, +/* ASUS */ + { USB_DEVICE(0x0b05, 0x17e8) },/* Azurewave */ { USB_DEVICE(0x13d3, 0x3329) }, { USB_DEVICE(0x13d3, 0x3365) },
@@ -1271,6 +1273,7 @@ static struct usb_device_id rt2800usb_de { USB_DEVICE(0x057c, 0x8501) },/* Buffalo */ { USB_DEVICE(0x0411, 0x0241) }, + { USB_DEVICE(0x0411, 0x0253) },/* D-Link */ { USB_DEVICE(0x2001, 0x3c1a) }, { USB_DEVICE(0x2001, 0x3c21) },
@@ -1361,6 +1364,7 @@ static struct usb_device_id rt2800usb_de { USB_DEVICE(0x0df6, 0x0053) }, { USB_DEVICE(0x0df6, 0x0069) }, { USB_DEVICE(0x0df6, 0x006f) }, + { USB_DEVICE(0x0df6, 0x0078) },/* SMC */ { USB_DEVICE(0x083a, 0xa512) }, { USB_DEVICE(0x083a, 0xc522) },
Greg Kroah-Hartman
maintainerPATCH 143/203 wireless: rt2x00: add new rt2800usb device
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cyril Brulebois <[email protected]>
commit 664d6a792785cc677c2091038ce10322c8d04ae1 upstream.
0x1b75 0xa200 AirLive WN-200USB wireless 11b/g/n dongle
References: https://bugs.debian.org/766802
--- drivers/net/wireless/rt2x00/rt2800usb.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/rt2x00/rt2800usb.c +1 -0
@@ -1062,6 +1062,7 @@ static struct usb_device_id rt2800usb_de/* Ovislink */ { USB_DEVICE(0x1b75, 0x3071) }, { USB_DEVICE(0x1b75, 0x3072) }, + { USB_DEVICE(0x1b75, 0xa200) },/* Para */ { USB_DEVICE(0x20b8, 0x8888) },/* Pegatron */
Greg Kroah-Hartman
maintainerPATCH 144/203 usb: dwc3: gadget: Properly initialize LINK TRB
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jack Pham <[email protected]>
commit 1200a82a59b6aa65758ccc92c3447b98c53cd7a2 upstream.
On ISOC endpoints the last trb_pool entry used as a LINK TRB is not getting zeroed out correctly due to memset being called incorrectly and in the wrong place. If pool allocated from DMA was not zero-initialized to begin with this will result in the size and ctrl values being random garbage. Call memset correctly after assignment of the trb_link pointer.
--- drivers/usb/dwc3/gadget.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/dwc3/gadget.c +1 -2
@@ -532,12 +532,11 @@ static int __dwc3_gadget_ep_enable(strucif (!usb_endpoint_xfer_isoc (desc))return 0 ; -memset (&trb_link,0 ,sizeof (trb_link)); -/* Link TRB for ISOC. The HWO bit is never reset */ trb_st_hw = &dep->trb_pool[0 ]; trb_link = &dep->trb_pool[DWC3_TRB_NUM -1 ]; +memset (trb_link,0 ,sizeof (*trb_link)); trb_link->bpl =lower_32_bits (dwc3_trb_dma_offset (dep, trb_st_hw)); trb_link->bph =upper_32_bits (dwc3_trb_dma_offset (dep, trb_st_hw));
Greg Kroah-Hartman
maintainerPATCH 145/203 spi: pl022: Fix incorrect dma_unmap_sg
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ray Jui <[email protected]>
commit 3ffa6158f002e096d28ede71be4e0ee8ab20baa2 upstream.
When mapped RX DMA entries are unmapped in an error condition when DMA is firstly configured in the driver, the number of TX DMA entries was passed in, which is incorrect
--- drivers/spi/spi-pl022.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-pl022.c +1 -1
@@ -1075,7 +1075,7 @@ err_rxdesc: pl022->sgt_tx.nents, DMA_TO_DEVICE); err_tx_sgmap:dma_unmap_sg (rxchan->device->dev, pl022->sgt_rx.sgl, - pl022->sgt_tx.nents,DMA_FROM_DEVICE ); + pl022->sgt_rx.nents,DMA_FROM_DEVICE ); err_rx_sgmap:sg_free_table (&pl022->sgt_tx); err_alloc_tx_sg:
Greg Kroah-Hartman
maintainerPATCH 146/203 spi: fsl-dspi: Fix CTAR selection
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Stein <[email protected]>
commit 5cc7b04740effa5cc0af53f434134b5859d58b73 upstream.
There are only 4 CTAR registers (CTAR0 - CTAR3) so we can only use the lower 2 bits of the chip select to select a CTAR register. SPI_PUSHR_CTAS used the lower 3 bits which would result in wrong bit values if the chip selects 4/5 are used. For those chip selects SPI_CTAR even calculated offsets of non-existing registers.
--- drivers/spi/spi-fsl-dspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-fsl-dspi.c +2 -2
@@ -45,7 +45,7 @@#define SPI_TCR 0x08 -#define SPI_CTAR (x) (0x0c + (x * 4)) +#define SPI_CTAR (x) (0x0c + (((x) & 0x3) * 4))#define SPI_CTAR_FMSZ (x) (((x) & 0x0000000f) << 27)#define SPI_CTAR_CPOL (x) ((x) << 26)#define SPI_CTAR_CPHA (x) ((x) << 25)
@@ -69,7 +69,7 @@#define SPI_PUSHR 0x34#define SPI_PUSHR_CONT (1 << 31) -#define SPI_PUSHR_CTAS (x) (((x) & 0x00000007) << 28) +#define SPI_PUSHR_CTAS (x) (((x) & 0x00000003) << 28)#define SPI_PUSHR_EOQ (1 << 27)#define SPI_PUSHR_CTCNT (1 << 26)#define SPI_PUSHR_PCS (x) (((1 << x) & 0x0000003f) << 16)
Greg Kroah-Hartman
maintainerPATCH 147/203 spi: pxa2xx: toggle clocks on suspend if not disabled by runtime PM
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Eremin-Solenikov <[email protected]>
commit 2b9375b91bef65b837bed61a05fb387159b38ddf upstream.
If PM_RUNTIME is enabled, it is easy to trigger the following backtrace on pxa2xx hosts:
------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at /home/lumag/linux/arch/arm/mach-pxa/clock.c:35 clk_disable+0xa0/0xa8() Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 3.17.0-00007-g1b3d2ee-dirty #104 [<c000de68>] (unwind_backtrace) from [<c000c078>] (show_stack+0x10/0x14) [<c000c078>] (show_stack) from [<c001d75c>] (warn_slowpath_common+0x6c/0x8c) [<c001d75c>] (warn_slowpath_common) from [<c001d818>] (warn_slowpath_null+0x1c/0x24) [<c001d818>] (warn_slowpath_null) from [<c0015e80>] (clk_disable+0xa0/0xa8) [<c0015e80>] (clk_disable) from [<c02507f8>] (pxa2xx_spi_suspend+0x2c/0x34) [<c02507f8>] (pxa2xx_spi_suspend) from [<c0200360>] (platform_pm_suspend+0x2c/0x54) [<c0200360>] (platform_pm_suspend) from [<c0207fec>] (dpm_run_callback.isra.14+0x2c/0x74) [<c0207fec>] (dpm_run_callback.isra.14) from [<c0209254>] (__device_suspend+0x120/0x2f8) [<c0209254>] (__device_suspend) from [<c0209a94>] (dpm_suspend+0x50/0x208) [<c0209a94>] (dpm_suspend) from [<c00455ac>] (suspend_devices_and_enter+0x8c/0x3a0) [<c00455ac>] (suspend_devices_and_enter) from [<c0045ad4>] (pm_suspend+0x214/0x2a8) [<c0045ad4>] (pm_suspend) from [<c04b5c34>] (test_suspend+0x14c/0x1dc) [<c04b5c34>] (test_suspend) from [<c000880c>] (do_one_initcall+0x8c/0x1fc) [<c000880c>] (do_one_initcall) from [<c04aecfc>] (kernel_init_freeable+0xf4/0x1b4) [<c04aecfc>] (kernel_init_freeable) from [<c0378078>] (kernel_init+0x8/0xec) [<c0378078>] (kernel_init) from [<c0009590>] (ret_from_fork+0x14/0x24) ---[ end trace 46524156d8faa4f6 ]---
This happens because suspend function tries to disable a clock that is already disabled by runtime_suspend callback. Add if (!pm_runtime_suspended()) checks to suspend/resume path.
--- drivers/spi/spi-pxa2xx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/spi/spi-pxa2xx.c +5 -2
@@ -1280,7 +1280,9 @@ static int pxa2xx_spi_suspend(struct devif (status !=0 )return status;write_SSCR0 (0 , drv_data->ioaddr); -clk_disable_unprepare (ssp->clk); + +if (!pm_runtime_suspended (dev)) +clk_disable_unprepare (ssp->clk);return 0 ; }
@@ -1294,7 +1296,8 @@ static int pxa2xx_spi_resume(struct devipxa2xx_spi_dma_resume (drv_data);/* Enable the SSP clock */ -clk_prepare_enable (ssp->clk); +if (!pm_runtime_suspended (dev)) +clk_prepare_enable (ssp->clk);/* Restore LPSS private register bits */ lpss_ssp_setup (drv_data);
Greg Kroah-Hartman
maintainerPATCH 148/203 usb: musb: cppi41: restart hrtimer only if not yet done
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit d2e6d62c9cbbc2da4211f672dbeea08960e29a80 upstream.
commit c58d80f52 ("usb: musb: Ensure that cppi41 timer gets armed on premature DMA TX irq") fixed hrtimer scheduling bug. There is one left which does not trigger that often.
The following scenario is still possible:
lock(&x->lock);
hrtimer_start(&x->t);
unlock(&x->lock);expires:
t->function();
lock(&x->lock);
lock(&x->lock); if (!hrtimer_queued(&x->t))
hrtimer_start(&x->t);
unlock(&x->lock);
if (!list_empty(x->early_tx_list))
ret = HRTIMER_RESTART;
-> hrtimer_forward_now(...)
} else
ret = HRTIMER_NORESTART;
unlock(&x->lock);and the timer callback returns HRTIMER_RESTART for an armed timer. This is wrong and we run into the BUG_ON() in __run_hrtimer(). This can happens on SMP or PREEMPT-RT.
The patch fixes the problem by only starting the timer if the timer is not yet queued.
[bigeasy: collected information and created a patch + description based
on it]
--- drivers/usb/musb/musb_cppi41.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/musb/musb_cppi41.c +2 -1
@@ -190,7 +190,8 @@ static enum hrtimer_restart cppi41_reche } } -if (!list_empty (&controller->early_tx_list)) { +if (!list_empty (&controller->early_tx_list) && + !hrtimer_is_queued (&controller->early_tx)) { ret =HRTIMER_RESTART ;hrtimer_forward_now (&controller->early_tx,ktime_set (0 ,150 *NSEC_PER_USEC ));
Greg Kroah-Hartman
maintainerPATCH 149/203 usb: musb: dsps: start OTG timer on resume again
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
commit 53185b3a441a6cc9bb3f57e924342d249138dcd6 upstream.
Commit 468bcc2a2ca ("usb: musb: dsps: kill OTG timer on suspend") stopped the timer in suspend path but forgot the re-enable it in the resume path. This patch fixes the behaviour.
Fixes 468bcc2a2ca "usb: musb: dsps: kill OTG timer on suspend"
--- drivers/usb/musb/musb_dsps.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/musb/musb_dsps.c +3 -1
@@ -733,7 +733,9 @@ static int dsps_resume(struct device *dedsps_writel (mbase, wrp->mode, glue->context.mode);dsps_writel (mbase, wrp->tx_mode, glue->context.tx_mode);dsps_writel (mbase, wrp->rx_mode, glue->context.rx_mode); -setup_timer (&glue->timer, otg_timer, (unsigned long ) musb); +if (musb->xceiv->state ==OTG_STATE_B_IDLE && + musb->port_mode ==MUSB_PORT_MODE_DUAL_ROLE ) +mod_timer (&glue->timer, jiffies + wrp->poll_seconds *HZ );return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 151/203 USB: quirks: enable device-qualifier quirk for Elan Touchscreen
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit c68929f75dfcb6354918862b91b5778585de1fa5 upstream.
Enable device-qualifier quirk for Elan Touchscreen, which often fails to handle requests for the device_descriptor.
Note that the device sometimes do respond properly with a Request Error (three times as USB core retries), but usually fails to respond at all. When this happens any further descriptor requests also fails, for example:
[ 1528.688934] usb 2-7: new full-speed USB device number 4 using xhci_hcd [ 1530.945588] usb 2-7: unable to read config index 0 descriptor/start: -71 [ 1530.945592] usb 2-7: can't read configurations, error -71
This has been observed repeating for over a minute before eventual successful enumeration.
--- drivers/usb/core/quirks.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/core/quirks.c +4 -0
@@ -93,6 +93,10 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x04e8, 0x6601), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, + /* Elan Touchscreen */ + { USB_DEVICE(0x04f3, 0x0089), .driver_info = + USB_QUIRK_DEVICE_QUALIFIER }, + /* Roland SC-8820 */ { USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },
Greg Kroah-Hartman
maintainerPATCH 152/203 USB: quirks: enable device-qualifier quirk for another Elan touchscreen
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adel Gadllah <[email protected]>
commit 876af5d454548be40327ba9efea4bc92a8575019 upstream.
Currently this quirk is enabled for the model with the device id 0x0089, it is needed for the 0x009b model, which is found on the Fujitsu Lifebook u904 as well.
--- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/quirks.c +3 -0
@@ -97,6 +97,9 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x04f3, 0x0089), .driver_info = USB_QUIRK_DEVICE_QUALIFIER }, + { USB_DEVICE(0x04f3, 0x009b), .driver_info = + USB_QUIRK_DEVICE_QUALIFIER }, + /* Roland SC-8820 */ { USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },
Greg Kroah-Hartman
maintainerPATCH 153/203 USB: quirks: enable device-qualifier quirk for yet another Elan touchscreen
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adel Gadllah <[email protected]>
commit d749947561af5996ccc076b2ffcc5f48b1be5d74 upstream.
Yet another device affected by this.
--- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/quirks.c +3 -0
@@ -100,6 +100,9 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x04f3, 0x009b), .driver_info = USB_QUIRK_DEVICE_QUALIFIER }, + { USB_DEVICE(0x04f3, 0x016f), .driver_info = + USB_QUIRK_DEVICE_QUALIFIER }, + /* Roland SC-8820 */ { USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },
Greg Kroah-Hartman
maintainerPATCH 154/203 HID: usbhid: add always-poll quirk
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 0b750b3baa2d64f1b77aecc10f20deeb28efe60d upstream.
Add quirk to make sure that a device is always polled for input events even if it hasn't been opened.
This is needed for devices that disconnects from the bus unless the interrupt endpoint has been polled at least once or when not responding to an input event (e.g. after having shut down X).
--- drivers/hid/usbhid/hid-core.c | 26 +++++++++++++++++++++++--- include/linux/hid.h | 1 + 2 files changed, 24 insertions(+), 3 deletions(-)
drivers/hid/usbhid/hid-core.c +23 -3
@@ -82,7 +82,7 @@ static int hid_start_in(struct hid_devicstruct usbhid_device *usbhid = hid->driver_data;spin_lock_irqsave (&usbhid->lock, flags); -if (hid->open >0 && +if ((hid->open >0 || hid->quirks &HID_QUIRK_ALWAYS_POLL ) && !test_bit (HID_DISCONNECTED , &usbhid->iofl) && !test_bit (HID_SUSPENDED , &usbhid->iofl) && !test_and_set_bit (HID_IN_RUNNING , &usbhid->iofl)) {
@@ -292,6 +292,8 @@ static void hid_irq_in(struct urb *urb)case 0 :/* success */ usbhid_mark_busy (usbhid); usbhid->retry_delay =0 ; +if ((hid->quirks &HID_QUIRK_ALWAYS_POLL ) && !hid->open) +break ;hid_input_report (urb->context,HID_INPUT_REPORT , urb->transfer_buffer, urb->actual_length,1 );
@@ -734,8 +736,10 @@ void usbhid_close(struct hid_device *hidif (!--hid->open) {spin_unlock_irq (&usbhid->lock);hid_cancel_delayed_stuff (usbhid); -usb_kill_urb (usbhid->urbin); - usbhid->intf->needs_remote_wakeup =0 ; +if (!(hid->quirks &HID_QUIRK_ALWAYS_POLL )) { +usb_kill_urb (usbhid->urbin); + usbhid->intf->needs_remote_wakeup =0 ; + } }else {spin_unlock_irq (&usbhid->lock); }
@@ -1119,6 +1123,19 @@ static int usbhid_start(struct hid_devicset_bit (HID_STARTED , &usbhid->iofl); +if (hid->quirks &HID_QUIRK_ALWAYS_POLL ) { + ret =usb_autopm_get_interface (usbhid->intf); +if (ret) + goto fail; + usbhid->intf->needs_remote_wakeup =1 ; + ret =hid_start_in (hid); +if (ret) { +dev_err (&hid->dev, +"failed to start in urb: %d\n" , ret); + } +usb_autopm_put_interface (usbhid->intf); + } +/* Some keyboards don't work until their LEDs have been set. * Since BIOSes do set the LEDs, it must be safe for any device * that supports the keyboard boot protocol.
@@ -1151,6 +1168,9 @@ static void usbhid_stop(struct hid_devicif (WARN_ON (!usbhid))return ; +if (hid->quirks &HID_QUIRK_ALWAYS_POLL ) + usbhid->intf->needs_remote_wakeup =0 ; +clear_bit (HID_STARTED , &usbhid->iofl);spin_lock_irq (&usbhid->lock);/* Sync with error and led handlers */ set_bit (HID_DISCONNECTED , &usbhid->iofl);
include/linux/hid.h +1 -0
@@ -286,6 +286,7 @@ struct hid_item {#define HID_QUIRK_HIDINPUT_FORCE 0x00000080#define HID_QUIRK_NO_EMPTY_INPUT 0x00000100#define HID_QUIRK_NO_INIT_INPUT_REPORTS 0x00000200 +#define HID_QUIRK_ALWAYS_POLL 0x00000400#define HID_QUIRK_SKIP_OUTPUT_REPORTS 0x00010000#define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000#define HID_QUIRK_NO_INIT_REPORTS 0x20000000
Greg Kroah-Hartman
maintainerPATCH 155/203 HID: usbhid: enable always-poll quirk for Elan Touchscreen
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit bfe3c873e978d78b542a5852575dd74f4d1a5838 upstream.
Enable the always-poll quirk for Elan Touchscreens found on some recent Samsung laptops.
Without this quirk the device keeps disconnecting from the bus (and is re-enumerated) unless opened (and kept open, should an input event occur).
Note that while the device can be run-time suspended, the autosuspend timeout must be high enough to allow the device to be polled at least once before being suspended. Specifically, using autosuspend_delay_ms=0 will still cause the device to disconnect on input events.
--- drivers/hid/hid-ids.h | 3 +++ drivers/hid/usbhid/hid-quirks.c | 1 + 2 files changed, 4 insertions(+)
drivers/hid/hid-ids.h +3 -0
@@ -292,6 +292,9 @@#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_73F7 0x73f7#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001 +#define USB_VENDOR_ID_ELAN 0x04f3 +#define USB_DEVICE_ID_ELAN_TOUCHSCREEN 0x0089 +#define USB_VENDOR_ID_ELECOM 0x056e#define USB_DEVICE_ID_ELECOM_BM084 0x0061
drivers/hid/usbhid/hid-quirks.c +1 -0
@@ -69,6 +69,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK, HID_QUIRK_NOGET }, { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET }, { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL }, { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
Greg Kroah-Hartman
maintainerPATCH 156/203 HID: usbhid: enable always-poll quirk for Elan Touchscreen 009b
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adel Gadllah <[email protected]>
commit 29d05c2ecf396161ef2938a0635707ef5685ef58 upstream.
This device needs the quirk as well.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/usbhid/hid-quirks.c | 1 + 2 files changed, 2 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -294,6 +294,7 @@#define USB_VENDOR_ID_ELAN 0x04f3#define USB_DEVICE_ID_ELAN_TOUCHSCREEN 0x0089 +#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B 0x009b#define USB_VENDOR_ID_ELECOM 0x056e#define USB_DEVICE_ID_ELECOM_BM084 0x0061
drivers/hid/usbhid/hid-quirks.c +1 -0
@@ -70,6 +70,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET }, { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL }, + { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL }, { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
Greg Kroah-Hartman
maintainerPATCH 157/203 HID: usbhid: enable always-poll quirk for Elan Touchscreen 016f
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adel Gadllah <[email protected]>
commit 1af39588f84c7c18f8c6d88342f36513a4ce383c upstream.
This device needs the quirk as well.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/usbhid/hid-quirks.c | 1 + 2 files changed, 2 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -295,6 +295,7 @@#define USB_VENDOR_ID_ELAN 0x04f3#define USB_DEVICE_ID_ELAN_TOUCHSCREEN 0x0089#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B 0x009b +#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F 0x016f#define USB_VENDOR_ID_ELECOM 0x056e#define USB_DEVICE_ID_ELECOM_BM084 0x0061
drivers/hid/usbhid/hid-quirks.c +1 -0
@@ -71,6 +71,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL }, { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL }, + { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F, HID_QUIRK_ALWAYS_POLL }, { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
Greg Kroah-Hartman
maintainerPATCH 158/203 ALSA: usb-audio: Fix device_del() sysfs warnings at disconnect
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 0725dda207e95ff25f1aa01432250323e0ec49d6 upstream.
Some USB-audio devices show weird sysfs warnings at disconnecting the devices, e.g.
usb 1-3: USB disconnect, device number 3
------------[ cut here ]------------ WARNING: CPU: 0 PID: 973 at fs/sysfs/group.c:216 device_del+0x39/0x180() sysfs group ffffffff8183df40 not found for kobject 'midiC1D0' Call Trace: [<ffffffff814a3e38>] ? dump_stack+0x49/0x71 [<ffffffff8103cb72>] ? warn_slowpath_common+0x82/0xb0 [<ffffffff8103cc55>] ? warn_slowpath_fmt+0x45/0x50 [<ffffffff813521e9>] ? device_del+0x39/0x180 [<ffffffff81352339>] ? device_unregister+0x9/0x20 [<ffffffff81352384>] ? device_destroy+0x34/0x40 [<ffffffffa00ba29f>] ? snd_unregister_device+0x7f/0xd0 [snd] [<ffffffffa025124e>] ? snd_rawmidi_dev_disconnect+0xce/0x100 [snd_rawmidi] [<ffffffffa00c0192>] ? snd_device_disconnect+0x62/0x90 [snd] [<ffffffffa00c025c>] ? snd_device_disconnect_all+0x3c/0x60 [snd] [<ffffffffa00bb574>] ? snd_card_disconnect+0x124/0x1a0 [snd] [<ffffffffa02e54e8>] ? usb_audio_disconnect+0x88/0x1c0 [snd_usb_audio] [<ffffffffa015260e>] ? usb_unbind_interface+0x5e/0x1b0 [usbcore] [<ffffffff813553e9>] ? __device_release_driver+0x79/0xf0 [<ffffffff81355485>] ? device_release_driver+0x25/0x40 [<ffffffff81354e11>] ? bus_remove_device+0xf1/0x130 [<ffffffff813522b9>] ? device_del+0x109/0x180 [<ffffffffa01501d5>] ? usb_disable_device+0x95/0x1f0 [usbcore] [<ffffffffa014634f>] ? usb_disconnect+0x8f/0x190 [usbcore] [<ffffffffa0149179>] ? hub_thread+0x539/0x13a0 [usbcore] [<ffffffff810669f5>] ? sched_clock_local+0x15/0x80 [<ffffffff81066c98>] ? sched_clock_cpu+0xb8/0xd0 [<ffffffff81070730>] ? bit_waitqueue+0xb0/0xb0 [<ffffffffa0148c40>] ? usb_port_resume+0x430/0x430 [usbcore] [<ffffffffa0148c40>] ? usb_port_resume+0x430/0x430 [usbcore] [<ffffffff8105973e>] ? kthread+0xce/0xf0 [<ffffffff81059670>] ? kthread_create_on_node+0x1c0/0x1c0 [<ffffffff814a8b7c>] ? ret_from_fork+0x7c/0xb0 [<ffffffff81059670>] ? kthread_create_on_node+0x1c0/0x1c0 ---[ end trace 40b1928d1136b91e ]---
This comes from the fact that usb-audio driver may receive the disconnect callback multiple times, per each usb interface. When a device has both audio and midi interfaces, it gets called twice, and currently the driver tries to release resources at the last call. At this point, the first parent interface has been already deleted, thus deleting a child of the first parent hits such a warning.
For fixing this problem, we need to call snd_card_disconnect() and cancel pending operations at the very first disconnect while the release of the whole objects waits until the last disconnect call.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=80931
--- sound/usb/card.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
sound/usb/card.c +7 -2
@@ -586,18 +586,19 @@ static void snd_usb_audio_disconnect(str {struct snd_card *card;struct list_head *p; +bool was_shutdown;if (chip == (void *)-1L )return ; card = chip->card;down_write (&chip->shutdown_rwsem); + was_shutdown = chip->shutdown; chip->shutdown =1 ;up_write (&chip->shutdown_rwsem);mutex_lock (®ister_mutex); - chip->num_interfaces--; -if (chip->num_interfaces <=0 ) { +if (!was_shutdown) {struct snd_usb_endpoint *ep;snd_card_disconnect (card);
@@ -617,6 +618,10 @@ static void snd_usb_audio_disconnect(strlist_for_each (p, &chip->mixer_list) {snd_usb_mixer_disconnect (p); } + } + + chip->num_interfaces--; +if (chip->num_interfaces <=0 ) { usb_chip[chip->index] =NULL ;mutex_unlock (®ister_mutex);snd_card_free_when_closed (card);
Greg Kroah-Hartman
maintainerPATCH 159/203 usb-storage: handle a skipped data phase
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 93c9bf4d1838d5851a18ca398b0ad66397f05056 upstream.
Sometimes mass-storage devices using the Bulk-only transport will mistakenly skip the data phase of a command. Rather than sending the data expected by the host or sending a zero-length packet, they go directly to the status phase and send the CSW.
This causes problems for usb-storage, for obvious reasons. The driver will interpret the CSW as a short data transfer and will wait to receive a CSW. The device won't have anything left to send, so the command eventually times out.
The SCSI layer doesn't retry commands after they time out (this is a relatively recent change). Therefore we should do our best to detect a skipped data phase and handle it promptly.
This patch adds code to do that. If usb-storage receives a short 13-byte data transfer from the device, and if the first four bytes of the data match the CSW signature, the driver will set the residue to the full transfer length and interpret the data as a CSW.
This fixes Bugzilla #86611.
--- drivers/usb/storage/transport.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/usb/storage/transport.c +26 -0
@@ -1118,6 +1118,31 @@ int usb_stor_Bulk_transport(struct scsi_*/ if (result ==USB_STOR_XFER_LONG ) fake_sense =1 ; + +/* +* Sometimes a device will mistakenly skip the data phase +* and go directly to the status phase without sending a +* zero-length packet. If we get a 13-byte response here, +* check whether it really is a CSW. +*/ +if (result ==USB_STOR_XFER_SHORT && + srb->sc_data_direction ==DMA_FROM_DEVICE && + transfer_length -scsi_get_resid (srb) == +US_BULK_CS_WRAP_LEN ) { +struct scatterlist *sg =NULL ; +unsigned int offset =0 ; + +if (usb_stor_access_xfer_buf ((unsigned char *) bcs, +US_BULK_CS_WRAP_LEN , srb, &sg, + &offset,FROM_XFER_BUF ) == +US_BULK_CS_WRAP_LEN && + bcs->Signature == +cpu_to_le32 (US_BULK_CS_SIGN )) { +usb_stor_dbg (us,"Device skipped data phase\n" ); +scsi_set_resid (srb, transfer_length); + goto skipped_data_phase; + } + } }/* See flow chart on pg 15 of the Bulk Only Transport spec for
@@ -1153,6 +1178,7 @@ int usb_stor_Bulk_transport(struct scsi_if (result !=USB_STOR_XFER_GOOD )return USB_STOR_TRANSPORT_ERROR ; + skipped_data_phase:/* check bulk status */ residue =le32_to_cpu (bcs->Residue); usb_stor_dbg(us, "Bulk Status S 0x%x T 0x%x R %u Stat 0x%x\n",
Greg Kroah-Hartman
maintainerPATCH 160/203 USB: opticon: fix non-atomic allocation in write path
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit e681286de221af78fc85db9222b6a203148c005a upstream.
Write may be called from interrupt context so make sure to use GFP_ATOMIC for all allocations in write.
--- drivers/usb/serial/opticon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/opticon.c +1 -1
@@ -215,7 +215,7 @@ static int opticon_write(struct tty_stru/* The connected devices do not have a bulk write endpoint, * to transmit data to de barcode device the control endpoint is used */ - dr =kmalloc (sizeof (struct usb_ctrlrequest ),GFP_NOIO ); + dr =kmalloc (sizeof (struct usb_ctrlrequest ),GFP_ATOMIC );if (!dr) { count = -ENOMEM ; goto error_no_dr;
Greg Kroah-Hartman
maintainerPATCH 161/203 usb: Do not allow usb_alloc_streams on unconfigured devices
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit 90a646c770c50cc206ceba0d7b50453c46c13c36 upstream.
This commit fixes the following oops:
[10238.622067] scsi host3: uas_eh_bus_reset_handler start [10240.766164] usb 3-4: reset SuperSpeed USB device number 3 using xhci_hcd [10245.779365] usb 3-4: device descriptor read/8, error -110 [10245.883331] usb 3-4: reset SuperSpeed USB device number 3 using xhci_hcd [10250.897603] usb 3-4: device descriptor read/8, error -110 [10251.058200] BUG: unable to handle kernel NULL pointer dereference at 0000000000000040 [10251.058244] IP: [<ffffffff815ac6e1>] xhci_check_streams_endpoint+0x91/0x140 <snip> [10251.059473] Call Trace: [10251.059487] [<ffffffff815aca6c>] xhci_calculate_streams_and_bitmask+0xbc/0x130 [10251.059520] [<ffffffff815aeb5f>] xhci_alloc_streams+0x10f/0x5a0 [10251.059548] [<ffffffff810a4685>] ? check_preempt_curr+0x75/0xa0 [10251.059575] [<ffffffff810a46dc>] ? ttwu_do_wakeup+0x2c/0x100 [10251.059601] [<ffffffff810a49e6>] ? ttwu_do_activate.constprop.111+0x66/0x70 [10251.059635] [<ffffffff815779ab>] usb_alloc_streams+0xab/0xf0 [10251.059662] [<ffffffffc0616b48>] uas_configure_endpoints+0x128/0x150 [uas] [10251.059694] [<ffffffffc0616bac>] uas_post_reset+0x3c/0xb0 [uas] [10251.059722] [<ffffffff815727d9>] usb_reset_device+0x1b9/0x2a0 [10251.059749] [<ffffffffc0616f42>] uas_eh_bus_reset_handler+0xb2/0x190 [uas] [10251.059781] [<ffffffff81514293>] scsi_try_bus_reset+0x53/0x110 [10251.059808] [<ffffffff815163b7>] scsi_eh_bus_reset+0xf7/0x270
<snip>
The problem is the following call sequence (simplified):
1) usb_reset_device
2) usb_reset_and_verify_device
2) hub_port_init
3) hub_port_finish_reset
3) xhci_discover_or_reset_device
This frees xhci->devs[slot_id]->eps[ep_index].ring for all eps but 0
4) usb_get_device_descriptor
This fails
5) hub_port_init fails
6) usb_reset_and_verify_device fails, does not restore device config
7) uas_post_reset
8) xhci_alloc_streams
NULL deref on the free-ed ring
This commit fixes this by not allowing usb_alloc_streams to continue if the device is not configured.
Note that we do allow usb_free_streams to continue after a (logical) disconnect, as it is necessary to explicitly free the streams at the xhci controller level.
--- drivers/usb/core/hcd.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/core/hcd.c +2 -0
@@ -2057,6 +2057,8 @@ int usb_alloc_streams(struct usb_interfareturn -EINVAL ;if (dev->speed !=USB_SPEED_SUPER )return -EINVAL ; +if (dev->state <USB_STATE_CONFIGURED ) +return -ENODEV ;/* Streams only apply to bulk endpoints. */ for (i =0 ; i < num_eps; i++)
Greg Kroah-Hartman
maintainerPATCH 162/203 USB: kobil_sct: fix non-atomic allocation in write path
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 191252837626fca0de694c18bb2aa64c118eda89 upstream.
Write may be called from interrupt context so make sure to use GFP_ATOMIC for all allocations in write.
--- drivers/usb/serial/kobil_sct.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/serial/kobil_sct.c +3 -2
@@ -335,7 +335,8 @@ static int kobil_write(struct tty_struct port->interrupt_out_urb->transfer_buffer_length = length; priv->cur_pos = priv->cur_pos + length; - result =usb_submit_urb (port->interrupt_out_urb,GFP_NOIO ); + result =usb_submit_urb (port->interrupt_out_urb, +GFP_ATOMIC );dev_dbg (&port->dev,"%s - Send write URB returns: %i\n" , __func__, result); todo = priv->filled - priv->cur_pos;
@@ -350,7 +351,7 @@ static int kobil_write(struct tty_structif (priv->device_type ==KOBIL_ADAPTER_B_PRODUCT_ID || priv->device_type ==KOBIL_ADAPTER_K_PRODUCT_ID ) { result =usb_submit_urb (port->interrupt_in_urb, -GFP_NOIO ); +GFP_ATOMIC );dev_dbg (&port->dev,"%s - Send read URB returns: %i\n" , __func__, result); } }
Greg Kroah-Hartman
maintainerPATCH 163/203 sh: fix sh770x SCIF memory regions
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andriy Skulysh <[email protected]>
commit 5417421b270229bfce0795ccc99a4b481e4954ca upstream.
Resources scif1_resources & scif2_resources overlap. Actual SCIF region size is 0x10.
This is regression from commit d850acf975be ("sh: Declare SCIF register base and IRQ as resources")
--- arch/sh/kernel/cpu/sh3/setup-sh770x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/sh/kernel/cpu/sh3/setup-sh770x.c +3 -3
@@ -118,7 +118,7 @@ static struct plat_sci_port scif0_platfo };static struct resource scif0_resources[] = { -DEFINE_RES_MEM (0xfffffe80 ,0x100 ), +DEFINE_RES_MEM (0xfffffe80 ,0x10 ),DEFINE_RES_IRQ (evt2irq (0x4e0 )), };
@@ -143,7 +143,7 @@ static struct plat_sci_port scif1_platfo };static struct resource scif1_resources[] = { -DEFINE_RES_MEM (0xa4000150 ,0x100 ), +DEFINE_RES_MEM (0xa4000150 ,0x10 ),DEFINE_RES_IRQ (evt2irq (0x900 )), };
@@ -169,7 +169,7 @@ static struct plat_sci_port scif2_platfo };static struct resource scif2_resources[] = { -DEFINE_RES_MEM (0xa4000140 ,0x100 ), +DEFINE_RES_MEM (0xa4000140 ,0x10 ),DEFINE_RES_IRQ (evt2irq (0x880 )), };
Greg Kroah-Hartman
maintainerPATCH 164/203 mm: free compound page with correct order
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Zhao <[email protected]>
commit 5ddacbe92b806cd5b4f8f154e8e46ac267fff55c upstream.
Compound page should be freed by put_page() or free_pages() with correct order. Not doing so will cause tail pages leaked.
The compound order can be obtained by compound_order() or use HPAGE_PMD_ORDER in our case. Some people would argue the latter is faster but I prefer the former which is more general.
This bug was observed not just on our servers (the worst case we saw is 11G leaked on a 48G machine) but also on our workstations running Ubuntu based distro.
$ cat /proc/vmstat | grep thp_zero_page_alloc thp_zero_page_alloc 55 thp_zero_page_alloc_failed 0
This means there is (thp_zero_page_alloc - 1) * (2M - 4K) memory leaked.
--- mm/huge_memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/huge_memory.c +2 -2
@@ -199,7 +199,7 @@ retry:preempt_disable ();if (cmpxchg (&huge_zero_page,NULL , zero_page)) {preempt_enable (); -__free_page (zero_page); +__free_pages (zero_page,compound_order (zero_page)); goto retry; }
@@ -231,7 +231,7 @@ static unsigned long shrink_huge_zero_paif (atomic_cmpxchg (&huge_zero_refcount,1 ,0 ) ==1 ) {struct page *zero_page =xchg (&huge_zero_page,NULL );BUG_ON (zero_page ==NULL ); -__free_page (zero_page); +__free_pages (zero_page,compound_order (zero_page));return HPAGE_PMD_NR ; }
Greg Kroah-Hartman
maintainerPATCH 165/203 cgroup/kmemleak: add kmemleak_free() for cgroup deallocations.
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Nan <[email protected]>
commit 401507d67d5c2854f5a88b3f93f64fc6f267bca5 upstream.
Commit ff7ee93f4715 ("cgroup/kmemleak: Annotate alloc_page() for cgroup allocations") introduces kmemleak_alloc() for alloc_page_cgroup(), but corresponding kmemleak_free() is missing, which makes kmemleak be wrongly disabled after memory offlining. Log is pasted at the end of this commit message.
This patch add kmemleak_free() into free_page_cgroup(). During page offlining, this patch removes corresponding entries in kmemleak rbtree. After that, the freed memory can be allocated again by other subsystems without killing kmemleak.
bash # for x in 1 2 3 4; do echo offline > /sys/devices/system/memory/memory$x/state ; sleep 1; done ; dmesg | grep leak
Offlined Pages 32768
kmemleak: Cannot insert 0xffff880016969000 into the object search tree (overlaps existing)
CPU: 0 PID: 412 Comm: sleep Not tainted 3.17.0-rc5+ #86
Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
Call Trace:
dump_stack+0x46/0x58
create_object+0x266/0x2c0
kmemleak_alloc+0x26/0x50
kmem_cache_alloc+0xd3/0x160
__sigqueue_alloc+0x49/0xd0
__send_signal+0xcb/0x410
send_signal+0x45/0x90
__group_send_sig_info+0x13/0x20
do_notify_parent+0x1bb/0x260
do_exit+0x767/0xa40
do_group_exit+0x44/0xa0
SyS_exit_group+0x17/0x20
system_call_fastpath+0x16/0x1b kmemleak: Kernel memory leak detector disabled
kmemleak: Object 0xffff880016900000 (size 524288):
kmemleak: comm "swapper/0", pid 0, jiffies 4294667296
kmemleak: min_count = 0
kmemleak: count = 0
kmemleak: flags = 0x1
kmemleak: checksum = 0
kmemleak: backtrace:
log_early+0x63/0x77
kmemleak_alloc+0x4b/0x50
init_section_page_cgroup+0x7f/0xf5
page_cgroup_init+0xc5/0xd0
start_kernel+0x333/0x408
x86_64_start_reservations+0x2a/0x2c
x86_64_start_kernel+0xf5/0xfc--- mm/page_cgroup.c | 1 + 1 file changed, 1 insertion(+)
mm/page_cgroup.c +1 -0
@@ -171,6 +171,7 @@ static void free_page_cgroup(void *addr)sizeof (struct page_cgroup ) *PAGES_PER_SECTION ;BUG_ON (PageReserved (page)); +kmemleak_free (addr);free_pages_exact (addr, table_size); } }
Greg Kroah-Hartman
maintainerPATCH 166/203 mm: memcontrol: do not iterate uninitialized memcgs
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Weiner <[email protected]>
commit 2f7dd7a4100ad4affcb141605bef178ab98ccb18 upstream.
The cgroup iterators yield css objects that have not yet gone through css_online(), but they are not complete memcgs at this point and so the memcg iterators should not return them. Commit d8ad30559715 ("mm/memcg:
iteration skip memcgs not yet fully initialized") set out to implement exactly this, but it uses CSS_ONLINE, a cgroup-internal flag that does not meet the ordering requirements for memcg, and so the iterator may skip over initialized groups, or return partially initialized memcgs.
The cgroup core can not reasonably provide a clear answer on whether the object around the css has been fully initialized, as that depends on controller-specific locking and lifetime rules. Thus, introduce a memcg-specific flag that is set after the memcg has been initialized in css_online(), and read before mem_cgroup_iter() callers access the memcg members.
--- mm/memcontrol.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-)
mm/memcontrol.c +31 -4
@@ -292,6 +292,9 @@ struct mem_cgroup {/* vmpressure notifications */ struct vmpressure vmpressure; +/* css_online() has been completed */ +int initialized; +/* * the counter to account for mem+swap usage. */
@@ -1127,9 +1130,21 @@ skip_node:* skipping css reference should be safe. */ if (next_css) { -if ((next_css == &root->css) || - ((next_css->flags &CSS_ONLINE ) &&css_tryget (next_css))) -return mem_cgroup_from_css (next_css); +struct mem_cgroup *memcg =mem_cgroup_from_css (next_css); + +if (next_css == &root->css) +return memcg; + +if (css_tryget (next_css)) { +/* +* Make sure the memcg is initialized: +* mem_cgroup_css_online() orders the the +* initialization against setting the flag. +*/ +if (smp_load_acquire (&memcg->initialized)) +return memcg; +css_put (next_css); + } prev_css = next_css; goto skip_node;
@@ -6538,6 +6553,7 @@ mem_cgroup_css_online(struct cgroup_subs {struct mem_cgroup *memcg =mem_cgroup_from_css (css);struct mem_cgroup *parent =mem_cgroup_from_css (css_parent (css)); +int ret;if (css->cgroup->id >MEM_CGROUP_ID_MAX )return -ENOSPC ;
@@ -6574,7 +6590,18 @@ mem_cgroup_css_online(struct cgroup_subs }mutex_unlock (&memcg_create_mutex); -return memcg_init_kmem (memcg, &mem_cgroup_subsys); + ret =memcg_init_kmem (memcg, &mem_cgroup_subsys); +if (ret) +return ret; + +/* +* Make sure the memcg is initialized: mem_cgroup_iter() +* orders reading memcg->initialized against its callers +* reading the memcg members. +*/ +smp_store_release (&memcg->initialized,1 ); + +return 0 ; }/*
Greg Kroah-Hartman
maintainerPATCH 167/203 lib/bitmap.c: fix undefined shift in __bitmap_shift_{left|right}()
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit ea5d05b34aca25c066e0699512d0ffbd8ee6ac3e upstream.
If __bitmap_shift_left() or __bitmap_shift_right() are asked to shift by a multiple of BITS_PER_LONG, they will try to shift a long value by BITS_PER_LONG bits which is undefined. Change the functions to avoid the undefined shift.
Coverity id: 1192175
Coverity id: 1192174
--- lib/bitmap.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
lib/bitmap.c +6 -2
@@ -131,7 +131,9 @@ void __bitmap_shift_right(unsigned long lower = src[off + k];if (left && off + k == lim -1 ) lower &= mask; - dst[k] = upper << (BITS_PER_LONG - rem) | lower >> rem; + dst[k] = lower >> rem; +if (rem) + dst[k] |= upper << (BITS_PER_LONG - rem);if (left && k == lim -1 ) dst[k] &= mask; }
@@ -172,7 +174,9 @@ void __bitmap_shift_left(unsigned long * upper = src[k];if (left && k == lim -1 ) upper &= (1UL << left) -1 ; - dst[k + off] = lower >> (BITS_PER_LONG - rem) | upper << rem; + dst[k + off] = upper << rem; +if (rem) + dst[k + off] |= lower >> (BITS_PER_LONG - rem);if (left && k + off == lim -1 ) dst[k + off] &= (1UL << left) -1 ; }
Greg Kroah-Hartman
maintainerPATCH 168/203 scsi: Fix error handling in SCSI_IOCTL_SEND_COMMAND
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 84ce0f0e94ac97217398b3b69c21c7a62ebeed05 upstream.
When sg_scsi_ioctl() fails to prepare request to submit in blk_rq_map_kern() we jump to a label where we just end up copying (luckily zeroed-out) kernel buffer to userspace instead of reporting error. Fix the problem by jumping to the right label.
CC: Jens Axboe <[email protected]>
CC: [email protected]
Coverity-id: 1226871
Fixed up the, now unused, out label.
--- block/scsi_ioctl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
block/scsi_ioctl.c +1 -2
@@ -489,7 +489,7 @@ int sg_scsi_ioctl(struct request_queue *if (bytes &&blk_rq_map_kern (q, rq, buffer, bytes, __GFP_WAIT)) { err =DRIVER_ERROR <<24 ; - goto out; + goto error; }memset (sense,0 ,sizeof (sense));
@@ -499,7 +499,6 @@ int sg_scsi_ioctl(struct request_queue *blk_execute_rq (q, disk, rq,0 ); -out: err = rq->errors &0xff ;/* only 8 bit SCSI status */ if (err) {if (rq->sense_len && rq->sense) {
Greg Kroah-Hartman
maintainerPATCH 169/203 i82860_edac: Report CE events properly
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Baron <[email protected]>
commit ab0543de6ff0877474f57a5aafbb51a61e88676f upstream.
Fix CE event being reported as HW_EVENT_ERR_UNCORRECTED.
--- drivers/edac/i82860_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/edac/i82860_edac.c +1 -1
@@ -124,7 +124,7 @@ static int i82860_process_error_info(str dimm->location[0 ], dimm->location[1 ],-1 , "i82860 UE", ""); else - edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, + edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, info->eap, 0, info->derrsyn, dimm->location[0], dimm->location[1], -1, "i82860 CE", "");
Greg Kroah-Hartman
maintainerPATCH 170/203 i3200_edac: Report CE events properly
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Baron <[email protected]>
commit 8a3f075d6c9b3612b4a5fb2af8db82b38b20caf0 upstream.
Fix CE event being reported as HW_EVENT_ERR_UNCORRECTED.
--- drivers/edac/i3200_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/edac/i3200_edac.c +2 -2
@@ -242,11 +242,11 @@ static void i3200_process_error_info(str-1 ,-1 , "i3000 UE", ""); }else if (log &I3200_ECCERRLOG_CE ) { -edac_mc_handle_error (HW_EVENT_ERR_UNCORRECTED , mci,1 , +edac_mc_handle_error (HW_EVENT_ERR_CORRECTED , mci,1 ,0 ,0 ,eccerrlog_syndrome (log),eccerrlog_row (channel, log),-1 ,-1 , -"i3000 UE" ,"" ); +"i3000 CE" ,"" ); } } }
Greg Kroah-Hartman
maintainerPATCH 171/203 e7xxx_edac: Report CE events properly
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Baron <[email protected]>
commit 8030122a9ccf939186f8db96c318dbb99b5463f6 upstream.
Fix CE event being reported as HW_EVENT_ERR_UNCORRECTED.
--- drivers/edac/e7xxx_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/edac/e7xxx_edac.c +1 -1
@@ -226,7 +226,7 @@ static void process_ce(struct mem_ctl_instatic void process_ce_no_info (struct mem_ctl_info *mci) {edac_dbg (3 ,"\n" ); -edac_mc_handle_error (HW_EVENT_ERR_UNCORRECTED , mci,1 ,0 ,0 ,0 ,-1 ,-1 ,-1 , +edac_mc_handle_error (HW_EVENT_ERR_CORRECTED , mci,1 ,0 ,0 ,0 ,-1 ,-1 ,-1 ,"e7xxx CE log register overflow" ,"" ); }
Greg Kroah-Hartman
maintainerPATCH 172/203 cpc925_edac: Report UE events properly
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Baron <[email protected]>
commit fa19ac4b92bc2b5024af3e868f41f81fa738567a upstream.
Fix UE event being reported as HW_EVENT_ERR_CORRECTED.
--- drivers/edac/cpc925_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/edac/cpc925_edac.c +1 -1
@@ -562,7 +562,7 @@ static void cpc925_mc_check(struct mem_cif (apiexcp &UECC_EXCP_DETECTED ) {cpc925_mc_printk (mci,KERN_INFO ,"DRAM UECC Fault\n" ); -edac_mc_handle_error (HW_EVENT_ERR_CORRECTED , mci,1 , +edac_mc_handle_error (HW_EVENT_ERR_UNCORRECTED , mci,1 , pfn, offset,0 , csrow,-1 ,-1 , mci->ctl_name,"" );
Greg Kroah-Hartman
maintainerPATCH 173/203 nfsd4: fix crash on unknown operation number
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: "J. Bruce Fields" <[email protected]>
commit 51904b08072a8bf2b9ed74d1bd7a5300a614471d upstream.
Unknown operation numbers are caught in nfsd4_decode_compound() which sets op->opnum to OP_ILLEGAL and op->status to nfserr_op_illegal. The error causes the main loop in nfsd4_proc_compound() to skip most processing. But nfsd4_proc_compound also peeks ahead at the next operation in one case and doesn't take similar precautions there.
--- fs/nfsd/nfs4proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/nfsd/nfs4proc.c +2 -1
@@ -1243,7 +1243,8 @@ static bool need_wrongsec_check(struct s*/ if (argp->opcnt == resp->opcnt)return false; - +if (next->opnum ==OP_ILLEGAL ) +return false; nextd =OPDESC (next);/* * Rest of 2.6.3.1.1: certain operations will return WRONGSEC
Greg Kroah-Hartman
maintainerPATCH 174/203 Revert "iwlwifi: mvm: treat EAPOLs like mgmt frames wrt rate"
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Emmanuel Grumbach <[email protected]>
commit 1ffde699aae127e7abdb98dbdedc2cc6a973a1a1 upstream.
This reverts commit aa11bbf3df026d6b1c6b528bef634fd9de7c2619. This commit was causing connection issues and is not needed if IWL_MVM_RS_RSSI_BASED_INIT_RATE is set to false by default.
Regardless of the issues mentioned above, this patch added the following WARNING:
WARNING: CPU: 0 PID: 3946 at drivers/net/wireless/iwlwifi/mvm/tx.c:190 iwl_mvm_set_tx_params+0x60a/0x6f0 [iwlmvm]() Got an HT rate for a non data frame 0x8 CPU: 0 PID: 3946 Comm: wpa_supplicant Tainted: G O 3.17.0+ #6 Hardware name: LENOVO 20ANCTO1WW/20ANCTO1WW, BIOS GLET71WW (2.25 ) 07/02/2014 0000000000000009 ffffffff814fa911 ffff8804288db8f8 ffffffff81064f52 0000000000001808 ffff8804288db948 ffff88040add8660 ffff8804291b5600 0000000000000000 ffffffff81064fb7 ffffffffa07b73d0 0000000000000020 Call Trace: [<ffffffff814fa911>] ? dump_stack+0x41/0x51 [<ffffffff81064f52>] ? warn_slowpath_common+0x72/0x90 [<ffffffff81064fb7>] ? warn_slowpath_fmt+0x47/0x50 [<ffffffffa07a39ea>] ? iwl_mvm_set_tx_params+0x60a/0x6f0 [iwlmvm] [<ffffffffa07a3cf8>] ? iwl_mvm_tx_skb+0x48/0x3c0 [iwlmvm] [<ffffffffa079cb9b>] ? iwl_mvm_mac_tx+0x7b/0x180 [iwlmvm] [<ffffffffa0746ce9>] ? __ieee80211_tx+0x2b9/0x3c0 [mac80211] [<ffffffffa07492f3>] ? ieee80211_tx+0xb3/0x100 [mac80211] [<ffffffffa0749c49>] ? ieee80211_subif_start_xmit+0x459/0xca0 [mac80211] [<ffffffff814116e7>] ? dev_hard_start_xmit+0x337/0x5f0 [<ffffffff81430d46>] ? sch_direct_xmit+0x96/0x1f0 [<ffffffff81411ba3>] ? __dev_queue_xmit+0x203/0x4f0 [<ffffffff8142f670>] ? ether_setup+0x70/0x70 [<ffffffff814e96a1>] ? packet_sendmsg+0xf81/0x1110 [<ffffffff8140625c>] ? skb_free_datagram+0xc/0x40 [<ffffffff813f7538>] ? sock_sendmsg+0x88/0xc0 [<ffffffff813f7274>] ? move_addr_to_kernel.part.20+0x14/0x60 [<ffffffff811c47c2>] ? __inode_wait_for_writeback+0x62/0xb0 [<ffffffff813f7a91>] ? SYSC_sendto+0xf1/0x180 [<ffffffff813f88f9>] ? __sys_recvmsg+0x39/0x70 [<ffffffff8150066d>] ? system_call_fastpath+0x1a/0x1f ---[ end trace cc19a150d311fc63 ]---
which was reported here: https://bugzilla.kernel.org/show_bug.cgi?id=85691
--- drivers/net/wireless/iwlwifi/mvm/tx.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/net/wireless/iwlwifi/mvm/tx.c +2 -6
@@ -173,14 +173,10 @@ static void iwl_mvm_set_tx_cmd_rate(stru/* * for data packets, rate info comes from the table inside the fw. This -* table is controlled by LINK_QUALITY commands. Exclude ctrl port -* frames like EAPOLs which should be treated as mgmt frames. This -* avoids them being sent initially in high rates which increases the -* chances for completion of the 4-Way handshake. +* table is controlled by LINK_QUALITY commands */ -if (ieee80211_is_data (fc) && sta && - !(info->control.flags &IEEE80211_TX_CTRL_PORT_CTRL_PROTO )) { +if (ieee80211_is_data (fc) && sta) { tx_cmd->initial_rate_index =0 ; tx_cmd->tx_flags |=cpu_to_le32 (TX_CMD_FLG_STA_RATE );return ;
Greg Kroah-Hartman
maintainerPATCH 175/203 ext3: Dont check quota format when there are no quota files
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 7938db449bbc55bbeb164bec7af406212e7e98f1 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/ext3/super.c | 7 ------- 1 file changed, 7 deletions(-)
fs/ext3/super.c +0 -7
@@ -1354,13 +1354,6 @@ set_qf_format: "not specified."); return 0; } - }else { -if (sbi->s_jquota_fmt) { -ext3_msg (sb,KERN_ERR ,"error: journaled quota format " -"specified with no journaling " -"enabled." ); -return 0 ; - } }#endif return 1 ;