3.10.22-stable review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 3.10.22-stable review
This is the start of the stable review cycle for the 3.10.22 release. There are 173 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 Wed Dec 4 19:10:16 UTC 2013. 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.10.22-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 3.10.22-rc1
Wei Liu <[email protected]>
xen-netback: fix refcnt unbalance for 3.10
Stanislaw Gruszka <[email protected]>
iwl4965: better skb management in rx path
Eric Dumazet <[email protected]>
iwl3945: better skb management in rx path
Johannes Koch <[email protected]>
media: cx23885: Fix TeVii S471 regression since introduction of ts2020
Michal Kubecek <[email protected]>
netfilter: nf_conntrack: use RCU safe kfree for conntrack extensions
Emmanuel Grumbach <[email protected]>
iwlwifi: don't WARN on host commands sent when firmware is dead
Alex Deucher <[email protected]>
drm/radeon: re-enable sw ACR support on pre-DCE4
Alex Deucher <[email protected]>
drm/radeon: use hw generated CTS/N values for audio
Alex Deucher <[email protected]>
drm/radeon: fix N/CTS clock matching for audio
Alex Deucher <[email protected]>
drm/radeon: use 64-bit math to calculate CTS values for audio (v2)
Nanno Langstraat <[email protected]>
HID: apple: option to swap the 'Option' ("Alt") and 'Command' ("Flag") keys.
Tristan Rice <[email protected]>
HID: enable Mayflash USB Gamecube Adapter
Stefan Achatz <[email protected]>
HID: roccat: add missing special driver declarations
Stefan Achatz <[email protected]>
HID: roccat: fix Coverity CID 141438
Stefan Achatz <[email protected]>
HID: roccat: add new device return value
David Howells <[email protected]>
X.509: Remove certificate date checks
Mauro Carvalho Chehab <[email protected]>
media: s5h1420: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: dvb-frontends: again, Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: dvb-frontends: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: stb0899_drv: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: stv0367: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: stv090x: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: tuners: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: tuner-xc2028: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: lirc_zilog: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: cx18: struct i2c_client is too big for stack
Mauro Carvalho Chehab <[email protected]>
media: cimax2: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: av7110_hw: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: cxusb: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: dibusb-common: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: dw2102: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: af9015: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: af9035: Don't use dynamic static allocation
Mauro Carvalho Chehab <[email protected]>
media: mxl111sf: Don't use dynamic static allocation
Johannes Berg <[email protected]>
cfg80211: fix scheduled scan pointer access
Alex Deucher <[email protected]>
drm/radeon/vm: don't attempt to update ptes if ib allocation fails
Tejun Heo <[email protected]>
cgroup: use a dedicated workqueue for cgroup destruction
Linus Walleij <[email protected]>
gpio: pl061: move irqdomain initialization
Simon Wood <[email protected]>
HID: lg: fix ReportDescriptor for Logitech Formula Vibration
Simon Wood <[email protected]>
HID:hid-lg4ff: Initialize device properties before we touch autocentering.
Simon Wood <[email protected]>
HID:hid-lg4ff: Switch autocentering off when strength is set to zero.
Simon Wood <[email protected]>
HID:hid-lg4ff: Scale autocentering force properly on Logitech wheel
KaiChung Cheng <[email protected]>
HID: multicouh: add PID VID to support 1 new Wistron optical touch device
Srinivas Pandruvada <[email protected]>
HID: hid-sensor-hub: fix report size
Forest Bond <[email protected]>
HID: hid-multitouch: add support for SiS panels
Elias Vanderstuyft <[email protected]>
HID: logitech - lg2ff: Add IDs for Formula Vibration Feedback Wheel
Luosong <[email protected]>
HID: multitouch: Fix GeneralTouch products and add more PIDs
Michael Marineau <[email protected]>
9p: send uevent after adding/removing mount_tag attribute
Simon Guinot <[email protected]>
clk: armada-370: fix tclk frequencies
Mark Langsdorf <[email protected]>
cpufreq: highbank-cpufreq: Enable Midway/ECX-2000
Forest Bond <[email protected]>
Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs
Forest Bond <[email protected]>
HID: don't ignore eGalax/D-Wav/EETI HIDs
Tom Gundersen <[email protected]>
Input: i8042 - add PNP modaliases
Joseph Salisbury <[email protected]>
Input: cypress_ps2 - do not consider data bad if palm is detected
Daniel Stone <[email protected]>
Input: evdev - fall back to vmalloc for client event buffer
Steven Rostedt (Red Hat) <[email protected]>
tracing: Allow events to have NULL strings
Takashi Iwai <[email protected]>
ALSA: hda - Check leaf nodes to find aamix amps
Takashi Iwai <[email protected]>
ALSA: hda - Initialize missing bass speaker pin for ASUS AIO ET2700
Takashi Iwai <[email protected]>
ALSA: hda - Create Headhpone Mic Jack Mode when really needed
Takashi Iwai <[email protected]>
ALSA: hda - Fix hp-mic mode without VREF bits
Kailang Yang <[email protected]>
ALSA: hda/realtek - Add support of ALC231 codec
Kailang Yang <[email protected]>
ALSA: hda/realtek - Set pcbeep amp for ALC668
Peter Zijlstra <[email protected]>
cpuset: Fix memory allocator deadlock
Tejun Heo <[email protected]>
workqueue: fix ordered workqueues in NUMA setups
Heiko Carstens <[email protected]>
s390/uaccess: add missing page table walk range check
Frank Zago <[email protected]>
iio:accel:kxsd9 fix missing mutex unlock
Michael Neuling <[email protected]>
powerpc/signals: Improved mark VSX not saved with small contexts fix
David Herrmann <[email protected]>
HID: uhid: fix leak for 64/32 UHID_CREATE
NeilBrown <[email protected]>
md: fix calculation of stacking limits on level change.
Steve French <[email protected]>
setfacl removes part of ACL when setting POSIX ACLs to Samba
Robert Richter <[email protected]>
edac, highbank: Fix interrupt setup of mem and l2 controller
Jerome Glisse <[email protected]>
radeon: workaround pinning failure on low ram gpu
Alex Deucher <[email protected]>
drm/radeon: don't share PPLLs on DCE4.1
Christian König <[email protected]>
drm/radeon: activate UVD clocks before sending the destroy msg
Alex Deucher <[email protected]>
drm/radeon/si: fix define for MC_SEQ_TRAIN_WAKEUP_CNTL
Ben Skeggs <[email protected]>
drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence
Daniel Vetter <[email protected]>
drm/i915: flush cursors harder
Thomas Hellstrom <[email protected]>
drm/ttm: Fix ttm_bo_move_memcpy
Jakob Bornecrantz <[email protected]>
drm/ttm: Handle in-memory region copies
Thomas Hellstrom <[email protected]>
drm/ttm: Fix memory type compatibility check
Steven Rostedt (Red Hat) <[email protected]>
ftrace: Fix function graph with loading of modules
Dan Williams <[email protected]>
prism54: set netdev type to "wlan"
Andreas Bießmann <[email protected]>
avr32: fix out-of-range jump in large kernels
Andreas Bießmann <[email protected]>
avr32: setup crt for early panic()
Paul Moore <[email protected]>
selinux: correct locking in selinux_netlbl_socket_connect)
Toshi Kani <[email protected]>
ACPI / hotplug: Fix conflicted PCI bridge notify handlers
Yinghai Lu <[email protected]>
PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove()
Jeff Layton <[email protected]>
audit: log the audit_names record type
Jeff Layton <[email protected]>
audit: add child record before the create to handle case where create fails
Jeff Layton <[email protected]>
audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record
Mathias Krause <[email protected]>
audit: fix info leak in AUDIT_GET requests
Mathias Krause <[email protected]>
audit: use nlmsg_len() to get message payload length
Tyler Hicks <[email protected]>
audit: printk USER_AVC messages when audit isn't enabled
Ujjal Roy <[email protected]>
mwifiex: fix wrong eth_hdr usage for bridged packets in AP mode
Avinash Patil <[email protected]>
mwifiex: correct packet length for packets from SDIO interface
Dave Airlie <[email protected]>
qxl: avoid an oops in the deferred io code.
Rafael J. Wysocki <[email protected]>
PM / runtime: Use pm_runtime_put_sync() in __device_release_driver()
Aaron Lu <[email protected]>
PM / hibernate: Avoid overflow in hibernate_preallocate_memory()
Mikulas Patocka <[email protected]>
blk-core: Fix memory corruption if blkcg_init_queue fails
Dan Williams <[email protected]>
ioatdma: fix selection of 16 vs 8 source path
Dan Williams <[email protected]>
ioatdma: fix sed pool selection
Mikulas Patocka <[email protected]>
dm: allocate buffer for messages with small number of arguments using GFP_NOIO
Joe Thornber <[email protected]>
dm cache: fix a race condition between queuing new migrations and quiescing for a shutdown
Joe Thornber <[email protected]>
dm array: fix bug in growing array
Shiva Krishna Merla <[email protected]>
dm mpath: fix race condition between multipath_dtr and pg_init_done
Rodolfo Giometti <[email protected]>
mmc: atmel-mci: fix oops in atmci_tasklet_func
Ludovic Desroches <[email protected]>
mmc: atmel-mci: abort transfer on timeout error
Akira Takeuchi <[email protected]>
mm: ensure get_unmapped_area() returns higher address than mmap_min_addr
Stanislaw Gruszka <[email protected]>
rt2400pci: fix RSSI read
Ursula Braun <[email protected]>
qeth: avoid buffer overflow in snmp ioctl
Larry Finger <[email protected]>
rtlwifi: rtl8192cu: Fix incorrect signal strength for unassociated AP
Larry Finger <[email protected]>
rtlwifi: rtl8192se: Fix incorrect signal strength for unassociated AP
Larry Finger <[email protected]>
rtlwifi: rtl8192de: Fix incorrect signal strength for unassociated AP
Vegard Nossum <[email protected]>
xen/blkback: fix reference counting
Theodore Ts'o <[email protected]>
ext4: avoid bh leak in retry path of ext4_expand_extra_isize_ea()
Huang Shijie <[email protected]>
mtd: gpmi: fix kernel BUG due to racing DMA operations
Wang Haitao <[email protected]>
mtd: map: fixed bug in 64-bit systems
Brian Norris <[email protected]>
mtd: nand: hack ONFI for non-power-of-2 dimensions
Mikulas Patocka <[email protected]>
loop: fix crash when using unassigned loop device
Mikulas Patocka <[email protected]>
loop: fix crash if blk_alloc_queue fails
Bart Van Assche <[email protected]>
IB/srp: Report receive errors correctly
Mike Marciniszyn <[email protected]>
IB/qib: Fix txselect regression
Jan Kara <[email protected]>
IB/ipath: Convert ipath_user_sdma_pin_pages() to use get_user_pages_fast()
Eric Seppanen <[email protected]>
iscsi-target: chap auth shouldn't match username with trailing garbage
Eric Seppanen <[email protected]>
iscsi-target: fix extract_param to handle buffer length corner case
Nicholas Bellinger <[email protected]>
iscsi-target: Fix mutex_trylock usage in iscsit_increment_maxcmdsn
Samir Benmendil <[email protected]>
ahci: add Marvell 9230 to the AHCI PCI device list
xiangliang yu <[email protected]>
ahci: disabled FBS prior to issuing software reset
James Ralston <[email protected]>
ahci: Add Device IDs for Intel Wildcat Point-LP
Manfred Spraul <[email protected]>
ipc/sem.c: synchronize semop and semctl with IPC_RMID
Davidlohr Bueso <[email protected]>
ipc: update locking scheme comments
Mathias Krause <[email protected]>
ipc, msg: forbid negative values for "msg{max,mnb,mni}"
Mathias Krause <[email protected]>
ipc, msg: fix message length check for negative values
Larry Finger <[email protected]>
rtlwifi: rtl8192cu: Fix more pointer arithmetic errors
Felipe Pena <[email protected]>
rtlwifi: rtl8192se: Fix wrong assignment
Mark Cave-Ayland <[email protected]>
rtlwifi: Fix endian error in extracting packet type
Larry Finger <[email protected]>
rtlwifi: rtl8188ee: Fix smatch warning in rtl8188ee/hw.c
Ryan Mallon <[email protected]>
vsprintf: check real user/group id for %pK
Shan Hai <[email protected]>
drivers/libata: Set max sector to 65535 for Slimtype DVD A DS8A9SH drive
Gwendal Grignou <[email protected]>
libata: Fix display of sata speed
Dan Carpenter <[email protected]>
gpio: rcar: NULL dereference on error in probe()
Dan Carpenter <[email protected]>
gpio: mvebu: make mvchip->irqbase signed for error handling
Tony Lindgren <[email protected]>
gpio: twl4030: Fix regression for twl gpio output
Stephen Warren <[email protected]>
ARM: bcm2835: add missing #xxx-cells to I2C nodes
Doug Anderson <[email protected]>
ARM: dts: Add max77686 RTC interrupt to cros5250-common
Ionut Nicu <[email protected]>
i2c: mux: gpio: use gpio_set_value_cansleep()
Ionut Nicu <[email protected]>
i2c: mux: gpio: use reg value for i2c_add_mux_adapter
Marc Kleine-Budde <[email protected]>
can: flexcan: fix flexcan_chip_start() on imx6
Helge Deller <[email protected]>
parisc: break out SOCK_NONBLOCK define to own asm header file
Ilija Hadzic <[email protected]>
devpts: plug the memory leak in kill_sb
Roel Kluin <[email protected]>
pinctrl: dove: unset twsi option3 for gconfig as well
KOSAKI Motohiro <[email protected]>
alarmtimer: return EINVAL instead of ENOTSUPP if rtcdev doesn't exist
Michael Hudson-Doyle <[email protected]>
perf tools: Remove cast of non-variadic function to variadic
Charles Keepax <[email protected]>
ASoC: wm5110: Add post SYSCLK register patch for rev D chip
Richard Fitzgerald <[email protected]>
ASoC: arizona: Set FLL to free-run before disabling
Oskar Schirmer <[email protected]>
ASoC: fsl: imx-pcm-fiq: omit fiq counter to avoid harm in unbalanced situations
Takashi Iwai <[email protected]>
ASoC: blackfin: Fix missing break
Nicolin Chen <[email protected]>
ASoC: wm8962: Turn on regcache_cache_only before disabling regulator
Brian Austin <[email protected]>
ASoC: cs42l52: Correct MIC CTL mask
Phil Edworthy <[email protected]>
ASoC: ak4642: prevent un-necessary changes to SG_SL1
Johan Hovold <[email protected]>
backlight: atmel-pwm-bl: fix reported brightness
Johan Hovold <[email protected]>
backlight: atmel-pwm-bl: fix gpio polarity in remove
Malcolm Priestley <[email protected]>
staging: vt6656: [BUG] Fix for TX USB resets from vendors driver.
Olav Haugan <[email protected]>
staging: zsmalloc: Ensure handle is never 0 on success
Greg Kroah-Hartman <[email protected]>
Staging: tidspbridge: disable driver
Jiada Wang <[email protected]>
ARM: i.MX6q: fix the wrong parent of can_root clock
Johan Hovold <[email protected]>
ARM: at91: fix hanged boot due to early rtt-interrupt
Johan Hovold <[email protected]>
ARM: at91: fix hanged boot due to early rtc-interrupt
Jonathan Austin <[email protected]>
ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD
Marc Zyngier <[email protected]>
ARM: 7876/1: clear Thumb-2 IT state on exception handling
Russell King <[email protected]>
ARM: sa11x0/assabet: ensure CS2 is configured appropriately
Markus Pargmann <[email protected]>
ARM: OMAP2+: irq, AM33XX add missing register check
Helge Deller <[email protected]>
parisc: sticon - unbreak on 64bit kernel
-------------
Diffstat:
Documentation/sysctl/kernel.txt | 25 ++-- Makefile | 4 +- arch/arm/boot/dts/bcm2835.dtsi | 4 + arch/arm/boot/dts/cros5250-common.dtsi | 12 ++ arch/arm/kernel/entry-armv.S | 1 + arch/arm/mach-at91/Makefile | 2 +- arch/arm/mach-at91/at91sam9260.c | 2 + arch/arm/mach-at91/at91sam9261.c | 2 + arch/arm/mach-at91/at91sam9263.c | 3 + arch/arm/mach-at91/at91sam9g45.c | 3 + arch/arm/mach-at91/at91sam9n12.c | 6 + arch/arm/mach-at91/at91sam9rl.c | 3 + arch/arm/mach-at91/at91sam9x5.c | 6 + arch/arm/mach-at91/generic.h | 2 + arch/arm/mach-at91/include/mach/at91sam9n12.h | 5 + arch/arm/mach-at91/include/mach/at91sam9x5.h | 5 + arch/arm/mach-at91/include/mach/sama5d3.h | 5 + arch/arm/mach-at91/sama5d3.c | 6 + arch/arm/mach-at91/sysirq_mask.c | 71 +++++++++++ arch/arm/mach-imx/clk-imx6q.c | 2 +- arch/arm/mach-integrator/integrator_cp.c | 3 +- arch/arm/mach-omap2/irq.c | 2 +- arch/arm/mach-sa1100/assabet.c | 3 + arch/arm/mm/extable.c | 7 +- arch/avr32/boot/u-boot/head.S | 35 +++++- arch/avr32/kernel/entry-avr32b.S | 3 +- arch/avr32/kernel/head.S | 20 ---- arch/parisc/include/asm/socket.h | 11 ++ arch/parisc/include/uapi/asm/socket.h | 11 +- arch/powerpc/kernel/signal_32.c | 16 ++- arch/powerpc/kernel/signal_64.c | 6 + arch/s390/lib/uaccess_pt.c | 3 + block/blk-core.c | 4 +- crypto/asymmetric_keys/x509_public_key.c | 38 ------ drivers/acpi/pci_root.c | 3 + drivers/acpi/scan.c | 2 +- drivers/ata/ahci.c | 6 + drivers/ata/libahci.c | 16 +++ drivers/ata/libata-core.c | 1 + drivers/ata/libata-transport.c | 16 +-- drivers/base/dd.c | 2 +- drivers/block/loop.c | 19 +-- drivers/block/xen-blkback/blkback.c | 3 +- drivers/clk/mvebu/clk-core.c | 4 +- drivers/cpufreq/highbank-cpufreq.c | 3 +- drivers/dma/ioat/dma_v3.c | 46 +++---- drivers/edac/highbank_l2_edac.c | 18 +-- drivers/edac/highbank_mc_edac.c | 18 +-- drivers/gpio/gpio-mvebu.c | 2 +- drivers/gpio/gpio-pl061.c | 10 +- drivers/gpio/gpio-rcar.c | 2 +- drivers/gpio/gpio-twl4030.c | 5 +- drivers/gpu/drm/i915/intel_display.c | 4 + drivers/gpu/drm/nouveau/nouveau_gem.c | 3 +- drivers/gpu/drm/qxl/qxl_fb.c | 2 +- drivers/gpu/drm/radeon/atombios_crtc.c | 2 +- drivers/gpu/drm/radeon/evergreen_hdmi.c | 3 +- drivers/gpu/drm/radeon/r600_hdmi.c | 21 ++-- drivers/gpu/drm/radeon/radeon_gart.c | 2 + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 28 +++++ drivers/gpu/drm/radeon/radeon_uvd.c | 2 + drivers/gpu/drm/radeon/sid.h | 2 +- drivers/gpu/drm/ttm/ttm_bo.c | 32 +++-- drivers/gpu/drm/ttm/ttm_bo_util.c | 30 +++-- drivers/hid/Kconfig | 10 +- drivers/hid/hid-apple.c | 22 ++++ drivers/hid/hid-axff.c | 3 +- drivers/hid/hid-core.c | 17 ++- drivers/hid/hid-ids.h | 13 ++ drivers/hid/hid-lg.c | 80 +++++++++++++ drivers/hid/hid-lg2ff.c | 2 +- drivers/hid/hid-lg4ff.c | 62 +++++++--- drivers/hid/hid-multitouch.c | 33 ++++- drivers/hid/hid-roccat-common.c | 12 +- drivers/hid/hid-roccat-kovaplus.c | 4 + drivers/hid/hid-sensor-hub.c | 13 +- drivers/hid/uhid.c | 2 +- drivers/hid/usbhid/hid-quirks.c | 2 + drivers/i2c/muxes/i2c-mux-gpio.c | 8 +- drivers/iio/accel/kxsd9.c | 7 +- drivers/infiniband/hw/ipath/ipath_user_sdma.c | 7 +- drivers/infiniband/hw/qib/qib_iba7322.c | 11 +- drivers/infiniband/ulp/srp/ib_srp.c | 9 +- drivers/input/evdev.c | 16 ++- drivers/input/mouse/cypress_ps2.c | 19 +-- drivers/input/serio/i8042-x86ia64io.h | 2 + drivers/input/touchscreen/usbtouchscreen.c | 4 +- drivers/md/dm-cache-target.c | 54 ++++++--- drivers/md/dm-mpath.c | 18 ++- drivers/md/dm-table.c | 18 ++- drivers/md/md.c | 1 + drivers/md/persistent-data/dm-array.c | 5 +- drivers/media/dvb-frontends/af9013.c | 14 ++- drivers/media/dvb-frontends/af9033.c | 23 +++- drivers/media/dvb-frontends/bcm3510.c | 15 ++- drivers/media/dvb-frontends/cxd2820r_core.c | 21 +++- drivers/media/dvb-frontends/itd1000.c | 13 +- drivers/media/dvb-frontends/mt312.c | 10 +- drivers/media/dvb-frontends/nxt200x.c | 11 +- drivers/media/dvb-frontends/rtl2830.c | 14 ++- drivers/media/dvb-frontends/rtl2832.c | 14 ++- drivers/media/dvb-frontends/s5h1420.c | 11 +- drivers/media/dvb-frontends/stb0899_drv.c | 12 +- drivers/media/dvb-frontends/stb6100.c | 11 +- drivers/media/dvb-frontends/stv0367.c | 13 +- drivers/media/dvb-frontends/stv090x.c | 12 +- drivers/media/dvb-frontends/stv6110.c | 12 +- drivers/media/dvb-frontends/stv6110x.c | 13 +- drivers/media/dvb-frontends/tda10071.c | 25 +++- drivers/media/dvb-frontends/tda18271c2dd.c | 14 ++- drivers/media/dvb-frontends/zl10039.c | 12 +- drivers/media/pci/cx18/cx18-driver.c | 20 ++-- drivers/media/pci/cx23885/cimax2.c | 13 +- drivers/media/pci/cx23885/cx23885-dvb.c | 4 + drivers/media/pci/ttpci/av7110_hw.c | 19 ++- drivers/media/tuners/e4000.c | 25 +++- drivers/media/tuners/fc2580.c | 25 +++- drivers/media/tuners/tda18212.c | 25 +++- drivers/media/tuners/tda18218.c | 23 +++- drivers/media/tuners/tuner-xc2028.c | 8 +- drivers/media/usb/dvb-usb-v2/af9015.c | 3 +- drivers/media/usb/dvb-usb-v2/af9035.c | 29 ++++- drivers/media/usb/dvb-usb-v2/mxl111sf.c | 10 +- drivers/media/usb/dvb-usb/cxusb.c | 41 ++++++- drivers/media/usb/dvb-usb/dibusb-common.c | 10 +- drivers/media/usb/dvb-usb/dw2102.c | 90 ++++++++++++-- drivers/mmc/host/atmel-mci.c | 21 +++- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 4 +- drivers/mtd/nand/nand_base.c | 15 ++- drivers/net/can/flexcan.c | 12 -- drivers/net/wireless/iwlegacy/3945.c | 31 +++-- drivers/net/wireless/iwlegacy/4965-mac.c | 18 ++- drivers/net/wireless/iwlwifi/iwl-trans.h | 6 +- drivers/net/wireless/mwifiex/sdio.c | 3 + drivers/net/wireless/mwifiex/uap_txrx.c | 29 ++++- drivers/net/wireless/prism54/islpci_dev.c | 7 +- drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- drivers/net/wireless/rtlwifi/base.c | 93 +++++++-------- drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 1 + drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 6 +- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 8 +- drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192se/rf.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 2 +- drivers/net/wireless/rtlwifi/wifi.h | 6 +- drivers/net/xen-netback/interface.c | 10 +- drivers/pci/pcie/portdrv_pci.c | 1 - drivers/pinctrl/mvebu/pinctrl-dove.c | 2 +- drivers/s390/net/qeth_core_main.c | 6 +- drivers/staging/media/lirc/lirc_zilog.c | 12 +- drivers/staging/tidspbridge/Kconfig | 2 +- drivers/staging/vt6656/baseband.c | 11 ++ drivers/staging/vt6656/rndis.h | 2 + drivers/staging/zsmalloc/zsmalloc-main.c | 17 ++- drivers/target/iscsi/iscsi_target_auth.c | 5 +- drivers/target/iscsi/iscsi_target_configfs.c | 5 + drivers/target/iscsi/iscsi_target_device.c | 6 +- drivers/target/iscsi/iscsi_target_nego.c | 2 +- drivers/video/backlight/atmel-pwm-bl.c | 10 +- drivers/video/console/sticore.c | 166 ++++++++++++++++---------- drivers/video/sticore.h | 62 ++++++++-- drivers/video/stifb.c | 10 +- fs/cifs/cifssmb.c | 8 +- fs/devpts/inode.c | 1 + fs/ext4/xattr.c | 1 + fs/namei.c | 1 + include/acpi/acpi_bus.h | 1 + include/linux/audit.h | 26 +++- include/linux/ipc_namespace.h | 6 +- include/linux/msg.h | 6 +- include/linux/mtd/map.h | 4 +- include/net/netfilter/nf_conntrack_extend.h | 2 +- include/trace/ftrace.h | 5 +- ipc/ipc_sysctl.c | 20 ++-- ipc/mqueue.c | 2 + ipc/msgutil.c | 20 ++-- ipc/sem.c | 42 +++++-- ipc/util.c | 27 ++++- ipc/util.h | 4 +- kernel/audit.c | 27 ++++- kernel/audit.h | 1 + kernel/auditsc.c | 12 +- kernel/cgroup.c | 28 ++++- kernel/cpuset.c | 8 +- kernel/power/snapshot.c | 6 +- kernel/time/alarmtimer.c | 4 +- kernel/trace/ftrace.c | 64 +++++----- kernel/workqueue.c | 24 +++- lib/vsprintf.c | 33 ++++- mm/mmap.c | 10 +- net/9p/trans_virtio.c | 5 + net/wireless/scan.c | 4 +- security/selinux/netlabel.c | 6 +- sound/pci/hda/hda_generic.c | 79 ++++++++---- sound/pci/hda/patch_realtek.c | 11 ++ sound/soc/blackfin/bf5xx-i2s.c | 1 + sound/soc/codecs/ak4642.c | 2 +- sound/soc/codecs/arizona.c | 4 + sound/soc/codecs/cs42l52.h | 2 +- sound/soc/codecs/wm5110.c | 43 ++++++- sound/soc/codecs/wm8962.c | 2 + sound/soc/fsl/imx-pcm-fiq.c | 29 +++-- tools/perf/ui/hist.c | 2 +- tools/perf/util/color.c | 11 +- tools/perf/util/color.h | 2 +- 205 files changed, 2129 insertions(+), 771 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/173 parisc: sticon - unbreak on 64bit kernel
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 0219132fe7c26574371232b50db085573f6fbd3f upstream.
STI text console (sticon) was broken on 64bit machines with more than 4GB RAM and this lead in some cases to a kernel crash.
Since sticon uses the 32bit STI API it needs to keep pointers to memory below 4GB. But on a 64bit kernel some memory regions (e.g. the kernel stack) might be above 4GB which then may crash the kernel in the STI functions.
Additionally sticon didn't selected the built-in framebuffer fonts by default. This is now fixed.
On a side-note: Theoretically we could enhance the sticon driver to use the 64bit STI API. But - beside the fact that some machines don't provide a 64bit STI ROM - this would just add complexity.
--- drivers/video/console/sticore.c | 168 ++++++++++++++++++++++++---------------- drivers/video/sticore.h | 62 +++++++++++--- drivers/video/stifb.c | 10 +- 3 files changed, 159 insertions(+), 81 deletions(-)
drivers/video/console/sticore.c +104 -64
@@ -3,7 +3,7 @@* core code for console driver using HP's STI firmware * * Copyright (C) 2000 Philipp Rumpf <[email protected]> -* Copyright (C) 2001-2003 Helge Deller <[email protected]> +* Copyright (C) 2001-2013 Helge Deller <[email protected]> * Copyright (C) 2001-2002 Thomas Bogendoerfer <[email protected]> * * TODO:
@@ -30,7 +30,7 @@#include "../sticore.h" -#define STI_DRIVERVERSION "Version 0.9a" +#define STI_DRIVERVERSION "Version 0.9b"static struct sti_struct *default_sti__read_mostly ;
@@ -73,28 +73,34 @@ static const struct sti_init_flags defaustatic int sti_init_graph (struct sti_struct *sti) { -struct sti_init_inptr_ext inptr_ext = {0 , }; -struct sti_init_inptr inptr = { - .text_planes =3 ,/* # of text planes (max 3 for STI) */ - .ext_ptr =STI_PTR (&inptr_ext) - }; -struct sti_init_outptr outptr = {0 , }; +struct sti_init_inptr *inptr = &sti->sti_data->init_inptr; +struct sti_init_inptr_ext *inptr_ext = &sti->sti_data->init_inptr_ext; +struct sti_init_outptr *outptr = &sti->sti_data->init_outptr;unsigned long flags; -int ret; +int ret, err;spin_lock_irqsave (&sti->lock, flags); - ret =STI_CALL (sti->init_graph, &default_init_flags, &inptr, - &outptr, sti->glob_cfg); +memset (inptr,0 ,sizeof (*inptr)); + inptr->text_planes =3 ;/* # of text planes (max 3 for STI) */ +memset (inptr_ext,0 ,sizeof (*inptr_ext)); + inptr->ext_ptr =STI_PTR (inptr_ext); + outptr->errno =0 ; + + ret =sti_call (sti, sti->init_graph, &default_init_flags, inptr, + outptr, sti->glob_cfg); + +if (ret >=0 ) + sti->text_planes = outptr->text_planes; + err = outptr->errno;spin_unlock_irqrestore (&sti->lock, flags);if (ret <0 ) { -printk (KERN_ERR "STI init_graph failed (ret %d, errno %d)\n" ,ret,outptr.errno); +pr_err ("STI init_graph failed (ret %d, errno %d)\n" , ret, err);return -1 ; } - sti->text_planes = outptr.text_planes;return 0 ; }
@@ -104,16 +110,18 @@ static const struct sti_conf_flags defaustatic void sti_inq_conf (struct sti_struct *sti) { -struct sti_conf_inptr inptr = {0 , }; +struct sti_conf_inptr *inptr = &sti->sti_data->inq_inptr; +struct sti_conf_outptr *outptr = &sti->sti_data->inq_outptr;unsigned long flags;s32 ret; - sti->outptr.ext_ptr =STI_PTR (&sti->outptr_ext); + outptr->ext_ptr =STI_PTR (&sti->sti_data->inq_outptr_ext);do {spin_lock_irqsave (&sti->lock, flags); - ret =STI_CALL (sti->inq_conf, &default_conf_flags, - &inptr, &sti->outptr, sti->glob_cfg); +memset (inptr,0 ,sizeof (*inptr)); + ret =sti_call (sti, sti->inq_conf, &default_conf_flags, + inptr, outptr, sti->glob_cfg);spin_unlock_irqrestore (&sti->lock, flags); }while (ret ==1 ); }
@@ -126,7 +134,8 @@ static const struct sti_font_flags defauvoid sti_putc (struct sti_struct *sti,int c,int y,int x) { -struct sti_font_inptr inptr = { +struct sti_font_inptr *inptr = &sti->sti_data->font_inptr; +struct sti_font_inptr inptr_default = { .font_start_addr=STI_PTR (sti->font->raw), .index =c_index (sti, c), .fg_color =c_fg (sti, c),
@@ -134,14 +143,15 @@ sti_putc(struct sti_struct *sti, int c, .dest_x = x * sti->font_width, .dest_y = y * sti->font_height, }; -struct sti_font_outptr outptr = {0 , }; +struct sti_font_outptr *outptr = &sti->sti_data->font_outptr;s32 ret;unsigned long flags;do {spin_lock_irqsave (&sti->lock, flags); - ret =STI_CALL (sti->font_unpmv, &default_font_flags, - &inptr, &outptr, sti->glob_cfg); + *inptr = inptr_default; + ret =sti_call (sti, sti->font_unpmv, &default_font_flags, + inptr, outptr, sti->glob_cfg);spin_unlock_irqrestore (&sti->lock, flags); }while (ret ==1 ); }
@@ -156,7 +166,8 @@ void sti_set(struct sti_struct *sti, int src_y, int src_x, int height, int width, u8 color) { - struct sti_blkmv_inptr inptr = { + struct sti_blkmv_inptr *inptr = &sti->sti_data->blkmv_inptr; + struct sti_blkmv_inptr inptr_default = { .fg_color = color, .bg_color = color, .src_x = src_x,
@@ -166,14 +177,15 @@ sti_set(struct sti_struct *sti, int src_ .width = width, .height = height, }; -struct sti_blkmv_outptr outptr = {0 , }; +struct sti_blkmv_outptr *outptr = &sti->sti_data->blkmv_outptr;s32 ret;unsigned long flags;do {spin_lock_irqsave (&sti->lock, flags); - ret =STI_CALL (sti->block_move, &clear_blkmv_flags, - &inptr, &outptr, sti->glob_cfg); + *inptr = inptr_default; + ret =sti_call (sti, sti->block_move, &clear_blkmv_flags, + inptr, outptr, sti->glob_cfg);spin_unlock_irqrestore (&sti->lock, flags); }while (ret ==1 ); }
@@ -182,7 +194,8 @@ void sti_clear(struct sti_struct *sti, int src_y, int src_x, int height, int width, int c) { - struct sti_blkmv_inptr inptr = { + struct sti_blkmv_inptr *inptr = &sti->sti_data->blkmv_inptr; + struct sti_blkmv_inptr inptr_default = { .fg_color = c_fg(sti, c), .bg_color = c_bg(sti, c), .src_x = src_x * sti->font_width,
@@ -192,14 +205,15 @@ sti_clear(struct sti_struct *sti, int sr .width = width * sti->font_width, .height = height* sti->font_height, }; -struct sti_blkmv_outptr outptr = {0 , }; +struct sti_blkmv_outptr *outptr = &sti->sti_data->blkmv_outptr;s32 ret;unsigned long flags;do {spin_lock_irqsave (&sti->lock, flags); - ret =STI_CALL (sti->block_move, &clear_blkmv_flags, - &inptr, &outptr, sti->glob_cfg); + *inptr = inptr_default; + ret =sti_call (sti, sti->block_move, &clear_blkmv_flags, + inptr, outptr, sti->glob_cfg);spin_unlock_irqrestore (&sti->lock, flags); }while (ret ==1 ); }
@@ -212,7 +226,8 @@ void sti_bmove(struct sti_struct *sti, int src_y, int src_x, int dst_y, int dst_x, int height, int width) { - struct sti_blkmv_inptr inptr = { + struct sti_blkmv_inptr *inptr = &sti->sti_data->blkmv_inptr; + struct sti_blkmv_inptr inptr_default = { .src_x = src_x * sti->font_width, .src_y = src_y * sti->font_height, .dest_x = dst_x * sti->font_width,
@@ -220,14 +235,15 @@ sti_bmove(struct sti_struct *sti, int sr .width = width * sti->font_width, .height = height* sti->font_height, }; -struct sti_blkmv_outptr outptr = {0 , }; +struct sti_blkmv_outptr *outptr = &sti->sti_data->blkmv_outptr;s32 ret;unsigned long flags;do {spin_lock_irqsave (&sti->lock, flags); - ret =STI_CALL (sti->block_move, &default_blkmv_flags, - &inptr, &outptr, sti->glob_cfg); + *inptr = inptr_default; + ret =sti_call (sti, sti->block_move, &default_blkmv_flags, + inptr, outptr, sti->glob_cfg);spin_unlock_irqrestore (&sti->lock, flags); }while (ret ==1 ); }
@@ -284,7 +300,7 @@ __setup("sti=", sti_setup); -static char *font_name[MAX_STI_ROMS ] = {"VGA8x16" , }; +static char *font_name[MAX_STI_ROMS ];static int font_index[MAX_STI_ROMS ], font_height[MAX_STI_ROMS ], font_width[MAX_STI_ROMS ];
@@ -389,10 +405,10 @@ static void sti_dump_outptr(struct sti_s"%d used bits\n" "%d planes\n" "attributes %08x\n" , - sti->outptr.bits_per_pixel, - sti->outptr.bits_used, - sti->outptr.planes, - sti->outptr.attributes)); + sti->sti_data->inq_outptr.bits_per_pixel, + sti->sti_data->inq_outptr.bits_used, + sti->sti_data->inq_outptr.planes, + sti->sti_data->inq_outptr.attributes)); } static int sti_init_glob_cfg(struct sti_struct *sti, unsigned long rom_address,
@@ -402,24 +418,21 @@ static int sti_init_glob_cfg(struct sti_struct sti_glob_cfg_ext *glob_cfg_ext;void *save_addr;void *sti_mem_addr; -const int save_addr_size =1024 ;/* XXX */ -int i; +int i, size; -if (!sti->sti_mem_request) +if (sti->sti_mem_request <256 ) sti->sti_mem_request =256 ;/* STI default */ - glob_cfg =kzalloc (sizeof (*sti->glob_cfg),GFP_KERNEL ); - glob_cfg_ext =kzalloc (sizeof (*glob_cfg_ext),GFP_KERNEL ); - save_addr =kzalloc (save_addr_size,GFP_KERNEL ); - sti_mem_addr =kzalloc (sti->sti_mem_request,GFP_KERNEL ); - -if (!(glob_cfg && glob_cfg_ext && save_addr && sti_mem_addr)) { -kfree (glob_cfg); -kfree (glob_cfg_ext); -kfree (save_addr); -kfree (sti_mem_addr); + size =sizeof (struct sti_all_data ) + sti->sti_mem_request -256 ; + + sti->sti_data =kzalloc (size,STI_LOWMEM ); +if (!sti->sti_data)return -ENOMEM ; - } + + glob_cfg = &sti->sti_data->glob_cfg; + glob_cfg_ext = &sti->sti_data->glob_cfg_ext; + save_addr = &sti->sti_data->save_addr; + sti_mem_addr = &sti->sti_data->sti_mem_addr; glob_cfg->ext_ptr =STI_PTR (glob_cfg_ext); glob_cfg->save_addr =STI_PTR (save_addr);
@@ -475,32 +488,31 @@ static int sti_init_glob_cfg(struct sti_return 0 ; } -#ifdef CONFIG_FB +#ifdef CONFIG_FONTS static struct sti_cooked_font *sti_select_fbfont (struct sti_cooked_rom *cooked_rom,const char *fbfont_name) { -const struct font_desc *fbfont; +const struct font_desc *fbfont =NULL ;unsigned int size, bpc;void *dest;struct sti_rom_font *nf;struct sti_cooked_font *cooked_font; -if (!fbfont_name || !strlen (fbfont_name)) -return NULL ; - fbfont =find_font (fbfont_name); +if (fbfont_name &&strlen (fbfont_name)) + fbfont =find_font (fbfont_name);if (!fbfont) fbfont =get_default_font (1024 ,768 , ~(u32 )0 , ~(u32 )0 );if (!fbfont)return NULL ; -DPRINTK ((KERN_DEBUG "selected %dx%d fb-font %s\n" , - fbfont->width, fbfont->height, fbfont->name)); +pr_info ("STI selected %dx%d framebuffer font %s for sticon\n" , + fbfont->width, fbfont->height, fbfont->name); bpc = ((fbfont->width+7 )/8 ) * fbfont->height; size = bpc *256 ; size +=sizeof (struct sti_rom_font ); - nf =kzalloc (size,GFP_KERNEL ); + nf =kzalloc (size,STI_LOWMEM );if (!nf)return NULL ;
@@ -637,7 +649,7 @@ static void *sti_bmode_font_raw(struct sunsigned char *n, *p, *q;int size = f->raw->bytes_per_char*256 +sizeof (struct sti_rom_font ); - n =kzalloc (4 *size,GFP_KERNEL ); + n =kzalloc (4 *size,STI_LOWMEM );if (!n)return NULL ; p = n +3 ;
@@ -673,7 +685,7 @@ static struct sti_rom *sti_get_bmode_romsti_bmode_rom_copy (address +BMODE_LAST_ADDR_OFFS ,sizeof (size), &size); size = (size+3 ) /4 ; - raw =kmalloc (size,GFP_KERNEL ); + raw =kmalloc (size,STI_LOWMEM );if (raw) {sti_bmode_rom_copy (address, size, raw);memmove (&raw->res004, &raw->type[0 ],0x3c );
@@ -707,7 +719,7 @@ static struct sti_rom *sti_get_wmode_rom/* read the ROM size directly from the struct in ROM */ size =gsc_readl (address + offsetof(struct sti_rom ,last_addr)); - raw =kmalloc (size,GFP_KERNEL ); + raw =kmalloc (size,STI_LOWMEM );if (raw)sti_rom_copy (address, size, raw);
@@ -743,6 +755,10 @@ static int sti_read_rom(int wordmode, st address = (unsigned long )STI_PTR (raw); +pr_info ("STI ROM supports 32 %sbit firmware functions.\n" , + raw->alt_code_type ==ALT_CODE_TYPE_PA_RISC_64 + ?"and 64 " :"" ); + sti->font_unpmv = address + (raw->font_unpmv &0x03ffffff ); sti->block_move = address + (raw->block_move &0x03ffffff ); sti->init_graph = address + (raw->init_graph &0x03ffffff );
@@ -901,7 +917,8 @@ test_rom:sti_dump_globcfg (sti->glob_cfg, sti->sti_mem_request);sti_dump_outptr (sti); -printk (KERN_INFO " graphics card name: %s\n" , sti->outptr.dev_name ); +pr_info (" graphics card name: %s\n" , + sti->sti_data->inq_outptr.dev_name); sti_roms[num_sti_roms] = sti; num_sti_roms++;
@@ -1073,6 +1090,29 @@ struct sti_struct * sti_get_rom(unsigned }EXPORT_SYMBOL (sti_get_rom); + +int sti_call (const struct sti_struct *sti,unsigned long func, +const void *flags,void *inptr,void *outptr, +struct sti_glob_cfg *glob_cfg) +{ +unsigned long _flags =STI_PTR (flags); +unsigned long _inptr =STI_PTR (inptr); +unsigned long _outptr =STI_PTR (outptr); +unsigned long _glob_cfg =STI_PTR (glob_cfg); +int ret; + +#ifdef CONFIG_64BIT +/* Check for overflow when using 32bit STI on 64bit kernel. */ +if (WARN_ONCE (_flags>>32 || _inptr>>32 || _outptr>>32 || _glob_cfg>>32 , +"Out of 32bit-range pointers!" )) +return -1 ; +#endif + + ret =pdc_sti_call (func, _flags, _inptr, _outptr, _glob_cfg); + +return ret; +} +MODULE_AUTHOR ("Philipp Rumpf, Helge Deller, Thomas Bogendoerfer" );MODULE_DESCRIPTION ("Core STI driver for HP's NGLE series graphics cards in HP PARISC machines" );MODULE_LICENSE ("GPL v2" );
drivers/video/sticore.h +50 -12
105 lines not on this page · raw message
drivers/video/stifb.c +5 -5
@@ -1101,6 +1101,7 @@ static int __init stifb_init_fb(struct s var = &info->var; fb->sti = sti; + dev_name = sti->sti_data->inq_outptr.dev_name;/* store upper 32bits of the graphics id */ fb->id = fb->sti->graphics_id[0 ];
@@ -1114,11 +1115,11 @@ static int __init stifb_init_fb(struct sSince this driver only supports standard mode, we check if the device name contains the string "DX" and tell the user how to reconfigure the card. */ -if (strstr (sti->outptr.dev_name,"DX" )) { +if (strstr (dev_name,"DX" )) {printk (KERN_WARNING "WARNING: stifb framebuffer driver does not support '%s' in double-buffer mode.\n" "WARNING: Please disable the double-buffer mode in IPL menu (the PARISC-BIOS).\n" , - sti->outptr.dev_name); + dev_name); goto out_err0; }/* fall though */
@@ -1130,7 +1131,7 @@ static int __init stifb_init_fb(struct sbreak ;default :printk (KERN_WARNING "stifb: '%s' (id: 0x%08x) not supported.\n" , - sti->outptr.dev_name, fb->id); + dev_name, fb->id); goto out_err0; }
@@ -1154,7 +1155,6 @@ static int __init stifb_init_fb(struct s fb->id =S9000_ID_A1659A ;break ;case S9000_ID_TIMBER :/* HP9000/710 Any (may be a grayscale device) */ - dev_name = fb->sti->outptr.dev_name;if (strstr (dev_name,"GRAYSCALE" ) ||strstr (dev_name,"Grayscale" ) ||strstr (dev_name,"grayscale" ))
@@ -1290,7 +1290,7 @@ static int __init stifb_init_fb(struct s var->xres, var->yres, var->bits_per_pixel, - sti->outptr.dev_name, + dev_name, fb->id, fix->mmio_start);
Greg Kroah-Hartman
maintainerPATCH 2/173 ARM: OMAP2+: irq, AM33XX add missing register check
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Markus Pargmann <[email protected]>
commit 0bebda684857f76548ea48c8886785198701d8d3 upstream.
am33xx has a INTC_PENDING_IRQ3 register that is not checked for pending interrupts. This patch adds AM33XX to the ifdef of SOCs that have to check this register.
--- arch/arm/mach-omap2/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/irq.c +1 -1
@@ -233,7 +233,7 @@ static inline void omap_intc_handle_irq( goto out; irqnr =readl_relaxed (base_addr +0xd8 ); -#ifdef CONFIG_SOC_TI81XX +#if IS_ENABLED (CONFIG_SOC_TI81XX ) ||IS_ENABLED (CONFIG_SOC_AM33XX )if (irqnr) goto out; irqnr =readl_relaxed (base_addr +0xf8 );
Greg Kroah-Hartman
maintainerPATCH 3/173 ARM: sa11x0/assabet: ensure CS2 is configured appropriately
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell King <[email protected]>
commit f3964fe1c9d9a887d65faf594669852e4dec46e0 upstream.
The CS2 region contains the Assabet board configuration and status registers, which are 32-bit. Unfortunately, some boot loaders do not configure this region correctly, leaving it setup as a 16-bit region. Fix this.
--- arch/arm/mach-sa1100/assabet.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/mach-sa1100/assabet.c +3 -0
@@ -512,6 +512,9 @@ static void __init assabet_map_io(void)* Its called GPCLKR0 in my SA1110 manual. */ Ser1SDCR0 |=SDCR0_SUS ; +MSC1 = (MSC1 & ~0xffff ) | + MSC_NonBrst | MSC_32BitStMem | +MSC_RdAcc (2 ) |MSC_WrAcc (2 ) |MSC_Rec (0 );if (!machine_has_neponset ())sa1100_register_uart_fns (&assabet_port_fns);
Greg Kroah-Hartman
maintainerPATCH 4/173 ARM: 7876/1: clear Thumb-2 IT state on exception handling
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
commit e16b31bf47738f4498d7ce632e12d7d2a6a2492a upstream.
The exception handling code fails to clear the IT state, potentially leading to incorrect execution of the fixup if the size of the IT block is more than one.
Let fixup_exception do the IT sanitizing if a fixup has been found, and restore CPSR from the stack when returning from a data abort.
--- arch/arm/kernel/entry-armv.S | 1 + arch/arm/mm/extable.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)
arch/arm/kernel/entry-armv.S +1 -0
@@ -192,6 +192,7 @@ __dabt_svc: svc_entry mov r2, sp dabt_helper + THUMB( ldr r5, [sp, #S_PSR] ) @ potentially updated CPSR svc_exit r5 @ return from exception UNWIND(.fnend ) ENDPROC(__dabt_svc)
arch/arm/mm/extable.c +6 -1
@@ -9,8 +9,13 @@ int fixup_exception(struct pt_regs *regsconst struct exception_table_entry *fixup; fixup =search_exception_tables (instruction_pointer (regs)); -if (fixup) +if (fixup) { regs->ARM_pc = fixup->fixup; +#ifdef CONFIG_THUMB2_KERNEL +/* Clear the IT state to avoid nasty surprises in the fixup */ + regs->ARM_cpsr &= ~PSR_IT_MASK ; +#endif + }return fixup !=NULL ; }
Greg Kroah-Hartman
maintainerPATCH 5/173 ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Austin <[email protected]>
commit 30aeadd44deea3f3b0df45b9a70ee0fd5f8d6dc2 upstream.
This turns on the internal integrator LCD display(s). It seems that the code to do this got lost in refactoring of the CLCD driver.
--- arch/arm/mach-integrator/integrator_cp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-integrator/integrator_cp.c +2 -1
@@ -199,7 +199,8 @@ static struct mmci_platform_data mmc_datstatic void cp_clcd_enable (struct clcd_fb *fb) {struct fb_var_screeninfo *var = &fb->fb.var; -u32 val =CM_CTRL_STATIC1 |CM_CTRL_STATIC2 ; +u32 val =CM_CTRL_STATIC1 |CM_CTRL_STATIC2 + |CM_CTRL_LCDEN0 |CM_CTRL_LCDEN1 ;if (var->bits_per_pixel <=8 || (var->bits_per_pixel ==16 && var->green.length ==5 ))
Greg Kroah-Hartman
maintainerPATCH 6/173 ARM: at91: fix hanged boot due to early rtc-interrupt
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 6de714c21a8ea315fffba6a93bbe537f4c1bf4f0 upstream.
Make sure the RTC-interrupts are masked at boot by adding a new helper function to be used at SOC-init.
This fixes hanged boot on all AT91 SOCs with an RTC (but RM9200), for example, after a reset during an RTC-update or if an RTC-alarm goes off after shutdown (e.g. when using RTC wakeup).
The RTC and RTT-peripherals are powered by backup power (VDDBU) (on all AT91 SOCs but RM9200) and are not reset on wake-up, user, watchdog or software reset. This means that their interrupts may be enabled during early boot if, for example, they where not disabled during a previous shutdown (e.g. due to a buggy driver or a non-clean shutdown such as a user reset). Furthermore, an RTC or RTT-alarm may also be active.
The RTC and RTT-interrupts use the shared system-interrupt line, which is also used by the PIT, and if an interrupt occurs before a handler (e.g. RTC-driver) has been installed this leads to the system interrupt being disabled and prevents the system from booting.
Note that when boot hangs due to an early RTC or RTT-interrupt, the only way to get the system to start again is to remove the backup power (e.g. battery) or to disable the interrupt manually from the bootloader. In particular, a user reset is not sufficient.
--- arch/arm/mach-at91/Makefile | 2 - arch/arm/mach-at91/at91sam9g45.c | 2 + arch/arm/mach-at91/at91sam9n12.c | 6 +++ arch/arm/mach-at91/at91sam9rl.c | 2 + arch/arm/mach-at91/at91sam9x5.c | 6 +++ arch/arm/mach-at91/generic.h | 1 arch/arm/mach-at91/include/mach/at91sam9n12.h | 5 ++ arch/arm/mach-at91/include/mach/at91sam9x5.h | 5 ++ arch/arm/mach-at91/include/mach/sama5d3.h | 5 ++ arch/arm/mach-at91/sama5d3.c | 6 +++ arch/arm/mach-at91/sysirq_mask.c | 47 ++++++++++++++++++++++++++ 11 files changed, 86 insertions(+), 1 deletion(-)
arch/arm/mach-at91/Makefile +1 -1
@@ -2,7 +2,7 @@ # Makefile for the linux kernel. # -obj-y := irq.o gpio.o setup.o +obj-y := irq.o gpio.o setup.o sysirq_mask.o obj-m := obj-n := obj- :=
arch/arm/mach-at91/at91sam9g45.c +2 -0
@@ -376,6 +376,8 @@ static void __init at91sam9g45_initializ arm_pm_restart = at91sam9g45_restart; at91_extern_irq = (1 <<AT91SAM9G45_ID_IRQ0 ); +at91_sysirq_mask_rtc (AT91SAM9G45_BASE_RTC ); +/* Register GPIO subsystem */ at91_gpio_init (at91sam9g45_gpio,5 ); }
arch/arm/mach-at91/at91sam9n12.c +6 -0
@@ -223,7 +223,13 @@ static void __init at91sam9n12_map_io(voat91_init_sram (0 ,AT91SAM9N12_SRAM_BASE ,AT91SAM9N12_SRAM_SIZE ); } +static void __init at91sam9n12_initialize (void ) +{ +at91_sysirq_mask_rtc (AT91SAM9N12_BASE_RTC ); +} +AT91_SOC_START (at91sam9n12) .map_io = at91sam9n12_map_io, .register_clocks = at91sam9n12_register_clocks, + .init = at91sam9n12_initialize,AT91_SOC_END
arch/arm/mach-at91/at91sam9rl.c +2 -0
@@ -295,6 +295,8 @@ static void __init at91sam9rl_initialize arm_pm_restart = at91sam9_alt_restart; at91_extern_irq = (1 <<AT91SAM9RL_ID_IRQ0 ); +at91_sysirq_mask_rtc (AT91SAM9RL_BASE_RTC ); +/* Register GPIO subsystem */ at91_gpio_init (at91sam9rl_gpio,4 ); }
arch/arm/mach-at91/at91sam9x5.c +6 -0
@@ -318,6 +318,11 @@ static void __init at91sam9x5_map_io(voiat91_init_sram (0 ,AT91SAM9X5_SRAM_BASE ,AT91SAM9X5_SRAM_SIZE ); } +static void __init at91sam9x5_initialize (void ) +{ +at91_sysirq_mask_rtc (AT91SAM9X5_BASE_RTC ); +} +/* -------------------------------------------------------------------- * Interrupt initialization * -------------------------------------------------------------------- */
@@ -325,4 +330,5 @@ static void __init at91sam9x5_map_io(voiAT91_SOC_START (at91sam9x5) .map_io = at91sam9x5_map_io, .register_clocks = at91sam9x5_register_clocks, + .init = at91sam9x5_initialize,AT91_SOC_END
arch/arm/mach-at91/generic.h +1 -0
@@ -33,6 +33,7 @@ extern int __init at91_aic_of_init(stru struct device_node *parent);extern int __init at91_aic5_of_init (struct device_node *node,struct device_node *parent); +extern void __init at91_sysirq_mask_rtc (u32 rtc_base);/* Timer */
arch/arm/mach-at91/include/mach/at91sam9n12.h +5 -0
@@ -49,6 +49,11 @@#define AT91SAM9N12_BASE_USART3 0xf8028000/* +* System Peripherals +*/ +#define AT91SAM9N12_BASE_RTC 0xfffffeb0 + +/* * Internal Memory. */ #define AT91SAM9N12_SRAM_BASE 0x00300000/* Internal SRAM base address */
arch/arm/mach-at91/include/mach/at91sam9x5.h +5 -0
@@ -55,6 +55,11 @@#define AT91SAM9X5_BASE_USART2 0xf8024000/* +* System Peripherals +*/ +#define AT91SAM9X5_BASE_RTC 0xfffffeb0 + +/* * Internal Memory. */ #define AT91SAM9X5_SRAM_BASE 0x00300000/* Internal SRAM base address */
arch/arm/mach-at91/include/mach/sama5d3.h +5 -0
@@ -65,6 +65,11 @@#define SAMA5D3_ID_IRQ0 47/* Advanced Interrupt Controller (IRQ0) */ /* +* System Peripherals +*/ +#define SAMA5D3_BASE_RTC 0xfffffeb0 + +/* * Internal Memory */ #define SAMA5D3_SRAM_BASE 0x00300000/* Internal SRAM base address */
arch/arm/mach-at91/sama5d3.c +6 -0
@@ -371,7 +371,13 @@ static void __init sama5d3_map_io(void)at91_init_sram (0 ,SAMA5D3_SRAM_BASE ,SAMA5D3_SRAM_SIZE ); } +static void __init sama5d3_initialize (void ) +{ +at91_sysirq_mask_rtc (SAMA5D3_BASE_RTC ); +} +AT91_SOC_START (sama5d3) .map_io = sama5d3_map_io, .register_clocks = sama5d3_register_clocks, + .init = sama5d3_initialize,AT91_SOC_END
arch/arm/mach-at91/sysirq_mask.c new file +47 -0
47 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 7/173 ARM: at91: fix hanged boot due to early rtt-interrupt
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 94c4c79f2f1acca6e69a50bff5a7d9027509c16b upstream.
Make sure the RTT-interrupts are masked at boot by adding a new helper function to be used at SOC-init.
This fixes hanged boot on all AT91 SOCs with an RTT, for example, if an RTT-alarm goes off after a non-clean shutdown (e.g. when using RTC wakeup).
The RTC and RTT-peripherals are powered by backup power (VDDBU) (on all AT91 SOCs but RM9200) and are not reset on wake-up, user, watchdog or software reset. This means that their interrupts may be enabled during early boot if, for example, they where not disabled during a previous shutdown (e.g. due to a buggy driver or a non-clean shutdown such as a user reset). Furthermore, an RTC or RTT-alarm may also be active.
The RTC and RTT-interrupts use the shared system-interrupt line, which is also used by the PIT, and if an interrupt occurs before a handler (e.g. RTC-driver) has been installed this leads to the system interrupt being disabled and prevents the system from booting.
Note that when boot hangs due to an early RTC or RTT-interrupt, the only way to get the system to start again is to remove the backup power (e.g. battery) or to disable the interrupt manually from the bootloader. In particular, a user reset is not sufficient.
--- arch/arm/mach-at91/at91sam9260.c | 2 ++ arch/arm/mach-at91/at91sam9261.c | 2 ++ arch/arm/mach-at91/at91sam9263.c | 3 +++ arch/arm/mach-at91/at91sam9g45.c | 1 + arch/arm/mach-at91/at91sam9rl.c | 1 + arch/arm/mach-at91/generic.h | 1 + arch/arm/mach-at91/sysirq_mask.c | 24 ++++++++++++++++++++++++ 7 files changed, 34 insertions(+)
arch/arm/mach-at91/at91sam9260.c +2 -0
@@ -351,6 +351,8 @@ static void __init at91sam9260_initializ at91_extern_irq = (1 <<AT91SAM9260_ID_IRQ0 ) | (1 <<AT91SAM9260_ID_IRQ1 ) | (1 <<AT91SAM9260_ID_IRQ2 ); +at91_sysirq_mask_rtt (AT91SAM9260_BASE_RTT ); +/* Register GPIO subsystem */ at91_gpio_init (at91sam9260_gpio,3 ); }
arch/arm/mach-at91/at91sam9261.c +2 -0
@@ -293,6 +293,8 @@ static void __init at91sam9261_initializ at91_extern_irq = (1 <<AT91SAM9261_ID_IRQ0 ) | (1 <<AT91SAM9261_ID_IRQ1 ) | (1 <<AT91SAM9261_ID_IRQ2 ); +at91_sysirq_mask_rtt (AT91SAM9261_BASE_RTT ); +/* Register GPIO subsystem */ at91_gpio_init (at91sam9261_gpio,3 ); }
arch/arm/mach-at91/at91sam9263.c +3 -0
@@ -329,6 +329,9 @@ static void __init at91sam9263_initializ arm_pm_restart = at91sam9_alt_restart; at91_extern_irq = (1 <<AT91SAM9263_ID_IRQ0 ) | (1 <<AT91SAM9263_ID_IRQ1 ); +at91_sysirq_mask_rtt (AT91SAM9263_BASE_RTT0 ); +at91_sysirq_mask_rtt (AT91SAM9263_BASE_RTT1 ); +/* Register GPIO subsystem */ at91_gpio_init (at91sam9263_gpio,5 ); }
arch/arm/mach-at91/at91sam9g45.c +1 -0
@@ -377,6 +377,7 @@ static void __init at91sam9g45_initializ at91_extern_irq = (1 <<AT91SAM9G45_ID_IRQ0 );at91_sysirq_mask_rtc (AT91SAM9G45_BASE_RTC ); +at91_sysirq_mask_rtt (AT91SAM9G45_BASE_RTT );/* Register GPIO subsystem */ at91_gpio_init (at91sam9g45_gpio,5 );
arch/arm/mach-at91/at91sam9rl.c +1 -0
@@ -296,6 +296,7 @@ static void __init at91sam9rl_initialize at91_extern_irq = (1 <<AT91SAM9RL_ID_IRQ0 );at91_sysirq_mask_rtc (AT91SAM9RL_BASE_RTC ); +at91_sysirq_mask_rtt (AT91SAM9RL_BASE_RTT );/* Register GPIO subsystem */ at91_gpio_init (at91sam9rl_gpio,4 );
arch/arm/mach-at91/generic.h +1 -0
@@ -34,6 +34,7 @@ extern int __init at91_aic_of_init(struextern int __init at91_aic5_of_init (struct device_node *node,struct device_node *parent);extern void __init at91_sysirq_mask_rtc (u32 rtc_base); +extern void __init at91_sysirq_mask_rtt (u32 rtt_base);/* Timer */
arch/arm/mach-at91/sysirq_mask.c +24 -0
@@ -21,6 +21,7 @@*/ #include <linux/io.h> +#include <mach/at91_rtt.h> #include "generic.h"
@@ -44,4 +45,27 @@ void __init at91_sysirq_mask_rtc(u32 rtc }iounmap (base); +} + +void __init at91_sysirq_mask_rtt (u32 rtt_base) +{ +void __iomem *base; +void __iomem *reg; +u32 mode; + + base =ioremap (rtt_base,16 ); +if (!base) +return ; + + reg = base +AT91_RTT_MR ; + + mode =readl_relaxed (reg); +if (mode & (AT91_RTT_ALMIEN |AT91_RTT_RTTINCIEN )) { +pr_info ("AT91: Disabling rtt irq\n" ); + mode &= ~(AT91_RTT_ALMIEN |AT91_RTT_RTTINCIEN ); +writel_relaxed (mode, reg); + (void )readl_relaxed (reg);/* flush */ + } + +iounmap (base); }
Greg Kroah-Hartman
maintainerPATCH 8/173 ARM: i.MX6q: fix the wrong parent of can_root clock
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiada Wang <[email protected]>
commit 9b3d423707c3b1f6633be1be7e959623e10c596b upstream.
instead of pll3_usb_otg the parent of can_root clock should be pll3_60m.
--- arch/arm/mach-imx/clk-imx6q.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-imx/clk-imx6q.c +1 -1
@@ -424,7 +424,7 @@ int __init mx6q_clocks_init(void) clk[asrc_podf] =imx_clk_divider ("asrc_podf" ,"asrc_pred" , base +0x30 ,9 ,3 ); clk[spdif_pred] =imx_clk_divider ("spdif_pred" ,"spdif_sel" , base +0x30 ,25 ,3 ); clk[spdif_podf] =imx_clk_divider ("spdif_podf" ,"spdif_pred" , base +0x30 ,22 ,3 ); - clk[can_root] =imx_clk_divider ("can_root" ,"pll3_usb_otg" , base +0x20 ,2 ,6 ); + clk[can_root] =imx_clk_divider ("can_root" ,"pll3_60m" , base +0x20 ,2 ,6 ); clk[ecspi_root] =imx_clk_divider ("ecspi_root" ,"pll3_60m" , base +0x38 ,19 ,6 ); clk[gpu2d_core_podf] =imx_clk_divider ("gpu2d_core_podf" ,"gpu2d_core_sel" , base +0x18 ,23 ,3 ); clk[gpu3d_core_podf] =imx_clk_divider ("gpu3d_core_podf" ,"gpu3d_core_sel" , base +0x18 ,26 ,3 );
Greg Kroah-Hartman
maintainerPATCH 9/173 Staging: tidspbridge: disable driver
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 930ba4a374b96560ef9fde2145cdc454a164ddcc upstream.
There seems to be no active maintainer for the driver, and there is an unfixed security bug, so disable the driver for now.
Hopefully someone steps up to be the maintainer, and works to get this out of staging, otherwise it will be deleted soon.
--- drivers/staging/tidspbridge/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/tidspbridge/Kconfig +1 -1
@@ -4,7 +4,7 @@ menuconfig TIDSPBRIDGE tristate "DSP Bridge driver" - depends on ARCH_OMAP3 && !ARCH_MULTIPLATFORM + depends on ARCH_OMAP3 && !ARCH_MULTIPLATFORM && BROKEN select OMAP_MBOX_FWK help DSP/BIOS Bridge is designed for platforms that contain a GPP and
Greg Kroah-Hartman
maintainerPATCH 10/173 staging: zsmalloc: Ensure handle is never 0 on success
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olav Haugan <[email protected]>
commit 67296874eb1cc80317bf2a8fba22b494e21eb29b upstream.
zsmalloc encodes a handle using the pfn and an object index. On hardware platforms with physical memory starting at 0x0 the pfn can be 0. This causes the encoded handle to be 0 and is incorrectly interpreted as an allocation failure.
This issue affects all current and future SoCs with physical memory starting at 0x0. All MSM8974 SoCs which includes Google Nexus 5 devices are affected.
To prevent this false error we ensure that the encoded handle will not be 0 when allocation succeeds.
--- drivers/staging/zsmalloc/zsmalloc-main.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/staging/zsmalloc/zsmalloc-main.c +13 -4
@@ -430,7 +430,12 @@ static struct page *get_next_page(structreturn next; } -/* Encode <page, obj_idx> as a single handle value */ +/* +* Encode <page, obj_idx> as a single handle value. +* On hardware platforms with physical memory starting at 0x0 the pfn +* could be 0 so we ensure that the handle will never be 0 by adjusting the +* encoded obj_idx value before encoding. +*/ static void *obj_location_to_handle (struct page *page,unsigned long obj_idx) {unsigned long handle;
@@ -441,17 +446,21 @@ static void *obj_location_to_handle(stru } handle =page_to_pfn (page) <<OBJ_INDEX_BITS ; - handle |= (obj_idx &OBJ_INDEX_MASK ); + handle |= ((obj_idx +1 ) &OBJ_INDEX_MASK );return (void *)handle; } -/* Decode <page, obj_idx> pair from the given object handle */ +/* +* Decode <page, obj_idx> pair from the given object handle. We adjust the +* decoded obj_idx back to its original value since it was adjusted in +* obj_location_to_handle(). +*/ static void obj_handle_to_location (unsigned long handle,struct page **page,unsigned long *obj_idx) { *page =pfn_to_page (handle >>OBJ_INDEX_BITS ); - *obj_idx = handle &OBJ_INDEX_MASK ; + *obj_idx = (handle &OBJ_INDEX_MASK ) -1 ; } static unsigned long obj_idx_to_offset(struct page *page,
Greg Kroah-Hartman
maintainerPATCH 11/173 staging: vt6656: [BUG] Fix for TX USB resets from vendors driver.
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Malcolm Priestley <[email protected]>
commit 9df682927c2e3a92f43803d6b52095992e3b2ab8 upstream.
This fixes resets on heavy TX data traffic.
Vendor driver
VT6656_Linux_src_v1.21.03_x86_11.04.zip
http://www.viaembedded.com/servlet/downloadSvl?id=1890&download_file_id=14704
This is GPL-licensed code.
original code
BBbVT3184Init
...
//2007-0725, RobertChang add, Enable Squelch detect reset option(SQ_RST_Opt), USB (register4, bit1) CONTROLnsRequestIn(pDevice,
MESSAGE_TYPE_READ,
(WORD)0x600+4, // USB's Reg4's bit1
MESSAGE_REQUEST_MEM,
1,
(PBYTE) &byData);
byData = byData|2 ;
CONTROLnsRequestOut(pDevice,
MESSAGE_TYPE_WRITE,
(WORD)0x600+4, // USB's Reg4's bit1
MESSAGE_REQUEST_MEM,
1,
(PBYTE) &byData);return TRUE;//ntStatus;
....
A back port patch is needed for kernels less than 3.10.
--- drivers/staging/vt6656/baseband.c | 11 +++++++++++ drivers/staging/vt6656/rndis.h | 2 ++ 2 files changed, 13 insertions(+)
drivers/staging/vt6656/baseband.c +11 -0
@@ -941,6 +941,7 @@ int BBbVT3184Init(struct vnt_private *pDu8 * pbyAgc;u16 wLengthAgc;u8 abyArray[256 ]; +u8 data; ntStatus = CONTROLnsRequestIn(pDevice, MESSAGE_TYPE_READ,
@@ -1106,6 +1107,16 @@ else {ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0x0D ,0x01 );RFbRFTableDownload (pDevice); + +/* Fix for TX USB resets from vendors driver */ +CONTROLnsRequestIn (pDevice,MESSAGE_TYPE_READ ,USB_REG4 , +MESSAGE_REQUEST_MEM ,sizeof (data), &data); + + data |=0x2 ; + +CONTROLnsRequestOut (pDevice,MESSAGE_TYPE_WRITE ,USB_REG4 , +MESSAGE_REQUEST_MEM ,sizeof (data), &data); +return true;//ntStatus; }
drivers/staging/vt6656/rndis.h +2 -0
@@ -66,6 +66,8 @@#define VIAUSB20_PACKET_HEADER 0x04 +#define USB_REG4 0x604 + typedef struct _CMD_MESSAGE { u8 byData[256];
Greg Kroah-Hartman
maintainerPATCH 12/173 backlight: atmel-pwm-bl: fix gpio polarity in remove
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit ad5066d4c2b1d696749f8d7816357c23b648c4d3 upstream.
Make sure to honour gpio polarity also at remove so that the backlight is actually disabled on boards with active-low enable pin.
--- drivers/video/backlight/atmel-pwm-bl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +4 -2
@@ -207,8 +207,10 @@ static int atmel_pwm_bl_remove(struct pl {struct atmel_pwm_bl *pwmbl =platform_get_drvdata (pdev); -if (pwmbl->gpio_on !=-1 ) -gpio_set_value (pwmbl->gpio_on,0 ); +if (pwmbl->gpio_on !=-1 ) { +gpio_set_value (pwmbl->gpio_on, +0 ^ pwmbl->pdata->on_active_low); + }pwm_channel_disable (&pwmbl->pwmc);pwm_channel_free (&pwmbl->pwmc);backlight_device_unregister (pwmbl->bldev);
Greg Kroah-Hartman
maintainerPATCH 13/173 backlight: atmel-pwm-bl: fix reported brightness
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 185d91442550110db67a7dc794a32efcea455a36 upstream.
The driver supports 16-bit brightness values, but the value returned from get_brightness was truncated to eight bits.
--- drivers/video/backlight/atmel-pwm-bl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +2 -2
@@ -70,7 +70,7 @@ static int atmel_pwm_bl_set_intensity(ststatic int atmel_pwm_bl_get_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd); -u8 intensity; +u32 intensity;if (pwmbl->pdata->pwm_active_low) { intensity = pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY) -
@@ -80,7 +80,7 @@ static int atmel_pwm_bl_get_intensity(stpwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); } -return intensity; +return intensity &0xffff ; }static int atmel_pwm_bl_init_pwm (struct atmel_pwm_bl *pwmbl)
Greg Kroah-Hartman
maintainerPATCH 14/173 ASoC: ak4642: prevent un-necessary changes to SG_SL1
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phil Edworthy <[email protected]>
commit 7b5bfb82882b9b1c8423ce0ed6852ca3762d967a upstream.
If you record the sound during playback,
the playback sound becomes silent.
Modify so that the codec driver does not clearSG_SL1::DACL bit which is controlled under widget
--- sound/soc/codecs/ak4642.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/ak4642.c +1 -1
@@ -257,7 +257,7 @@ static int ak4642_dai_startup(struct snd* This operation came from example code of * "ASAHI KASEI AK4642" (japanese) manual p94. */ -snd_soc_write (codec,SG_SL1 ,PMMP |MGAIN0 ); +snd_soc_update_bits (codec,SG_SL1 ,PMMP |MGAIN0 ,PMMP |MGAIN0 );snd_soc_write (codec,TIMER ,ZTM (0x3 ) |WTM (0x3 ));snd_soc_write (codec,ALC_CTL1 ,ALC |LMTH0 );snd_soc_update_bits (codec,PW_MGMT1 ,PMADL ,PMADL );
Greg Kroah-Hartman
maintainerPATCH 15/173 ASoC: cs42l52: Correct MIC CTL mask
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Austin <[email protected]>
commit 3d800c6d75b8c92fa928a0bcaf95cd7ac5fd1ce5 upstream.
The mask for CS42L52_MIC_CTL_TYPE_MASK was wrong keeping the mic config from being set correctly.
--- sound/soc/codecs/cs42l52.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/cs42l52.h +1 -1
@@ -179,7 +179,7 @@#define CS42L52_MICB_CTL 0x11#define CS42L52_MIC_CTL_MIC_SEL_MASK 0xBF#define CS42L52_MIC_CTL_MIC_SEL_SHIFT 6 -#define CS42L52_MIC_CTL_TYPE_MASK 0xDF +#define CS42L52_MIC_CTL_TYPE_MASK 0x20#define CS42L52_MIC_CTL_TYPE_SHIFT 5
Greg Kroah-Hartman
maintainerPATCH 16/173 ASoC: wm8962: Turn on regcache_cache_only before disabling regulator
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolin Chen <[email protected]>
commit 50bfcf2df2fadf77e143d6099150e6fa7ef4d78c upstream.
It's safer to turn on regcache_cache_only before disabling regulator since the driver will turn off the regcache_cache_only after enabling regulator.
If we remain cache_only false, some command like 'amixer cset' would get failure if being run before wm8962_resume().
--- sound/soc/codecs/wm8962.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/wm8962.c +2 -0
@@ -3686,6 +3686,8 @@ static int wm8962_i2c_probe(struct i2c_cif (ret <0 ) goto err_enable; +regcache_cache_only (wm8962->regmap, true); +/* The drivers should power up as needed */ regulator_bulk_disable (ARRAY_SIZE (wm8962->supplies), wm8962->supplies);
Greg Kroah-Hartman
maintainerPATCH 17/173 ASoC: blackfin: Fix missing break
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit afed4dbe3a043dbd833a53b6b4951e155708afd2 upstream.
--- sound/soc/blackfin/bf5xx-i2s.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/blackfin/bf5xx-i2s.c +1 -0
@@ -111,6 +111,7 @@ static int bf5xx_i2s_hw_params(struct sn bf5xx_i2s->tcr2 |=7 ; bf5xx_i2s->rcr2 |=7 ; sport_handle->wdsize =1 ; +break ;case SNDRV_PCM_FORMAT_S16_LE : bf5xx_i2s->tcr2 |=15 ; bf5xx_i2s->rcr2 |=15 ;
Greg Kroah-Hartman
maintainerPATCH 18/173 ASoC: fsl: imx-pcm-fiq: omit fiq counter to avoid harm in unbalanced situations
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oskar Schirmer <[email protected]>
commit fc7dc61d9a87011aaf8a6eb3144ebf9552adf5d2 upstream.
Unbalanced calls to snd_imx_pcm_trigger() may result in endless FIQ activity and thus provoke eternal sound. While on the first glance, the switch statement looks pretty symmetric, the SUSPEND/RESUME pair is not: the suspend case comes along snd_pcm_suspend_all(), which for fsl/imx-pcm-fiq is called only at snd_soc_suspend(), but the resume case originates straight from the SNDRV_PCM_IOCTL_RESUME. This way userland may provoke an unbalanced resume, which might cause the fiq_enable counter to increase and never return to zero again, so eventually imx_pcm_fiq is never disabled.
Simply removing the fiq_enable will solve the problem, as long as one never goes play and capture game simultaneously, but beware trying both at once, the early TRIGGER_STOP will cut off the other activity prematurely. So now playing and capturing is scrutinized separately, instead of by counting.
--- sound/soc/fsl/imx-pcm-fiq.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
sound/soc/fsl/imx-pcm-fiq.c +17 -12
@@ -42,7 +42,8 @@ struct imx_pcm_runtime_data {struct hrtimer hrt;int poll_time_ns;struct snd_pcm_substream *substream; -atomic_t running; +atomic_t playing; +atomic_t capturing; };static enum hrtimer_restart snd_hrtimer_callback (struct hrtimer *hrt)
@@ -54,7 +55,7 @@ static enum hrtimer_restart snd_hrtimer_struct pt_regs regs;unsigned long delta; -if (!atomic_read (&iprtd->running)) +if (!atomic_read (&iprtd->playing) && !atomic_read (&iprtd->capturing))return HRTIMER_NORESTART ;get_fiq_regs (®s);
@@ -122,7 +123,6 @@ static int snd_imx_pcm_prepare(struct snreturn 0 ; } -static int fiq_enable;static int imx_pcm_fiq;static int snd_imx_pcm_trigger (struct snd_pcm_substream *substream,int cmd)
@@ -134,23 +134,27 @@ static int snd_imx_pcm_trigger(struct sncase SNDRV_PCM_TRIGGER_START :case SNDRV_PCM_TRIGGER_RESUME :case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : -atomic_set (&iprtd->running,1 ); +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) +atomic_set (&iprtd->playing,1 ); +else +atomic_set (&iprtd->capturing,1 );hrtimer_start (&iprtd->hrt,ns_to_ktime (iprtd->poll_time_ns),HRTIMER_MODE_REL ); -if (++fiq_enable ==1 ) -enable_fiq (imx_pcm_fiq); - +enable_fiq (imx_pcm_fiq);break ;case SNDRV_PCM_TRIGGER_STOP :case SNDRV_PCM_TRIGGER_SUSPEND :case SNDRV_PCM_TRIGGER_PAUSE_PUSH : -atomic_set (&iprtd->running,0 ); - -if (--fiq_enable ==0 ) +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) +atomic_set (&iprtd->playing,0 ); +else +atomic_set (&iprtd->capturing,0 ); +if (!atomic_read (&iprtd->playing) && + !atomic_read (&iprtd->capturing))disable_fiq (imx_pcm_fiq); -break ; +default :return -EINVAL ; }
@@ -198,7 +202,8 @@ static int snd_imx_open(struct snd_pcm_s iprtd->substream = substream; -atomic_set (&iprtd->running,0 ); +atomic_set (&iprtd->playing,0 ); +atomic_set (&iprtd->capturing,0 );hrtimer_init (&iprtd->hrt,CLOCK_MONOTONIC ,HRTIMER_MODE_REL ); iprtd->hrt.function = snd_hrtimer_callback;
Greg Kroah-Hartman
maintainerPATCH 19/173 ASoC: arizona: Set FLL to free-run before disabling
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Fitzgerald <[email protected]>
commit 3e68ce1bc72e5d6615677ec5a8b0a9bcb6c7a490 upstream.
The FLL must be placed into free-run mode before disabling to allow it to entirely shut down.
--- sound/soc/codecs/arizona.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/soc/codecs/arizona.c +4 -0
@@ -1455,6 +1455,8 @@ static void arizona_enable_fll(struct artry_wait_for_completion (&fll->ok);regmap_update_bits (arizona->regmap, fll->base +1 , +ARIZONA_FLL1_FREERUN ,0 ); +regmap_update_bits (arizona->regmap, fll->base +1 ,ARIZONA_FLL1_ENA ,ARIZONA_FLL1_ENA );if (fll->ref_src >=0 && fll->sync_src >=0 && fll->ref_src != fll->sync_src)
@@ -1473,6 +1475,8 @@ static void arizona_disable_fll(struct astruct arizona *arizona = fll->arizona;bool change; +regmap_update_bits (arizona->regmap, fll->base +1 , +ARIZONA_FLL1_FREERUN ,ARIZONA_FLL1_FREERUN );regmap_update_bits_check (arizona->regmap, fll->base +1 ,ARIZONA_FLL1_ENA ,0 , &change); regmap_update_bits(arizona->regmap, fll->base + 0x11,
Greg Kroah-Hartman
maintainerPATCH 20/173 ASoC: wm5110: Add post SYSCLK register patch for rev D chip
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charles Keepax <[email protected]>
commit f69f86b1ba6493126a7f093a65a8952bcb183de2 upstream.
Certain registers require patching after the SYSCLK has been brought up add support for this into the CODEC driver.
--- sound/soc/codecs/wm5110.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-)
sound/soc/codecs/wm5110.c +42 -1
@@ -37,6 +37,47 @@ struct wm5110_priv {struct arizona_fll fll[2 ]; }; +static const struct reg_default wm5110_sysclk_revd_patch[] = { + {0x3093 ,0x1001 }, + {0x30E3 ,0x1301 }, + {0x3133 ,0x1201 }, + {0x3183 ,0x1501 }, + {0x31D3 ,0x1401 }, +}; + +static int wm5110_sysclk_ev (struct snd_soc_dapm_widget *w, +struct snd_kcontrol *kcontrol,int event) +{ +struct snd_soc_codec *codec = w->codec; +struct arizona *arizona =dev_get_drvdata (codec->dev->parent); +struct regmap *regmap = codec->control_data; +const struct reg_default *patch =NULL ; +int i, patch_size; + +switch (arizona->rev) { +case 3 : + patch = wm5110_sysclk_revd_patch; + patch_size =ARRAY_SIZE (wm5110_sysclk_revd_patch); +break ; +default : +return 0 ; + } + +switch (event) { +case SND_SOC_DAPM_POST_PMU : +if (patch) +for (i =0 ; i < patch_size; i++) +regmap_write (regmap, patch[i].reg, + patch[i].def); +break ; + +default : +break ; + } + +return 0 ; +} + static DECLARE_TLV_DB_SCALE(ana_tlv, 0, 100, 0); static DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0); static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0);
@@ -386,7 +427,7 @@ static const struct snd_kcontrol_new wm5static const struct snd_soc_dapm_widget wm5110_dapm_widgets[] = {SND_SOC_DAPM_SUPPLY ("SYSCLK" ,ARIZONA_SYSTEM_CLOCK_1 ,ARIZONA_SYSCLK_ENA_SHIFT , -0 ,NULL ,0 ), +0 , wm5110_sysclk_ev,SND_SOC_DAPM_POST_PMU ),SND_SOC_DAPM_SUPPLY ("ASYNCCLK" ,ARIZONA_ASYNC_CLOCK_1 ,ARIZONA_ASYNC_CLK_ENA_SHIFT ,0 ,NULL ,0 ), SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK,
Greg Kroah-Hartman
maintainerPATCH 21/173 perf tools: Remove cast of non-variadic function to variadic
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Hudson-Doyle <[email protected]>
commit 53805eca3d89b095062c11a6798689bb0af09216 upstream.
The 4fb71074a570 (perf ui/hist: Consolidate hpp helpers) cset introduced a cast of percent_color_snprintf to a function pointer type with varargs. Change percent_color_snprintf to be variadic and remove the cast.
The symptom of this was all percentages being reported as 0.00% in perf report --stdio output on the armhf arch.
--- tools/perf/ui/hist.c | 2 +- tools/perf/util/color.c | 11 +++++++++-- tools/perf/util/color.h | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-)
tools/perf/ui/hist.c +1 -1
@@ -113,7 +113,7 @@ static u64 he_get_##_field(struct hist_e static int hpp__color_##_type(struct perf_hpp *hpp, struct hist_entry *he) \ { \ return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%", \ - (hpp_snprint_fn )percent_color_snprintf, true); \ + percent_color_snprintf, true); \ }#define __HPP_ENTRY_PERCENT_FN (_type, _field) \
tools/perf/util/color.c +9 -2
@@ -318,8 +318,15 @@ int percent_color_fprintf(FILE *fp, consreturn r; } -int percent_color_snprintf (char *bf,size_t size,const char *fmt,double percent) +int percent_color_snprintf (char *bf,size_t size,const char *fmt, ...) { -const char *color =get_percent_color (percent); +va_list args; +double percent; +const char *color; + +va_start (args, fmt); + percent =va_arg (args, double); +va_end (args); + color =get_percent_color (percent);return color_snprintf (bf, size, color, fmt, percent); }
tools/perf/util/color.h +1 -1
@@ -39,7 +39,7 @@ int color_fprintf(FILE *fp, const char *int color_snprintf (char *bf,size_t size,const char *color,const char *fmt, ...);int color_fprintf_ln (FILE *fp,const char *color,const char *fmt, ...);int color_fwrite_lines (FILE *fp,const char *color,size_t count,const char *buf); -int percent_color_snprintf (char *bf,size_t size,const char *fmt,double percent); +int percent_color_snprintf (char *bf,size_t size,const char *fmt, ...);int percent_color_fprintf (FILE *fp,const char *fmt,double percent);const char *get_percent_color (double percent);
Greg Kroah-Hartman
maintainerPATCH 22/173 alarmtimer: return EINVAL instead of ENOTSUPP if rtcdev doesnt exist
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: KOSAKI Motohiro <[email protected]>
commit 98d6f4dd84a134d942827584a3c5f67ffd8ec35f upstream.
Fedora Ruby maintainer reported latest Ruby doesn't work on Fedora Rawhide on ARM. (http://bugs.ruby-lang.org/issues/9008)
Because of, commit 1c6b39ad3f (alarmtimers: Return -ENOTSUPP if no RTC device is present) intruduced to return ENOTSUPP when clock_get{time,res} can't find a RTC device. However this is incorrect.
First, ENOTSUPP isn't exported to userland (ENOTSUP or EOPNOTSUP are the closest userland equivlents).
Second, Posix and Linux man pages agree that clock_gettime and clock_getres should return EINVAL if clk_id argument is invalid. While the arugment that the clockid is valid, but just not supported on this hardware could be made, this is just a technicality that doesn't help userspace applicaitons, and only complicates error handling.
Thus, this patch changes the code to use EINVAL.
--- kernel/time/alarmtimer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/time/alarmtimer.c +2 -2
@@ -445,7 +445,7 @@ static int alarm_clock_getres(const clocclockid_t baseid = alarm_bases[clock2alarm (which_clock)].base_clockid;if (!alarmtimer_get_rtcdev ()) -return -ENOTSUPP ; +return -EINVAL ;return hrtimer_get_res (baseid, tp); }
@@ -462,7 +462,7 @@ static int alarm_clock_get(clockid_t whistruct alarm_base *base = &alarm_bases[clock2alarm (which_clock)];if (!alarmtimer_get_rtcdev ()) -return -ENOTSUPP ; +return -EINVAL ; *tp =ktime_to_timespec (base->gettime ());return 0 ;
Greg Kroah-Hartman
maintainerPATCH 23/173 pinctrl: dove: unset twsi option3 for gconfig as well
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roel Kluin <[email protected]>
commit 6d0a4ed2b90a12e1403d3e7d9d8c2cc7fdc301b5 upstream.
This fixes a typo which left twsi config3 option enabled.
--- drivers/pinctrl/mvebu/pinctrl-dove.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/mvebu/pinctrl-dove.c +1 -1
@@ -323,7 +323,7 @@ static int dove_twsi_ctrl_set(struct mveunsigned long gcfg2 =readl (DOVE_GLOBAL_CONFIG_2 ); gcfg1 &= ~DOVE_TWSI_ENABLE_OPTION1 ; - gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 |DOVE_TWSI_ENABLE_OPTION2 ); + gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 |DOVE_TWSI_ENABLE_OPTION3 );switch (config) {case 1 :
Greg Kroah-Hartman
maintainerPATCH 24/173 devpts: plug the memory leak in kill_sb
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilija Hadzic <[email protected]>
commit 66da0e1f9034140ae2f571ef96e254a25083906c upstream.
When devpts is unmounted, there may be a no-longer-used IDR tree hanging off the superblock we are about to kill. This needs to be cleaned up before destroying the SB.
The leak is usually not a big deal because unmounting devpts is typically done when shutting down the whole machine. However, shutting down an LXC container instead of a physical machine exposes the problem (the garbage is detectable with kmemleak).
--- fs/devpts/inode.c | 1 + 1 file changed, 1 insertion(+)
fs/devpts/inode.c +1 -0
@@ -498,6 +498,7 @@ static void devpts_kill_sb(struct super_ {struct pts_fs_info *fsi =DEVPTS_SB (sb); +ida_destroy (&fsi->allocated_ptys);kfree (fsi);kill_litter_super (sb); }
Greg Kroah-Hartman
maintainerPATCH 25/173 parisc: break out SOCK_NONBLOCK define to own asm header file
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 38c7937379276a5ea8c54481205003af2f2b5694 upstream.
Break SOCK_NONBLOCK out to its own asm-file as other arches do. This fixes build errors with auditd and probably other packages.
--- arch/parisc/include/asm/socket.h | 11 +++++++++++ arch/parisc/include/uapi/asm/socket.h | 11 +++-------- 2 files changed, 14 insertions(+), 8 deletions(-)
arch/parisc/include/asm/socket.h new file +11 -0
@@ -0,0 +1,11 @@ +#ifndef _ASM_SOCKET_H +#define _ASM_SOCKET_H + +#include <uapi/asm/socket.h> + +/* O_NONBLOCK clashes with the bits used for socket types. Therefore we +* have to define SOCK_NONBLOCK to a different value here. +*/ +#define SOCK_NONBLOCK 0x40000000 + +#endif /* _ASM_SOCKET_H */
arch/parisc/include/uapi/asm/socket.h +3 -8
@@ -1,5 +1,5 @@ -#ifndef _ASM_SOCKET_H -#define _ASM_SOCKET_H +#ifndef _UAPI_ASM_SOCKET_H +#define _UAPI_ASM_SOCKET_H#include <asm/sockios.h>
@@ -73,9 +73,4 @@#define SO_SELECT_ERR_QUEUE 0x4026 -/* O_NONBLOCK clashes with the bits used for socket types. Therefore we -* have to define SOCK_NONBLOCK to a different value here. -*/ -#define SOCK_NONBLOCK 0x40000000 - -#endif /* _ASM_SOCKET_H */ +#endif /* _UAPI_ASM_SOCKET_H */
Greg Kroah-Hartman
maintainerPATCH 26/173 can: flexcan: fix flexcan_chip_start() on imx6
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Kleine-Budde <[email protected]>
commit 0d1862ea1a5bb876cf05555a7307080cb75bf379 upstream.
In the flexcan_chip_start() function first the flexcan core is going through the soft reset sequence, then the RX FIFO is enabled.
With the hardware is put into FIFO mode, message buffers 1...7 are reserved by the FIFO engine. The remaining message buffers are in reset default values. This patch removes the bogus initialization of the message buffers, as it causes an imprecise external abort on imx6.
--- drivers/net/can/flexcan.c | 12 ------------ 1 file changed, 12 deletions(-)
drivers/net/can/flexcan.c +0 -12
@@ -711,7 +711,6 @@ static int flexcan_chip_start(struct net {struct flexcan_priv *priv =netdev_priv (dev);struct flexcan_regs __iomem *regs = priv->base; -unsigned int i;int err;u32 reg_mcr, reg_ctrl;
@@ -783,17 +782,6 @@ static int flexcan_chip_start(struct netnetdev_dbg (dev,"%s: writing ctrl=0x%08x" , __func__, reg_ctrl);flexcan_write (reg_ctrl, ®s->ctrl); -for (i =0 ; i <ARRAY_SIZE (regs->cantxfg); i++) { -flexcan_write (0 , ®s->cantxfg[i].can_ctrl); -flexcan_write (0 , ®s->cantxfg[i].can_id); -flexcan_write (0 , ®s->cantxfg[i].data[0 ]); -flexcan_write (0 , ®s->cantxfg[i].data[1 ]); - -/* put MB into rx queue */ -flexcan_write (FLEXCAN_MB_CNT_CODE (0x4 ), - ®s->cantxfg[i].can_ctrl); - } -/* Abort any pending TX, mark Mailbox as INACTIVE */ flexcan_write (FLEXCAN_MB_CNT_CODE (0x4 ), ®s->cantxfg[FLEXCAN_TX_BUF_ID ].can_ctrl);
Greg Kroah-Hartman
maintainerPATCH 27/173 i2c: mux: gpio: use reg value for i2c_add_mux_adapter
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ionut Nicu <[email protected]>
commit 8c0ec2500eeb89749341884a972860d7f9e56f9c upstream.
The i2c-mux driver requires that the chan_id parameter passed to the i2c_add_mux_adapter() function is equal to the reg value for that adapter:
for_each_child_of_node(mux_dev->of_node, child) {
ret = of_property_read_u32(child, "reg", ®);
if (ret)
continue;
if (chan_id == reg) {
priv->adap.dev.of_node = child;
break;
}
}The i2c-mux-gpio driver uses an internal logical index for chan_id when calling i2c_add_mux_adapter() instead of using the reg value.
Because of this, there will problems in selecting the right adapter when the i2c-mux-gpio's index into mux->data.values doesn't match the reg value.
An example of such a case:
mux->data.values = { 1, 0 }
For chan_id = 0, i2c-mux will bind the adapter to the of_node with reg = <0>, but when it will call the select() callback with chan_id set to 0, the i2c-mux-gpio will use it as an index into mux->data.values and it will actually select the bus with reg = <1>.
--- drivers/i2c/muxes/i2c-mux-gpio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/muxes/i2c-mux-gpio.c +2 -2
@@ -39,7 +39,7 @@ static int i2c_mux_gpio_select(struct i2 {struct gpiomux *mux = data; -i2c_mux_gpio_set (mux, mux->data.values[chan]); +i2c_mux_gpio_set (mux, chan);return 0 ; }
@@ -223,7 +223,7 @@ static int i2c_mux_gpio_probe(struct plaunsigned int class = mux->data.classes ? mux->data.classes[i] :0 ; mux->adap[i] =i2c_add_mux_adapter (parent, &pdev->dev, mux, nr, - i, class, + mux->data.values[i], class, i2c_mux_gpio_select, deselect);if (!mux->adap[i]) { ret = -ENODEV ;
Greg Kroah-Hartman
maintainerPATCH 28/173 i2c: mux: gpio: use gpio_set_value_cansleep()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ionut Nicu <[email protected]>
commit 250ad590d6f12d93f4d85be305b0a598d609232e upstream.
Some gpio chips may have get/set operations that can sleep. gpio_set_value() only works for chips which do not sleep, for the others we will get a kernel warning. Using gpio_set_value_cansleep() will work for both chips that do sleep and those who don't.
--- drivers/i2c/muxes/i2c-mux-gpio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/muxes/i2c-mux-gpio.c +2 -2
@@ -31,8 +31,8 @@ static void i2c_mux_gpio_set(const strucint i;for (i =0 ; i < mux->data.n_gpios; i++) -gpio_set_value (mux->gpio_base + mux->data.gpios[i], - val & (1 << i)); +gpio_set_value_cansleep (mux->gpio_base + mux->data.gpios[i], + val & (1 << i)); }static int i2c_mux_gpio_select (struct i2c_adapter *adap,void *data,u32 chan)
Greg Kroah-Hartman
maintainerPATCH 29/173 ARM: dts: Add max77686 RTC interrupt to cros5250-common
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Doug Anderson <[email protected]>
commit c61248afa8190ae3f47ee67f46e3c9b584a73d31 upstream.
Without the interrupt you'll get problems if you enable CONFIG_RTC_DRV_MAX77686. Setup the interrupt properly in the device tree.
--- arch/arm/boot/dts/cros5250-common.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm/boot/dts/cros5250-common.dtsi +12 -0
@@ -27,6 +27,13 @@ i2c2_bus: i2c2-bus { samsung,pin-pud = <0>; }; + + max77686_irq: max77686-irq { + samsung,pins = "gpx3-2"; + samsung,pin-function = <0>; + samsung,pin-pud = <0>; + samsung,pin-drv = <0>; + }; }; i2c@12C60000 {
@@ -35,6 +42,11 @@ max77686@09 { compatible = "maxim,max77686"; + interrupt-parent = <&gpx3>; + interrupts = <2 0>; + pinctrl-names = "default"; + pinctrl-0 = <&max77686_irq>; + wakeup-source; reg = <0x09>; voltage-regulators {
Greg Kroah-Hartman
maintainerPATCH 30/173 ARM: bcm2835: add missing #xxx-cells to I2C nodes
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Warren <[email protected]>
commit a31ab44ef5d07c6707df4a9ad2c8affd2d62ff4b upstream.
The I2C controller node needs #address-cells and #size-cells properties, but these are currently missing. Add them. This allows child nodes to be parsed correctly.
--- arch/arm/boot/dts/bcm2835.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/bcm2835.dtsi +4 -0
@@ -85,6 +85,8 @@ reg = <0x7e205000 0x1000>; interrupts = <2 21>; clocks = <&clk_i2c>; + #address-cells = <1>; + #size-cells = <0>; status = "disabled"; };
@@ -93,6 +95,8 @@ reg = <0x7e804000 0x1000>; interrupts = <2 21>; clocks = <&clk_i2c>; + #address-cells = <1>; + #size-cells = <0>; status = "disabled"; };
Greg Kroah-Hartman
maintainerPATCH 31/173 gpio: twl4030: Fix regression for twl gpio output
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <[email protected]>
commit 0b2aa8bed3e13892fcac77e4f50ec6e80125469d upstream.
Commit c111feabe2e2 (gpio: twl4030: Cache the direction and output states in private data) improved things in general, but caused a regression for setting the GPIO output direction.
The change reorganized twl_direction_out() and twl_set() and swapped the function names around in the process. While doing that, a bug got introduced that's not obvious while reading the patch as it appears as no change to the code.
The bug is we now call function twl4030_set_gpio_dataout() twice in both twl_direction_out() and twl_set(). Instead, we should first call twl_direction_out() in twl_direction_out() followed by twl4030_set_gpio_dataout() in twl_set().
This regression probably has gone unnoticed for a long time as the bootloader may have set the GPIO direction properly in many cases. This fixes at least the LCD panel not turning on omap3 LDP for example.
--- drivers/gpio/gpio-twl4030.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpio/gpio-twl4030.c +3 -2
@@ -354,17 +354,18 @@ static void twl_set(struct gpio_chip *chstatic int twl_direction_out (struct gpio_chip *chip,unsigned offset,int value) {struct gpio_twl4030_priv *priv =to_gpio_twl4030 (chip); +int ret = -EINVAL ;mutex_lock (&priv->mutex);if (offset <TWL4030_GPIO_MAX ) -twl4030_set_gpio_dataout (offset, value); + ret =twl4030_set_gpio_direction (offset,0 ); priv->direction |=BIT (offset);mutex_unlock (&priv->mutex);twl_set (chip, offset, value); -return 0 ; +return ret; }static int twl_to_irq (struct gpio_chip *chip,unsigned offset)
Greg Kroah-Hartman
maintainerPATCH 32/173 gpio: mvebu: make mvchip->irqbase signed for error handling
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit d535922691fc026479fcc03e78ac3d931a54e75a upstream.
There is a bug in mvebu_gpio_probe() where we do:
mvchip->irqbase = irq_alloc_descs(-1, 0, ngpios, -1);
if (mvchip->irqbase < 0) {The problem is that mvchip->irqbase is unsigned so the error handling doesn't work. I have changed it to be a regular int.
--- drivers/gpio/gpio-mvebu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-mvebu.c +1 -1
@@ -79,7 +79,7 @@ struct mvebu_gpio_chip {spinlock_t lock;void __iomem *membase;void __iomem *percpu_membase; -unsigned int irqbase; +int irqbase;struct irq_domain *domain;int soc_variant; };
Greg Kroah-Hartman
maintainerPATCH 33/173 gpio: rcar: NULL dereference on error in probe()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 0c8aab8e65e450f2bfea494c1b6a86ded653f88c upstream.
It's not obvious from the label name but "err1" tries to release "p->irq_domain" which leads to a NULL dereference.
--- drivers/gpio/gpio-rcar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-rcar.c +1 -1
@@ -329,7 +329,7 @@ static int gpio_rcar_probe(struct platfoif (!p->irq_domain) { ret = -ENXIO ;dev_err (&pdev->dev,"cannot initialize irq domain\n" ); - goto err1; + goto err0; } if (devm_request_irq(&pdev->dev, irq->start,
Greg Kroah-Hartman
maintainerPATCH 34/173 libata: Fix display of sata speed
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gwendal Grignou <[email protected]>
commit 3e85c3ecbc520751324a191d23bb94873ed01b10 upstream.
6.0 Gbps link speed was not decoded properly:
speed was reported at 3.0 Gbps only.
Tested: On a machine where libata reports 6.0 Gbps in
/var/log/messages:
ata1: SATA link up 6.0 Gbps (SStatus 133 SControl 300)
Before:
cat /sys/class/ata_link/link1/sata_spd
3.0 Gbps
After:
cat /sys/class/ata_link/link1/sata_spd
6.0 Gbps--- drivers/ata/libata-transport.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/ata/libata-transport.c +8 -8
@@ -319,25 +319,25 @@ int ata_tport_add(struct device *parent,/* * ATA link attributes */ +static int noop (int x) {return x; } - -#define ata_link_show_linkspeed (field) \ +#define ata_link_show_linkspeed (field, format) \ static ssize_t \ show_ata_link_##field(struct device *dev, \ struct device_attribute *attr, char *buf) \ { \ struct ata_link *link = transport_class_to_link(dev); \ \ - return sprintf(buf,"%s\n", sata_spd_string(fls(link->field))); \ + return sprintf(buf, "%s\n", sata_spd_string(format(link->field))); \ } -#define ata_link_linkspeed_attr (field) \ - ata_link_show_linkspeed(field) \ +#define ata_link_linkspeed_attr (field, format) \ + ata_link_show_linkspeed(field, format) \ static DEVICE_ATTR(field, S_IRUGO, show_ata_link_##field, NULL) -ata_link_linkspeed_attr (hw_sata_spd_limit); -ata_link_linkspeed_attr (sata_spd_limit); -ata_link_linkspeed_attr (sata_spd); +ata_link_linkspeed_attr (hw_sata_spd_limit, fls); +ata_link_linkspeed_attr (sata_spd_limit, fls); +ata_link_linkspeed_attr (sata_spd, noop); static DECLARE_TRANSPORT_CLASS(ata_link_class,
Greg Kroah-Hartman
maintainerPATCH 35/173 drivers/libata: Set max sector to 65535 for Slimtype DVD A DS8A9SH drive
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shan Hai <[email protected]>
commit 0523f037f65dba10191b0fa9c51266f90ba64630 upstream.
The "Slimtype DVD A DS8A9SH" drive locks up with following backtrace when the max sector is smaller than 65535 bytes, fix it by adding a quirk to set the max sector to 65535 bytes.
INFO: task flush-11:0:663 blocked for more than 120 seconds.
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
flush-11:0 D 00000000ffff5ceb 0 663 2 0x00000000
ffff88026d3b1710 0000000000000046 0000000000000001 0000000000000000 ffff88026f2530c0 ffff88026d365860 ffff88026d3b16e0 ffffffff812ffd52 ffff88026d4fd3d0 0000000100000001 ffff88026d3b16f0 ffff88026d3b1fd8
Call Trace: [<ffffffff812ffd52>] ? cfq_may_queue+0x52/0xf0 [<ffffffff81604338>] schedule+0x18/0x30 [<ffffffff81604392>] io_schedule+0x42/0x60 [<ffffffff812f22bb>] get_request_wait+0xeb/0x1f0 [<ffffffff81065660>] ? autoremove_wake_function+0x0/0x40 [<ffffffff812eb382>] ? elv_merge+0x42/0x210 [<ffffffff812f26ae>] __make_request+0x8e/0x4e0 [<ffffffff812f068e>] generic_make_request+0x21e/0x5e0 [<ffffffff812f0aad>] submit_bio+0x5d/0xd0 [<ffffffff81141422>] submit_bh+0xf2/0x130 [<ffffffff8114474c>] __block_write_full_page+0x1dc/0x3a0 [<ffffffff81143f60>] ? end_buffer_async_write+0x0/0x120 [<ffffffff811474e0>] ? blkdev_get_block+0x0/0x70 [<ffffffff811474e0>] ? blkdev_get_block+0x0/0x70 [<ffffffff81143f60>] ? end_buffer_async_write+0x0/0x120 [<ffffffff811449ee>] block_write_full_page_endio+0xde/0x100 [<ffffffff81144a20>] block_write_full_page+0x10/0x20 [<ffffffff81148703>] blkdev_writepage+0x13/0x20 [<ffffffff810d7525>] __writepage+0x15/0x40 [<ffffffff810d7c0f>] write_cache_pages+0x1cf/0x3e0 [<ffffffff810d7510>] ? __writepage+0x0/0x40 [<ffffffff810d7e42>] generic_writepages+0x22/0x30 [<ffffffff810d7e6f>] do_writepages+0x1f/0x40 [<ffffffff8113ae67>] writeback_single_inode+0xe7/0x3b0 [<ffffffff8113b574>] writeback_sb_inodes+0x184/0x280 [<ffffffff8113bedb>] writeback_inodes_wb+0x6b/0x1a0 [<ffffffff8113c24b>] wb_writeback+0x23b/0x2a0 [<ffffffff8113c42d>] wb_do_writeback+0x17d/0x190 [<ffffffff8113c48b>] bdi_writeback_task+0x4b/0xe0 [<ffffffff810e82a0>] ? bdi_start_fn+0x0/0x100 [<ffffffff810e8321>] bdi_start_fn+0x81/0x100 [<ffffffff810e82a0>] ? bdi_start_fn+0x0/0x100 [<ffffffff8106522e>] kthread+0x8e/0xa0 [<ffffffff81039274>] ? finish_task_switch+0x54/0xc0 [<ffffffff81003334>] kernel_thread_helper+0x4/0x10 [<ffffffff810651a0>] ? kthread+0x0/0xa0 [<ffffffff81003330>] ? kernel_thread_helper+0x0/0x10
The above trace was triggered by
"dd if=/dev/zero of=/dev/sr0 bs=2048 count=32768"
--- drivers/ata/libata-core.c | 1 + 1 file changed, 1 insertion(+)
drivers/ata/libata-core.c +1 -0
@@ -4110,6 +4110,7 @@ static const struct ata_blacklist_entry { "TORiSAN DVD-ROM DRD-N216", NULL, ATA_HORKAGE_MAX_SEC_128 }, { "QUANTUM DAT DAT72-000", NULL, ATA_HORKAGE_ATAPI_MOD16_DMA }, { "Slimtype DVD A DS8A8SH", NULL, ATA_HORKAGE_MAX_SEC_LBA48 }, + { "Slimtype DVD A DS8A9SH", NULL, ATA_HORKAGE_MAX_SEC_LBA48 }, /* Devices we expect to fail diagnostics */
Greg Kroah-Hartman
maintainerPATCH 36/173 vsprintf: check real user/group id for %pK
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryan Mallon <[email protected]>
commit 312b4e226951f707e120b95b118cbc14f3d162b2 upstream.
Some setuid binaries will allow reading of files which have read permission by the real user id. This is problematic with files which use %pK because the file access permission is checked at open() time, but the kptr_restrict setting is checked at read() time. If a setuid binary opens a %pK file as an unprivileged user, and then elevates permissions before reading the file, then kernel pointer values may be leaked.
This happens for example with the setuid pppd application on Ubuntu 12.04:
$ head -1 /proc/kallsyms 00000000 T startup_32
$ pppd file /proc/kallsyms pppd: In file /proc/kallsyms: unrecognized option 'c1000000'
This will only leak the pointer value from the first line, but other setuid binaries may leak more information.
Fix this by adding a check that in addition to the current process having CAP_SYSLOG, that effective user and group ids are equal to the real ids. If a setuid binary reads the contents of a file which uses %pK then the pointer values will be printed as NULL if the real user is unprivileged.
Update the sysctl documentation to reflect the changes, and also correct the documentation to state the kptr_restrict=0 is the default.
This is a only temporary solution to the issue. The correct solution is to do the permission check at open() time on files, and to replace %pK with a function which checks the open() time permission. %pK uses in printk should be removed since no sane permission check can be done, and instead protected by using dmesg_restrict.
--- Documentation/sysctl/kernel.txt | 25 ++++++++++++++++++------- lib/vsprintf.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 10 deletions(-)
Documentation/sysctl/kernel.txt +18 -7
@@ -289,13 +289,24 @@ Default value is "/sbin/hotplug". kptr_restrict: This toggle indicates whether restrictions are placed on -exposing kernel addresses via /proc and other interfaces. When -kptr_restrict is set to (0), there are no restrictions. When -kptr_restrict is set to (1), the default, kernel pointers -printed using the %pK format specifier will be replaced with 0's -unless the user has CAP_SYSLOG. When kptr_restrict is set to -(2), kernel pointers printed using %pK will be replaced with 0's -regardless of privileges. +exposing kernel addresses via /proc and other interfaces. + +When kptr_restrict is set to (0), the default, there are no restrictions. + +When kptr_restrict is set to (1), kernel pointers printed using the %pK +format specifier will be replaced with 0's unless the user has CAP_SYSLOG +and effective user and group ids are equal to the real ids. This is +because %pK checks are done at read() time rather than open() time, so +if permissions are elevated between the open() and the read() (e.g via +a setuid binary) then %pK will not leak kernel pointers to unprivileged +users. Note, this is a temporary solution only. The correct long-term +solution is to do the permission checks at open() time. Consider removing +world read permissions from files that use %pK, and using dmesg_restrict +to protect against uses of %pK in dmesg(8) if leaking kernel pointer +values to unprivileged users is a concern. + +When kptr_restrict is set to (2), kernel pointers printed using +%pK will be replaced with 0's regardless of privileges. ==============================================================
lib/vsprintf.c +30 -3
@@ -26,6 +26,7 @@#include <linux/math64.h> #include <linux/uaccess.h> #include <linux/ioport.h> +#include <linux/cred.h> #include <net/addrconf.h> #include <asm/page.h> /* for PAGE_SIZE */
@@ -1118,11 +1119,37 @@ char *pointer(const char *fmt, char *buf spec.field_width = default_width;return string (buf, end,"pK-error" , spec); } -if (!((kptr_restrict ==0 ) || - (kptr_restrict ==1 && -has_capability_noaudit (current,CAP_SYSLOG )))) + +switch (kptr_restrict) { +case 0 : +/* Always print %pK values */ +break ; +case 1 : { +/* +* Only print the real pointer value if the current +* process has CAP_SYSLOG and is running with the +* same credentials it started with. This is because +* access to files is checked at open() time, but %pK +* checks permission at read() time. We don't want to +* leak pointer values if a binary opens a file using +* %pK and then elevates privileges before reading it. +*/ +const struct cred *cred =current_cred (); + +if (!has_capability_noaudit (current,CAP_SYSLOG ) || + !uid_eq (cred->euid, cred->uid) || + !gid_eq (cred->egid, cred->gid)) + ptr =NULL ; +break ; + } +case 2 : +default : +/* Always print 0's for %pK */ ptr =NULL ; +break ; + }break ; +case 'N' :switch (fmt[1 ]) {case 'F' :
Greg Kroah-Hartman
maintainerPATCH 37/173 rtlwifi: rtl8188ee: Fix smatch warning in rtl8188ee/hw.c
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit dab3df5e88b979f8d09860f873ccfaa7a55758d2 upstream.
Smatch lists the following:
CHECK drivers/net/wireless/rtlwifi/rtl8188ee/hw.cdrivers/net/wireless/rtlwifi/rtl8188ee/hw.c:149 _rtl88ee_set_fw_clock_on() info: ignoring unreachable code. drivers/net/wireless/rtlwifi/rtl8188ee/hw.c:149 _rtl88ee_set_fw_clock_on() info: ignoring unreachable code.
This info message is the result of a real error due to a missing break statement in a "while (1)" loop.
--- drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/rtlwifi/rtl8188ee/hw.c +1 -0
@@ -143,6 +143,7 @@ static void _rtl88ee_set_fw_clock_on(str }else { rtlhal->fw_clk_change_in_progress = false;spin_unlock_bh (&rtlpriv->locks.fw_ps_lock); +break ; } }
Greg Kroah-Hartman
maintainerPATCH 38/173 rtlwifi: Fix endian error in extracting packet type
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Cave-Ayland <[email protected]>
commit 0c5d63f0ab6728f05ddefa25aff55e31297f95e6 upstream.
All of the rtlwifi drivers have an error in the routine that tests if the data is "special". If it is, the subsequant transmission will be at the lowest rate to enhance reliability. The 16-bit quantity is big-endian, but was being extracted in native CPU mode. One of the effects of this bug is to inhibit association under some conditions as the TX rate is too high.
Based on suggestions by Joe Perches, the entire routine is rewritten.
One of the local headers contained duplicates of some of the ETH_P_XXX definitions. These are deleted.
--- drivers/net/wireless/rtlwifi/base.c | 97 +++++++++++++++--------------------- drivers/net/wireless/rtlwifi/wifi.h | 6 -- 2 files changed, 44 insertions(+), 59 deletions(-)
drivers/net/wireless/rtlwifi/base.c +43 -54
@@ -37,6 +37,7 @@#include <linux/ip.h> #include <linux/module.h> +#include <linux/udp.h> /* *NOTICE!!!: This file will be very big, we should
@@ -1066,64 +1067,52 @@ u8 rtl_is_special_data(struct ieee80211_if (!ieee80211_is_data (fc))return false; + ip = (const struct iphdr *)(skb->data + mac_hdr_len + +SNAP_SIZE +PROTOC_TYPE_SIZE ); + ether_type =be16_to_cpup ((__be16 *) + (skb->data + mac_hdr_len +SNAP_SIZE )); + +switch (ether_type) { +case ETH_P_IP : { +struct udphdr *udp; +u16 src; +u16 dst; + +if (ip->protocol !=IPPROTO_UDP ) +return false; + udp = (struct udphdr *)((u8 *)ip + (ip->ihl <<2 )); + src =be16_to_cpu (udp->source); + dst =be16_to_cpu (udp->dest); + +/* If this case involves port 68 (UDP BOOTP client) connecting +* with port 67 (UDP BOOTP server), then return true so that +* the lowest speed is used. +*/ +if (!((src ==68 && dst ==67 ) || (src ==67 && dst ==68 ))) +return false; - ip = (struct iphdr *)((u8 *) skb->data + mac_hdr_len + -SNAP_SIZE +PROTOC_TYPE_SIZE ); - ether_type = *(u16 *) ((u8 *) skb->data + mac_hdr_len +SNAP_SIZE ); -/* ether_type = ntohs(ether_type); */ - -if (ETH_P_IP == ether_type) { -if (IPPROTO_UDP == ip->protocol) { -struct udphdr *udp = (struct udphdr *)((u8 *) ip + - (ip->ihl <<2 )); -if (((((u8 *) udp)[1 ] ==68 ) && - (((u8 *) udp)[3 ] ==67 )) || - ((((u8 *) udp)[1 ] ==67 ) && - (((u8 *) udp)[3 ] ==68 ))) { -/* -* 68 : UDP BOOTP client -* 67 : UDP BOOTP server -*/ -RT_TRACE (rtlpriv, (COMP_SEND |COMP_RECV ), -DBG_DMESG ,"dhcp %s !!\n" , - is_tx ?"Tx" :"Rx" ); - -if (is_tx) { - rtlpriv->enter_ps = false; -schedule_work (&rtlpriv-> - works.lps_change_work); - ppsc->last_delaylps_stamp_jiffies = - jiffies; - } - -return true; - } - } - }else if (ETH_P_ARP == ether_type) { -if (is_tx) { - rtlpriv->enter_ps = false; -schedule_work (&rtlpriv->works.lps_change_work); - ppsc->last_delaylps_stamp_jiffies = jiffies; - } - -return true; - }else if (ETH_P_PAE == ether_type) { +RT_TRACE (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , +"dhcp %s !!\n" , is_tx ?"Tx" :"Rx" ); +break ; + } +case ETH_P_ARP : +break ; +case ETH_P_PAE :RT_TRACE (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG ,"802.1X %s EAPOL pkt!!\n" , is_tx ?"Tx" :"Rx" ); - -if (is_tx) { - rtlpriv->enter_ps = false; -schedule_work (&rtlpriv->works.lps_change_work); - ppsc->last_delaylps_stamp_jiffies = jiffies; - } - -return true; - }else if (ETH_P_IPV6 == ether_type) { -/* IPv6 */ -return true; +break ; +case ETH_P_IPV6 : +/* TODO: Is this right? */ +return false; +default : +return false; } - -return false; +if (is_tx) { + rtlpriv->enter_ps = false; +schedule_work (&rtlpriv->works.lps_change_work); + ppsc->last_delaylps_stamp_jiffies = jiffies; + } +return true; }/*********************************************************
drivers/net/wireless/rtlwifi/wifi.h +1 -5
@@ -77,11 +77,7 @@#define RTL_SLOT_TIME_9 9#define RTL_SLOT_TIME_20 20 -/*related with tcp/ip. */ -/*if_ehther.h*/ -#define ETH_P_PAE 0x888E/*Port Access Entity (IEEE 802.1X) */ -#define ETH_P_IP 0x0800/*Internet Protocol packet */ -#define ETH_P_ARP 0x0806/*Address Resolution packet */ +/*related to tcp/ip. */ #define SNAP_SIZE 6#define PROTOC_TYPE_SIZE 2
Greg Kroah-Hartman
maintainerPATCH 39/173 rtlwifi: rtl8192se: Fix wrong assignment
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felipe Pena <[email protected]>
commit 3aef7dde8dcf09e0124f0a2665845a507331972b upstream.
There is a typo in the struct member name on assignment when checking rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40, the check uses pwrgroup_ht40 for bound limit and uses pwrgroup_ht20 when assigning instead.
--- drivers/net/wireless/rtlwifi/rtl8192se/rf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/rtlwifi/rtl8192se/rf.c +1 -1
@@ -265,7 +265,7 @@ static void _rtl92s_get_txpower_writeval rtlefuse->pwrgroup_ht40 [RF90_PATH_A][chnl - 1]) { pwrdiff_limit[i] = - rtlefuse->pwrgroup_ht20 + rtlefuse->pwrgroup_ht40 [RF90_PATH_A ][chnl -1 ]; } }else {
Greg Kroah-Hartman
maintainerPATCH 40/173 rtlwifi: rtl8192cu: Fix more pointer arithmetic errors
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit eafbdde9c5629bea58df07275c5917eb42afbbe7 upstream.
This driver uses a number of macros to get and set various fields in the RX and TX descriptors. To work correctly, a u8 pointer to the descriptor must be used; however, in some cases a descriptor structure pointer is used instead. In addition, a duplicated statement is removed.
--- drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 6 +++--- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/rtlwifi/rtl8192cu/mac.c +3 -3
@@ -778,7 +778,7 @@ static long _rtl92c_signal_scale_mapping static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw, struct rtl_stats *pstats, - struct rx_desc_92c *pdesc, + struct rx_desc_92c *p_desc, struct rx_fwinfo_92c *p_drvinfo, bool packet_match_bssid, bool packet_toself,
@@ -793,11 +793,11 @@ static void _rtl92c_query_rxphystatus(stu32 rssi, total_rssi =0 ;bool in_powersavemode = false;bool is_cck_rate; +u8 *pdesc = (u8 *)p_desc; - is_cck_rate =RX_HAL_IS_CCK_RATE (pdesc); + is_cck_rate =RX_HAL_IS_CCK_RATE (p_desc); pstats->packet_matchbssid = packet_match_bssid; pstats->packet_toself = packet_toself; - pstats->is_cck = is_cck_rate; pstats->packet_beacon = packet_beacon; pstats->is_cck = is_cck_rate; pstats->RX_SIGQ[0 ] =-1 ;
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c +3 -3
@@ -303,10 +303,10 @@ out:bool rtl92cu_rx_query_desc (struct ieee80211_hw *hw,struct rtl_stats *stats,struct ieee80211_rx_status *rx_status, -u8 *p_desc,struct sk_buff *skb) +u8 *pdesc,struct sk_buff *skb) {struct rx_fwinfo_92c *p_drvinfo; -struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc; +struct rx_desc_92c *p_desc = (struct rx_desc_92c *)pdesc;u32 phystatus =GET_RX_DESC_PHY_STATUS (pdesc); stats->length = (u16 )GET_RX_DESC_PKT_LEN (pdesc);
@@ -345,7 +345,7 @@ bool rtl92cu_rx_query_desc(struct ieee80if (phystatus) { p_drvinfo = (struct rx_fwinfo_92c *)(skb->data + stats->rx_bufshift); -rtl92c_translate_rx_signal_stuff (hw, skb, stats, pdesc, +rtl92c_translate_rx_signal_stuff (hw, skb, stats, p_desc, p_drvinfo); }/*rx_status->qual = stats->signal; */
Greg Kroah-Hartman
maintainerPATCH 41/173 ipc, msg: fix message length check for negative values
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Krause <[email protected]>
commit 4e9b45a19241354daec281d7a785739829b52359 upstream.
On 64 bit systems the test for negative message sizes is bogus as the size, which may be positive when evaluated as a long, will get truncated to an int when passed to load_msg(). So a long might very well contain a positive value but when truncated to an int it would become negative.
That in combination with a small negative value of msg_ctlmax (which will be promoted to an unsigned type for the comparison against msgsz, making it a big positive value and therefore make it pass the check) will lead to two problems: 1/ The kmalloc() call in alloc_msg() will allocate a too small buffer as the addition of alen is effectively a subtraction. 2/ The copy_from_user() call in load_msg() will first overflow the buffer with userland data and then, when the userland access generates an access violation, the fixup handler copy_user_handle_tail() will try to fill the remainder with zeros -- roughly 4GB. That almost instantly results in a system crash or reset.
,-[ Reproducer (needs to be run as root) ]--
| #include <sys/stat.h>
| #include <sys/msg.h>
| #include <unistd.h>
| #include <fcntl.h>
|
| int main(void) {
| long msg = 1;
| int fd;
|
| fd = open("/proc/sys/kernel/msgmax", O_WRONLY);
| write(fd, "-1", 2);
| close(fd);
|
| msgsnd(0, &msg, 0xfffffff0, IPC_NOWAIT);
|
| return 0;
| }
'---Fix the issue by preventing msgsz from getting truncated by consistently using size_t for the message length. This way the size checks in do_msgsnd() could still be passed with a negative value for msg_ctlmax but we would fail on the buffer allocation in that case and error out.
Also change the type of m_ts from int to size_t to avoid similar nastiness in other code paths -- it is used in similar constructs, i.e. signed vs. unsigned checks. It should never become negative under normal circumstances, though.
Setting msg_ctlmax to a negative value is an odd configuration and should be prevented. As that might break existing userland, it will be handled in a separate commit so it could easily be reverted and reworked without reintroducing the above described bug.
Hardening mechanisms for user copy operations would have catched that bug early -- e.g. checking slab object sizes on user copy operations as the usercopy feature of the PaX patch does. Or, for that matter, detect the long vs. int sign change due to truncation, as the size overflow plugin of the very same patch does.
--- include/linux/msg.h | 6 +++--- ipc/msgutil.c | 20 ++++++++++---------- ipc/util.h | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-)
include/linux/msg.h +3 -3
@@ -6,9 +6,9 @@/* one msg_msg structure for each message */ struct msg_msg { -struct list_head m_list; -long m_type; -int m_ts;/* message text size */ +struct list_head m_list; +long m_type; +size_t m_ts;/* message text size */ struct msg_msgseg * next;void *security;/* the actual message follows immediately */
ipc/msgutil.c +10 -10
@@ -41,15 +41,15 @@ struct msg_msgseg {/* the next part of the message follows immediately */ }; -#define DATALEN_MSG (int)(PAGE_SIZE-sizeof(struct msg_msg)) -#define DATALEN_SEG (int)(PAGE_SIZE-sizeof(struct msg_msgseg)) +#define DATALEN_MSG ((size_t)PAGE_SIZE-sizeof(struct msg_msg)) +#define DATALEN_SEG ((size_t)PAGE_SIZE-sizeof(struct msg_msgseg)) -static struct msg_msg *alloc_msg (int len) +static struct msg_msg *alloc_msg (size_t len) {struct msg_msg *msg;struct msg_msgseg **pseg; -int alen; +size_t alen; alen =min (len,DATALEN_MSG ); msg =kmalloc (sizeof (*msg) + alen,GFP_KERNEL );
@@ -80,12 +80,12 @@ out_err:return NULL ; } -struct msg_msg *load_msg (const void __user *src,int len) +struct msg_msg *load_msg (const void __user *src,size_t len) {struct msg_msg *msg;struct msg_msgseg *seg;int err = -EFAULT ; -int alen; +size_t alen; msg =alloc_msg (len);if (msg ==NULL )
@@ -117,8 +117,8 @@ out_err:struct msg_msg *copy_msg (struct msg_msg *src,struct msg_msg *dst) {struct msg_msgseg *dst_pseg, *src_pseg; -int len = src->m_ts; -int alen; +size_t len = src->m_ts; +size_t alen;BUG_ON (dst ==NULL );if (src->m_ts > dst->m_ts)
@@ -147,9 +147,9 @@ struct msg_msg *copy_msg(struct msg_msg return ERR_PTR(-ENOSYS); }#endif -int store_msg (void __user *dest,struct msg_msg *msg,int len) +int store_msg (void __user *dest,struct msg_msg *msg,size_t len) { -int alen; +size_t alen;struct msg_msgseg *seg; alen =min (len,DATALEN_MSG );
ipc/util.h +2 -2
@@ -148,9 +148,9 @@ int ipc_parse_version (int *cmd);#endif extern void free_msg (struct msg_msg *msg); -extern struct msg_msg *load_msg (const void __user *src,int len); +extern struct msg_msg *load_msg (const void __user *src,size_t len);extern struct msg_msg *copy_msg (struct msg_msg *src,struct msg_msg *dst); -extern int store_msg (void __user *dest,struct msg_msg *msg,int len); +extern int store_msg (void __user *dest,struct msg_msg *msg,size_t len);extern void recompute_msgmni (struct ipc_namespace *);
Greg Kroah-Hartman
maintainerPATCH 42/173 ipc, msg: forbid negative values for "msg{max,mnb,mni}"
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Krause <[email protected]>
commit 9bf76ca325d5e9208eb343f7bd4cc666f703ed30 upstream.
Negative message lengths make no sense -- so don't do negative queue lenghts or identifier counts. Prevent them from getting negative.
Also change the underlying data types to be unsigned to avoid hairy surprises with sign extensions in cases where those variables get evaluated in unsigned expressions with bigger data types, e.g size_t.
In case a user still wants to have "unlimited" sizes she could just use INT_MAX instead.
--- include/linux/ipc_namespace.h | 6 +++--- ipc/ipc_sysctl.c | 20 ++++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-)
include/linux/ipc_namespace.h +3 -3
@@ -34,9 +34,9 @@ struct ipc_namespace {int sem_ctls[4 ];int used_sems; -int msg_ctlmax; -int msg_ctlmnb; -int msg_ctlmni; +unsigned int msg_ctlmax; +unsigned int msg_ctlmnb; +unsigned int msg_ctlmni;atomic_t msg_bytes;atomic_t msg_hdrs;int auto_msgmni;
ipc/ipc_sysctl.c +12 -8
@@ -62,7 +62,7 @@ static int proc_ipc_dointvec_minmax_orphreturn err; } -static int proc_ipc_callback_dointvec (ctl_table *table,int write, +static int proc_ipc_callback_dointvec_minmax (ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {struct ctl_table ipc_table;
@@ -72,7 +72,7 @@ static int proc_ipc_callback_dointvec(ctmemcpy (&ipc_table, table,sizeof (ipc_table)); ipc_table.data =get_ipc (table); - rc =proc_dointvec (&ipc_table, write, buffer, lenp, ppos); + rc =proc_dointvec_minmax (&ipc_table, write, buffer, lenp, ppos);if (write && !rc && lenp_bef == *lenp)/*
@@ -152,15 +152,13 @@ static int proc_ipcauto_dointvec_minmax(#define proc_ipc_dointvec NULL#define proc_ipc_dointvec_minmax NULL#define proc_ipc_dointvec_minmax_orphans NULL -#define proc_ipc_callback_dointvec NULL +#define proc_ipc_callback_dointvec_minmax NULL#define proc_ipcauto_dointvec_minmax NULL#endif static int zero;static int one =1 ; -#ifdef CONFIG_CHECKPOINT_RESTORE static int int_max =INT_MAX ; -#endif static struct ctl_table ipc_kern_table[] = { {
@@ -198,21 +196,27 @@ static struct ctl_table ipc_kern_table[] .data = &init_ipc_ns.msg_ctlmax, .maxlen = sizeof (init_ipc_ns.msg_ctlmax), .mode = 0644, - .proc_handler = proc_ipc_dointvec, + .proc_handler = proc_ipc_dointvec_minmax, + .extra1 = &zero, + .extra2 = &int_max, }, { .procname = "msgmni", .data = &init_ipc_ns.msg_ctlmni, .maxlen = sizeof (init_ipc_ns.msg_ctlmni), .mode = 0644, - .proc_handler = proc_ipc_callback_dointvec, + .proc_handler = proc_ipc_callback_dointvec_minmax, + .extra1 = &zero, + .extra2 = &int_max, }, { .procname = "msgmnb", .data = &init_ipc_ns.msg_ctlmnb, .maxlen = sizeof (init_ipc_ns.msg_ctlmnb), .mode = 0644, - .proc_handler = proc_ipc_dointvec, + .proc_handler = proc_ipc_dointvec_minmax, + .extra1 = &zero, + .extra2 = &int_max, }, { .procname = "sem",
Greg Kroah-Hartman
maintainerPATCH 43/173 ipc: update locking scheme comments
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Davidlohr Bueso <[email protected]>
commit 18ccee263c7e250a57f01c9434658f11f4118a64 upstream.
The initial documentation was a bit incomplete, update accordingly.
--- ipc/util.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)
ipc/util.c +21 -6
@@ -17,12 +17,27 @@* Pavel Emelianov <[email protected]> * * General sysv ipc locking scheme: -* when doing ipc id lookups, take the ids->rwsem -* rcu_read_lock() -* obtain the ipc object (kern_ipc_perm) -* perform security, capabilities, auditing and permission checks, etc. -* acquire the ipc lock (kern_ipc_perm.lock) throught ipc_lock_object() -* perform data updates (ie: SET, RMID, LOCK/UNLOCK commands) +* rcu_read_lock() +* obtain the ipc object (kern_ipc_perm) by looking up the id in an idr +* tree. +* - perform initial checks (capabilities, auditing and permission, +* etc). +* - perform read-only operations, such as STAT, INFO commands. +* acquire the ipc lock (kern_ipc_perm.lock) through +* ipc_lock_object() +* - perform data updates, such as SET, RMID commands and +* mechanism-specific operations (semop/semtimedop, +* msgsnd/msgrcv, shmat/shmdt). +* drop the ipc lock, through ipc_unlock_object(). +* rcu_read_unlock() +* +* The ids->rwsem must be taken when: +* - creating, removing and iterating the existing entries in ipc +* identifier sets. +* - iterating through files under /proc/sysvipc/ +* +* Note that sems have a special fast path that avoids kern_ipc_perm.lock - +* see sem_lock(). */ #include <linux/mm.h>
Greg Kroah-Hartman
maintainerPATCH 44/173 ipc/sem.c: synchronize semop and semctl with IPC_RMID
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manfred Spraul <[email protected]>
commit 6e224f94597842c5eb17f1fc2208d20b6f7f7d49 upstream.
After acquiring the semlock spinlock, operations must test that the array is still valid.
- semctl() and exit_sem() would walk stale linked lists (ugly, but should be ok: all lists are empty)
- semtimedop() would sleep forever - and if woken up due to a signal - access memory after free.
The patch also:
- standardizes the tests for .deleted, so that all tests in one function leave the function with the same approach.
- unconditionally tests for .deleted immediately after every call to sem_lock - even it it means that for semctl(GETALL), .deleted will be tested twice.
Both changes make the review simpler: After every sem_lock, there must be a test of .deleted, followed by a goto to the cleanup code (if the function uses "goto cleanup").
The only exception is semctl_down(): If sem_ids().rwsem is locked, then the presence in ids->ipcs_idr is equivalent to !.deleted, thus no additional test is required.
--- ipc/sem.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-)
ipc/sem.c +29 -13
@@ -1282,6 +1282,12 @@ static int semctl_setval(struct ipc_namesem_lock (sma,NULL ,-1 ); +if (sma->sem_perm.deleted) { +sem_unlock (sma,-1 ); +rcu_read_unlock (); +return -EIDRM ; + } + curr = &sma->sem_base[semnum];ipc_assert_locked_object (&sma->sem_perm);
@@ -1336,12 +1342,14 @@ static int semctl_main(struct ipc_namespint i;sem_lock (sma,NULL ,-1 ); +if (sma->sem_perm.deleted) { + err = -EIDRM ; + goto out_unlock; + }if (nsems >SEMMSL_FAST ) {if (!ipc_rcu_getref (sma)) { -sem_unlock (sma,-1 ); -rcu_read_unlock (); err = -EIDRM ; - goto out_free; + goto out_unlock; }sem_unlock (sma,-1 );rcu_read_unlock ();
@@ -1354,10 +1362,8 @@ static int semctl_main(struct ipc_namesprcu_read_lock ();sem_lock_and_putref (sma);if (sma->sem_perm.deleted) { -sem_unlock (sma,-1 ); -rcu_read_unlock (); err = -EIDRM ; - goto out_free; + goto out_unlock; } }for (i =0 ; i < sma->sem_nsems; i++)
@@ -1375,8 +1381,8 @@ static int semctl_main(struct ipc_namespstruct sem_undo *un;if (!ipc_rcu_getref (sma)) { -rcu_read_unlock (); -return -EIDRM ; + err = -EIDRM ; + goto out_rcu_wakeup; }rcu_read_unlock ();
@@ -1404,10 +1410,8 @@ static int semctl_main(struct ipc_namesprcu_read_lock ();sem_lock_and_putref (sma);if (sma->sem_perm.deleted) { -sem_unlock (sma,-1 ); -rcu_read_unlock (); err = -EIDRM ; - goto out_free; + goto out_unlock; }for (i =0 ; i < nsems; i++)
@@ -1431,6 +1435,10 @@ static int semctl_main(struct ipc_namesp goto out_rcu_wakeup;sem_lock (sma,NULL ,-1 ); +if (sma->sem_perm.deleted) { + err = -EIDRM ; + goto out_unlock; + } curr = &sma->sem_base[semnum];switch (cmd) {
@@ -1836,6 +1844,10 @@ SYSCALL_DEFINE4(semtimedop, int, semid,if (error) goto out_rcu_wakeup; + error = -EIDRM ; + locknum =sem_lock (sma, sops, nsops); +if (sma->sem_perm.deleted) + goto out_unlock_free;/* * semid identifiers are not unique - find_alloc_undo may have * allocated an undo structure, it was invalidated by an RMID
@@ -1843,8 +1855,6 @@ SYSCALL_DEFINE4(semtimedop, int, semid,* This case can be detected checking un->semid. The existence of * "un" itself is guaranteed by rcu. */ - error = -EIDRM ; - locknum =sem_lock (sma, sops, nsops);if (un && un->semid ==-1 ) goto out_unlock_free;
@@ -2057,6 +2067,12 @@ void exit_sem(struct task_struct *tsk) }sem_lock (sma,NULL ,-1 ); +/* exit_sem raced with IPC_RMID, nothing to do */ +if (sma->sem_perm.deleted) { +sem_unlock (sma,-1 ); +rcu_read_unlock (); +continue ; + } un =__lookup_undo (ulp, semid);if (un ==NULL ) {/* exit_sem raced with IPC_RMID+semget() that created
Greg Kroah-Hartman
maintainerPATCH 45/173 ahci: Add Device IDs for Intel Wildcat Point-LP
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Ralston <[email protected]>
commit 9f961a5f6efc87a79571d7166257b36af28ffcfe upstream.
This patch adds the AHCI-mode SATA Device IDs for the Intel Wildcat Point-LP PCH.
--- drivers/ata/ahci.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/ata/ahci.c +4 -0
@@ -292,6 +292,10 @@ static const struct pci_device_id ahci_p { PCI_VDEVICE(INTEL, 0x8d66), board_ahci }, /* Wellsburg RAID */ { PCI_VDEVICE(INTEL, 0x8d6e), board_ahci }, /* Wellsburg RAID */ { PCI_VDEVICE(INTEL, 0x23a3), board_ahci }, /* Coleto Creek AHCI */ + { PCI_VDEVICE(INTEL, 0x9c83), board_ahci }, /* Wildcat Point-LP AHCI */ + { PCI_VDEVICE(INTEL, 0x9c85), board_ahci }, /* Wildcat Point-LP RAID */ + { PCI_VDEVICE(INTEL, 0x9c87), board_ahci }, /* Wildcat Point-LP RAID */ + { PCI_VDEVICE(INTEL, 0x9c8f), board_ahci }, /* Wildcat Point-LP RAID *//* JMicron 360/1/3/5/6, match class to avoid IDE function */ { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
Greg Kroah-Hartman
maintainerPATCH 46/173 ahci: disabled FBS prior to issuing software reset
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: xiangliang yu <[email protected]>
commit 89dafa20f3daab5b3e0c13d0068a28e8e64e2102 upstream.
Tested with Marvell 88se9125, attached with one port mulitplier(5 ports) and one disk, we will get following boot log messages if using current code:
ata8: SATA link up 6.0 Gbps (SStatus 133 SControl 330) ata8.15: Port Multiplier 1.2, 0x1b4b:0x9715 r160, 5 ports, feat 0x1/0x1f ahci 0000:03:00.0: FBS is enabled
ata8.00: hard resetting link
ata8.00: SATA link down (SStatus 0 SControl 330)
ata8.01: hard resetting link
ata8.01: SATA link down (SStatus 0 SControl 330)
ata8.02: hard resetting link
ata8.02: SATA link down (SStatus 0 SControl 330)
ata8.03: hard resetting link
ata8.03: SATA link up 6.0 Gbps (SStatus 133 SControl 133) ata8.04: hard resetting link
ata8.04: failed to resume link (SControl 133)
ata8.04: failed to read SCR 0 (Emask=0x40)
ata8.04: failed to read SCR 0 (Emask=0x40)
ata8.04: failed to read SCR 1 (Emask=0x40)
ata8.04: failed to read SCR 0 (Emask=0x40)
ata8.03: native sectors (2) is smaller than sectors (976773168) ata8.03: ATA-8: ST3500413AS, JC4B, max UDMA/133
ata8.03: 976773168 sectors, multi 0: LBA48 NCQ (depth 31/32) ata8.03: configured for UDMA/133
ata8.04: failed to IDENTIFY (I/O error, err_mask=0x100) ata8.15: hard resetting link
ata8.15: SATA link up 6.0 Gbps (SStatus 133 SControl 330) ata8.15: Port Multiplier vendor mismatch '0x1b4b' != '0x133' ata8.15: PMP revalidation failed (errno=-19)
ata8.15: hard resetting link
ata8.15: SATA link up 6.0 Gbps (SStatus 133 SControl 330) ata8.15: Port Multiplier vendor mismatch '0x1b4b' != '0x133' ata8.15: PMP revalidation failed (errno=-19)
ata8.15: limiting SATA link speed to 3.0 Gbps
ata8.15: hard resetting link
ata8.15: SATA link up 3.0 Gbps (SStatus 123 SControl 320) ata8.15: Port Multiplier vendor mismatch '0x1b4b' != '0x133' ata8.15: PMP revalidation failed (errno=-19)
ata8.15: failed to recover PMP after 5 tries, giving up ata8.15: Port Multiplier detaching
ata8.03: disabled
ata8.00: disabled
ata8: EH complete
The reason is that current detection code doesn't follow AHCI spec:
First,the port multiplier detection process look like this:
ahci_hardreset(link, class, deadline)
if (class == ATA_DEV_PMP) {
sata_pmp_attach(dev) /* will enable FBS */
sata_pmp_init_links(ap, nr_ports);
ata_for_each_link(link, ap, EDGE) {
sata_std_hardreset(link, class, deadline);
if (link_is_online) /* do soft reset */
ahci_softreset(link, class, deadline);
}
}But, according to chapter 9.3.9 in AHCI spec: Prior to issuing software reset, software shall clear PxCMD.ST to '0' and then clear PxFBS.EN to '0'.
The patch test ok with kernel 3.11.1.
tj: Patch white space contaminated, applied manually with trivial
updates.
--- drivers/ata/libahci.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/ata/libahci.c +16 -0
@@ -1266,9 +1266,11 @@ int ahci_do_softreset(struct ata_link *l {struct ata_port *ap = link->ap;struct ahci_host_priv *hpriv = ap->host->private_data; +struct ahci_port_priv *pp = ap->private_data;const char *reason =NULL ;unsigned long now, msecs;struct ata_taskfile tf; +bool fbs_disabled = false;int rc;DPRINTK ("ENTER\n" );
@@ -1278,6 +1280,16 @@ int ahci_do_softreset(struct ata_link *lif (rc && rc != -EOPNOTSUPP )ata_link_warn (link,"failed to reset engine (errno=%d)\n" , rc); +/* +* According to AHCI-1.2 9.3.9: if FBS is enable, software shall +* clear PxFBS.EN to '0' prior to issuing software reset to devices +* that is attached to port multiplier. +*/ +if (!ata_is_host_link (link) && pp->fbs_enabled) { +ahci_disable_fbs (ap); + fbs_disabled = true; + } +ata_tf_init (link->device, &tf);/* issue the first D2H Register FIS */
@@ -1318,6 +1330,10 @@ int ahci_do_softreset(struct ata_link *l }else *class =ahci_dev_classify (ap); +/* re-enable FBS if disabled before */ +if (fbs_disabled) +ahci_enable_fbs (ap); +DPRINTK ("EXIT, class=%u\n" , *class);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 47/173 ahci: add Marvell 9230 to the AHCI PCI device list
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samir Benmendil <[email protected]>
commit 6d5278a68a75891db1df5ae1ecf83d288fc58c65 upstream.
Tested with a DAWICONTROL DC-624e on 3.10.10
--- drivers/ata/ahci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/ata/ahci.c +2 -0
@@ -435,6 +435,8 @@ static const struct pci_device_id ahci_p .driver_data = board_ahci_yes_fbs }, /* 88se9172 on some Gigabyte */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3), .driver_data = board_ahci_yes_fbs }, + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230), + .driver_data = board_ahci_yes_fbs },/* Promise */ { PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */
Greg Kroah-Hartman
maintainerPATCH 48/173 iscsi-target: Fix mutex_trylock usage in iscsit_increment_maxcmdsn
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit 5e8e6b4b3adebf01a9d97056cbbfd8c44330df99 upstream.
This patch fixes a >= v3.10 regression bug with mutex_trylock() usage within iscsit_increment_maxcmdsn(), that was originally added to allow for a special case where ->cmdsn_mutex was already held from the iscsit_execute_cmd() exception path for ib_isert.
When !mutex_trylock() was occuring under contention during normal RX/TX process context codepaths, the bug was manifesting itself as the following protocol error:
Received CmdSN: 0x000fcbb7 is greater than MaxCmdSN: 0x000fcbb6, protocol error. Received CmdSN: 0x000fcbb8 is greater than MaxCmdSN: 0x000fcbb6, protocol error.
This patch simply avoids the direct ib_isert callback in lio_queue_status() for the special iscsi_execute_cmd() exception cases, that allows the problematic mutex_trylock() usage in iscsit_increment_maxcmdsn() to go away.
--- drivers/target/iscsi/iscsi_target_configfs.c | 5 +++++ drivers/target/iscsi/iscsi_target_device.c | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/target/iscsi/iscsi_target_configfs.c +5 -0
@@ -1650,6 +1650,11 @@ static int lio_queue_status(struct se_cm struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd); cmd->i_state =ISTATE_SEND_STATUS ; + +if (cmd->se_cmd.scsi_status || cmd->sense_reason) { +iscsit_add_cmd_to_response_queue (cmd, cmd->conn, cmd->i_state); +return 0 ; + } cmd->conn->conn_transport->iscsit_queue_status (cmd->conn, cmd);return 0 ;
drivers/target/iscsi/iscsi_target_device.c +1 -5
@@ -60,11 +60,7 @@ void iscsit_increment_maxcmdsn(struct is cmd->maxcmdsn_inc =1 ; -if (!mutex_trylock (&sess->cmdsn_mutex)) { - sess->max_cmd_sn +=1 ; -pr_debug ("Updated MaxCmdSN to 0x%08x\n" , sess->max_cmd_sn); -return ; - } +mutex_lock (&sess->cmdsn_mutex); sess->max_cmd_sn +=1 ;pr_debug ("Updated MaxCmdSN to 0x%08x\n" , sess->max_cmd_sn);mutex_unlock (&sess->cmdsn_mutex);
Greg Kroah-Hartman
maintainerPATCH 49/173 iscsi-target: fix extract_param to handle buffer length corner case
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Seppanen <[email protected]>
commit 369653e4fb511928511b0ce81f41c812ff1f28b6 upstream.
extract_param() is called with max_length set to the total size of the output buffer. It's not safe to allow a parameter length equal to the buffer size as the terminating null would be written one byte past the end of the output buffer.
--- drivers/target/iscsi/iscsi_target_nego.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/iscsi/iscsi_target_nego.c +1 -1
@@ -90,7 +90,7 @@ int extract_param(if (len <0 )return -1 ; -if (len > max_length) { +if (len >= max_length) {pr_err ("Length of input: %d exceeds max_length:" " %d\n" , len, max_length);return -1 ;
Greg Kroah-Hartman
maintainerPATCH 50/173 iscsi-target: chap auth shouldnt match username with trailing garbage
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Seppanen <[email protected]>
commit 86784c6bdeeef78eed94d298be7a8879f6a97ee2 upstream.
In iSCSI negotiations with initiator CHAP enabled, usernames with trailing garbage are permitted, because the string comparison only checks the strlen of the configured username.
e.g. "usernameXXXXX" will be permitted to match "username".
Just check one more byte so the trailing null char is also matched.
--- drivers/target/iscsi/iscsi_target_auth.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/target/iscsi/iscsi_target_auth.c +4 -1
@@ -148,6 +148,7 @@ static int chap_server_compute_md5(unsigned char client_digest[MD5_SIGNATURE_SIZE ];unsigned char server_digest[MD5_SIGNATURE_SIZE ];unsigned char chap_n[MAX_CHAP_N_SIZE ], chap_r[MAX_RESPONSE_LENGTH ]; +size_t compare_len;struct iscsi_chap *chap = conn->auth_protocol;struct crypto_hash *tfm;struct hash_desc desc;
@@ -186,7 +187,9 @@ static int chap_server_compute_md5( goto out; } -if (memcmp (chap_n, auth->userid,strlen (auth->userid)) !=0 ) { +/* Include the terminating NULL in the compare */ + compare_len =strlen (auth->userid) +1 ; +if (strncmp (chap_n, auth->userid, compare_len) !=0 ) {pr_err ("CHAP_N values do not match!\n" ); goto out; }
Greg Kroah-Hartman
maintainerPATCH 51/173 IB/ipath: Convert ipath_user_sdma_pin_pages() to use get_user_pages_fast()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 4adcf7fb6783e354aab38824d803fa8c4f8e8a27 upstream.
ipath_user_sdma_queue_pkts() gets called with mmap_sem held for writing. Except for get_user_pages() deep down in ipath_user_sdma_pin_pages() we don't seem to need mmap_sem at all.
Even more interestingly the function ipath_user_sdma_queue_pkts() (and also ipath_user_sdma_coalesce() called somewhat later) call copy_from_user() which can hit a page fault and we deadlock on trying to get mmap_sem when handling that fault. So just make ipath_user_sdma_pin_pages() use get_user_pages_fast() and leave mmap_sem locking for mm.
This deadlock has actually been observed in the wild when the node is under memory pressure.
[ Merged in fix for call to get_user_pages_fast from Tetsuo Handa
<[email protected]>. - Roland ]
--- drivers/infiniband/hw/ipath/ipath_user_sdma.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/infiniband/hw/ipath/ipath_user_sdma.c +1 -6
@@ -280,9 +280,7 @@ static int ipath_user_sdma_pin_pages(conint j;int ret; - ret =get_user_pages (current, current->mm, addr, - npages,0 ,1 , pages,NULL ); - + ret =get_user_pages_fast (addr, npages,0 , pages);if (ret != npages) {int i;
@@ -811,10 +809,7 @@ int ipath_user_sdma_writev(struct ipath_while (dim) {const int mxp =8 ; -down_write (¤t->mm->mmap_sem); ret =ipath_user_sdma_queue_pkts (dd, pq, &list, iov, dim, mxp); -up_write (¤t->mm->mmap_sem); -if (ret <=0 ) goto done_unlock;else {
Greg Kroah-Hartman
maintainerPATCH 52/173 IB/qib: Fix txselect regression
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Marciniszyn <[email protected]>
commit 2fadd83184d58701f1116ca578465b5a75f9417c upstream.
Commit 7fac33014f54("IB/qib: checkpatch fixes") was overzealous in removing a simple_strtoul for a parse routine, setup_txselect(). That routine is required to handle a multi-value string.
Unwind that aspect of the fix.
--- drivers/infiniband/hw/qib/qib_iba7322.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/infiniband/hw/qib/qib_iba7322.c +5 -6
@@ -5853,21 +5853,20 @@ static int setup_txselect(const char *st {struct qib_devdata *dd;unsigned long val; -int ret; - +char *n;if (strlen (str) >=MAX_ATTEN_LEN ) {pr_info ("txselect_values string too long\n" );return -ENOSPC ; } - ret =kstrtoul (str,0 , &val); -if (ret || val >= (TXDDS_TABLE_SZ +TXDDS_EXTRA_SZ + + val =simple_strtoul (str, &n,0 ); +if (n == str || val >= (TXDDS_TABLE_SZ +TXDDS_EXTRA_SZ +TXDDS_MFG_SZ )) {pr_info ("txselect_values must start with a number < %d\n" ,TXDDS_TABLE_SZ +TXDDS_EXTRA_SZ +TXDDS_MFG_SZ ); -return ret ? ret : -EINVAL ; +return -EINVAL ; } -strcpy (txselect_list, str); +list_for_each_entry (dd, &qib_dev_list, list)if (dd->deviceid ==PCI_DEVICE_ID_QLOGIC_IB_7322 )set_no_qsfp_atten (dd,1 );
Greg Kroah-Hartman
maintainerPATCH 53/173 IB/srp: Report receive errors correctly
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
commit cd4e38542a5c2cab94e5410fb17c1cc004a60792 upstream.
The IB spec does not guarantee that the opcode is available in error completions. Hence do not rely on it. See also commit 948d1e889e5b ("IB/srp: Introduce srp_handle_qp_err()").
--- drivers/infiniband/ulp/srp/ib_srp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/infiniband/ulp/srp/ib_srp.c +4 -5
@@ -1300,14 +1300,13 @@ static void srp_handle_recv(struct srp_t PFX "Recv failed with error code %d\n", res); } -static void srp_handle_qp_err (enum ib_wc_status wc_status, -enum ib_wc_opcode wc_opcode, +static void srp_handle_qp_err (enum ib_wc_status wc_status,bool send_err,struct srp_target_port *target) {if (target->connected && !target->qp_in_error) {shost_printk (KERN_ERR , target->scsi_host,PFX "failed %s status %d\n" , - wc_opcode &IB_WC_RECV ?"receive" :"send" , + send_err ?"send" :"receive" , wc_status); } target->qp_in_error = true;
@@ -1323,7 +1322,7 @@ static void srp_recv_completion(struct iif (likely (wc.status ==IB_WC_SUCCESS )) {srp_handle_recv (target, &wc); }else { -srp_handle_qp_err (wc.status, wc.opcode, target); +srp_handle_qp_err (wc.status, false, target); } } }
@@ -1339,7 +1338,7 @@ static void srp_send_completion(struct i iu = (struct srp_iu *) (uintptr_t ) wc.wr_id;list_add (&iu->list, &target->free_tx); }else { -srp_handle_qp_err (wc.status, wc.opcode, target); +srp_handle_qp_err (wc.status, true, target); } } }
Greg Kroah-Hartman
maintainerPATCH 54/173 loop: fix crash if blk_alloc_queue fails
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit 3ec981e30fae1f3c8728a05c730acaa1f627bcfb upstream.
loop: fix crash if blk_alloc_queue fails
If blk_alloc_queue fails, loop_add cleans up, but it doesn't clean up the identifier allocated with idr_alloc. That causes crash on module unload in idr_for_each(&loop_index_idr, &loop_exit_cb, NULL); where we attempt to remove non-existed device with that id.
BUG: unable to handle kernel NULL pointer dereference at 0000000000000380 IP: [<ffffffff812057c9>] del_gendisk+0x19/0x2d0 PGD 43d399067 PUD 43d0ad067 PMD 0 Oops: 0000 [#1] PREEMPT SMP Modules linked in: loop(-) dm_snapshot dm_zero dm_mirror dm_region_hash dm_log dm_loop dm_mod ip6table_filter ip6_tables uvesafb cfbcopyarea cfbimgblt cfbfillrect fbcon font bitblit fbcon_rotate fbcon_cw fbcon_ud fbcon_ccw softcursor fb fbdev msr ipt_MASQUERADE iptable_nat nf_nat_ipv4 nf_conntrack_ipv4 nf_defrag_ipv4 xt_state ipt_REJECT xt_tcpudp iptable_filter ip_tables x_tables bridge stp llc tun ipv6 cpufreq_userspace cpufreq_stats cpufreq_ondemand cpufreq_conservative cpufreq_powersave spadfs fuse hid_generic usbhid hid raid0 md_mod dmi_sysfs nf_nat_ftp nf_nat nf_conntrack_ftp nf_conntrack snd_usb_audio snd_pcm_oss snd_mixer_oss snd_pcm snd_timer snd_page_alloc lm85 hwmon_vid snd_hwdep snd_usbmidi_lib snd_rawmidi snd soundcore acpi_cpufreq ohci_hcd freq_table tg3 ehci_pci mperf ehci_hcd kvm_amd kvm sata_svw serverworks libphy libata ide_core k10temp usbcore hwmon microcode ptp pcspkr pps_core e100 skge mii usb_common i2c_piix4 floppy evdev rtc_cmos i2c_core processor but! ton unix CPU: 7 PID: 2735 Comm: rmmod Tainted: G W 3.10.15-devel #15 Hardware name: empty empty/S3992-E, BIOS 'V1.06 ' 06/09/2009 task: ffff88043d38e780 ti: ffff88043d21e000 task.ti: ffff88043d21e000 RIP: 0010:[<ffffffff812057c9>] [<ffffffff812057c9>] del_gendisk+0x19/0x2d0 RSP: 0018:ffff88043d21fe10 EFLAGS: 00010282 RAX: ffffffffa05102e0 RBX: 0000000000000000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffff88043ea82800 RDI: 0000000000000000 RBP: ffff88043d21fe48 R08: 0000000000000000 R09: 0000000000000001 R10: 0000000000000001 R11: 0000000000000000 R12: 00000000000000ff R13: 0000000000000080 R14: 0000000000000000 R15: ffff88043ea82800 FS: 00007ff646534700(0000) GS:ffff880447000000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000380 CR3: 000000043e9bf000 CR4: 00000000000007e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Stack: ffffffff8100aba4 0000000000000092 ffff88043d21fe48 ffff88043ea82800 00000000000000ff ffff88043d21fe98 0000000000000000 ffff88043d21fe60 ffffffffa05102b4 0000000000000000 ffff88043d21fe70 ffffffffa05102ec Call Trace: [<ffffffff8100aba4>] ? native_sched_clock+0x24/0x80 [<ffffffffa05102b4>] loop_remove+0x14/0x40 [loop] [<ffffffffa05102ec>] loop_exit_cb+0xc/0x10 [loop] [<ffffffff81217b74>] idr_for_each+0x104/0x190 [<ffffffffa05102e0>] ? loop_remove+0x40/0x40 [loop] [<ffffffff8109adc5>] ? trace_hardirqs_on_caller+0x105/0x1d0 [<ffffffffa05135dc>] loop_exit+0x34/0xa58 [loop] [<ffffffff810a98ea>] SyS_delete_module+0x13a/0x260 [<ffffffff81221d5e>] ? trace_hardirqs_on_thunk+0x3a/0x3f [<ffffffff813cff16>] system_call_fastpath+0x1a/0x1f Code: f0 4c 8b 6d f8 c9 c3 66 66 2e 0f 1f 84 00 00 00 00 00 55 48 89 e5 41 56 41 55 4c 8d af 80 00 00 00 41 54 53 48 89 fb 48 83 ec 18 <48> 83 bf 80 03 00
00 00 74 4d e8 98 fe ff ff 31 f6 48 c7 c7 20
RIP [<ffffffff812057c9>] del_gendisk+0x19/0x2d0
RSP <ffff88043d21fe10>
CR2: 0000000000000380
---[ end trace 64ec069ec70f1309 ]---
--- drivers/block/loop.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/block/loop.c +3 -1
@@ -1633,7 +1633,7 @@ static int loop_add(struct loop_device * err = -ENOMEM ; lo->lo_queue =blk_alloc_queue (GFP_KERNEL );if (!lo->lo_queue) - goto out_free_dev; + goto out_free_idr; disk = lo->lo_disk =alloc_disk (1 << part_shift);if (!disk)
@@ -1678,6 +1678,8 @@ static int loop_add(struct loop_device * out_free_queue:blk_cleanup_queue (lo->lo_queue); +out_free_idr: +idr_remove (&loop_index_idr, i); out_free_dev:kfree (lo); out:
Greg Kroah-Hartman
maintainerPATCH 55/173 loop: fix crash when using unassigned loop device
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit ef7e7c82e02b602f29c2b87f42dcd6143a6777da upstream.
When the loop module is loaded, it creates 8 loop devices /dev/loop[0-7]. The devices have no request routine and thus, when they are used without being assigned, a crash happens.
For example, these commands cause crash (assuming there are no used loop devices):
Kernel Fault: Code=26 regs=000000007f420980 (Addr=0000000000000010)
CPU: 1 PID: 50 Comm: kworker/1:1 Not tainted 3.11.0 #1
Workqueue: ksnaphd do_metadata [dm_snapshot]
task: 000000007fcf4078 ti: 000000007f420000 task.ti: 000000007f420000
[ 116.319988]
YZrvWESTHLNXBCVMcbcbcbcbOGFRQPDI
PSW: 00001000000001001111111100001111 Not tainted
r00-03 000000ff0804ff0f 00000000408bf5d0 00000000402d8204 000000007b7ff6c0
r04-07 00000000408a95d0 000000007f420950 000000007b7ff6c0 000000007d06c930
r08-11 000000007f4205c0 0000000000000001 000000007f4205c0 000000007f4204b8
r12-15 0000000000000010 0000000000000000 0000000000000000 0000000000000000
r16-19 000000001108dd48 000000004061cd7c 000000007d859800 000000000800000f
r20-23 0000000000000000 0000000000000008 0000000000000000 0000000000000000
r24-27 00000000ffffffff 000000007b7ff6c0 000000007d859800 00000000408a95d0
r28-31 0000000000000000 000000007f420950 000000007f420980 000000007f4208e8
sr00-03 0000000000000000 0000000000000000 0000000000000000 0000000000303000
sr04-07 0000000000000000 0000000000000000 0000000000000000 0000000000000000
[ 117.549988]IASQ: 0000000000000000 0000000000000000 IAOQ: 00000000402d82fc 00000000402d8300
IIR: 53820020 ISR: 0000000000000000 IOR: 0000000000000010
CPU: 1 CR30: 000000007f420000 CR31: ffffffffffffffff
ORIG_R28: 0000000000000001
IAOQ[0]: generic_make_request+0x11c/0x1a0
IAOQ[1]: generic_make_request+0x120/0x1a0
RP(r2): generic_make_request+0x24/0x1a0
Backtrace: [<00000000402d83f0>] submit_bio+0x70/0x140 [<0000000011087c4c>] dispatch_io+0x234/0x478 [dm_mod] [<0000000011087f44>] sync_io+0xb4/0x190 [dm_mod] [<00000000110883bc>] dm_io+0x2c4/0x310 [dm_mod] [<00000000110bfcd0>] do_metadata+0x28/0xb0 [dm_snapshot] [<00000000401591d8>] process_one_work+0x160/0x460 [<0000000040159bc0>] worker_thread+0x300/0x478 [<0000000040161a70>] kthread+0x118/0x128 [<0000000040104020>] end_fault_vector+0x20/0x28 [<0000000040177220>] task_tick_fair+0x420/0x4d0 [<00000000401aa048>] invoke_rcu_core+0x50/0x60 [<00000000401ad5b8>] rcu_check_callbacks+0x210/0x8d8 [<000000004014aaa0>] update_process_times+0xa8/0xc0 [<00000000401ab86c>] rcu_process_callbacks+0x4b4/0x598 [<0000000040142408>] __do_softirq+0x250/0x2c0 [<00000000401789d0>] find_busiest_group+0x3c0/0xc70 [ 119.379988] Kernel panic - not syncing: Kernel Fault
Rebooting in 1 seconds..
--- drivers/block/loop.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/block/loop.c +8 -7
@@ -894,13 +894,6 @@ static int loop_set_fd(struct loop_devicbio_list_init (&lo->lo_bio_list); -/* -* set queue make_request_fn, and add limits based on lower level -* device -*/ -blk_queue_make_request (lo->lo_queue, loop_make_request); - lo->lo_queue->queuedata = lo; -if (!(lo_flags &LO_FLAGS_READ_ONLY ) && file->f_op->fsync)blk_queue_flush (lo->lo_queue,REQ_FLUSH );
@@ -1618,6 +1611,8 @@ static int loop_add(struct loop_device *if (!lo) goto out; + lo->lo_state = Lo_unbound; +/* allocate id, if @id >= 0, we're requesting that specific id */ if (i >=0 ) { err =idr_alloc (&loop_index_idr, lo, i, i +1 ,GFP_KERNEL );
@@ -1635,6 +1630,12 @@ static int loop_add(struct loop_device *if (!lo->lo_queue) goto out_free_idr; +/* +* set queue make_request_fn +*/ +blk_queue_make_request (lo->lo_queue, loop_make_request); + lo->lo_queue->queuedata = lo; + disk = lo->lo_disk =alloc_disk (1 << part_shift);if (!disk) goto out_free_queue;
Greg Kroah-Hartman
maintainerPATCH 56/173 mtd: nand: hack ONFI for non-power-of-2 dimensions
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Norris <[email protected]>
commit 4355b70cf48363c50a9de450b01178c83aba8f6a upstream.
Some bright specification writers decided to write this in the ONFI spec (from ONFI 3.0, Section 3.1):
"The number of blocks and number of pages per block is not required to be a power of two. In the case where one of these values is not a power of two, the corresponding address shall be rounded to an integral number of bits such that it addresses a range up to the subsequent power of two value. The host shall not access upper addresses in a range that is shown as not supported."
This breaks every assumption MTD makes about NAND block/chip-size dimensions -- they *must* be a power of two!
And of course, an enterprising manufacturer has made use of this lovely freedom. Exhibit A: Micron MT29F32G08CBADAWP
"- Plane size: 2 planes x 1064 blocks per plane
- Device size: 32Gb: 2128 blockss [sic]"
This quickly hits a BUG() in nand_base.c, since the extra dimensions overflow so we think it's a second chip (on my single-chip setup):
ONFI param page 0 valid
ONFI flash detected
NAND device: Manufacturer ID: 0x2c, Chip ID: 0x44 (Micron MT29F32G08CBADAWP), 4256MiB, page size: 8192, OOB size: 744
------------[ cut here ]------------
kernel BUG at drivers/mtd/nand/nand_base.c:203!
Internal error: Oops - BUG: 0 [#1] SMP ARM
[... trim ...]
[<c02cf3e4>] (nand_select_chip+0x18/0x2c) from [<c02d25c0>] (nand_do_read_ops+0x90/0x424)
[<c02d25c0>] (nand_do_read_ops+0x90/0x424) from [<c02d2dd8>] (nand_read+0x54/0x78)
[<c02d2dd8>] (nand_read+0x54/0x78) from [<c02ad2c8>] (mtd_read+0x84/0xbc)
[<c02ad2c8>] (mtd_read+0x84/0xbc) from [<c02d4b28>] (scan_read.clone.4+0x4c/0x64)
[<c02d4b28>] (scan_read.clone.4+0x4c/0x64) from [<c02d4c88>] (search_bbt+0x148/0x290)
[<c02d4c88>] (search_bbt+0x148/0x290) from [<c02d4ea4>] (nand_scan_bbt+0xd4/0x5c0)
[... trim ...]
---[ end trace 0c9363860d865ff2 ]---So to fix this, just truncate these dimensions down to the greatest power-of-2 dimension that is less than or equal to the specified dimension.
--- drivers/mtd/nand/nand_base.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/mtd/nand/nand_base.c +13 -2
@@ -2904,10 +2904,21 @@ static int nand_flash_detect_onfi(structsanitize_string (p->model,sizeof (p->model));if (!mtd->name) mtd->name = p->model; + mtd->writesize =le32_to_cpu (p->byte_per_page); - mtd->erasesize =le32_to_cpu (p->pages_per_block) * mtd->writesize; + +/* +* pages_per_block and blocks_per_lun may not be a power-of-2 size +* (don't ask me who thought of this...). MTD assumes that these +* dimensions will be power-of-2, so just truncate the remaining area. +*/ + mtd->erasesize =1 << (fls (le32_to_cpu (p->pages_per_block)) -1 ); + mtd->erasesize *= mtd->writesize; + mtd->oobsize =le16_to_cpu (p->spare_bytes_per_page); - chip->chipsize =le32_to_cpu (p->blocks_per_lun); + +/* See erasesize comment */ + chip->chipsize =1 << (fls (le32_to_cpu (p->blocks_per_lun)) -1 ); chip->chipsize *= (uint64_t )mtd->erasesize * p->lun_count; *busw =0 ;if (le16_to_cpu (p->features) &1 )
Greg Kroah-Hartman
maintainerPATCH 57/173 mtd: map: fixed bug in 64-bit systems
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Haitao <[email protected]>
commit a4d62babf988fe5dfde24437fa135ef147bc7aa0 upstream.
Hardware:
CPU: XLP832,the 64-bit OS
NOR Flash:S29GL128S 128M
Software:
Kernel:2.6.32.41
Filesystem:JFFS2
When writing files, errors appear:
Write len 182 but return retlen 180
Write of 182 bytes at 0x072c815c failed. returned -5, retlen 180
Write len 186 but return retlen 184
Write of 186 bytes at 0x072caff4 failed. returned -5, retlen 184
These errors exist only in 64-bit systems,not in 32-bit systems. After analysis, we
found that the left shift operation is wrong in map_word_load_partial. For instance:
unsigned char buf[3] ={0x9e,0x3a,0xea};
map_bankwidth(map) is 4;
for (i=0; i < 3; i++) {
int bitpos;
bitpos = (map_bankwidth(map)-1-i)*8;
orig.x[0] &= ~(0xff << bitpos);
orig.x[0] |= buf[i] << bitpos;
}The value of orig.x[0] is expected to be 0x9e3aeaff, but in this situation(64-bit System) we'll get the wrong value of 0xffffffff9e3aeaff due to the 64-bit sign extension:
buf[i] is defined as "unsigned char" and the left-shift operation will convert it to the type of "signed int", so when left-shift buf[i] by 24 bits, the final result will get the wrong value: 0xffffffff9e3aeaff.
If the left-shift bits are less than 24, then sign extension will not occur. Whereas the bankwidth of the nor flash we used is 4, therefore this BUG emerges.
--- include/linux/mtd/map.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/mtd/map.h +2 -2
@@ -365,7 +365,7 @@ static inline map_word map_word_load_par bitpos = (map_bankwidth (map)-1 -i)*8 ;#endif orig.x[0 ] &= ~(0xff << bitpos); - orig.x[0 ] |= buf[i-start] << bitpos; + orig.x[0 ] |= (unsigned long )buf[i-start] << bitpos; } }return orig;
@@ -384,7 +384,7 @@ static inline map_word map_word_ff(strucif (map_bankwidth (map) <MAP_FF_LIMIT ) {int bw =8 *map_bankwidth (map); - r.x[0 ] = (1 << bw) -1 ; + r.x[0 ] = (1UL << bw) -1 ; }else {for (i=0 ; i<map_words (map); i++) r.x[i] = ~0UL ;
Greg Kroah-Hartman
maintainerPATCH 58/173 mtd: gpmi: fix kernel BUG due to racing DMA operations
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huang Shijie <[email protected]>
commit 7b3d2fb92067bcb29f0f085a9fa9fa64920a6646 upstream.
[1] The gpmi uses the nand_command_lp to issue the commands to NAND chips. The gpmi issues a DMA operation with gpmi_cmd_ctrl when it handles a NAND_CMD_NONE control command. So when we read a page(NAND_CMD_READ0) from the NAND, we may send two DMA operations back-to-back.
If we do not serialize the two DMA operations, we will meet a bug when
1.1) we enable CONFIG_DMA_API_DEBUG, CONFIG_DMADEVICES_DEBUG,
and CONFIG_DEBUG_SG.
1.2) Use the following commands in an UART console and a SSH console:
cmd 1: while true;do dd if=/dev/mtd0 of=/dev/null;done cmd 1: while true;do dd if=/dev/mmcblk0 of=/dev/null;done
The kernel log shows below:
-----------------------------------------------------------------
kernel BUG at lib/scatterlist.c:28!
Unable to handle kernel NULL pointer dereference at virtual address 00000000
.........................
[<80044a0c>] (__bug+0x18/0x24) from [<80249b74>] (sg_next+0x48/0x4c) [<80249b74>] (sg_next+0x48/0x4c) from [<80255398>] (debug_dma_unmap_sg+0x170/0x1a4) [<80255398>] (debug_dma_unmap_sg+0x170/0x1a4) from [<8004af58>] (dma_unmap_sg+0x14/0x6c) [<8004af58>] (dma_unmap_sg+0x14/0x6c) from [<8027e594>] (mxs_dma_tasklet+0x18/0x1c) [<8027e594>] (mxs_dma_tasklet+0x18/0x1c) from [<8007d444>] (tasklet_action+0x114/0x164)
-----------------------------------------------------------------
1.3) Assume the two DMA operations is X (first) and Y (second).
The root cause of the bug:
Assume process P issues DMA X, and sleep on the completion
@this->dma_done. X's tasklet callback is dma_irq_callback. It firstly wake up the process sleeping on the completion @this->dma_done, and then trid to unmap the scatterlist S. The waked process P will issue Y in another ARM core. Y initializes S->sg_magic to zero with sg_init_one(), while dma_irq_callback is unmapping S at the same time.
See the diagram:
ARM core 0 | ARM core 1
-------------------------------------------------------------
(P issues DMA X, then sleep) --> |
|
(X's tasklet wakes P) --> |
|
| <-- (P begin to issue DMA Y) |
(X's tasklet unmap the |
scatterlist S with dma_unmap_sg) --> | <-- (Y calls sg_init_one() to init
| scatterlist S)
|
[2] This patch serialize both the X and Y in the following way:
Unmap the DMA scatterlist S firstly, and wake up the process at the end
of the DMA callback, in such a way, Y will be executed after X.
After this patch:
ARM core 0 | ARM core 1
-------------------------------------------------------------
(P issues DMA X, then sleep) --> |
|
(X's tasklet unmap the |
scatterlist S with dma_unmap_sg) --> |
|
(X's tasklet wakes P) --> |
|
| <-- (P begin to issue DMA Y)
|
| <-- (Y calls sg_init_one() to init
| scatterlist S)
|--- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/gpmi-nand/gpmi-nand.c +2 -2
@@ -264,8 +264,6 @@ static void dma_irq_callback(void *paramstruct gpmi_nand_data *this = param;struct completion *dma_c = &this->dma_done; -complete (dma_c); -switch (this->dma_type) {case DMA_FOR_COMMAND :dma_unmap_sg (this->dev, &this->cmd_sgl,1 ,DMA_TO_DEVICE );
@@ -290,6 +288,8 @@ static void dma_irq_callback(void *paramdefault :pr_err ("in wrong DMA operation.\n" ); } + +complete (dma_c); } int start_dma_without_bch_irq(struct gpmi_nand_data *this,
Greg Kroah-Hartman
maintainerPATCH 59/173 ext4: avoid bh leak in retry path of ext4_expand_extra_isize_ea()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit dcb9917ba041866686fe152850364826c4622a36 upstream.
--- fs/ext4/xattr.c | 1 + 1 file changed, 1 insertion(+)
fs/ext4/xattr.c +1 -0
@@ -1352,6 +1352,7 @@ retry: new_extra_isize = s_min_extra_isize;kfree (is); is =NULL ;kfree (bs); bs =NULL ; +brelse (bh); goto retry; } error =-1 ;
Greg Kroah-Hartman
maintainerPATCH 60/173 xen/blkback: fix reference counting
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vegard Nossum <[email protected]>
commit ea5ec76d76da9279d12027c1828544c5ccbe7932 upstream.
If the permission check fails, we drop a reference to the blkif without having taken it in the first place. The bug was introduced in commit 604c499cbbcc3d5fe5fb8d53306aa0fae1990109 (xen/blkback: Check device permissions before allowing OP_DISCARD).
--- drivers/block/xen-blkback/blkback.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/xen-blkback/blkback.c +2 -1
@@ -649,6 +649,8 @@ static int dispatch_discard_io(struct xeunsigned long secure;struct phys_req preq; +xen_blkif_get (blkif); + preq.sector_number = req->u.discard.sector_number; preq.nr_sects = req->u.discard.nr_sectors;
@@ -661,7 +663,6 @@ static int dispatch_discard_io(struct xe } blkif->st_ds_req++; -xen_blkif_get (blkif); secure = (blkif->vbd.discard_secure && (req->u.discard.flag &BLKIF_DISCARD_SECURE )) ?BLKDEV_DISCARD_SECURE :0 ;
Greg Kroah-Hartman
maintainerPATCH 61/173 rtlwifi: rtl8192de: Fix incorrect signal strength for unassociated AP
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit 3545f3d5f4af715c914394123ce7725a9cf0a1c4 upstream.
The routine that processes received frames was returning the RSSI value for the signal strength; however, that value is available only for associated APs. As a result, the strength was the absurd value of 10 dBm. As a result, scans return incorrect values for the strength, which causes unwanted attempts to roam.
--- drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/rtlwifi/rtl8192de/trx.c +1 -1
@@ -525,7 +525,7 @@ bool rtl92de_rx_query_desc(struct ieee80 p_drvinfo); }/*rx_status->qual = stats->signal; */ - rx_status->signal = stats->rssi +10 ; + rx_status->signal = stats->recvsignalpower +10 ;/*rx_status->noise = -stats->noise; */ return true; }
Greg Kroah-Hartman
maintainerPATCH 62/173 rtlwifi: rtl8192se: Fix incorrect signal strength for unassociated AP
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit b4ade797668e33b4e8353c2701ce01d7084dfafa upstream.
The routine that processes received frames was returning the RSSI value for the signal strength; however, that value is available only for associated APs. As a result, the strength was the absurd value of 10 dBm. As a result, scans return incorrect values for the strength, which causes unwanted attempts to roam.
This patch fixes https://bugzilla.kernel.org/show_bug.cgi?id=63881.
--- drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/rtlwifi/rtl8192se/trx.c +1 -1
@@ -329,7 +329,7 @@ bool rtl92se_rx_query_desc(struct ieee80 }/*rx_status->qual = stats->signal; */ - rx_status->signal = stats->rssi +10 ; + rx_status->signal = stats->recvsignalpower +10 ;/*rx_status->noise = -stats->noise; */ return true;
Greg Kroah-Hartman
maintainerPATCH 63/173 rtlwifi: rtl8192cu: Fix incorrect signal strength for unassociated AP
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit 78dbfecb95be4635b995af3bd29fa10013409fcd upstream.
The routine that processes received frames was returning the RSSI value for the signal strength; however, that value is available only for associated APs. As a result, the strength was the absurd value of 10 dBm. As a result, scans return incorrect values for the strength, which causes unwanted attempts to roam.
--- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c +1 -1
@@ -349,7 +349,7 @@ bool rtl92cu_rx_query_desc(struct ieee80 p_drvinfo); }/*rx_status->qual = stats->signal; */ - rx_status->signal = stats->rssi +10 ; + rx_status->signal = stats->recvsignalpower +10 ;/*rx_status->noise = -stats->noise; */ return true; }
Greg Kroah-Hartman
maintainerPATCH 64/173 qeth: avoid buffer overflow in snmp ioctl
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ursula Braun <[email protected]>
commit 6fb392b1a63ae36c31f62bc3fc8630b49d602b62 upstream.
Check user-defined length in snmp ioctl request and allow request only if it fits into a qeth command buffer.
--- drivers/s390/net/qeth_core_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/s390/net/qeth_core_main.c +5 -1
@@ -4448,7 +4448,7 @@ int qeth_snmp_command(struct qeth_card *struct qeth_cmd_buffer *iob;struct qeth_ipa_cmd *cmd;struct qeth_snmp_ureq *ureq; -int req_len; +unsigned int req_len;struct qeth_arp_query_info qinfo = {0 , };int rc =0 ;
@@ -4464,6 +4464,10 @@ int qeth_snmp_command(struct qeth_card */* skip 4 bytes (data_len struct member) to get req_len */ if (copy_from_user (&req_len, udata +sizeof (int ),sizeof (int )))return -EFAULT ; +if (req_len > (QETH_BUFSIZE -IPA_PDU_HEADER_SIZE - +sizeof (struct qeth_ipacmd_hdr ) - +sizeof (struct qeth_ipacmd_setadpparms_hdr ))) +return -EINVAL ; ureq =memdup_user (udata, req_len +sizeof (struct qeth_snmp_ureq_hdr ));if (IS_ERR (ureq)) {QETH_CARD_TEXT (card,2 ,"snmpnome" );
Greg Kroah-Hartman
maintainerPATCH 65/173 rt2400pci: fix RSSI read
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
commit 2bf127a5cc372b9319afcbae10b090663b621c8b upstream.
RSSI value is provided on word3 not on word2.
--- drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/rt2x00/rt2400pci.c +1 -1
@@ -1261,7 +1261,7 @@ static void rt2400pci_fill_rxdone(struct*/ rxdesc->timestamp = ((u64 )rx_high <<32 ) | rx_low; rxdesc->signal =rt2x00_get_field32 (word2,RXD_W2_SIGNAL ) & ~0x08 ; - rxdesc->rssi =rt2x00_get_field32 (word2,RXD_W3_RSSI ) - + rxdesc->rssi =rt2x00_get_field32 (word3,RXD_W3_RSSI ) - entry->queue->rt2x00dev->rssi_offset; rxdesc->size =rt2x00_get_field32 (word0,RXD_W0_DATABYTE_COUNT );
Greg Kroah-Hartman
maintainerPATCH 66/173 mm: ensure get_unmapped_area() returns higher address than mmap_min_addr
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Akira Takeuchi <[email protected]>
commit 2afc745f3e3079ab16c826be4860da2529054dd2 upstream.
This patch fixes the problem that get_unmapped_area() can return illegal address and result in failing mmap(2) etc.
In case that the address higher than PAGE_SIZE is set to /proc/sys/vm/mmap_min_addr, the address lower than mmap_min_addr can be returned by get_unmapped_area(), even if you do not pass any virtual address hint (i.e. the second argument).
This is because the current get_unmapped_area() code does not take into account mmap_min_addr.
This leads to two actual problems as follows:
1. mmap(2) can fail with EPERM on the process without CAP_SYS_RAWIO, although any illegal parameter is not passed.
2. The bottom-up search path after the top-down search might not work in arch_get_unmapped_area_topdown().
Note: The first and third chunk of my patch, which changes "len" check, are for more precise check using mmap_min_addr, and not for solving the above problem.
[How to reproduce]
--- test.c -------------------------------------------------
#include <stdio.h>
#include <unistd.h>
#include <sys/mman.h>
#include <sys/errno.h>
int main(int argc, char *argv[])
{
void *ret = NULL, *last_map;
size_t pagesize = sysconf(_SC_PAGESIZE);
do {
last_map = ret;
ret = mmap(0, pagesize, PROT_NONE,
MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
// printf("ret=%p\n", ret);
} while (ret != MAP_FAILED);
if (errno != ENOMEM) {
printf("ERR: unexpected errno: %d (last map=%p)\n",
errno, last_map);
}
return 0;
}
---------------------------------------------------------------
$ gcc -m32 -o test test.c
$ sudo sysctl -w vm.mmap_min_addr=65536
vm.mmap_min_addr = 65536
$ ./test (run as non-priviledge user)
ERR: unexpected errno: 1 (last map=0x10000)--- mm/mmap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
mm/mmap.c +5 -5
@@ -1853,7 +1853,7 @@ arch_get_unmapped_area(struct file *filpstruct vm_area_struct *vma;struct vm_unmapped_area_info info; -if (len >TASK_SIZE ) +if (len >TASK_SIZE - mmap_min_addr)return -ENOMEM ;if (flags &MAP_FIXED )
@@ -1862,7 +1862,7 @@ arch_get_unmapped_area(struct file *filpif (addr) { addr =PAGE_ALIGN (addr); vma =find_vma (mm, addr); -if (TASK_SIZE - len >= addr && +if (TASK_SIZE - len >= addr && addr >= mmap_min_addr && (!vma || addr + len <= vma->vm_start))return addr; }
@@ -1901,7 +1901,7 @@ arch_get_unmapped_area_topdown(struct fistruct vm_unmapped_area_info info;/* requested length too big for entire address space */ -if (len >TASK_SIZE ) +if (len >TASK_SIZE - mmap_min_addr)return -ENOMEM ;if (flags &MAP_FIXED )
@@ -1911,14 +1911,14 @@ arch_get_unmapped_area_topdown(struct fiif (addr) { addr =PAGE_ALIGN (addr); vma =find_vma (mm, addr); -if (TASK_SIZE - len >= addr && +if (TASK_SIZE - len >= addr && addr >= mmap_min_addr && (!vma || addr + len <= vma->vm_start))return addr; } info.flags =VM_UNMAPPED_AREA_TOPDOWN ; info.length = len; - info.low_limit =PAGE_SIZE ; + info.low_limit =max (PAGE_SIZE , mmap_min_addr); info.high_limit = mm->mmap_base; info.align_mask =0 ; addr =vm_unmapped_area (&info);
Greg Kroah-Hartman
maintainerPATCH 67/173 mmc: atmel-mci: abort transfer on timeout error
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ludovic Desroches <[email protected]>
commit c1fa3426aa5c782724c97394303d52228206eda4 upstream.
When a software timeout occurs, the transfer is not stopped. In DMA case, it causes DMA channel to be stuck because the transfer is still active causing following transfers to be queued but not computed.
--- drivers/mmc/host/atmel-mci.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/mmc/host/atmel-mci.c +7 -0
@@ -584,6 +584,13 @@ static void atmci_timeout_timer(unsignedif (host->mrq->cmd->data) { host->mrq->cmd->data->error = -ETIMEDOUT ; host->data =NULL ; +/* +* With some SDIO modules, sometimes DMA transfer hangs. If +* stop_transfer() is not called then the DMA request is not +* removed, following ones are queued and never computed. +*/ +if (host->state ==STATE_DATA_XFER ) + host->stop_transfer (host); }else { host->mrq->cmd->error = -ETIMEDOUT ; host->cmd =NULL ;
Greg Kroah-Hartman
maintainerPATCH 68/173 mmc: atmel-mci: fix oops in atmci_tasklet_func
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rodolfo Giometti <[email protected]>
commit fbd986cd420d1deeabf1039ec4e74075a5639db5 upstream.
In some cases, a NULL pointer dereference happens because data is NULL when STATE_END_REQUEST case is reached in atmci_tasklet_func.
--- drivers/mmc/host/atmel-mci.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/mmc/host/atmel-mci.c +8 -6
@@ -1794,12 +1794,14 @@ static void atmci_tasklet_func(unsignedif (unlikely (status)) { host->stop_transfer (host); host->data =NULL ; -if (status &ATMCI_DTOE ) { - data->error = -ETIMEDOUT ; - }else if (status &ATMCI_DCRCE ) { - data->error = -EILSEQ ; - }else { - data->error = -EIO ; +if (data) { +if (status &ATMCI_DTOE ) { + data->error = -ETIMEDOUT ; + }else if (status &ATMCI_DCRCE ) { + data->error = -EILSEQ ; + }else { + data->error = -EIO ; + } } }
Greg Kroah-Hartman
maintainerPATCH 69/173 dm mpath: fix race condition between multipath_dtr and pg_init_done
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shiva Krishna Merla <[email protected]>
commit 954a73d5d3073df2231820c718fdd2f18b0fe4c9 upstream.
Whenever multipath_dtr() is happening we must prevent queueing any further path activation work. Implement this by adding a new 'pg_init_disabled' flag to the multipath structure that denotes future path activation work should be skipped if it is set. By disabling pg_init and then re-enabling in flush_multipath_work() we also avoid the potential for pg_init to be initiated while suspending an mpath device.
Without this patch a race condition exists that may result in a kernel panic:
1) If after pg_init_done() decrements pg_init_in_progress to 0, a call to wait_for_pg_init_completion() assumes there are no more pending path management commands.
2) If pg_init_required is set by pg_init_done(), due to retryable mode_select errors, then process_queued_ios() will again queue the path activation work.
3) If free_multipath() completes before activate_path() work is called a NULL pointer dereference like the following can be seen when accessing members of the recently destructed multipath:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000090 RIP: 0010:[<ffffffffa003db1b>] [<ffffffffa003db1b>] activate_path+0x1b/0x30 [dm_multipath] [<ffffffff81090ac0>] worker_thread+0x170/0x2a0 [<ffffffff81096c80>] ? autoremove_wake_function+0x0/0x40
--- drivers/md/dm-mpath.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/md/dm-mpath.c +15 -3
@@ -86,6 +86,7 @@ struct multipath { unsigned queue_if_no_path:1; /* Queue I/O if last path fails? */ unsigned saved_queue_if_no_path:1; /* Saved state during suspension */ unsigned retain_attached_hw_handler:1; /* If there's already a hw_handler present, don't change it. */ + unsigned pg_init_disabled:1; /* pg_init is not currently allowed */unsigned pg_init_retries;/* Number of times to retry pg_init */ unsigned pg_init_count;/* Number of times pg_init called */
@@ -497,7 +498,8 @@ static void process_queued_ios(struct wo (!pgpath && !m->queue_if_no_path)) must_queue =0 ; -if (m->pg_init_required && !m->pg_init_in_progress && pgpath) +if (m->pg_init_required && !m->pg_init_in_progress && pgpath && + !m->pg_init_disabled)__pg_init_all_paths (m);spin_unlock_irqrestore (&m->lock, flags);
@@ -942,10 +944,20 @@ static void multipath_wait_for_pg_init_cstatic void flush_multipath_work (struct multipath *m) { +unsigned long flags; + +spin_lock_irqsave (&m->lock, flags); + m->pg_init_disabled =1 ; +spin_unlock_irqrestore (&m->lock, flags); +flush_workqueue (kmpath_handlerd);multipath_wait_for_pg_init_completion (m);flush_workqueue (kmultipathd);flush_work (&m->trigger_event); + +spin_lock_irqsave (&m->lock, flags); + m->pg_init_disabled =0 ; +spin_unlock_irqrestore (&m->lock, flags); }static void multipath_dtr (struct dm_target *ti)
@@ -1164,7 +1176,7 @@ static int pg_init_limit_reached(structspin_lock_irqsave (&m->lock, flags); -if (m->pg_init_count <= m->pg_init_retries) +if (m->pg_init_count <= m->pg_init_retries && !m->pg_init_disabled) m->pg_init_required =1 ;else limit_reached =1 ;
@@ -1699,7 +1711,7 @@ out:*---------------------------------------------------------------*/ static struct target_type multipath_target = { .name ="multipath" , - .version = {1 ,5 ,1 }, + .version = {1 ,6 ,0 }, .module =THIS_MODULE , .ctr = multipath_ctr, .dtr = multipath_dtr,
Greg Kroah-Hartman
maintainerPATCH 70/173 dm array: fix bug in growing array
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joe Thornber <[email protected]>
commit 9c1d4de56066e4d6abc66ec188faafd7b303fb08 upstream.
Entries would be lost if the old tail block was partially filled.
--- drivers/md/persistent-data/dm-array.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/md/persistent-data/dm-array.c +4 -1
@@ -509,15 +509,18 @@ static int grow_add_tail_block(struct restatic int grow_needs_more_blocks (struct resize *resize) {int r; +unsigned old_nr_blocks = resize->old_nr_full_blocks;if (resize->old_nr_entries_in_last_block >0 ) { + old_nr_blocks++; + r =grow_extend_tail_block (resize, resize->max_entries);if (r)return r; } r =insert_full_ablocks (resize->info, resize->size_of_block, - resize->old_nr_full_blocks, + old_nr_blocks, resize->new_nr_full_blocks, resize->max_entries, resize->value, &resize->root);
Greg Kroah-Hartman
maintainerPATCH 71/173 dm cache: fix a race condition between queuing new migrations and quiescing for a shutdown
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joe Thornber <[email protected]>
commit 66cb1910df17b38334153462ec8166e48058035f upstream.
The code that was trying to do this was inadequate. The postsuspend method (in ioctl context), needs to wait for the worker thread to acknowledge the request to quiesce. Otherwise the migration count may drop to zero temporarily before the worker thread realises we're quiescing. In this case the target will be taken down, but the worker thread may have issued a new migration, which will cause an oops when it completes.
--- drivers/md/dm-cache-target.c | 54 +++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 14 deletions(-)
drivers/md/dm-cache-target.c +40 -14
@@ -151,6 +151,9 @@ struct cache {atomic_t nr_migrations;wait_queue_head_t migration_wait; +wait_queue_head_t quiescing_wait; +atomic_t quiescing_ack; +/* * cache_size entries, dirty if set */
@@ -742,8 +745,9 @@ static void cell_defer(struct cache *cacstatic void cleanup_migration (struct dm_cache_migration *mg) { -dec_nr_migrations (mg->cache); +struct cache *cache = mg->cache;free_migration (mg); +dec_nr_migrations (cache); }static void migration_failure (struct dm_cache_migration *mg)
@@ -1340,34 +1344,51 @@ static void writeback_some_dirty_blocks(/*---------------------------------------------------------------- * Main worker loop *--------------------------------------------------------------*/ -static void start_quiescing (struct cache *cache) +static bool is_quiescing (struct cache *cache) { +int r;unsigned long flags;spin_lock_irqsave (&cache->lock, flags); - cache->quiescing =1 ; + r = cache->quiescing;spin_unlock_irqrestore (&cache->lock, flags); + +return r; } -static void stop_quiescing (struct cache *cache) +static void ack_quiescing (struct cache *cache) +{ +if (is_quiescing (cache)) { +atomic_inc (&cache->quiescing_ack); +wake_up (&cache->quiescing_wait); + } +} + +static void wait_for_quiescing_ack (struct cache *cache) +{ +wait_event (cache->quiescing_wait,atomic_read (&cache->quiescing_ack)); +} + +static void start_quiescing (struct cache *cache) {unsigned long flags;spin_lock_irqsave (&cache->lock, flags); - cache->quiescing =0 ; + cache->quiescing = true;spin_unlock_irqrestore (&cache->lock, flags); + +wait_for_quiescing_ack (cache); } -static bool is_quiescing (struct cache *cache) +static void stop_quiescing (struct cache *cache) { -int r;unsigned long flags;spin_lock_irqsave (&cache->lock, flags); - r = cache->quiescing; + cache->quiescing = false;spin_unlock_irqrestore (&cache->lock, flags); -return r; +atomic_set (&cache->quiescing_ack,0 ); }static void wait_for_migrations (struct cache *cache)
@@ -1414,16 +1435,15 @@ static void do_worker(struct work_struct struct cache *cache = container_of(ws, struct cache, worker); do { - if (!is_quiescing(cache)) + if (!is_quiescing(cache)) { + writeback_some_dirty_blocks(cache); + process_deferred_writethrough_bios(cache); process_deferred_bios(cache); + } process_migrations(cache, &cache->quiesced_migrations, issue_copy); process_migrations(cache, &cache->completed_migrations, complete_migration); - writeback_some_dirty_blocks(cache); - - process_deferred_writethrough_bios(cache); - if (commit_if_needed(cache)) { process_deferred_flush_bios(cache, false);
@@ -1436,6 +1456,9 @@ static void do_worker(struct work_structprocess_migrations (cache, &cache->need_commit_migrations, migration_success_post_commit); } + +ack_quiescing (cache); + }while (more_work (cache)); }
@@ -1998,6 +2021,9 @@ static int cache_create(struct cache_argatomic_set (&cache->nr_migrations,0 );init_waitqueue_head (&cache->migration_wait); +init_waitqueue_head (&cache->quiescing_wait); +atomic_set (&cache->quiescing_ack,0 ); + r = -ENOMEM ; cache->nr_dirty =0 ; cache->dirty_bitset =alloc_bitset (from_cblock (cache->cache_size));
Greg Kroah-Hartman
maintainerPATCH 72/173 dm: allocate buffer for messages with small number of arguments using GFP_NOIO
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit f36afb3957353d2529cb2b00f78fdccd14fc5e9c upstream.
dm-mpath and dm-thin must process messages even if some device is suspended, so we allocate argv buffer with GFP_NOIO. These messages have a small fixed number of arguments.
On the other hand, dm-switch needs to process bulk data using messages so excessive use of GFP_NOIO could cause trouble.
The patch also lowers the default number of arguments from 64 to 8, so that there is smaller load on GFP_NOIO allocations.
--- drivers/md/dm-table.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/md/dm-table.c +16 -2
@@ -580,14 +580,28 @@ static int adjoin(struct dm_table *table/* * Used to dynamically allocate the arg array. +* +* We do first allocation with GFP_NOIO because dm-mpath and dm-thin must +* process messages even if some device is suspended. These messages have a +* small fixed number of arguments. +* +* On the other hand, dm-switch needs to process bulk data using messages and +* excessive use of GFP_NOIO could cause trouble. */ static char **realloc_argv (unsigned *array_size,char **old_argv) {char **argv;unsigned new_size; +gfp_t gfp; - new_size = *array_size ? *array_size *2 :64 ; - argv =kmalloc (new_size *sizeof (*argv),GFP_KERNEL ); +if (*array_size) { + new_size = *array_size *2 ; + gfp =GFP_KERNEL ; + }else { + new_size =8 ; + gfp =GFP_NOIO ; + } + argv =kmalloc (new_size *sizeof (*argv), gfp);if (argv) {memcpy (argv, old_argv, *array_size *sizeof (*argv)); *array_size = new_size;
Greg Kroah-Hartman
maintainerPATCH 73/173 ioatdma: fix sed pool selection
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Williams <[email protected]>
commit 5d48b9b5d80e3aa38a5161565398b1e48a650573 upstream.
The array to lookup the sed pool based on the number of sources (pq16_idx_to_sedi) is 16 entries and expects a max source index. However, we pass the total source count which runs off the end of the array when src_cnt == 16. The minimal fix is to just pass src_cnt-1, but given we know the source count is > 8 we can just calculate the sed pool by (src_cnt - 2) >> 3.
--- drivers/dma/ioat/dma_v3.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
drivers/dma/ioat/dma_v3.c +1 -15
@@ -87,13 +87,6 @@ static const u8 pq_idx_to_field[] = { 1,static const u8 pq16_idx_to_field[] = {1 ,4 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,0 ,1 ,2 ,3 ,4 ,5 ,6 }; -/* -* technically sources 1 and 2 do not require SED, but the op will have -* at least 9 descriptors so that's irrelevant. -*/ -static const u8 pq16_idx_to_sed[] = {0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , -1 ,1 ,1 ,1 ,1 ,1 ,1 }; -static void ioat3_eh (struct ioat2_dma_chan *ioat);static dma_addr_t xor_get_src (struct ioat_raw_descriptor *descs[2 ],int idx)
@@ -135,12 +128,6 @@ static void pq_set_src(struct ioat_raw_d pq->coef[idx] = coef; } -static int sed_get_pq16_pool_idx (int src_cnt) -{ - -return pq16_idx_to_sed[src_cnt]; -} -static bool is_jf_ioat (struct pci_dev *pdev) {switch (pdev->device) {
@@ -1212,8 +1199,7 @@ __ioat3_prep_pq16_lock(struct dma_chan * descs[0 ] = (struct ioat_raw_descriptor *) pq; - desc->sed =ioat3_alloc_sed (device, -sed_get_pq16_pool_idx (src_cnt)); + desc->sed =ioat3_alloc_sed (device, (src_cnt-2 ) >>3 );if (!desc->sed) {dev_err (to_dev (chan),"%s: no free sed entries\n" , __func__);
Greg Kroah-Hartman
maintainerPATCH 74/173 ioatdma: fix selection of 16 vs 8 source path
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Williams <[email protected]>
commit 21e96c7313486390c694919522a76dfea0a86c59 upstream.
When performing continuations there are implied sources that need to be added to the source count. Quoting dma_set_maxpq:
/* dma_maxpq - reduce maxpq in the face of continued operations
* @dma - dma device with PQ capability
* @flags - to check if DMA_PREP_CONTINUE and DMA_PREP_PQ_DISABLE_P are set *
* When an engine does not support native continuation we need 3 extra
* source slots to reuse P and Q with the following coefficients:
* 1/ {00} * P : remove P from Q', but use it as a source for P'
* 2/ {01} * Q : use Q to continue Q' calculation
* 3/ {00} * Q : subtract Q from P' to cancel (2)
*
* In the case where P is disabled we only need 1 extra source:
* 1/ {01} * Q : use Q to continue Q' calculation
*/
...fix the selection of the 16 source path to take these implied sources into account.
Note this also kills the BUG_ON(src_cnt < 9) check in __ioat3_prep_pq16_lock(). Besides not accounting for implied sources the check is redundant given we already made the path selection.
--- drivers/dma/ioat/dma_v3.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/dma/ioat/dma_v3.c +15 -15
@@ -1169,9 +1169,6 @@ __ioat3_prep_pq16_lock(struct dma_chan *u8 op;int i, s, idx, num_descs; -/* this function only handles src_cnt 9 - 16 */ -BUG_ON (src_cnt <9 ); -/* this function is only called with 9-16 sources */ op = result ?IOAT_OP_PQ_VAL_16S :IOAT_OP_PQ_16S ;
@@ -1257,13 +1254,21 @@ __ioat3_prep_pq16_lock(struct dma_chan *return &desc->txd; } +static int src_cnt_flags (unsigned int src_cnt,unsigned long flags) +{ +if (dmaf_p_disabled_continue (flags)) +return src_cnt +1 ; +else if (dmaf_continue (flags)) +return src_cnt +3 ; +else +return src_cnt; +} +static struct dma_async_tx_descriptor *ioat3_prep_pq (struct dma_chan *chan,dma_addr_t *dst,dma_addr_t *src,unsigned int src_cnt,const unsigned char *scf,size_t len,unsigned long flags) { -struct dma_device *dma = chan->device; -/* specify valid address for disabled result */ if (flags &DMA_PREP_PQ_DISABLE_P ) dst[0 ] = dst[1 ];
@@ -1283,7 +1288,7 @@ ioat3_prep_pq(struct dma_chan *chan, dma single_source_coef[0 ] = scf[0 ]; single_source_coef[1 ] =0 ; -return (src_cnt >8 ) && (dma->max_pq >8 ) ? +return src_cnt_flags (src_cnt, flags) >8 ?__ioat3_prep_pq16_lock (chan,NULL , dst, single_source,2 , single_source_coef, len, flags) :
@@ -1291,7 +1296,7 @@ ioat3_prep_pq(struct dma_chan *chan, dma single_source_coef, len, flags); }else { -return (src_cnt >8 ) && (dma->max_pq >8 ) ? +return src_cnt_flags (src_cnt, flags) >8 ?__ioat3_prep_pq16_lock (chan,NULL , dst, src, src_cnt, scf, len, flags) : __ioat3_prep_pq_lock(chan, NULL, dst, src, src_cnt,
@@ -1304,8 +1309,6 @@ ioat3_prep_pq_val(struct dma_chan *chan, unsigned int src_cnt, const unsigned char *scf, size_t len, enum sum_check_flags *pqres, unsigned long flags) { - struct dma_device *dma = chan->device; - /* specify valid address for disabled result */ if (flags & DMA_PREP_PQ_DISABLE_P) pq[0 ] = pq[1 ];
@@ -1317,7 +1320,7 @@ ioat3_prep_pq_val(struct dma_chan *chan,*/ *pqres =0 ; -return (src_cnt >8 ) && (dma->max_pq >8 ) ? +return src_cnt_flags (src_cnt, flags) >8 ?__ioat3_prep_pq16_lock (chan, pqres, pq, src, src_cnt, scf, len, flags) : __ioat3_prep_pq_lock(chan, pqres, pq, src, src_cnt, scf, len,
@@ -1328,7 +1331,6 @@ static struct dma_async_tx_descriptor * ioat3_prep_pqxor(struct dma_chan *chan, dma_addr_t dst, dma_addr_t *src, unsigned int src_cnt, size_t len, unsigned long flags) { - struct dma_device *dma = chan->device; unsigned char scf[src_cnt];dma_addr_t pq[2 ];
@@ -1337,7 +1339,7 @@ ioat3_prep_pqxor(struct dma_chan *chan, flags |=DMA_PREP_PQ_DISABLE_Q ; pq[1 ] = dst;/* specify valid address for disabled result */ -return (src_cnt >8 ) && (dma->max_pq >8 ) ? +return src_cnt_flags (src_cnt, flags) >8 ?__ioat3_prep_pq16_lock (chan,NULL , pq, src, src_cnt, scf, len, flags) : __ioat3_prep_pq_lock(chan, NULL, pq, src, src_cnt, scf, len,
@@ -1349,7 +1351,6 @@ ioat3_prep_pqxor_val(struct dma_chan *ch unsigned int src_cnt, size_t len, enum sum_check_flags *result, unsigned long flags) { - struct dma_device *dma = chan->device; unsigned char scf[src_cnt];dma_addr_t pq[2 ];
@@ -1363,8 +1364,7 @@ ioat3_prep_pqxor_val(struct dma_chan *ch flags |=DMA_PREP_PQ_DISABLE_Q ; pq[1 ] = pq[0 ];/* specify valid address for disabled result */ - -return (src_cnt >8 ) && (dma->max_pq >8 ) ? +return src_cnt_flags (src_cnt, flags) >8 ?__ioat3_prep_pq16_lock (chan, result, pq, &src[1 ], src_cnt -1 , scf, len, flags) : __ioat3_prep_pq_lock(chan, result, pq, &src[1], src_cnt - 1,
Greg Kroah-Hartman
maintainerPATCH 75/173 blk-core: Fix memory corruption if blkcg_init_queue fails
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit fff4996b7db7955414ac74386efa5e07fd766b50 upstream.
If blkcg_init_queue fails, blk_alloc_queue_node doesn't call bdi_destroy to clean up structures allocated by the backing dev.
------------[ cut here ]------------ WARNING: at lib/debugobjects.c:260 debug_print_object+0x85/0xa0() ODEBUG: free active (active state 0) object type: percpu_counter hint: (null) Modules linked in: dm_loop dm_mod ip6table_filter ip6_tables uvesafb cfbcopyarea cfbimgblt cfbfillrect fbcon font bitblit fbcon_rotate fbcon_cw fbcon_ud fbcon_ccw softcursor fb fbdev ipt_MASQUERADE iptable_nat nf_nat_ipv4 msr nf_conntrack_ipv4 nf_defrag_ipv4 xt_state ipt_REJECT xt_tcpudp iptable_filter ip_tables x_tables bridge stp llc tun ipv6 cpufreq_userspace cpufreq_stats cpufreq_powersave cpufreq_ondemand cpufreq_conservative spadfs fuse hid_generic usbhid hid raid0 md_mod dmi_sysfs nf_nat_ftp nf_nat nf_conntrack_ftp nf_conntrack lm85 hwmon_vid snd_usb_audio snd_pcm_oss snd_mixer_oss snd_pcm snd_timer snd_page_alloc snd_hwdep snd_usbmidi_lib snd_rawmidi snd soundcore acpi_cpufreq freq_table mperf sata_svw serverworks kvm_amd ide_core ehci_pci ohci_hcd libata ehci_hcd kvm usbcore tg3 usb_common libphy k10temp pcspkr ptp i2c_piix4 i2c_core evdev microcode hwmon rtc_cmos pps_core e100 skge floppy mii processor button unix CPU: 0 PID: 2739 Comm: lvchange Tainted: G W 3.10.15-devel #14 Hardware name: empty empty/S3992-E, BIOS 'V1.06 ' 06/09/2009 0000000000000009 ffff88023c3c1ae8 ffffffff813c8fd4 ffff88023c3c1b20 ffffffff810399eb ffff88043d35cd58 ffffffff81651940 ffff88023c3c1bf8 ffffffff82479d90 0000000000000005 ffff88023c3c1b80 ffffffff81039a67 Call Trace: [<ffffffff813c8fd4>] dump_stack+0x19/0x1b [<ffffffff810399eb>] warn_slowpath_common+0x6b/0xa0 [<ffffffff81039a67>] warn_slowpath_fmt+0x47/0x50 [<ffffffff8122aaaf>] ? debug_check_no_obj_freed+0xcf/0x250 [<ffffffff81229a15>] debug_print_object+0x85/0xa0 [<ffffffff8122abe3>] debug_check_no_obj_freed+0x203/0x250 [<ffffffff8113c4ac>] kmem_cache_free+0x20c/0x3a0 [<ffffffff811f6709>] blk_alloc_queue_node+0x2a9/0x2c0 [<ffffffff811f672e>] blk_alloc_queue+0xe/0x10 [<ffffffffa04c0093>] dm_create+0x1a3/0x530 [dm_mod] [<ffffffffa04c6bb0>] ? list_version_get_info+0xe0/0xe0 [dm_mod] [<ffffffffa04c6c07>] dev_create+0x57/0x2b0 [dm_mod] [<ffffffffa04c6bb0>] ? list_version_get_info+0xe0/0xe0 [dm_mod] [<ffffffffa04c6bb0>] ? list_version_get_info+0xe0/0xe0 [dm_mod] [<ffffffffa04c6528>] ctl_ioctl+0x268/0x500 [dm_mod] [<ffffffff81097662>] ? get_lock_stats+0x22/0x70 [<ffffffffa04c67ce>] dm_ctl_ioctl+0xe/0x20 [dm_mod] [<ffffffff81161aad>] do_vfs_ioctl+0x2ed/0x520 [<ffffffff8116cfc7>] ? fget_light+0x377/0x4e0 [<ffffffff81161d2b>] SyS_ioctl+0x4b/0x90 [<ffffffff813cff16>] system_call_fastpath+0x1a/0x1f ---[ end trace 4b5ff0d55673d986 ]--- ------------[ cut here ]------------
This fix should be backported to stable kernels starting with 2.6.37. Note that in the kernels prior to 3.5 the affected code is different, but the bug is still there - bdi_init is called and bdi_destroy isn't.
--- block/blk-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
block/blk-core.c +3 -1
@@ -645,10 +645,12 @@ struct request_queue *blk_alloc_queue_no__set_bit (QUEUE_FLAG_BYPASS , &q->queue_flags);if (blkcg_init_queue (q)) - goto fail_id; + goto fail_bdi;return q; +fail_bdi: +bdi_destroy (&q->backing_dev_info); fail_id:ida_simple_remove (&blk_queue_ida, q->id); fail_q:
Greg Kroah-Hartman
maintainerPATCH 76/173 PM / hibernate: Avoid overflow in hibernate_preallocate_memory()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaron Lu <[email protected]>
commit fd432b9f8c7c88428a4635b9f5a9c6e174df6e36 upstream.
When system has a lot of highmem (e.g. 16GiB using a 32 bits kernel), the code to calculate how much memory we need to preallocate in normal zone may cause overflow. As Leon has analysed:
It looks that during computing 'alloc' variable there is overflow:
alloc = (3943404 - 1970542) - 1978280 = -5418 (signed) And this function goes to err_out.
Fix this by avoiding that overflow.
References: https://bugzilla.kernel.org/show_bug.cgi?id=60817
--- kernel/power/snapshot.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
kernel/power/snapshot.c +5 -1
@@ -1398,7 +1398,11 @@ int hibernate_preallocate_memory(void)* highmem and non-highmem zones separately. */ pages_highmem =preallocate_image_highmem (highmem /2 ); - alloc = (count - max_size) - pages_highmem; + alloc = count - max_size; +if (alloc > pages_highmem) + alloc -= pages_highmem; +else + alloc =0 ; pages =preallocate_image_memory (alloc, avail_normal);if (pages < alloc) {/* We have exhausted non-highmem pages, try highmem. */
Greg Kroah-Hartman
maintainerPATCH 77/173 PM / runtime: Use pm_runtime_put_sync() in __device_release_driver()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Rafael J. Wysocki" <[email protected]>
commit baab52ded242c35a2290e1fa82e0cc147d0d8c1a upstream.
Commit fa180eb448fa (PM / Runtime: Idle devices asynchronously after probe|release) modified __device_release_driver() to call pm_runtime_put(dev) instead of pm_runtime_put_sync(dev) before detaching the driver from the device. However, that was a mistake, because pm_runtime_put(dev) causes rpm_idle() to be queued up and the driver may be gone already when that function is executed. That breaks the assumptions the drivers have the right to make about the core's behavior on the basis of the existing documentation and actually causes problems to happen, so revert that part of commit fa180eb448fa and restore the previous behavior of __device_release_driver().
--- drivers/base/dd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/dd.c +1 -1
@@ -499,7 +499,7 @@ static void __device_release_driver(struBUS_NOTIFY_UNBIND_DRIVER , dev); -pm_runtime_put (dev); +pm_runtime_put_sync (dev);if (dev->bus && dev->bus->remove) dev->bus->remove (dev);
Greg Kroah-Hartman
maintainerPATCH 78/173 qxl: avoid an oops in the deferred io code.
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
commit cc87509d87696d7cd393882f5dedea01e03e41a9 upstream.
If we are using deferred io due to plymouth or X.org fbdev driver we will oops in memcpy due to this pointless multiply here,
removing it fixes fbdev to start and not oops.
--- drivers/gpu/drm/qxl/qxl_fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/qxl/qxl_fb.c +1 -1
@@ -91,7 +91,7 @@ static void qxl_fb_dirty_flush(struct fbu32 x1, x2, y1, y2;/* TODO: hard coding 32 bpp */ -int stride = qfbdev->qfb.base.pitches[0 ] *4 ; +int stride = qfbdev->qfb.base.pitches[0 ]; x1 = qfbdev->dirty.x1; x2 = qfbdev->dirty.x2;
Greg Kroah-Hartman
maintainerPATCH 79/173 mwifiex: correct packet length for packets from SDIO interface
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Avinash Patil <[email protected]>
commit d03b4aa77e1187b77dfe37d14a923547f00baa66 upstream.
While receiving a packet on SDIO interface, we allocate skb with size multiple of SDIO block size. We need to resize this skb after RX using packet length from RX header.
--- drivers/net/wireless/mwifiex/sdio.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mwifiex/sdio.c +3 -0
@@ -930,7 +930,10 @@ static int mwifiex_decode_rx_packet(stru struct sk_buff *skb, u32 upld_typ) {u8 *cmd_buf; +__le16 *curr_ptr = (__le16 *)skb->data; +u16 pkt_len =le16_to_cpu (*curr_ptr); +skb_trim (skb, pkt_len);skb_pull (skb,INTF_HEADER_LEN );switch (upld_typ) {
Greg Kroah-Hartman
maintainerPATCH 80/173 mwifiex: fix wrong eth_hdr usage for bridged packets in AP mode
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ujjal Roy <[email protected]>
commit 8d93f1f309d38b65fce0b9f0de91ba6c96990c07 upstream.
The eth_hdr is never defined in this driver but it gets compiled without any warning/error because kernel has defined eth_hdr.
Fix it by defining our own p_ethhdr and use it instead of eth_hdr.
--- drivers/net/wireless/mwifiex/uap_txrx.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-)
drivers/net/wireless/mwifiex/uap_txrx.c +26 -3
@@ -34,6 +34,7 @@ static void mwifiex_uap_queue_bridged_pkstruct mwifiex_txinfo *tx_info;int hdr_chop;struct timeval tv; +struct ethhdr *p_ethhdr;u8 rfc1042_eth_hdr[ETH_ALEN ] = {0xaa ,0xaa ,0x03 ,0x00 ,0x00 ,0x00 }; uap_rx_pd = (struct uap_rxpd *)(skb->data);
@@ -48,14 +49,36 @@ static void mwifiex_uap_queue_bridged_pk }if (!memcmp (&rx_pkt_hdr->rfc1042_hdr, - rfc1042_eth_hdr,sizeof (rfc1042_eth_hdr))) + rfc1042_eth_hdr,sizeof (rfc1042_eth_hdr))) { +/* Replace the 803 header and rfc1042 header (llc/snap) with +* an Ethernet II header, keep the src/dst and snap_type +* (ethertype). +* +* The firmware only passes up SNAP frames converting all RX +* data from 802.11 to 802.2/LLC/SNAP frames. +* +* To create the Ethernet II, just move the src, dst address +* right before the snap_type. +*/ + p_ethhdr = (struct ethhdr *) + ((u8 *)(&rx_pkt_hdr->eth803_hdr) + +sizeof (rx_pkt_hdr->eth803_hdr) + +sizeof (rx_pkt_hdr->rfc1042_hdr) + -sizeof (rx_pkt_hdr->eth803_hdr.h_dest) + -sizeof (rx_pkt_hdr->eth803_hdr.h_source) + -sizeof (rx_pkt_hdr->rfc1042_hdr.snap_type)); +memcpy (p_ethhdr->h_source, rx_pkt_hdr->eth803_hdr.h_source, +sizeof (p_ethhdr->h_source)); +memcpy (p_ethhdr->h_dest, rx_pkt_hdr->eth803_hdr.h_dest, +sizeof (p_ethhdr->h_dest));/* Chop off the rxpd + the excess memory from * 802.2/llc/snap header that was removed. */ - hdr_chop = (u8 *)eth_hdr - (u8 *)uap_rx_pd; -else + hdr_chop = (u8 *)p_ethhdr - (u8 *)uap_rx_pd; + }else {/* Chop off the rxpd */ hdr_chop = (u8 *)&rx_pkt_hdr->eth803_hdr - (u8 *)uap_rx_pd; + }/* Chop off the leading header bytes so the it points * to the start of either the reconstructed EthII frame
Greg Kroah-Hartman
maintainerPATCH 81/173 audit: printk USER_AVC messages when audit isnt enabled
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tyler Hicks <[email protected]>
commit 0868a5e150bc4c47e7a003367cd755811eb41e0b upstream.
When the audit=1 kernel parameter is absent and auditd is not running, AUDIT_USER_AVC messages are being silently discarded.
AUDIT_USER_AVC messages should be sent to userspace using printk(), as mentioned in the commit message of 4a4cd633 ("AUDIT: Optimise the audit-disabled case for discarding user messages").
When audit_enabled is 0, audit_receive_msg() discards all user messages except for AUDIT_USER_AVC messages. However, audit_log_common_recv_msg() refuses to allocate an audit_buffer if audit_enabled is 0. The fix is to special case AUDIT_USER_AVC messages in both functions.
It looks like commit 50397bd1 ("[AUDIT] clean up audit_receive_msg()") introduced this bug.
--- kernel/audit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/audit.c +1 -1
@@ -613,7 +613,7 @@ static int audit_log_common_recv_msg(strint rc =0 ;uid_t uid =from_kuid (&init_user_ns,current_uid ()); -if (!audit_enabled) { +if (!audit_enabled && msg_type !=AUDIT_USER_AVC ) { *ab =NULL ;return rc; }
Greg Kroah-Hartman
maintainerPATCH 82/173 audit: use nlmsg_len() to get message payload length
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Krause <[email protected]>
commit 4d8fe7376a12bf4524783dd95cbc00f1fece6232 upstream.
Using the nlmsg_len member of the netlink header to test if the message is valid is wrong as it includes the size of the netlink header itself. Thereby allowing to send short netlink messages that pass those checks.
Use nlmsg_len() instead to test for the right message length. The result of nlmsg_len() is guaranteed to be non-negative as the netlink message already passed the checks of nlmsg_ok().
Also switch to min_t() to please checkpatch.pl.
--- kernel/audit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/audit.c +2 -2
@@ -670,7 +670,7 @@ static int audit_receive_msg(struct sk_b &status_set, sizeof(status_set));break ;case AUDIT_SET : -if (nlh->nlmsg_len <sizeof (struct audit_status )) +if (nlmsg_len (nlh) <sizeof (struct audit_status ))return -EINVAL ; status_get = (struct audit_status *)data;if (status_get->mask &AUDIT_STATUS_ENABLED ) {
@@ -832,7 +832,7 @@ static int audit_receive_msg(struct sk_bmemset (&s,0 ,sizeof (s));/* guard against past and future API changes */ -memcpy (&s, data,min (sizeof (s), (size_t )nlh->nlmsg_len)); +memcpy (&s, data,min_t (size_t,sizeof (s),nlmsg_len (nlh)));if ((s.enabled !=0 && s.enabled !=1 ) || (s.log_passwd !=0 && s.log_passwd !=1 ))return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 83/173 audit: fix info leak in AUDIT_GET requests
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Krause <[email protected]>
commit 64fbff9ae0a0a843365d922e0057fc785f23f0e3 upstream.
We leak 4 bytes of kernel stack in response to an AUDIT_GET request as we miss to initialize the mask member of status_set. Fix that.
--- kernel/audit.c | 1 + 1 file changed, 1 insertion(+)
kernel/audit.c +1 -0
@@ -659,6 +659,7 @@ static int audit_receive_msg(struct sk_bswitch (msg_type) {case AUDIT_GET : + status_set.mask =0 ; status_set.enabled = audit_enabled; status_set.failure = audit_failure; status_set.pid = audit_pid;
Greg Kroah-Hartman
maintainerPATCH 84/173 audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton <[email protected]>
commit 79f6530cb59e2a0af6953742a33cc29e98ca631c upstream.
The old audit PATH records for mq_open looked like this:
type=PATH msg=audit(1366282323.982:869): item=1 name=(null) inode=6777 dev=00:0c mode=041777 ouid=0 ogid=0 rdev=00:00 obj=system_u:object_r:tmpfs_t:s15:c0.c1023
type=PATH msg=audit(1366282323.982:869): item=0 name="test_mq" inode=26732 dev=00:0c mode=0100700 ouid=0 ogid=0 rdev=00:00 obj=staff_u:object_r:user_tmpfs_t:s15:c0.c1023
...with the audit related changes that went into 3.7, they now look like this:
type=PATH msg=audit(1366282236.776:3606): item=2 name=(null) inode=66655 dev=00:0c mode=0100700 ouid=0 ogid=0 rdev=00:00 obj=staff_u:object_r:user_tmpfs_t:s15:c0.c1023
type=PATH msg=audit(1366282236.776:3606): item=1 name=(null) inode=6926 dev=00:0c mode=041777 ouid=0 ogid=0 rdev=00:00 obj=system_u:object_r:tmpfs_t:s15:c0.c1023
type=PATH msg=audit(1366282236.776:3606): item=0 name="test_mq"
Both of these look wrong to me. As Steve Grubb pointed out:
"What we need is 1 PATH record that identifies the MQ. The other PATH
records probably should not be there."
Fix it to record the mq root as a parent, and flag it such that it should be hidden from view when the names are logged, since the root of the mq filesystem isn't terribly interesting. With this change, we get a single PATH record that looks more like this:
type=PATH msg=audit(1368021604.836:484): item=0 name="test_mq" inode=16914 dev=00:0c mode=0100644 ouid=0 ogid=0 rdev=00:00 obj=unconfined_u:object_r:user_tmpfs_t:s0
In order to do this, a new audit_inode_parent_hidden() function is added. If we do it this way, then we avoid having the existing callers of audit_inode needing to do any sort of flag conversion if auditing is inactive.
--- include/linux/audit.h | 26 ++++++++++++++++++++++---- ipc/mqueue.c | 2 ++ kernel/audit.h | 1 + kernel/auditsc.c | 12 +++++++++--- 4 files changed, 34 insertions(+), 7 deletions(-)
include/linux/audit.h +22 -4
@@ -103,8 +103,11 @@ extern void __audit_syscall_exit(int retextern struct filename *__audit_reusename (const __user char *uptr);extern void __audit_getname (struct filename *name);extern void audit_putname (struct filename *name); + +#define AUDIT_INODE_PARENT 1/* dentry represents the parent */ +#define AUDIT_INODE_HIDDEN 2/* audit record should be hidden */ extern void __audit_inode (struct filename *name,const struct dentry *dentry, -unsigned int parent); +unsigned int flags);extern void __audit_inode_child (const struct inode *parent,const struct dentry *dentry,const unsigned char type);
@@ -148,10 +151,22 @@ static inline void audit_getname(structif (unlikely (!audit_dummy_context ()))__audit_getname (name); } -static inline void audit_inode (struct filename *name,const struct dentry *dentry, +static inline void audit_inode (struct filename *name, +const struct dentry *dentry,unsigned int parent) { +if (unlikely (!audit_dummy_context ())) { +unsigned int flags =0 ; +if (parent) + flags |=AUDIT_INODE_PARENT ; +__audit_inode (name, dentry, flags); + } +} +static inline void audit_inode_parent_hidden (struct filename *name, +const struct dentry *dentry) +{if (unlikely (!audit_dummy_context ())) -__audit_inode (name, dentry, parent); +__audit_inode (name, dentry, +AUDIT_INODE_PARENT |AUDIT_INODE_HIDDEN ); } static inline void audit_inode_child(const struct inode *parent, const struct dentry *dentry,
@@ -311,7 +326,7 @@ static inline void audit_putname(struct { }static inline void __audit_inode (struct filename *name,const struct dentry *dentry, -unsigned int parent) +unsigned int flags) { } static inline void __audit_inode_child(const struct inode *parent, const struct dentry *dentry,
@@ -321,6 +336,9 @@ static inline void audit_inode(struct fi const struct dentry *dentry, unsigned int parent) { } +static inline void audit_inode_parent_hidden (struct filename *name, +const struct dentry *dentry) +{ }static inline void audit_inode_child (const struct inode *parent,const struct dentry *dentry,const unsigned char type)
ipc/mqueue.c +2 -0
@@ -823,6 +823,7 @@ SYSCALL_DEFINE4(mq_open, const char __us error = ro; goto out; } +audit_inode_parent_hidden (name, root); filp =do_create (ipc_ns, root->d_inode, &path, oflag, mode, u_attr ? &attr :NULL );
@@ -868,6 +869,7 @@ SYSCALL_DEFINE1(mq_unlink, const char __if (IS_ERR (name))return PTR_ERR (name); +audit_inode_parent_hidden (name, mnt->mnt_root); err =mnt_want_write (mnt);if (err) goto out_name;
kernel/audit.h +1 -0
@@ -85,6 +85,7 @@ struct audit_names {struct filename *name;int name_len;/* number of chars to log */ +bool hidden;/* don't log this record */ bool name_put;/* call __putname()? */ unsigned long ino;
kernel/auditsc.c +9 -3
@@ -1399,8 +1399,11 @@ static void audit_log_exit(struct audit_ } i =0 ; -list_for_each_entry (n, &context->names_list, list) +list_for_each_entry (n, &context->names_list, list) { +if (n->hidden) +continue ;audit_log_name (context, n,NULL , i++, &call_panic); + }/* Send end of event record to help user space know we are finished */ ab =audit_log_start (context,GFP_KERNEL ,AUDIT_EOE );
@@ -1769,14 +1772,15 @@ void audit_putname(struct filename *name* __audit_inode - store the inode and device from a lookup * @name: name being audited * @dentry: dentry being audited -* @parent: does this dentry represent the parent? +* @flags: attributes for this particular entry */ void __audit_inode (struct filename *name,const struct dentry *dentry, -unsigned int parent) +unsigned int flags) {struct audit_context *context = current->audit_context;const struct inode *inode = dentry->d_inode;struct audit_names *n; +bool parent = flags &AUDIT_INODE_PARENT ;if (!context->in_syscall)return ;
@@ -1831,6 +1835,8 @@ out:if (parent) { n->name_len = n->name ?parent_len (n->name->name) :AUDIT_NAME_FULL ; n->type =AUDIT_TYPE_PARENT ; +if (flags &AUDIT_INODE_HIDDEN ) + n->hidden = true; }else { n->name_len =AUDIT_NAME_FULL ; n->type =AUDIT_TYPE_NORMAL ;
Greg Kroah-Hartman
maintainerPATCH 85/173 audit: add child record before the create to handle case where create fails
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton <[email protected]>
commit 14e972b4517128ac8e30e3de2ee4fbd995084223 upstream.
Historically, when a syscall that creates a dentry fails, you get an audit record that looks something like this (when trying to create a file named "new" in "/tmp/tmp.SxiLnCcv63"):
type=PATH msg=audit(1366128956.279:965): item=0 name="/tmp/tmp.SxiLnCcv63/new" inode=2138308 dev=fd:02 mode=040700 ouid=0 ogid=0 rdev=00:00 obj=staff_u:object_r:user_tmp_t:s15:c0.c1023
This record makes no sense since it's associating the inode information for "/tmp/tmp.SxiLnCcv63" with the path "/tmp/tmp.SxiLnCcv63/new". The recent patch I posted to fix the audit_inode call in do_last fixes this, by making it look more like this:
type=PATH msg=audit(1366128765.989:13875): item=0 name="/tmp/tmp.DJ1O8V3e4f/" inode=141 dev=fd:02 mode=040700 ouid=0 ogid=0 rdev=00:00 obj=staff_u:object_r:user_tmp_t:s15:c0.c1023
While this is more correct, if the creation of the file fails, then we have no record of the filename that the user tried to create.
This patch adds a call to audit_inode_child to may_create. This creates an AUDIT_TYPE_CHILD_CREATE record that will sit in place until the create succeeds. When and if the create does succeed, then this record will be updated with the correct inode info from the create.
This fixes what was broken in commit bfcec708. Commit 79f6530c should also be backported to stable v3.7+.
--- fs/namei.c | 1 + 1 file changed, 1 insertion(+)
fs/namei.c +1 -0
@@ -2263,6 +2263,7 @@ static int may_delete(struct inode *dir,*/ static inline int may_create (struct inode *dir,struct dentry *child) { +audit_inode_child (dir, child,AUDIT_TYPE_CHILD_CREATE );if (child->d_inode)return -EEXIST ;if (IS_DEADDIR (dir))
Greg Kroah-Hartman
maintainerPATCH 86/173 audit: log the audit_names record type
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton <[email protected]>
commit d3aea84a4ace5ff9ce7fb7714cee07bebef681c2 upstream.
...to make it clear what the intent behind each record's operation was.
In many cases you can infer this, based on the context of the syscall and the result. In other cases it's not so obvious. For instance, in the case where you have a file being renamed over another, you'll have two different records with the same filename but different inode info. By logging this information we can clearly tell which one was created and which was deleted.
This fixes what was broken in commit bfcec708. Commit 79f6530c should also be backported to stable v3.7+.
--- kernel/audit.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
kernel/audit.c +20 -0
@@ -1537,6 +1537,26 @@ void audit_log_name(struct audit_context } } +/* log the audit_names record type */ +audit_log_format (ab," nametype=" ); +switch (n->type) { +case AUDIT_TYPE_NORMAL : +audit_log_format (ab,"NORMAL" ); +break ; +case AUDIT_TYPE_PARENT : +audit_log_format (ab,"PARENT" ); +break ; +case AUDIT_TYPE_CHILD_DELETE : +audit_log_format (ab,"DELETE" ); +break ; +case AUDIT_TYPE_CHILD_CREATE : +audit_log_format (ab,"CREATE" ); +break ; +default : +audit_log_format (ab,"UNKNOWN" ); +break ; + } +audit_log_fcaps (ab, n);audit_log_end (ab); }
Re: [PATCH 3.10 086/173] audit: log the audit_names record type
Quoted 51 lines · On Mon, 2 Dec 2013 11:11:09 -0800 Greg Kroah-Hartman…
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton <[email protected]>
commit
d3aea84a4ace5ff9ce7fb7714cee07bebef681c2upstream....to make it clear what the intent behind each record's operation was.
In many cases you can infer this, based on the context of the syscall and the result. In other cases it's not so obvious. For instance, in the case where you have a file being renamed over another, you'll have two different records with the same filename but different inode info. By logging this information we can clearly tell which one was created and which was deleted.
This fixes what was broken in commit
bfcec708. Commit79f6530cshould also be backported to stable v3.7+.Signed-off-by Jeff Layton <[email protected]>Signed-off-by Eric Paris <[email protected]>Signed-off-by Richard Guy Briggs <[email protected]>Signed-off-by Eric Paris <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- kernel/audit.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)kernel/audit.c +13
-0@@ -1537,6 +1537,26 @@ void audit_log_name(struct audit_context } } +/* log the audit_names record type */ +audit_log_format (ab," nametype=" ); +switch (n->type) { +case AUDIT_TYPE_NORMAL : +audit_log_format (ab,"NORMAL" ); +break ; +case AUDIT_TYPE_PARENT : +audit_log_format (ab,"PARENT" ); +break ; +case AUDIT_TYPE_CHILD_DELETE : +audit_log_format (ab,"DELETE" ); +break ; +case AUDIT_TYPE_CHILD_CREATE :
kernel/audit.c void audit_log_name(struct audit_context · line 1562
Quoted 10 lines
kernel/audit.c +7
-0+audit_log_format (ab,"CREATE" ); +break ; +default : +audit_log_format (ab,"UNKNOWN" ); +break ; + } +audit_log_fcaps (ab, n);audit_log_end (ab); }
I'm not sure this is really suitable or needed for stable. It's unlikely to hurt anything, but it doesn't really fix a problem per-se. It just adds a little extra info to the audit records.
Ditto for the 3.12 version of this patch...
Signature · 1 line
Jeff Layton <[email protected]>
Greg Kroah-Hartman
maintainerRe: [PATCH 3.10 086/173] audit: log the audit_names record type
Quoted 60 lines · Jeff Layton
Quoted 57 lines · On Mon, 2 Dec 2013 11:11:09 -0800 Greg Kroah-Hartman…
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton <[email protected]>
commit
d3aea84a4ace5ff9ce7fb7714cee07bebef681c2upstream....to make it clear what the intent behind each record's operation was.
In many cases you can infer this, based on the context of the syscall and the result. In other cases it's not so obvious. For instance, in the case where you have a file being renamed over another, you'll have two different records with the same filename but different inode info. By logging this information we can clearly tell which one was created and which was deleted.
This fixes what was broken in commit
bfcec708. Commit79f6530cshould also be backported to stable v3.7+.Signed-off-by Jeff Layton <[email protected]>Signed-off-by Eric Paris <[email protected]>Signed-off-by Richard Guy Briggs <[email protected]>Signed-off-by Eric Paris <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- kernel/audit.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)kernel/audit.c +20
-0@@ -1537,6 +1537,26 @@ void audit_log_name(struct audit_context } } +/* log the audit_names record type */ +audit_log_format (ab," nametype=" ); +switch (n->type) { +case AUDIT_TYPE_NORMAL : +audit_log_format (ab,"NORMAL" ); +break ; +case AUDIT_TYPE_PARENT : +audit_log_format (ab,"PARENT" ); +break ; +case AUDIT_TYPE_CHILD_DELETE : +audit_log_format (ab,"DELETE" ); +break ; +case AUDIT_TYPE_CHILD_CREATE : +audit_log_format (ab,"CREATE" ); +break ; +default : +audit_log_format (ab,"UNKNOWN" ); +break ; + } +audit_log_fcaps (ab, n);
Quoted 8 lines
kernel/audit.c void audit_log_name(struct audit_context · line 1562
Quoted 4 lines
kernel/audit.c +0
-0audit_log_end (ab); }I'm not sure this is really suitable or needed for stable. It's unlikely to hurt anything, but it doesn't really fix a problem per-se. It just adds a little extra info to the audit records.
I think that "extra info" is good to have, so I'll leave it, thanks.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 87/173 PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yinghai Lu <[email protected]>
commit e7cc5cf74544d97d7b69e2701595037474db1f96 upstream.
The pcie_portdrv .probe() method calls pci_enable_device() once, in pcie_port_device_register(), but the .remove() method calls pci_disable_device() twice, in pcie_port_device_remove() and in pcie_portdrv_remove().
That causes a "disabling already-disabled device" warning when removing a PCIe port device. This happens all the time when removing Thunderbolt devices, but is also easy to reproduce with, e.g.,
"echo 0000:00:1c.3 > /sys/bus/pci/drivers/pcieport/unbind"
This patch removes the disable from pcie_portdrv_remove().
--- drivers/pci/pcie/portdrv_pci.c | 1 - 1 file changed, 1 deletion(-)
drivers/pci/pcie/portdrv_pci.c +0 -1
@@ -223,7 +223,6 @@ static int pcie_portdrv_probe(struct pcistatic void pcie_portdrv_remove (struct pci_dev *dev) {pcie_port_device_remove (dev); -pci_disable_device (dev); }static int error_detected_iter (struct device *device,void *data)
Greg Kroah-Hartman
maintainerPATCH 88/173 ACPI / hotplug: Fix conflicted PCI bridge notify handlers
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Toshi Kani <[email protected]>
commit ca499fc87ed945094d952da0eb7eea7dbeb1feec upstream.
The PCI host bridge scan handler installs its own notify handler, handle_hotplug_event_root(), by itself. Nevertheless, the ACPI hotplug framework also installs the common notify handler, acpi_hotplug_notify_cb(), for PCI root bridges. This causes acpi_hotplug_notify_cb() to call _OST method with unsupported error as hotplug.enabled is not set.
To address this issue, introduce hotplug.ignore flag, which indicates that the scan handler installs its own notify handler by itself. The ACPI hotplug framework does not install the common notify handler when this flag is set.
--- drivers/acpi/pci_root.c | 3 +++ drivers/acpi/scan.c | 2 +- include/acpi/acpi_bus.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)
drivers/acpi/pci_root.c +3 -0
@@ -63,6 +63,9 @@ static struct acpi_scan_handler pci_root .ids = root_device_ids, .attach = acpi_pci_root_add, .detach = acpi_pci_root_remove, + .hotplug = { + .ignore = true, + }, };/* Lock to protect both acpi_pci_roots lists */
drivers/acpi/scan.c +1 -1
@@ -1790,7 +1790,7 @@ static void acpi_scan_init_hotplug(acpi_*/ list_for_each_entry (hwid, &pnp.ids, list) { handler =acpi_scan_match_handler (hwid->id,NULL ); -if (handler) { +if (handler && !handler->hotplug.ignore) {acpi_install_notify_handler (handle,ACPI_SYSTEM_NOTIFY , acpi_hotplug_notify_cb, handler);break ;
include/acpi/acpi_bus.h +1 -0
@@ -97,6 +97,7 @@ enum acpi_hotplug_mode {struct acpi_hotplug_profile {struct kobject kobj;bool enabled:1 ; +bool ignore:1 ;enum acpi_hotplug_mode mode; };
Greg Kroah-Hartman
maintainerPATCH 89/173 selinux: correct locking in selinux_netlbl_socket_connect)
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Moore <[email protected]>
commit 42d64e1add3a1ce8a787116036163b8724362145 upstream.
The SELinux/NetLabel glue code has a locking bug that affects systems with NetLabel enabled, see the kernel error message below. This patch corrects this problem by converting the bottom half socket lock to a more conventional, and correct for this call-path, lock_sock() call.
===============================
[ INFO: suspicious RCU usage. ]
3.11.0-rc3+ #19 Not tainted
-------------------------------
net/ipv4/cipso_ipv4.c:1928 suspicious rcu_dereference_protected() usage!
other info that might help us debug this:
rcu_scheduler_active = 1, debug_locks = 0
2 locks held by ping/731:
#0: (slock-AF_INET/1){+.-...}, at: [...] selinux_netlbl_socket_connect #1: (rcu_read_lock){.+.+..}, at: [<...>] netlbl_conn_setattr
stack backtrace: CPU: 1 PID: 731 Comm: ping Not tainted 3.11.0-rc3+ #19 Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 0000000000000001 ffff88006f659d28 ffffffff81726b6a ffff88003732c500 ffff88006f659d58 ffffffff810e4457 ffff88006b845a00 0000000000000000 000000000000000c ffff880075aa2f50 ffff88006f659d90 ffffffff8169bec7 Call Trace: [<ffffffff81726b6a>] dump_stack+0x54/0x74 [<ffffffff810e4457>] lockdep_rcu_suspicious+0xe7/0x120 [<ffffffff8169bec7>] cipso_v4_sock_setattr+0x187/0x1a0 [<ffffffff8170f317>] netlbl_conn_setattr+0x187/0x190 [<ffffffff8170f195>] ? netlbl_conn_setattr+0x5/0x190 [<ffffffff8131ac9e>] selinux_netlbl_socket_connect+0xae/0xc0 [<ffffffff81303025>] selinux_socket_connect+0x135/0x170 [<ffffffff8119d127>] ? might_fault+0x57/0xb0 [<ffffffff812fb146>] security_socket_connect+0x16/0x20 [<ffffffff815d3ad3>] SYSC_connect+0x73/0x130 [<ffffffff81739a85>] ? sysret_check+0x22/0x5d [<ffffffff810e5e2d>] ? trace_hardirqs_on_caller+0xfd/0x1c0 [<ffffffff81373d4e>] ? trace_hardirqs_on_thunk+0x3a/0x3f [<ffffffff815d52be>] SyS_connect+0xe/0x10 [<ffffffff81739a59>] system_call_fastpath+0x16/0x1b
--- security/selinux/netlabel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
security/selinux/netlabel.c +2 -4
@@ -442,8 +442,7 @@ int selinux_netlbl_socket_connect(struct sksec->nlbl_state != NLBL_CONNLABELED)return 0 ; -local_bh_disable (); -bh_lock_sock_nested (sk); +lock_sock (sk);/* connected sockets are allowed to disconnect when the address family * is set to AF_UNSPEC, if that is what is happening we want to reset
@@ -464,7 +463,6 @@ int selinux_netlbl_socket_connect(struct sksec->nlbl_state =NLBL_CONNLABELED ; socket_connect_return: -bh_unlock_sock (sk); -local_bh_enable (); +release_sock (sk);return rc; }
Greg Kroah-Hartman
maintainerPATCH 90/173 avr32: setup crt for early panic()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Bießmann <[email protected]>
commit 7a2a74f4b856993218aa7cdeeb6c3103101340db upstream.
Before the CRT was (fully) set up in kernel_entry (bss cleared before in _start, but also not before jump to panic() in no_tag_table case).
This patch fixes this up to have a fully working CRT when branching to panic() in no_tag_table.
--- arch/avr32/boot/u-boot/head.S | 30 +++++++++++++++++++++++++----- arch/avr32/kernel/head.S | 20 -------------------- 2 files changed, 25 insertions(+), 25 deletions(-)
arch/avr32/boot/u-boot/head.S +25 -5
@@ -8,6 +8,8 @@ * published by the Free Software Foundation. */ #include <asm/setup.h> +#include <asm/thread_info.h> +#include <asm/sysreg.h> /* * The kernel is loaded where we want it to be and all caches
@@ -20,11 +22,6 @@ .section .init.text,"ax" .global _start _start: - /* Check if the boot loader actually provided a tag table */ - lddpc r0, magic_number - cp.w r12, r0 - brne no_tag_table - /* Initialize .bss */ lddpc r2, bss_start_addr lddpc r3, end_addr
@@ -34,6 +31,25 @@ _start: cp r2, r3 brlo 1b + /* Initialize status register */ + lddpc r0, init_sr + mtsr SYSREG_SR, r0 + + /* Set initial stack pointer */ + lddpc sp, stack_addr + sub sp, -THREAD_SIZE + +#ifdef CONFIG_FRAME_POINTER + /* Mark last stack frame */ + mov lr, 0 + mov r7, 0 +#endif + + /* Check if the boot loader actually provided a tag table */ + lddpc r0, magic_number + cp.w r12, r0 + brne no_tag_table + /* * Save the tag table address for later use. This must be done * _after_ .bss has been initialized...
@@ -53,6 +69,10 @@ bss_start_addr: .long __bss_start end_addr: .long _end +init_sr: + .long 0x007f0000 /* Supervisor mode, everything masked */ +stack_addr: + .long init_thread_union no_tag_table: sub r12, pc, (. - 2f)
arch/avr32/kernel/head.S +0 -20
@@ -10,33 +10,13 @@ #include <linux/linkage.h> #include <asm/page.h> -#include <asm/thread_info.h> -#include <asm/sysreg.h> .section .init.text,"ax" .global kernel_entry kernel_entry: - /* Initialize status register */ - lddpc r0, init_sr - mtsr SYSREG_SR, r0 - - /* Set initial stack pointer */ - lddpc sp, stack_addr - sub sp, -THREAD_SIZE - -#ifdef CONFIG_FRAME_POINTER - /* Mark last stack frame */ - mov lr, 0 - mov r7, 0 -#endif - /* Start the show */ lddpc pc, kernel_start_addr .align 2 -init_sr: - .long 0x007f0000 /* Supervisor mode, everything masked */ -stack_addr: - .long init_thread_union kernel_start_addr: .long start_kernel
Greg Kroah-Hartman
maintainerPATCH 91/173 avr32: fix out-of-range jump in large kernels
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Bießmann <[email protected]>
commit d617b338bbfdd77e9cbd8e7dc949cee3dd73d575 upstream.
This patch fixes following error (for big kernels):
---8<---arch/avr32/boot/u-boot/head.o: In function `no_tag_table':
(.init.text+0x44): relocation truncated to fit: R_AVR32_22H_PCREL against symbol panic' defined in .text.unlikely section in kernel/built-in.o arch/avr32/kernel/built-in.o: In function bad_return':
(.ex.text+0x236): relocation truncated to fit: R_AVR32_22H_PCREL against symbol `panic' defined in .text.unlikely section in kernel/built-in.o --->8---
It comes up when the kernel increases and 'panic()' is too far away to fit in the +/- 2MiB range. Which in turn issues from the 21-bit displacement in 'br{cond4}' mnemonic which is one of the two ways to do jumps (rjmp has just 10-bit displacement and therefore a way smaller range). This fact was stated before in 8d29b7b9f81d6b83d869ff054e6c189d6da73f1f.
One solution to solve this is to add a local storage for the symbol address and just load the $pc with that value.
--- arch/avr32/boot/u-boot/head.S | 5 ++++- arch/avr32/kernel/entry-avr32b.S | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-)
arch/avr32/boot/u-boot/head.S +4 -1
@@ -73,8 +73,11 @@ init_sr: .long 0x007f0000 /* Supervisor mode, everything masked */ stack_addr: .long init_thread_union +panic_addr: + .long panic no_tag_table: sub r12, pc, (. - 2f) - bral panic + /* branch to panic() which can be far away with that construct */ + lddpc pc, panic_addr 2: .asciz "Boot loader didn't provide correct magic number\n"
arch/avr32/kernel/entry-avr32b.S +2 -1
@@ -401,9 +401,10 @@ handle_critical: /* We should never get here... */ bad_return: sub r12, pc, (. - 1f) - bral panic + lddpc pc, 2f .align 2 1: .asciz "Return from critical exception!" +2: .long panic .align 1 do_bus_error_write:
Greg Kroah-Hartman
maintainerPATCH 92/173 prism54: set netdev type to "wlan"
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Williams <[email protected]>
commit 8e3ffa471091c560deb6738ed9ab7445b7a5fd04 upstream.
Userspace uses the netdev devtype for stuff like device naming and type detection. Be nice and set it. Remove the pointless #if/#endif around SET_NETDEV_DEV too.
--- drivers/net/wireless/prism54/islpci_dev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/wireless/prism54/islpci_dev.c +5 -2
@@ -811,6 +811,10 @@ static const struct net_device_ops islpc .ndo_validate_addr = eth_validate_addr, }; +static struct device_type wlan_type = { + .name ="wlan" , +}; +struct net_device *islpci_setup (struct pci_dev *pdev) {
@@ -821,9 +825,8 @@ islpci_setup(struct pci_dev *pdev)return ndev;pci_set_drvdata (pdev, ndev); -#if defined(SET_NETDEV_DEV )SET_NETDEV_DEV (ndev, &pdev->dev); -#endif +SET_NETDEV_DEVTYPE (ndev, &wlan_type);/* setup the structure members */ ndev->base_addr =pci_resource_start (pdev,0 );
Greg Kroah-Hartman
maintainerPATCH 93/173 ftrace: Fix function graph with loading of modules
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (Red Hat)" <[email protected]>
commit 8a56d7761d2d041ae5e8215d20b4167d8aa93f51 upstream.
Commit 8c4f3c3fa9681 "ftrace: Check module functions being traced on reload" fixed module loading and unloading with respect to function tracing, but it missed the function graph tracer. If you perform the following
# cd /sys/kernel/debug/tracing # echo function_graph > current_tracer # modprobe nfsd # echo nop > current_tracer
You'll get the following oops message:
------------[ cut here ]------------ WARNING: CPU: 2 PID: 2910 at /linux.git/kernel/trace/ftrace.c:1640 __ftrace_hash_rec_update.part.35+0x168/0x1b9() Modules linked in: nfsd exportfs nfs_acl lockd ipt_MASQUERADE sunrpc ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables uinput snd_hda_codec_idt CPU: 2 PID: 2910 Comm: bash Not tainted 3.13.0-rc1-test #7 Hardware name: To Be Filled By O.E.M. To Be Filled By O.E.M./To be filled by O.E.M., BIOS SDBLI944.86P 05/08/2007 0000000000000668 ffff8800787efcf8 ffffffff814fe193 ffff88007d500000 0000000000000000 ffff8800787efd38 ffffffff8103b80a 0000000000000668 ffffffff810b2b9a ffffffff81a48370 0000000000000001 ffff880037aea000 Call Trace: [<ffffffff814fe193>] dump_stack+0x4f/0x7c [<ffffffff8103b80a>] warn_slowpath_common+0x81/0x9b [<ffffffff810b2b9a>] ? __ftrace_hash_rec_update.part.35+0x168/0x1b9 [<ffffffff8103b83e>] warn_slowpath_null+0x1a/0x1c [<ffffffff810b2b9a>] __ftrace_hash_rec_update.part.35+0x168/0x1b9 [<ffffffff81502f89>] ? __mutex_lock_slowpath+0x364/0x364 [<ffffffff810b2cc2>] ftrace_shutdown+0xd7/0x12b [<ffffffff810b47f0>] unregister_ftrace_graph+0x49/0x78 [<ffffffff810c4b30>] graph_trace_reset+0xe/0x10 [<ffffffff810bf393>] tracing_set_tracer+0xa7/0x26a [<ffffffff810bf5e1>] tracing_set_trace_write+0x8b/0xbd [<ffffffff810c501c>] ? ftrace_return_to_handler+0xb2/0xde [<ffffffff811240a8>] ? __sb_end_write+0x5e/0x5e [<ffffffff81122aed>] vfs_write+0xab/0xf6 [<ffffffff8150a185>] ftrace_graph_caller+0x85/0x85 [<ffffffff81122dbd>] SyS_write+0x59/0x82 [<ffffffff8150a185>] ftrace_graph_caller+0x85/0x85 [<ffffffff8150a2d2>] system_call_fastpath+0x16/0x1b ---[ end trace 940358030751eafb ]---
The above mentioned commit didn't go far enough. Well, it covered the function tracer by adding checks in __register_ftrace_function(). The problem is that the function graph tracer circumvents that (for a slight efficiency gain when function graph trace is running with a function tracer. The gain was not worth this).
The problem came with ftrace_startup() which should always be called after __register_ftrace_function(), if you want this bug to be completely fixed.
Anyway, this solution moves __register_ftrace_function() inside of ftrace_startup() and removes the need to call them both.
--- kernel/trace/ftrace.c | 64 +++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 29 deletions(-)
kernel/trace/ftrace.c +35 -29
@@ -367,9 +367,6 @@ static int remove_ftrace_list_ops(structstatic int __register_ftrace_function (struct ftrace_ops *ops) { -if (unlikely (ftrace_disabled)) -return -ENODEV ; -if (FTRACE_WARN_ON (ops == &global_ops))return -EINVAL ;
@@ -417,9 +414,6 @@ static int __unregister_ftrace_function( {int ret; -if (ftrace_disabled) -return -ENODEV ; -if (WARN_ON (!(ops->flags &FTRACE_OPS_FL_ENABLED )))return -EBUSY ;
@@ -2048,10 +2042,15 @@ static void ftrace_startup_enable(int costatic int ftrace_startup (struct ftrace_ops *ops,int command) {bool hash_enable = true; +int ret;if (unlikely (ftrace_disabled))return -ENODEV ; + ret =__register_ftrace_function (ops); +if (ret) +return ret; + ftrace_start_up++; command |=FTRACE_UPDATE_CALLS ;
@@ -2073,12 +2072,17 @@ static int ftrace_startup(struct ftrace_return 0 ; } -static void ftrace_shutdown (struct ftrace_ops *ops,int command) +static int ftrace_shutdown (struct ftrace_ops *ops,int command) {bool hash_disable = true; +int ret;if (unlikely (ftrace_disabled)) -return ; +return -ENODEV ; + + ret =__unregister_ftrace_function (ops); +if (ret) +return ret; ftrace_start_up--;/*
@@ -2113,9 +2117,10 @@ static void ftrace_shutdown(struct ftrac }if (!command || !ftrace_enabled) -return ; +return 0 ;ftrace_run_update_code (command); +return 0 ; }static void ftrace_startup_sysctl (void )
@@ -3020,16 +3025,13 @@ static void __enable_ftrace_function_proif (i ==FTRACE_FUNC_HASHSIZE )return ; - ret =__register_ftrace_function (&trace_probe_ops); -if (!ret) - ret =ftrace_startup (&trace_probe_ops,0 ); + ret =ftrace_startup (&trace_probe_ops,0 ); ftrace_probe_registered =1 ; }static void __disable_ftrace_function_probe (void ) { -int ret;int i;if (!ftrace_probe_registered)
@@ -3042,9 +3044,7 @@ static void __disable_ftrace_function_pr }/* no more funcs left */ - ret =__unregister_ftrace_function (&trace_probe_ops); -if (!ret) -ftrace_shutdown (&trace_probe_ops,0 ); +ftrace_shutdown (&trace_probe_ops,0 ); ftrace_probe_registered =0 ; }
@@ -4241,12 +4241,15 @@ core_initcall(ftrace_nodyn_init);static inline int ftrace_init_dyn_debugfs (struct dentry *d_tracer) {return 0 ; }static inline void ftrace_startup_enable (int command) { }/* Keep as macros so we do not need to define the commands */ -# define ftrace_startup (ops, command) \ - ({ \ - (ops)->flags |= FTRACE_OPS_FL_ENABLED; \ - 0; \ +# define ftrace_startup (ops, command) \ + ({ \ + int ___ret = __register_ftrace_function(ops); \ + if (!___ret) \ + (ops)->flags |= FTRACE_OPS_FL_ENABLED; \ + ___ret; \ }) -# define ftrace_shutdown (ops, command) do { } while (0) +# define ftrace_shutdown (ops, command) __unregister_ftrace_function(ops) +# define ftrace_startup_sysctl () do { } while (0)# define ftrace_shutdown_sysctl () do { } while (0)
@@ -4646,9 +4649,7 @@ int register_ftrace_function(struct ftramutex_lock (&ftrace_lock); - ret =__register_ftrace_function (ops); -if (!ret) - ret =ftrace_startup (ops,0 ); + ret =ftrace_startup (ops,0 );mutex_unlock (&ftrace_lock);
@@ -4667,9 +4668,7 @@ int unregister_ftrace_function(struct ftint ret;mutex_lock (&ftrace_lock); - ret =__unregister_ftrace_function (ops); -if (!ret) -ftrace_shutdown (ops,0 ); + ret =ftrace_shutdown (ops,0 );mutex_unlock (&ftrace_lock);return ret;
@@ -4863,6 +4862,13 @@ ftrace_suspend_notifier_call(struct notireturn NOTIFY_DONE ; } +/* Just a place holder for function graph */ +static struct ftrace_ops fgraph_ops__read_mostly = { + .func = ftrace_stub, + .flags =FTRACE_OPS_FL_STUB |FTRACE_OPS_FL_GLOBAL | +FTRACE_OPS_FL_RECURSION_SAFE , +}; +int register_ftrace_graph (trace_func_graph_ret_t retfunc,trace_func_graph_ent_t entryfunc) {
@@ -4889,7 +4895,7 @@ int register_ftrace_graph(trace_func_gra ftrace_graph_return = retfunc; ftrace_graph_entry = entryfunc; - ret =ftrace_startup (&global_ops,FTRACE_START_FUNC_RET ); + ret =ftrace_startup (&fgraph_ops,FTRACE_START_FUNC_RET ); out:mutex_unlock (&ftrace_lock);
@@ -4906,7 +4912,7 @@ void unregister_ftrace_graph(void) ftrace_graph_active--; ftrace_graph_return = (trace_func_graph_ret_t )ftrace_stub; ftrace_graph_entry = ftrace_graph_entry_stub; -ftrace_shutdown (&global_ops,FTRACE_STOP_FUNC_RET ); +ftrace_shutdown (&fgraph_ops,FTRACE_STOP_FUNC_RET );unregister_pm_notifier (&ftrace_suspend_notifier);unregister_trace_sched_switch (ftrace_graph_probe_sched_switch,NULL );
Greg Kroah-Hartman
maintainerPATCH 94/173 drm/ttm: Fix memory type compatibility check
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Hellstrom <[email protected]>
commit 59c8e66378fb78adbcd05f0d09783dde6fef282b upstream.
Also check the busy placements before deciding to move a buffer object. Failing to do this may result in a completely unneccessary move within a single memory type.
--- drivers/gpu/drm/ttm/ttm_bo.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +20 -12
@@ -1153,24 +1153,32 @@ out_unlock:return ret; } -static int ttm_bo_mem_compat (struct ttm_placement *placement, -struct ttm_mem_reg *mem) +static bool ttm_bo_mem_compat (struct ttm_placement *placement, +struct ttm_mem_reg *mem, +uint32_t *new_flags) {int i;if (mem->mm_node && placement->lpfn !=0 && (mem->start < placement->fpfn || mem->start + mem->num_pages > placement->lpfn)) -return -1 ; +return false;for (i =0 ; i < placement->num_placement; i++) { -if ((placement->placement[i] & mem->placement & -TTM_PL_MASK_CACHING ) && - (placement->placement[i] & mem->placement & -TTM_PL_MASK_MEM )) -return i; + *new_flags = placement->placement[i]; +if ((*new_flags & mem->placement &TTM_PL_MASK_CACHING ) && + (*new_flags & mem->placement &TTM_PL_MASK_MEM )) +return true; } -return -1 ; + +for (i =0 ; i < placement->num_busy_placement; i++) { + *new_flags = placement->busy_placement[i]; +if ((*new_flags & mem->placement &TTM_PL_MASK_CACHING ) && + (*new_flags & mem->placement &TTM_PL_MASK_MEM )) +return true; + } + +return false; } int ttm_bo_validate(struct ttm_buffer_object *bo,
@@ -1179,6 +1187,7 @@ int ttm_bo_validate(struct ttm_buffer_ob bool no_wait_gpu) {int ret; +uint32_t new_flags;BUG_ON (!ttm_bo_is_reserved (bo));/* Check that range is valid */
@@ -1189,8 +1198,7 @@ int ttm_bo_validate(struct ttm_buffer_ob/* * Check whether we need to move buffer. */ - ret =ttm_bo_mem_compat (placement, &bo->mem); -if (ret <0 ) { +if (!ttm_bo_mem_compat (placement, &bo->mem, &new_flags)) { ret =ttm_bo_move_buffer (bo, placement, interruptible, no_wait_gpu);if (ret)
@@ -1200,7 +1208,7 @@ int ttm_bo_validate(struct ttm_buffer_ob* Use the access and other non-mapping-related flag bits from * the compatible memory placement flags to the active flags */ -ttm_flag_masked (&bo->mem.placement, placement->placement[ret], +ttm_flag_masked (&bo->mem.placement, new_flags, ~TTM_PL_MASK_MEMTYPE ); }/*
Greg Kroah-Hartman
maintainerPATCH 95/173 drm/ttm: Handle in-memory region copies
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakob Bornecrantz <[email protected]>
commit 9a0599ddeae012a771bba5e23393fc52d8a59d89 upstream.
Fix the case where the ttm pointer may be NULL causing a NULL pointer dereference.
--- drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/ttm/ttm_bo_util.c +3 -1
@@ -347,7 +347,9 @@ int ttm_bo_move_memcpy(struct ttm_bufferif (old_iomap ==NULL && ttm ==NULL ) goto out2; -if (ttm->state == tt_unpopulated) { +/* TTM might be null for moves within the same region. +*/ +if (ttm && ttm->state == tt_unpopulated) { ret = ttm->bdev->driver->ttm_tt_populate (ttm);if (ret) {/* if we fail here don't nuke the mm node
Greg Kroah-Hartman
maintainerPATCH 96/173 drm/ttm: Fix ttm_bo_move_memcpy
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Hellstrom <[email protected]>
commit da95c788ef0c645378ffccb7060a0df1a33aee38 upstream.
All error paths will want to keep the mm node, so handle this at the function exit. This fixes an ioremap failure error path. Also add some comments to make the function a bit easier to understand.
--- drivers/gpu/drm/ttm/ttm_bo_util.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
drivers/gpu/drm/ttm/ttm_bo_util.c +17 -11
@@ -342,21 +342,25 @@ int ttm_bo_move_memcpy(struct ttm_bufferif (ret) goto out; +/* +* Single TTM move. NOP. +*/ if (old_iomap ==NULL && new_iomap ==NULL ) goto out2; + +/* +* Move nonexistent data. NOP. +*/ if (old_iomap ==NULL && ttm ==NULL ) goto out2; -/* TTM might be null for moves within the same region. +/* +* TTM might be null for moves within the same region. */ if (ttm && ttm->state == tt_unpopulated) { ret = ttm->bdev->driver->ttm_tt_populate (ttm); -if (ret) { -/* if we fail here don't nuke the mm node -* as the bo still owns it */ - old_copy.mm_node =NULL ; +if (ret) goto out1; - } } add =0 ;
@@ -382,11 +386,8 @@ int ttm_bo_move_memcpy(struct ttm_buffer prot); }else ret =ttm_copy_io_page (new_iomap, old_iomap, page); -if (ret) { -/* failing here, means keep old copy as-is */ - old_copy.mm_node =NULL ; +if (ret) goto out1; - } }mb (); out2:
@@ -404,7 +405,12 @@ out1:ttm_mem_reg_iounmap (bdev, old_mem, new_iomap); out:ttm_mem_reg_iounmap (bdev, &old_copy, old_iomap); -ttm_bo_mem_put (bo, &old_copy); + +/* +* On error, keep the mm node! +*/ +if (!ret) +ttm_bo_mem_put (bo, &old_copy);return ret; }EXPORT_SYMBOL (ttm_bo_move_memcpy);
Greg Kroah-Hartman
maintainerPATCH 97/173 drm/i915: flush cursors harder
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
commit b2ea8ef559b4d94190009f3651b5b3ab7c05afd3 upstream.
Apparently they need the same treatment as primary planes. This fixes modesetting failures because of stuck cursors (!) on Thomas' i830M machine.
I've figured while at it I'll also roll it out for the ivb 3 pipe version of this function. I didn't do this for i845/i865 since Bspec says the update mechanism works differently, and there's some additional rules about what can be updated in which order.
--- drivers/gpu/drm/i915/intel_display.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_display.c +4 -0
@@ -6262,7 +6262,9 @@ static void i9xx_update_cursor(struct dr intel_crtc->cursor_visible = visible; }/* and commit changes on next vblank */ +POSTING_READ (CURCNTR (pipe));I915_WRITE (CURBASE (pipe), base); +POSTING_READ (CURBASE (pipe)); }static void ivb_update_cursor (struct drm_crtc *crtc,u32 base)
@@ -6289,7 +6291,9 @@ static void ivb_update_cursor(struct drm intel_crtc->cursor_visible = visible; }/* and commit changes on next vblank */ +POSTING_READ (CURCNTR_IVB (pipe));I915_WRITE (CURBASE_IVB (pipe), base); +POSTING_READ (CURBASE_IVB (pipe)); }/* If no-part of the cursor is visible on the framebuffer, then the GPU may hang... */
Greg Kroah-Hartman
maintainerPATCH 98/173 drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Skeggs <[email protected]>
commit 9360bd1112d8874d21942e2ae74f5416b00a8db6 upstream.
--- drivers/gpu/drm/nouveau/nouveau_gem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_gem.c +2 -1
@@ -287,7 +287,8 @@ validate_fini_list(struct list_head *lislist_for_each_safe (entry, tmp, list) { nvbo = list_entry(entry, struct nouveau_bo, entry); -nouveau_bo_fence (nvbo, fence); +if (likely (fence)) +nouveau_bo_fence (nvbo, fence);if (unlikely (nvbo->validate_mapped)) {ttm_bo_kunmap (&nvbo->kmap);
Greg Kroah-Hartman
maintainerPATCH 99/173 drm/radeon/si: fix define for MC_SEQ_TRAIN_WAKEUP_CNTL
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit d5693761b2b4ff530c8af8af9ec55b6eae76e617 upstream.
Typo in the register offset.
--- drivers/gpu/drm/radeon/sid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/sid.h +1 -1
@@ -247,7 +247,7 @@#define NOOFGROUPS_SHIFT 12#define NOOFGROUPS_MASK 0x00001000 -#define MC_SEQ_TRAIN_WAKEUP_CNTL 0x2808 +#define MC_SEQ_TRAIN_WAKEUP_CNTL 0x28e8#define TRAIN_DONE_D0 (1 << 30)#define TRAIN_DONE_D1 (1 << 31)
Greg Kroah-Hartman
maintainerPATCH 100/173 drm/radeon: activate UVD clocks before sending the destroy msg
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian König <[email protected]>
commit c154a76311293f9671439286834aa325b7ef59fe upstream.
Make sure the UVD clocks are still active before sending the destroy message, otherwise the hw might hang.
--- drivers/gpu/drm/radeon/radeon_uvd.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/radeon/radeon_uvd.c +2 -0
@@ -242,6 +242,8 @@ void radeon_uvd_free_handles(struct radeif (handle !=0 && rdev->uvd.filp[i] == filp) {struct radeon_fence *fence; +radeon_uvd_note_usage (rdev); + r =radeon_uvd_get_destroy_msg (rdev,R600_RING_TYPE_UVD_INDEX , handle, &fence);if (r) {
Greg Kroah-Hartman
maintainerPATCH 101/173 drm/radeon: dont share PPLLs on DCE4.1
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 70471860ff9f335c60c004d42ebd48945bfa5403 upstream.
Sharing PPLLs seems to cause problems on some boards.
Bug:
https://bugs.freedesktop.org/show_bug.cgi?id=45334
--- drivers/gpu/drm/radeon/atombios_crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/atombios_crtc.c +1 -1
@@ -1683,7 +1683,7 @@ static int radeon_atom_pick_pll(struct dif (pll !=ATOM_PPLL_INVALID )return pll; } - }else { + }else if (!ASIC_IS_DCE41 (rdev)) {/* Don't share PLLs on DCE4.1 chips */ /* use the same PPLL for all monitors with the same clock */ pll =radeon_get_shared_nondp_ppll (crtc);if (pll !=ATOM_PPLL_INVALID )
Greg Kroah-Hartman
maintainerPATCH 102/173 radeon: workaround pinning failure on low ram gpu
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Glisse <[email protected]>
commit 97b6ff6be9da7675aab339334fda996d6c5077d9 upstream.
GPU with low amount of ram can fails at pinning new framebuffer before unpinning old one. On such failure, retry with unpinning old one before pinning new one allowing to work around the issue. This is somewhat ugly but only affect those old GPU we care about.
--- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
drivers/gpu/drm/radeon/radeon_legacy_crtc.c +28 -0
@@ -422,6 +422,7 @@ int radeon_crtc_do_set_base(struct drm_c/* Pin framebuffer & get tilling informations */ obj = radeon_fb->obj; rbo =gem_to_radeon_bo (obj); +retry: r =radeon_bo_reserve (rbo, false);if (unlikely (r !=0 ))return r;
@@ -430,6 +431,33 @@ int radeon_crtc_do_set_base(struct drm_c &base);if (unlikely (r !=0 )) {radeon_bo_unreserve (rbo); + +/* On old GPU like RN50 with little vram pining can fails because +* current fb is taking all space needed. So instead of unpining +* the old buffer after pining the new one, first unpin old one +* and then retry pining new one. +* +* As only master can set mode only master can pin and it is +* unlikely the master client will race with itself especialy +* on those old gpu with single crtc. +* +* We don't shutdown the display controller because new buffer +* will end up in same spot. +*/ +if (!atomic && fb && fb != crtc->fb) { +struct radeon_bo *old_rbo; +unsigned long nsize, osize; + + old_rbo =gem_to_radeon_bo (to_radeon_framebuffer (fb)->obj); + osize =radeon_bo_size (old_rbo); + nsize =radeon_bo_size (rbo); +if (nsize <= osize && !radeon_bo_reserve (old_rbo, false)) { +radeon_bo_unpin (old_rbo); +radeon_bo_unreserve (old_rbo); + fb =NULL ; + goto retry; + } + }return -EINVAL ; }radeon_bo_get_tiling_flags (rbo, &tiling_flags,NULL );
Greg Kroah-Hartman
maintainerPATCH 103/173 edac, highbank: Fix interrupt setup of mem and l2 controller
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robert Richter <[email protected]>
commit a72b8859fd3941cc1d2940d5c43026d2c6fb959e upstream.
Register and enable interrupts after the edac registration. Otherwise incomming ecc error interrupts lead to crashes during device setup.
Fixing this in drivers for mc and l2.
--- drivers/edac/highbank_l2_edac.c | 18 ++++++++++-------- drivers/edac/highbank_mc_edac.c | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-)
drivers/edac/highbank_l2_edac.c +10 -8
@@ -90,28 +90,30 @@ static int highbank_l2_err_probe(struct goto err; } + dci->mod_name =dev_name (&pdev->dev); + dci->dev_name =dev_name (&pdev->dev); + +if (edac_device_add_device (dci)) + goto err; + drvdata->db_irq =platform_get_irq (pdev,0 ); res =devm_request_irq (&pdev->dev, drvdata->db_irq, highbank_l2_err_handler,0 ,dev_name (&pdev->dev), dci);if (res <0 ) - goto err; + goto err2; drvdata->sb_irq =platform_get_irq (pdev,1 ); res =devm_request_irq (&pdev->dev, drvdata->sb_irq, highbank_l2_err_handler,0 ,dev_name (&pdev->dev), dci);if (res <0 ) - goto err; - - dci->mod_name =dev_name (&pdev->dev); - dci->dev_name =dev_name (&pdev->dev); - -if (edac_device_add_device (dci)) - goto err; + goto err2;devres_close_group (&pdev->dev,NULL );return 0 ; +err2: +edac_device_del_device (&pdev->dev); err:devres_release_group (&pdev->dev,NULL );edac_device_free_ctl_info (dci);
drivers/edac/highbank_mc_edac.c +10 -8
@@ -189,14 +189,6 @@ static int highbank_mc_probe(struct plat goto err; } - irq =platform_get_irq (pdev,0 ); - res =devm_request_irq (&pdev->dev, irq, highbank_mc_err_handler, -0 ,dev_name (&pdev->dev), mci); -if (res <0 ) { -dev_err (&pdev->dev,"Unable to request irq %d\n" , irq); - goto err; - } - mci->mtype_cap =MEM_FLAG_DDR3 ; mci->edac_ctl_cap =EDAC_FLAG_NONE |EDAC_FLAG_SECDED ; mci->edac_cap =EDAC_FLAG_SECDED ;
@@ -217,10 +209,20 @@ static int highbank_mc_probe(struct platif (res <0 ) goto err; + irq =platform_get_irq (pdev,0 ); + res =devm_request_irq (&pdev->dev, irq, highbank_mc_err_handler, +0 ,dev_name (&pdev->dev), mci); +if (res <0 ) { +dev_err (&pdev->dev,"Unable to request irq %d\n" , irq); + goto err2; + } +highbank_mc_create_debugfs_nodes (mci);devres_close_group (&pdev->dev,NULL );return 0 ; +err2: +edac_mc_del_mc (&pdev->dev); err:devres_release_group (&pdev->dev,NULL );edac_mc_free (mci);
Greg Kroah-Hartman
maintainerPATCH 104/173 setfacl removes part of ACL when setting POSIX ACLs to Samba
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steve French <[email protected]>
commit b1d93356427be6f050dc55c86eb019d173700af6 upstream.
setfacl over cifs mounts can remove the default ACL when setting the (non-default part of) the ACL and vice versa (we were leaving at 0 rather than setting to -1 the count field for the unaffected half of the ACL. For example notice the setfacl removed the default ACL in this sequence:
steven@steven-GA-970A-DS3:~/cifs-2.6$ getfacl /mnt/test-dir ; setfacl -m default:user:test:rwx,user:test:rwx /mnt/test-dir getfacl: Removing leading '/' from absolute path names user::rwx group::r-x other::r-x default:user::rwx default:user:test:rwx default:group::r-x default:mask::rwx default:other::r-x
steven@steven-GA-970A-DS3:~/cifs-2.6$ getfacl /mnt/test-dir getfacl: Removing leading '/' from absolute path names user::rwx user:test:rwx group::r-x mask::rwx other::r-x
--- fs/cifs/cifssmb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
fs/cifs/cifssmb.c +5 -3
@@ -3306,11 +3306,13 @@ static __u16 ACL_to_cifs_posix(char *parreturn 0 ; } cifs_acl->version =cpu_to_le16 (1 ); -if (acl_type ==ACL_TYPE_ACCESS ) +if (acl_type ==ACL_TYPE_ACCESS ) { cifs_acl->access_entry_count =cpu_to_le16 (count); -else if (acl_type ==ACL_TYPE_DEFAULT ) + cifs_acl->default_entry_count =__constant_cpu_to_le16 (0xFFFF ); + }else if (acl_type ==ACL_TYPE_DEFAULT ) { cifs_acl->default_entry_count =cpu_to_le16 (count); -else { + cifs_acl->access_entry_count =__constant_cpu_to_le16 (0xFFFF ); + }else {cifs_dbg (FYI ,"unknown ACL type %d\n" , acl_type);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 105/173 md: fix calculation of stacking limits on level change.
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
commit 02e5f5c0a0f726e66e3d8506ea1691e344277969 upstream.
The various ->run routines of md personalities assume that the 'queue' has been initialised by the blk_set_stacking_limits() call in md_alloc().
However when the level is changed (by level_store()) the ->run routine for the new level is called for an array which has already had the stacking limits modified. This can result in incorrect final settings.
So call blk_set_stacking_limits() before ->run in level_store().
A specific consequence of this bug is that it causes discard_granularity to be set incorrectly when reshaping a RAID4 to a RAID0.
This is suitable for any -stable kernel since 3.3 in which blk_set_stacking_limits() was introduced.
--- drivers/md/md.c | 1 + 1 file changed, 1 insertion(+)
drivers/md/md.c +1 -0
@@ -3619,6 +3619,7 @@ level_store(struct mddev *mddev, const c mddev->in_sync =1 ;del_timer_sync (&mddev->safemode_timer); } +blk_set_stacking_limits (&mddev->queue->limits); pers->run (mddev);set_bit (MD_CHANGE_DEVS , &mddev->flags);mddev_resume (mddev);
Greg Kroah-Hartman
maintainerPATCH 106/173 HID: uhid: fix leak for 64/32 UHID_CREATE
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Herrmann <[email protected]>
commit 80897aa787ecd58eabb29deab7cbec9249c9b7e6 upstream.
UHID allows short writes so user-space can omit unused fields. We automatically set them to 0 in the kernel. However, the 64/32 bit compat-handler didn't do that in the UHID_CREATE fallback. This will reveal random kernel heap data (of random size, even) to user-space.
--- drivers/hid/uhid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/uhid.c +1 -1
@@ -312,7 +312,7 @@ static int uhid_event_from_user(const ch*/ struct uhid_create_req_compat *compat; - compat =kmalloc (sizeof (*compat),GFP_KERNEL ); + compat =kzalloc (sizeof (*compat),GFP_KERNEL );if (!compat)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 107/173 powerpc/signals: Improved mark VSX not saved with small contexts fix
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Neuling <[email protected]>
commit ec67ad82814bee92251fd963bf01c7a173856555 upstream.
In a recent patch:
commit c13f20ac48328b05cd3b8c19e31ed6c132b44b42
Author: Michael Neuling <[email protected]> powerpc/signals: Mark VSX not saved with small contexts
We fixed an issue but an improved solution was later discussed after the patch was merged.
Firstly, this patch doesn't handle the 64bit signals case, which could also hit this issue (but has never been reported).
Secondly, the original patch isn't clear what MSR VSX should be set to. The new approach below always clears the MSR VSX bit (to indicate no VSX is in the context) and sets it only in the specific case where VSX is available (ie. when VSX has been used and the signal context passed has space to provide the state).
This reverts the original patch and replaces it with the improved solution. It also adds a 64 bit version.
--- arch/powerpc/kernel/signal_32.c | 16 +++++++--------- arch/powerpc/kernel/signal_64.c | 6 ++++++ 2 files changed, 13 insertions(+), 9 deletions(-)
arch/powerpc/kernel/signal_32.c +7 -9
@@ -442,6 +442,12 @@ static int save_user_regs(struct pt_regs#endif /* CONFIG_ALTIVEC */ if (copy_fpr_to_user (&frame->mc_fregs, current))return 1 ; + +/* +* Clear the MSR VSX bit to indicate there is no valid state attached +* to this context, except in the specific case below where we set it. +*/ + msr &= ~MSR_VSX ;#ifdef CONFIG_VSX /* * Copy VSR 0-31 upper half from thread_struct to local
@@ -454,15 +460,7 @@ static int save_user_regs(struct pt_regsif (copy_vsx_to_user (&frame->mc_vsregs, current))return 1 ; msr |= MSR_VSX; - }else if (!ctx_has_vsx_region) -/* -* With a small context structure we can't hold the VSX -* registers, hence clear the MSR value to indicate the state -* was not saved. -*/ - msr &= ~MSR_VSX ; - - + }#endif /* CONFIG_VSX */ #ifdef CONFIG_SPE /* save spe registers */
arch/powerpc/kernel/signal_64.c +6 -0
@@ -121,6 +121,12 @@ static long setup_sigcontext(struct sigcflush_fp_to_thread (current);/* copy fpr regs and fpscr */ err |=copy_fpr_to_user (&sc->fp_regs, current); + +/* +* Clear the MSR VSX bit to indicate there is no valid state attached +* to this context, except in the specific case below where we set it. +*/ + msr &= ~MSR_VSX ;#ifdef CONFIG_VSX /* * Copy VSX low doubleword to local buffer for formatting,
Greg Kroah-Hartman
maintainerPATCH 108/173 iio:accel:kxsd9 fix missing mutex unlock
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Zago <[email protected]>
commit 0ee005c7dc2803125275e24598f0fb37775a6af3 upstream.
This will leave a lock held after reading from the device, preventing any further reads.
--- drivers/iio/accel/kxsd9.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iio/accel/kxsd9.c +4 -3
@@ -112,9 +112,10 @@ static int kxsd9_read(struct iio_dev *inmutex_lock (&st->buf_lock); st->tx[0 ] =KXSD9_READ (address); ret =spi_sync_transfer (st->us, xfers,ARRAY_SIZE (xfers)); -if (ret) -return ret; -return (((u16)(st->rx[0 ])) <<8 ) | (st->rx[1 ] &0xF0 ); +if (!ret) + ret = (((u16)(st->rx[0 ])) <<8 ) | (st->rx[1 ] &0xF0 ); +mutex_unlock (&st->buf_lock); +return ret; } static IIO_CONST_ATTR(accel_scale_available,
Greg Kroah-Hartman
maintainerPATCH 109/173 s390/uaccess: add missing page table walk range check
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
commit 71a86ef055f569b93bc6901f007bdf447dbf515f upstream.
When translating a user space address, the address must be checked against the ASCE limit of the process. If the address is larger than the maximum address that is reachable with the ASCE, an ASCE type exception must be generated.
The current code simply ignored the higher order bits. This resulted in an address wrap around in user space instead of an exception in user space.
--- arch/s390/lib/uaccess_pt.c | 3 +++ 1 file changed, 3 insertions(+)
arch/s390/lib/uaccess_pt.c +3 -0
@@ -78,11 +78,14 @@ static size_t copy_in_kernel(size_t coun* contains the (negative) exception code. */ #ifdef CONFIG_64BIT +static unsigned long follow_table (struct mm_struct *mm,unsigned long address,int write) {unsigned long *table = (unsigned long *)__pa (mm->pgd); +if (unlikely (address > mm->context.asce_limit -1 )) +return -0x38UL ;switch (mm->context.asce_bits & _ASCE_TYPE_MASK) {case _ASCE_TYPE_REGION1: table = table + ((address >>53 ) &0x7ff );
Greg Kroah-Hartman
maintainerPATCH 110/173 workqueue: fix ordered workqueues in NUMA setups
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit 8a2b75384444488fc4f2cbb9f0921b6a0794838f upstream.
An ordered workqueue implements execution ordering by using single pool_workqueue with max_active == 1. On a given pool_workqueue, work items are processed in FIFO order and limiting max_active to 1 enforces the queued work items to be processed one by one.
Unfortunately, 4c16bd327c ("workqueue: implement NUMA affinity for unbound workqueues") accidentally broke this guarantee by applying NUMA affinity to ordered workqueues too. On NUMA setups, an ordered workqueue would end up with separate pool_workqueues for different nodes. Each pool_workqueue still limits max_active to 1 but multiple work items may be executed concurrently and out of order depending on which node they are queued to.
Fix it by using dedicated ordered_wq_attrs[] when creating ordered workqueues. The new attrs match the unbound ones except that no_numa is always set thus forcing all NUMA nodes to share the default pool_workqueue.
While at it, add sanity check in workqueue creation path which verifies that an ordered workqueues has only the default pool_workqueue.
--- kernel/workqueue.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
kernel/workqueue.c +22 -2
@@ -295,6 +295,9 @@ static DEFINE_HASHTABLE(unbound_pool_has/* I: attributes used when instantiating standard unbound pools on demand */ static struct workqueue_attrs *unbound_std_wq_attrs[NR_STD_WORKER_POOLS ]; +/* I: attributes used when instantiating ordered pools on demand */ +static struct workqueue_attrs *ordered_wq_attrs[NR_STD_WORKER_POOLS ]; +struct workqueue_struct *system_wq__read_mostly ;EXPORT_SYMBOL (system_wq);struct workqueue_struct *system_highpri_wq__read_mostly ;
@@ -4059,7 +4062,7 @@ out_unlock:static int alloc_and_link_pwqs (struct workqueue_struct *wq) {bool highpri = wq->flags &WQ_HIGHPRI ; -int cpu; +int cpu, ret;if (!(wq->flags &WQ_UNBOUND )) { wq->cpu_pwqs = alloc_percpu(struct pool_workqueue);
@@ -4079,6 +4082,13 @@ static int alloc_and_link_pwqs(struct womutex_unlock (&wq->mutex); }return 0 ; + }else if (wq->flags & __WQ_ORDERED) { + ret =apply_workqueue_attrs (wq, ordered_wq_attrs[highpri]); +/* there should only be single pwq for ordering guarantee */ +WARN (!ret && (wq->pwqs.next != &wq->dfl_pwq->pwqs_node || + wq->pwqs.prev != &wq->dfl_pwq->pwqs_node), +"ordering guarantee broken for workqueue %s\n" , wq->name); +return ret; }else {return apply_workqueue_attrs (wq, unbound_std_wq_attrs[highpri]); }
@@ -4990,13 +5000,23 @@ static int __init init_workqueues(void) } } -/* create default unbound wq attrs */ +/* create default unbound and ordered wq attrs */ for (i =0 ; i <NR_STD_WORKER_POOLS ; i++) {struct workqueue_attrs *attrs;BUG_ON (!(attrs =alloc_workqueue_attrs (GFP_KERNEL ))); attrs->nice = std_nice[i]; unbound_std_wq_attrs[i] = attrs; + +/* +* An ordered wq should have only one pwq as ordering is +* guaranteed by max_active which is enforced by pwqs. +* Turn off NUMA so that dfl_pwq is used for all nodes. +*/ +BUG_ON (!(attrs =alloc_workqueue_attrs (GFP_KERNEL ))); + attrs->nice = std_nice[i]; + attrs->no_numa = true; + ordered_wq_attrs[i] = attrs; } system_wq =alloc_workqueue ("events" ,0 ,0 );
Greg Kroah-Hartman
maintainerPATCH 111/173 cpuset: Fix memory allocator deadlock
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 0fc0287c9ed1ffd3706f8b4d9b314aa102ef1245 upstream.
Juri hit the below lockdep report:
[ 4.303391] ======================================================
[ 4.303392] [ INFO: SOFTIRQ-safe -> SOFTIRQ-unsafe lock order detected ]
[ 4.303394] 3.12.0-dl-peterz+ #144 Not tainted
[ 4.303395] ------------------------------------------------------
[ 4.303397] kworker/u4:3/689 [HC0[0]:SC0[0]:HE0:SE1] is trying to acquire:
[ 4.303399] (&p->mems_allowed_seq){+.+...}, at: [<ffffffff8114e63c>] new_slab+0x6c/0x290
[ 4.303417]
[ 4.303417] and this task is already holding:
[ 4.303418] (&(&q->__queue_lock)->rlock){..-...}, at: [<ffffffff812d2dfb>] blk_execute_rq_nowait+0x5b/0x100
[ 4.303431] which would create a new lock dependency:
[ 4.303432] (&(&q->__queue_lock)->rlock){..-...} -> (&p->mems_allowed_seq){+.+...}
[ 4.303436][ 4.303898] the dependencies between the lock to be acquired and SOFTIRQ-irq-unsafe lock:
[ 4.303918] -> (&p->mems_allowed_seq){+.+...} ops: 2762 {
[ 4.303922] HARDIRQ-ON-W at:
[ 4.303923] [<ffffffff8108ab9a>] __lock_acquire+0x65a/0x1ff0
[ 4.303926] [<ffffffff8108cbe3>] lock_acquire+0x93/0x140
[ 4.303929] [<ffffffff81063dd6>] kthreadd+0x86/0x180
[ 4.303931] [<ffffffff816ded6c>] ret_from_fork+0x7c/0xb0
[ 4.303933] SOFTIRQ-ON-W at:
[ 4.303933] [<ffffffff8108abcc>] __lock_acquire+0x68c/0x1ff0
[ 4.303935] [<ffffffff8108cbe3>] lock_acquire+0x93/0x140
[ 4.303940] [<ffffffff81063dd6>] kthreadd+0x86/0x180
[ 4.303955] [<ffffffff816ded6c>] ret_from_fork+0x7c/0xb0
[ 4.303959] INITIAL USE at:
[ 4.303960] [<ffffffff8108a884>] __lock_acquire+0x344/0x1ff0
[ 4.303963] [<ffffffff8108cbe3>] lock_acquire+0x93/0x140
[ 4.303966] [<ffffffff81063dd6>] kthreadd+0x86/0x180
[ 4.303969] [<ffffffff816ded6c>] ret_from_fork+0x7c/0xb0
[ 4.303972] }Which reports that we take mems_allowed_seq with interrupts enabled. A little digging found that this can only be from cpuset_change_task_nodemask().
This is an actual deadlock because an interrupt doing an allocation will hit get_mems_allowed()->...->__read_seqcount_begin(), which will spin forever waiting for the write side to complete.
--- kernel/cpuset.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
kernel/cpuset.c +6 -2
@@ -984,8 +984,10 @@ static void cpuset_change_task_nodemask( need_loop =task_has_mempolicy (tsk) || !nodes_intersects (*newmems, tsk->mems_allowed); -if (need_loop) +if (need_loop) { +local_irq_disable ();write_seqcount_begin (&tsk->mems_allowed_seq); + }nodes_or (tsk->mems_allowed, tsk->mems_allowed, *newmems);mpol_rebind_task (tsk, newmems,MPOL_REBIND_STEP1 );
@@ -993,8 +995,10 @@ static void cpuset_change_task_nodemask(mpol_rebind_task (tsk, newmems,MPOL_REBIND_STEP2 ); tsk->mems_allowed = *newmems; -if (need_loop) +if (need_loop) {write_seqcount_end (&tsk->mems_allowed_seq); +local_irq_enable (); + }task_unlock (tsk); }
Greg Kroah-Hartman
maintainerPATCH 112/173 ALSA: hda/realtek - Set pcbeep amp for ALC668
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kailang Yang <[email protected]>
commit 9ad54547cf6f4410eba83bb95dfd2a0966718d6d upstream.
Set the missing pcbeep default amp for ALC668.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -4494,6 +4494,7 @@ static int patch_alc662(struct hda_codeccase 0x10ec0272 :case 0x10ec0663 :case 0x10ec0665 : +case 0x10ec0668 :set_beep_amp (spec,0x0b ,0x04 ,HDA_INPUT );break ;case 0x10ec0273 :
Greg Kroah-Hartman
maintainerPATCH 113/173 ALSA: hda/realtek - Add support of ALC231 codec
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kailang Yang <[email protected]>
commit ba4c4d0a9021ab034554d532a98133d668b87599 upstream.
It's compatible with ALC269.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -4552,6 +4552,7 @@ static int patch_alc680(struct hda_codec*/ static const struct hda_codec_preset snd_hda_preset_realtek[] = { { .id =0x10ec0221 , .name ="ALC221" , .patch = patch_alc269 }, + { .id =0x10ec0231 , .name ="ALC231" , .patch = patch_alc269 }, { .id =0x10ec0233 , .name ="ALC233" , .patch = patch_alc269 }, { .id =0x10ec0255 , .name ="ALC255" , .patch = patch_alc269 }, { .id =0x10ec0260 , .name ="ALC260" , .patch = patch_alc260 },
Greg Kroah-Hartman
maintainerPATCH 114/173 ALSA: hda - Fix hp-mic mode without VREF bits
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 16c0cefe8951b2c4b824fd06011ac1b359b1ab3b upstream.
When the hp mic pin has no VREF bits, the driver forgot to set PIN_IN bit. Spotted during debugging old MacBook Airs.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=65681
--- sound/pci/hda/hda_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/hda_generic.c +1 -1
@@ -2703,7 +2703,7 @@ static int hp_mic_jack_mode_put(struct s val &= ~(AC_PINCTL_VREFEN |PIN_HP ); val |=get_vref_idx (vref_caps, idx) |PIN_IN ; }else - val =snd_hda_get_default_vref (codec, nid); + val =snd_hda_get_default_vref (codec, nid) |PIN_IN ; }snd_hda_set_pin_ctl_cache (codec, nid, val);call_hp_automute (codec,NULL );
Greg Kroah-Hartman
maintainerPATCH 115/173 ALSA: hda - Create Headhpone Mic Jack Mode when really needed
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit ced4cefc75fdb8be95eaee325ad0f6b2fc0a484b upstream.
When a headphone jack is configurable as input, the generic parser tries to make it retaskable as Headphone Mic. The switching can be done smoothly if Capture Source control exists (i.e. there is another input source). Or when user explicitly enables the creation of jack mode controls, "Headhpone Mic Jack Mode" will be created accordingly.
However, if the headphone mic is the only input source, we have to create "Headphone Mic Jack Mode" control because there is no capture source selection. Otherwise, the generic parser assumes that the input is constantly enabled, thus the headphone is permanently set as input. This situation happens on the old MacBook Airs where no input is supported properly, for example.
This patch fixes the problem: now "Headphone Mic Jack Mode" is created when such an input selection isn't possible.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=65681
--- sound/pci/hda/hda_generic.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
sound/pci/hda/hda_generic.c +12 -8
@@ -2445,12 +2445,8 @@ static int create_out_jack_modes(structfor (i =0 ; i < num_pins; i++) {hda_nid_t pin = pins[i]; -if (pin == spec->hp_mic_pin) { -int ret =create_hp_mic_jack_mode (codec, pin); -if (ret <0 ) -return ret; +if (pin == spec->hp_mic_pin)continue ; - }if (get_out_jack_num_items (codec, pin) >1 ) {struct snd_kcontrol_new *knew;char name[44 ];
@@ -2723,9 +2719,6 @@ static int create_hp_mic_jack_mode(strucstruct hda_gen_spec *spec = codec->spec;struct snd_kcontrol_new *knew; -if (get_out_jack_num_items (codec, pin) <=1 && -get_in_jack_num_items (codec, pin) <=1 ) -return 0 ;/* no need */ knew =snd_hda_gen_add_kctl (spec,"Headphone Mic Jack Mode" , &hp_mic_jack_mode_enum);if (!knew)
@@ -4287,6 +4280,17 @@ int snd_hda_gen_parse_auto_config(structif (err <0 )return err; +/* create "Headphone Mic Jack Mode" if no input selection is +* available (or user specifies add_jack_modes hint) +*/ +if (spec->hp_mic_pin && + (spec->auto_mic || spec->input_mux.num_items ==1 || + spec->add_jack_modes)) { + err =create_hp_mic_jack_mode (codec, spec->hp_mic_pin); +if (err <0 ) +return err; + } +if (spec->add_jack_modes) {if (cfg->line_out_type !=AUTO_PIN_SPEAKER_OUT ) { err = create_out_jack_modes(codec, cfg->line_outs,
Greg Kroah-Hartman
maintainerPATCH 116/173 ALSA: hda - Initialize missing bass speaker pin for ASUS AIO ET2700
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 1f0bbf03cb829162ec8e6d03c98aaaed88c6f534 upstream.
Add a fixup entry for the missing bass speaker pin 0x16 on ASUS ET2700 AiO desktop. The channel map will be added in the next patch, so that this can be backported easily to stable kernels.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=65961
--- sound/pci/hda/patch_realtek.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/pci/hda/patch_realtek.c +9 -0
@@ -1765,6 +1765,7 @@ enum {ALC889_FIXUP_IMAC91_VREF ,ALC882_FIXUP_INV_DMIC ,ALC882_FIXUP_NO_PRIMARY_HP , + ALC887_FIXUP_ASUS_BASS, }; static void alc889_fixup_coef(struct hda_codec *codec,
@@ -2086,6 +2087,13 @@ static const struct hda_fixup alc882_fix .type = HDA_FIXUP_FUNC, .v.func = alc882_fixup_no_primary_hp, }, + [ALC887_FIXUP_ASUS_BASS] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { + {0x16 ,0x99130130 },/* bass speaker */ + {} + }, + }, };static const struct snd_pci_quirk alc882_fixup_tbl[] = {
@@ -2119,6 +2127,7 @@ static const struct snd_pci_quirk alc882SND_PCI_QUIRK (0x1043 ,0x1873 ,"ASUS W90V" ,ALC882_FIXUP_ASUS_W90V ),SND_PCI_QUIRK (0x1043 ,0x1971 ,"Asus W2JC" ,ALC882_FIXUP_ASUS_W2JC ),SND_PCI_QUIRK (0x1043 ,0x835f ,"Asus Eee 1601" ,ALC888_FIXUP_EEE1601 ), +SND_PCI_QUIRK (0x1043 ,0x84bc ,"ASUS ET2700" ,ALC887_FIXUP_ASUS_BASS ),SND_PCI_QUIRK (0x104d ,0x9047 ,"Sony Vaio TT" ,ALC889_FIXUP_VAIO_TT ),SND_PCI_QUIRK (0x104d ,0x905a ,"Sony Vaio Z" ,ALC882_FIXUP_NO_PRIMARY_HP ), SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP),
Greg Kroah-Hartman
maintainerPATCH 117/173 ALSA: hda - Check leaf nodes to find aamix amps
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 2ded3e5b61d61d0bc90bebb8004db6184c7db6eb upstream.
The current generic parser assumes blindly that the volume and mute amps are found in the aamix node itself. But on some codecs, typically Analog Devices ones, the aamix amps are separately implemented in each leaf node of the aamix node, and the current driver can't establish the correct amp controls. This is a regression compared with the previous static quirks.
This patch extends the search for the amps to the leaf nodes for allowing the aamix controls again on such codecs.
In this implementation, I didn't code to loop through the whole paths, since usually one depth should suffice, and we can't search too deeply, as it may result in the conflicting control assignments.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=65641
--- sound/pci/hda/hda_generic.c | 57 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 12 deletions(-)
sound/pci/hda/hda_generic.c +45 -12
@@ -2747,6 +2747,42 @@ static int add_loopback_list(struct hda_return 0 ; } +/* return true if either a volume or a mute amp is found for the given +* aamix path; the amp has to be either in the mixer node or its direct leaf +*/ +static bool look_for_mix_leaf_ctls (struct hda_codec *codec,hda_nid_t mix_nid, +hda_nid_t pin,unsigned int *mix_val, +unsigned int *mute_val) +{ +int idx, num_conns; +const hda_nid_t *list; +hda_nid_t nid; + + idx =snd_hda_get_conn_index (codec, mix_nid, pin, true); +if (idx <0 ) +return false; + + *mix_val = *mute_val =0 ; +if (nid_has_volume (codec, mix_nid,HDA_INPUT )) + *mix_val =HDA_COMPOSE_AMP_VAL (mix_nid,3 , idx,HDA_INPUT ); +if (nid_has_mute (codec, mix_nid,HDA_INPUT )) + *mute_val =HDA_COMPOSE_AMP_VAL (mix_nid,3 , idx,HDA_INPUT ); +if (*mix_val && *mute_val) +return true; + +/* check leaf node */ + num_conns =snd_hda_get_conn_list (codec, mix_nid, &list); +if (num_conns < idx) +return false; + nid = list[idx]; +if (!*mix_val &&nid_has_volume (codec, nid,HDA_OUTPUT )) + *mix_val =HDA_COMPOSE_AMP_VAL (nid,3 ,0 ,HDA_OUTPUT ); +if (!*mute_val &&nid_has_mute (codec, nid,HDA_OUTPUT )) + *mute_val =HDA_COMPOSE_AMP_VAL (nid,3 ,0 ,HDA_OUTPUT ); + +return *mix_val || *mute_val; +} +/* create input playback/capture controls for the given pin */ static int new_analog_input(struct hda_codec *codec, int input_idx, hda_nid_t pin, const char *ctlname, int ctlidx,
@@ -2754,12 +2790,11 @@ static int new_analog_input(struct hda_c {struct hda_gen_spec *spec = codec->spec;struct nid_path *path; -unsigned int val; +unsigned int mix_val, mute_val;int err, idx; -if (!nid_has_volume (codec, mix_nid,HDA_INPUT ) && - !nid_has_mute (codec, mix_nid,HDA_INPUT )) -return 0 ;/* no need for analog loopback */ +if (!look_for_mix_leaf_ctls (codec, mix_nid, pin, &mix_val, &mute_val)) +return 0 ; path =snd_hda_add_new_path (codec, pin, mix_nid,0 );if (!path)
@@ -2768,20 +2803,18 @@ static int new_analog_input(struct hda_c spec->loopback_paths[input_idx] =snd_hda_get_path_idx (codec, path); idx = path->idx[path->depth -1 ]; -if (nid_has_volume (codec, mix_nid,HDA_INPUT )) { - val =HDA_COMPOSE_AMP_VAL (mix_nid,3 , idx,HDA_INPUT ); - err =__add_pb_vol_ctrl (spec,HDA_CTL_WIDGET_VOL , ctlname, ctlidx, val); +if (mix_val) { + err =__add_pb_vol_ctrl (spec,HDA_CTL_WIDGET_VOL , ctlname, ctlidx, mix_val);if (err <0 )return err; - path->ctls[NID_PATH_VOL_CTL ] = val; + path->ctls[NID_PATH_VOL_CTL ] = mix_val; } -if (nid_has_mute (codec, mix_nid,HDA_INPUT )) { - val =HDA_COMPOSE_AMP_VAL (mix_nid,3 , idx,HDA_INPUT ); - err =__add_pb_sw_ctrl (spec,HDA_CTL_WIDGET_MUTE , ctlname, ctlidx, val); +if (mute_val) { + err =__add_pb_sw_ctrl (spec,HDA_CTL_WIDGET_MUTE , ctlname, ctlidx, mute_val);if (err <0 )return err; - path->ctls[NID_PATH_MUTE_CTL ] = val; + path->ctls[NID_PATH_MUTE_CTL ] = mute_val; } path->active = true;
Greg Kroah-Hartman
maintainerPATCH 118/173 tracing: Allow events to have NULL strings
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (Red Hat)" <[email protected]>
commit 4e58e54754dc1fec21c3a9e824bc108b05fdf46e upstream.
If an TRACE_EVENT() uses __assign_str() or __get_str on a NULL pointer then the following oops will happen:
BUG: unable to handle kernel NULL pointer dereference at (null) IP: [<c127a17b>] strlen+0x10/0x1a *pde = 00000000 ^M Oops: 0000 [#1] PREEMPT SMP Modules linked in: CPU: 1 PID: 0 Comm: swapper/1 Not tainted 3.13.0-rc1-test+ #2 Hardware name: /DG965MQ, BIOS MQ96510J.86A.0372.2006.0605.1717 06/05/2006^M task: f5cde9f0 ti: f5e5e000 task.ti: f5e5e000 EIP: 0060:[<c127a17b>] EFLAGS: 00210046 CPU: 1 EIP is at strlen+0x10/0x1a EAX: 00000000 EBX: c2472da8 ECX: ffffffff EDX: c2472da8 ESI: c1c5e5fc EDI: 00000000 EBP: f5e5fe84 ESP: f5e5fe80 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 CR0: 8005003b CR2: 00000000 CR3: 01f32000 CR4: 000007d0 Stack: f5f18b90 f5e5feb8 c10687a8 0759004f 00000005 00000005 00000005 00200046 00000002 00000000 c1082a93 f56c7e28 c2472da8 c1082a93 f5e5fee4 c106bc61^M 00000000 c1082a93 00000000 00000000 00000001 00200046 00200082 00000000 Call Trace: [<c10687a8>] ftrace_raw_event_lock+0x39/0xc0 [<c1082a93>] ? ktime_get+0x29/0x69 [<c1082a93>] ? ktime_get+0x29/0x69 [<c106bc61>] lock_release+0x57/0x1a5 [<c1082a93>] ? ktime_get+0x29/0x69 [<c10824dd>] read_seqcount_begin.constprop.7+0x4d/0x75 [<c1082a93>] ? ktime_get+0x29/0x69^M [<c1082a93>] ktime_get+0x29/0x69 [<c108a46a>] __tick_nohz_idle_enter+0x1e/0x426 [<c10690e8>] ? lock_release_holdtime.part.19+0x48/0x4d [<c10bc184>] ? time_hardirqs_off+0xe/0x28 [<c1068c82>] ? trace_hardirqs_off_caller+0x3f/0xaf [<c108a8cb>] tick_nohz_idle_enter+0x59/0x62 [<c1079242>] cpu_startup_entry+0x64/0x192 [<c102299c>] start_secondary+0x277/0x27c Code: 90 89 c6 89 d0 88 c4 ac 38 e0 74 09 84 c0 75 f7 be 01 00 00 00 89 f0 48 5e 5d c3 55 89 e5 57 66 66 66 66 90 83 c9 ff 89 c7 31 c0 <f2> ae f7 d1 8d 41 ff 5f 5d c3 55 89 e5 57 66 66 66 66 90 31 ff EIP: [<c127a17b>] strlen+0x10/0x1a SS:ESP 0068:f5e5fe80 CR2: 0000000000000000 ---[ end trace 01bc47bf519ec1b2 ]---
New tracepoints have been added that have allowed for NULL pointers being assigned to strings. To fix this, change the TRACE_EVENT() code to check for NULL and if it is, it will assign "(null)" to it instead (similar to what glibc printf does).
--- include/trace/ftrace.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
include/trace/ftrace.h +3 -2
@@ -368,7 +368,8 @@ ftrace_define_fields_##call(struct ftrac __data_size += (len) *sizeof (type);#undef __string -#define __string (item, src) __dynamic_array(char, item, strlen(src) + 1) +#define __string (item, src) __dynamic_array(char, item, \ + strlen((src) ? (const char *)(src) : "(null)") + 1)#undef DECLARE_EVENT_CLASS#define DECLARE_EVENT_CLASS (call, proto, args, tstruct, assign, print) \
@@ -498,7 +499,7 @@ static inline notrace int ftrace_get_off#undef __assign_str#define __assign_str (dst, src) \ - strcpy(__get_str(dst), src); + strcpy(__get_str(dst), (src) ? (const char *)(src) : "(null)");#undef TP_fast_assign #define TP_fast_assign(args...) args
Greg Kroah-Hartman
maintainerPATCH 119/173 Input: evdev - fall back to vmalloc for client event buffer
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Stone <[email protected]>
commit 92eb77d0ffbaa71b501a0a8dabf09a351bf4267f upstream.
evdev always tries to allocate the event buffer for clients using kzalloc rather than vmalloc, presumably to avoid mapping overhead where possible. However, drivers like bcm5974, which claims support for reporting 16 fingers simultaneously, can have an extraordinarily large buffer. The resultant contiguous order-4 allocation attempt fails due to fragmentation, and the device is thus unusable until reboot.
Try kzalloc if we can to avoid the mapping overhead, but if that fails, fall back to vzalloc.
--- drivers/input/evdev.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/input/evdev.c +12 -4
@@ -18,6 +18,8 @@#include <linux/poll.h> #include <linux/sched.h> #include <linux/slab.h> +#include <linux/vmalloc.h> +#include <linux/mm.h> #include <linux/module.h> #include <linux/init.h> #include <linux/input/mt.h>
@@ -289,7 +291,11 @@ static int evdev_release(struct inode *imutex_unlock (&evdev->mutex);evdev_detach_client (evdev, client); -kfree (client); + +if (is_vmalloc_addr (client)) +vfree (client); +else +kfree (client);evdev_close_device (evdev);
@@ -309,12 +315,14 @@ static int evdev_open(struct inode *inod { struct evdev *evdev = container_of(inode->i_cdev, struct evdev, cdev);unsigned int bufsize =evdev_compute_buffer_size (evdev->handle.dev); +unsigned int size =sizeof (struct evdev_client ) + + bufsize *sizeof (struct input_event );struct evdev_client *client;int error; - client =kzalloc (sizeof (struct evdev_client ) + - bufsize *sizeof (struct input_event ), -GFP_KERNEL ); + client =kzalloc (size,GFP_KERNEL | __GFP_NOWARN); +if (!client) + client =vzalloc (size);if (!client)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 120/173 Input: cypress_ps2 - do not consider data bad if palm is detected
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joseph Salisbury <[email protected]>
commit 5df682b297f6b23ec35615ed7bb50cbb25d25869 upstream.
If hardware (or firmware) detects palm on the surface of the device it does not mean that the data packet is bad from the protocol standpoint. Instead of reporting PSMOUSE_BAD_DATA in this case simply threat it as if nothing touches the surface.
--- drivers/input/mouse/cypress_ps2.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-)
drivers/input/mouse/cypress_ps2.c +3 -16
@@ -439,7 +439,7 @@ static int cypress_get_finger_count(unsicase 2 :return 5 ;default :/* Invalid contact (e.g. palm). Ignore it. */ -return -1 ; +return 0 ; } }
@@ -452,17 +452,10 @@ static int cypress_parse_packet(struct p {unsigned char *packet = psmouse->packet;unsigned char header_byte = packet[0 ]; -int contact_cnt;memset (report_data,0 ,sizeof (struct cytp_report_data )); - contact_cnt =cypress_get_finger_count (header_byte); - -if (contact_cnt <0 )/* e.g. palm detect */ -return -EINVAL ; - - report_data->contact_cnt = contact_cnt; - + report_data->contact_cnt =cypress_get_finger_count (header_byte); report_data->tap = (header_byte &ABS_MULTIFINGER_TAP ) ?1 :0 ;if (report_data->contact_cnt ==1 ) {
@@ -535,11 +528,9 @@ static void cypress_process_packet(strucint slots[CYTP_MAX_MT_SLOTS ];int n; -if (cypress_parse_packet (psmouse, cytp, &report_data)) -return ; +cypress_parse_packet (psmouse, cytp, &report_data); n = report_data.contact_cnt; -if (n >CYTP_MAX_MT_SLOTS ) n =CYTP_MAX_MT_SLOTS ;
@@ -605,10 +596,6 @@ static psmouse_ret_t cypress_validate_byreturn PSMOUSE_BAD_DATA ; contact_cnt =cypress_get_finger_count (packet[0 ]); - -if (contact_cnt <0 ) -return PSMOUSE_BAD_DATA ; -if (cytp->mode &CYTP_BIT_ABS_NO_PRESSURE )cypress_set_packet_size (psmouse, contact_cnt ==2 ?7 :4 );else
Greg Kroah-Hartman
maintainerPATCH 121/173 Input: i8042 - add PNP modaliases
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tom Gundersen <[email protected]>
commit 78551277e4df57864b0b0e7f85c23ede2be2edb8 upstream.
This allows the module to be autoloaded in the common case.
In order to work on non-PnP systems the module should be compiled in or loaded unconditionally at boot (c.f. modules-load.d(5)), as before.
--- drivers/input/serio/i8042-x86ia64io.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/input/serio/i8042-x86ia64io.h +2 -0
@@ -765,6 +765,7 @@ static struct pnp_device_id pnp_kbd_devi { .id = "CPQA0D7", .driver_data = 0 }, { .id = "", }, }; +MODULE_DEVICE_TABLE (pnp, pnp_kbd_devids);static struct pnp_driver i8042_pnp_kbd_driver = { .name ="i8042 kbd" ,
@@ -786,6 +787,7 @@ static struct pnp_device_id pnp_aux_devi { .id = "SYN0801", .driver_data = 0 }, { .id = "", }, }; +MODULE_DEVICE_TABLE (pnp, pnp_aux_devids);static struct pnp_driver i8042_pnp_aux_driver = { .name ="i8042 aux" ,
Greg Kroah-Hartman
maintainerPATCH 122/173 HID: dont ignore eGalax/D-Wav/EETI HIDs
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Forest Bond <[email protected]>
commit 95d50b6c5e18ff7351c5f2a6ff53afaed5f7e664 upstream.
Certain devices with class HID, protocol None did not work with the HID driver at one point, and as a result were bound to usbtouchscreen instead as of commit 139ebe8 ("Input: usbtouchscreen - fix eGalax HID ignoring"). This change was prompted by the following report:
https://lkml.org/lkml/2009/1/25/127
Unfortunately, the device mentioned in this report is no longer available for testing.
We've recently discovered that some devices with class HID, protocol None do not work with usbtouchscreen, but do work with usbhid. Here is the report that made this evident:
http://comments.gmane.org/gmane.linux.kernel.input/31710
Driver binding for these devices has flip-flopped a few times, so both of the above reports were regressions.
This situation would appear to leave us with no easy way to bind every device to the right driver. However, in my own testing with several devices I have not found a device with class HID that does not work with the current HID driver. It is my belief that changes to the HID driver since the original report have likely fixed the issue(s) that made it unsuitable at the time, and that we should prefer it over usbtouchscreen for these devices. In particular, HID quirks affecting these devices were added/removed in the following commits since then:
fe6065d HID: add multi-input quirk for eGalax Touchcontroller 77933c3 Merge branch 'egalax' into for-linus ebd11fe HID: Add quirk for eGalax touch controler. d34c4aa HID: add no-get quirk for eGalax touch controller
This patch makes the HID driver no longer ignore eGalax/D-Wav/EETI devices with class HID. If there are in fact devices with class HID that still do not work with the HID driver, we will see another round of regressions. In that case I propose we investigate why the device is not working with the HID driver rather than re-introduce regressions for functioning HID devices by again binding them to usbtouchscreen.
The corresponding change to usbtouchscreen will be made separately.
--- drivers/hid/hid-core.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/hid/hid-core.c +0 -9
@@ -2317,15 +2317,6 @@ bool hid_ignore(struct hid_device *hdev) hdev->type == HID_TYPE_USBNONE)return true;break ; -case USB_VENDOR_ID_DWAV : -/* These are handled by usbtouchscreen. hdev->type is probably -* HID_TYPE_USBNONE, but we say !HID_TYPE_USBMOUSE to match -* usbtouchscreen. */ -if ((hdev->product ==USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER || - hdev->product ==USB_DEVICE_ID_DWAV_TOUCHCONTROLLER ) && - hdev->type !=HID_TYPE_USBMOUSE ) -return true; -break ;case USB_VENDOR_ID_VELLEMAN :/* These are not HID devices. They are handled by comedi. */ if ((hdev->product >= USB_DEVICE_ID_VELLEMAN_K8055_FIRST &&
Greg Kroah-Hartman
maintainerPATCH 123/173 Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Forest Bond <[email protected]>
commit ae2aa3a512fa5f50f67feba9e66bc2efb394bd63 upstream.
The HID driver now handles these devices, regardless of what protocol the device claims it supports.
--- drivers/input/touchscreen/usbtouchscreen.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/input/touchscreen/usbtouchscreen.c +1 -3
@@ -146,12 +146,10 @@ enum {#define USB_DEVICE_HID_CLASS (vend, prod) \ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS \ - | USB_DEVICE_ID_MATCH_INT_PROTOCOL \ | USB_DEVICE_ID_MATCH_DEVICE, \ .idVendor = (vend), \ .idProduct = (prod), \ - .bInterfaceClass = USB_INTERFACE_CLASS_HID, \ - .bInterfaceProtocol = USB_INTERFACE_PROTOCOL_MOUSE + .bInterfaceClass = USB_INTERFACE_CLASS_HIDstatic const struct usb_device_id usbtouch_devices[] = { #ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
Greg Kroah-Hartman
maintainerPATCH 124/173 cpufreq: highbank-cpufreq: Enable Midway/ECX-2000
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Langsdorf <[email protected]>
commit fbbc5bfb44a22e7a8ef753a1c8dfb448d7ac8b85 upstream.
Calxeda's new ECX-2000 part uses the same cpufreq interface as highbank, so add it to the driver's compatibility list.
This is a minor change that can safely be applied to the 3.10 and 3.11 stable trees.
--- drivers/cpufreq/highbank-cpufreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/cpufreq/highbank-cpufreq.c +2 -1
@@ -66,7 +66,8 @@ static int hb_cpufreq_driver_init(void)struct device_node *np;int ret; -if (!of_machine_is_compatible ("calxeda,highbank" )) +if ((!of_machine_is_compatible ("calxeda,highbank" )) && + (!of_machine_is_compatible ("calxeda,ecx-2000" )))return -ENODEV ;for_each_child_of_node (of_find_node_by_path ("/cpus" ), np)
Greg Kroah-Hartman
maintainerPATCH 125/173 clk: armada-370: fix tclk frequencies
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Guinot <[email protected]>
commit 1022c75f5abd3a3b25e679bc8793d21bedd009b4 upstream.
This patch fixes the tclk frequency array for the Armada-370 SoC. This bug has been introduced by commit 6b72333d
("clk: mvebu: add Armada 370 SoC-centric clock init").
A wrong tclk frequency affects the following drivers: mvsdio, mvneta, i2c-mv64xxx and mvebu-devbus. This list may be incomplete.
About the mvneta Ethernet driver, note that the tclk frequency is used to compute the Rx time coalescence. Then, this bug harms the coalescence configuration and also degrades the networking performances with the default values.
--- drivers/clk/mvebu/clk-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/mvebu/clk-core.c +2 -2
@@ -126,8 +126,8 @@ static void __init mvebu_clk_core_setup(#define SARH_AXP_FAB_FREQ_OPT_SHIFT 4static const u32 __initconst armada_370_tclk_frequencies[] = { -16600000 , -20000000 , +166000000 , +200000000 , };static u32 __init armada_370_get_tclk_freq (void __iomem *sar)
Greg Kroah-Hartman
maintainerPATCH 126/173 9p: send uevent after adding/removing mount_tag attribute
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Marineau <[email protected]>
commit e0d6cb9cd3a3ac8a3b8e5b22b83c4f8619786f22 upstream.
This driver adds an attribute to the existing virtio device so a CHANGE event is required in order udev rules to make use of it. The ADD event happens before this driver is probed and unlike a more typical driver like a block device there isn't a higher level device to watch for.
--- net/9p/trans_virtio.c | 5 +++++ 1 file changed, 5 insertions(+)
net/9p/trans_virtio.c +5 -0
@@ -577,6 +577,10 @@ static int p9_virtio_probe(struct virtiomutex_lock (&virtio_9p_lock);list_add_tail (&chan->chan_list, &virtio_chan_list);mutex_unlock (&virtio_9p_lock); + +/* Let udev rules use the new mount_tag attribute. */ +kobject_uevent (&(vdev->dev.kobj),KOBJ_CHANGE ); +return 0 ; out_free_tag:
@@ -654,6 +658,7 @@ static void p9_virtio_remove(struct virtlist_del (&chan->chan_list);mutex_unlock (&virtio_9p_lock);sysfs_remove_file (&(vdev->dev.kobj), &dev_attr_mount_tag.attr); +kobject_uevent (&(vdev->dev.kobj),KOBJ_CHANGE );kfree (chan->tag);kfree (chan->vc_wq);kfree (chan);
Greg Kroah-Hartman
maintainerPATCH 127/173 HID: multitouch: Fix GeneralTouch products and add more PIDs
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luosong <[email protected]>
commit 7b2262920db2b98fe2cd32cde52141f02fd9eecf upstream.
GeneralTouch products should use the quirk SLOT_IS_CONTACTID instead of SLOT_IS_CONTACTNUMBER.
Adding PIDs 0101,e100,0102,0106,010a from the new products.
Tested on new and older products by GeneralTouch engineers.
--- drivers/hid/hid-ids.h | 5 +++++ drivers/hid/hid-multitouch.c | 19 +++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-)
drivers/hid/hid-ids.h +5 -0
@@ -330,6 +330,11 @@#define USB_VENDOR_ID_GENERAL_TOUCH 0x0dfc#define USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS 0x0003#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PWT_TENFINGERS 0x0100 +#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0101 0x0101 +#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0102 0x0102 +#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0106 0x0106 +#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_010A 0x010a +#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100#define USB_VENDOR_ID_GLAB 0x06c2#define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038
drivers/hid/hid-multitouch.c +17 -2
@@ -244,12 +244,12 @@ static struct mt_class mt_classes[] = { { .name = MT_CLS_GENERALTOUCH_TWOFINGERS, .quirks =MT_QUIRK_NOT_SEEN_MEANS_UP |MT_QUIRK_VALID_IS_INRANGE | - MT_QUIRK_SLOT_IS_CONTACTNUMBER, + MT_QUIRK_SLOT_IS_CONTACTID, .maxcontacts =2 }, { .name = MT_CLS_GENERALTOUCH_PWT_TENFINGERS, .quirks =MT_QUIRK_NOT_SEEN_MEANS_UP | -MT_QUIRK_SLOT_IS_CONTACTNUMBER +MT_QUIRK_SLOT_IS_CONTACTID }, { .name = MT_CLS_FLATFROG,
@@ -1191,6 +1191,21 @@ static const struct hid_device_id mt_dev { .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,MT_USB_DEVICE (USB_VENDOR_ID_GENERAL_TOUCH , USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PWT_TENFINGERS) }, + { .driver_data = MT_CLS_GENERALTOUCH_TWOFINGERS, +MT_USB_DEVICE (USB_VENDOR_ID_GENERAL_TOUCH , + USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0101) }, + { .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS, +MT_USB_DEVICE (USB_VENDOR_ID_GENERAL_TOUCH , + USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0102) }, + { .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS, +MT_USB_DEVICE (USB_VENDOR_ID_GENERAL_TOUCH , + USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0106) }, + { .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS, +MT_USB_DEVICE (USB_VENDOR_ID_GENERAL_TOUCH , + USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_010A) }, + { .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS, +MT_USB_DEVICE (USB_VENDOR_ID_GENERAL_TOUCH , + USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100) }, /* Gametel game controller */ { .driver_data = MT_CLS_NSMU,
Greg Kroah-Hartman
maintainerPATCH 128/173 HID: logitech - lg2ff: Add IDs for Formula Vibration Feedback Wheel
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Elias Vanderstuyft <[email protected]>
commit bd04363d3990c0727b7512a79a08c68436878bb0 upstream.
Add USB IDs for Logitech Formula Vibration Feedback Wheel (046d:ca04).
The lg2ff force feedback subdriver is used for vibration and HID_GD_MULTIAXIS is set to avoid deadzone like other Logitech wheels.
Kconfig description etc are also updated accordingly.
--- drivers/hid/Kconfig | 8 +++++--- drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 1 + drivers/hid/hid-lg.c | 3 +++ drivers/hid/hid-lg2ff.c | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-)
drivers/hid/Kconfig +5 -3
@@ -352,12 +352,14 @@ config LOGITECH_FF force feedback. config LOGIRUMBLEPAD2_FF - bool "Logitech RumblePad/Rumblepad 2 force feedback support" + bool "Logitech force feedback support (variant 2)" depends on HID_LOGITECH select INPUT_FF_MEMLESS help - Say Y here if you want to enable force feedback support for Logitech - RumblePad and Rumblepad 2 devices. + Say Y here if you want to enable force feedback support for: + - Logitech RumblePad + - Logitech Rumblepad 2 + - Logitech Formula Vibration Feedback Wheel config LOGIG940_FF bool "Logitech Flight System G940 force feedback support"
drivers/hid/hid-core.c +1 -0
@@ -1703,6 +1703,7 @@ static const struct hid_device_id hid_ha { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FLIGHT_SYSTEM_G940) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFP_WHEEL) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) },
drivers/hid/hid-ids.h +1 -0
@@ -562,6 +562,7 @@#define USB_DEVICE_ID_DINOVO_EDGE 0xc714#define USB_DEVICE_ID_DINOVO_MINI 0xc71f#define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2 0xca03 +#define USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL 0xca04#define USB_VENDOR_ID_LUMIO 0x202e#define USB_DEVICE_ID_CRYSTALTOUCH 0x0006
drivers/hid/hid-lg.c +3 -0
@@ -492,6 +492,7 @@ static int lg_input_mapped(struct hid_decase USB_DEVICE_ID_LOGITECH_G27_WHEEL :case USB_DEVICE_ID_LOGITECH_WII_WHEEL :case USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2 : +case USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL : field->application =HID_GD_MULTIAXIS ;break ;default :
@@ -639,6 +640,8 @@ static const struct hid_device_id lg_dev .driver_data = LG_NOGET | LG_FF4 }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2), .driver_data = LG_FF4 }, + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL), + .driver_data = LG_FF2 }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL), .driver_data = LG_FF4 }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL),
drivers/hid/hid-lg2ff.c +1 -1
@@ -95,7 +95,7 @@ int lg2ff_init(struct hid_device *hid)hid_hw_request (hid, report,HID_REQ_SET_REPORT ); -hid_info (hid,"Force feedback for Logitech RumblePad/Rumblepad 2 by Anssi Hannula <[email protected]>\n" ); +hid_info (hid,"Force feedback for Logitech variant 2 rumble devices by Anssi Hannula <[email protected]>\n" );return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 129/173 HID: hid-multitouch: add support for SiS panels
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Forest Bond <[email protected]>
commit a6802e008e19845fd9669511b895f7515ef9c48b upstream.
Add support for SiS multitouch panels.
--- drivers/hid/Kconfig | 1 + drivers/hid/hid-core.c | 2 ++ drivers/hid/hid-ids.h | 4 ++++ drivers/hid/hid-multitouch.c | 8 ++++++++ drivers/hid/usbhid/hid-quirks.c | 2 ++ 5 files changed, 17 insertions(+)
drivers/hid/Kconfig +1 -0
@@ -438,6 +438,7 @@ config HID_MULTITOUCH - Pixcir dual touch panels - Quanta panels - eGalax dual-touch panels, including the Joojoo and Wetab tablets + - SiS multitouch panels - Stantum multitouch panels - Touch International Panels - Unitec Panels
drivers/hid/hid-core.c +2 -0
@@ -1766,6 +1766,8 @@ static const struct hid_device_id hid_ha { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000) }, { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) }, + { HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH) }, + { HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS817_TOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
drivers/hid/hid-ids.h +4 -0
@@ -736,6 +736,10 @@#define USB_VENDOR_ID_SIGMATEL 0x066F#define USB_DEVICE_ID_SIGMATEL_STMP3780 0x3780 +#define USB_VENDOR_ID_SIS2_TOUCH 0x0457 +#define USB_DEVICE_ID_SIS9200_TOUCH 0x9200 +#define USB_DEVICE_ID_SIS817_TOUCH 0x0817 +#define USB_VENDOR_ID_SKYCABLE 0x1223#define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07
drivers/hid/hid-multitouch.c +8 -0
@@ -1317,6 +1317,14 @@ static const struct hid_device_id mt_dev MT_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008) }, +/* SiS panels */ + { .driver_data = MT_CLS_DEFAULT, +HID_USB_DEVICE (USB_VENDOR_ID_SIS2_TOUCH , + USB_DEVICE_ID_SIS9200_TOUCH) }, + { .driver_data = MT_CLS_DEFAULT, +HID_USB_DEVICE (USB_VENDOR_ID_SIS2_TOUCH , + USB_DEVICE_ID_SIS817_TOUCH) }, + /* Stantum panels */ { .driver_data = MT_CLS_CONFIDENCE, MT_USB_DEVICE(USB_VENDOR_ID_STANTUM,
drivers/hid/usbhid/hid-quirks.c +2 -0
@@ -84,6 +84,8 @@ static const struct hid_blacklist { { USB_VENDOR_ID_REALTEK, USB_DEVICE_ID_REALTEK_READER, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET }, { USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS817_TOUCH, HID_QUIRK_NOGET }, { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET }, { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET },
Greg Kroah-Hartman
maintainerPATCH 130/173 HID: hid-sensor-hub: fix report size
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Pandruvada <[email protected]>
commit d4b1bba76171cb783e32441b28462fe841073ed8 upstream.
Most of the hid sensor field size is reported in report_size field in the report descriptor. For rotation fusion sensor the quaternion data is 16 byte field, the report size was set to 4 and report count field is set to 4. So the total size is 16 bytes. But the current driver has a bug and not taking account for report count field. This causes user space to see only 4 bytes of data sent via IIO interface. The number of bytes in a field needs to take account of report_count field. Need to multiply report_size and report_count to get total number of bytes.
--- drivers/hid/hid-sensor-hub.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/hid/hid-sensor-hub.c +8 -5
@@ -327,7 +327,8 @@ int sensor_hub_input_get_attribute_info( field->logical == attr_usage_id) { sensor_hub_fill_attr_info(info, i, report->id, field->unit, field->unit_exponent, - field->report_size); + field->report_size * + field->report_count); ret = 0; } else {for (j =0 ; j < field->maxusage; ++j) {
@@ -339,7 +340,8 @@ int sensor_hub_input_get_attribute_info( i, report->id, field->unit, field->unit_exponent, - field->report_size); + field->report_size * + field->report_count); ret =0 ;break ; }
@@ -426,9 +428,10 @@ static int sensor_hub_raw_event(struct hhid_dbg (hdev,"%d collection_index:%x hid:%x sz:%x\n" , i, report->field[i]->usage->collection_index, report->field[i]->usage->hid, - report->field[i]->report_size/8 ); - - sz = report->field[i]->report_size/8 ; + (report->field[i]->report_size * + report->field[i]->report_count)/8 ); + sz = (report->field[i]->report_size * + report->field[i]->report_count)/8 ;if (pdata->pending.status && pdata->pending.attr_usage_id == report->field[i]->usage->hid) {hid_dbg (hdev,"data was pending ...\n" );
Greg Kroah-Hartman
maintainerPATCH 131/173 HID: multicouh: add PID VID to support 1 new Wistron optical touch device
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: KaiChung Cheng <[email protected]>
commit bf9d121efc18c30caa2caad85358cf9408eca117 upstream.
This patch adds PID VID to support for the Wistron Inc. Optical touch panel.
--- drivers/hid/Kconfig | 1 + drivers/hid/hid-ids.h | 3 +++ drivers/hid/hid-multitouch.c | 6 ++++++ 3 files changed, 10 insertions(+)
drivers/hid/Kconfig +1 -0
@@ -442,6 +442,7 @@ config HID_MULTITOUCH - Stantum multitouch panels - Touch International Panels - Unitec Panels + - Wistron optical touch panels - XAT optical touch panels - Xiroku optical touch panels - Zytronic touch panels
drivers/hid/hid-ids.h +3 -0
@@ -879,6 +879,9 @@#define USB_DEVICE_ID_SUPER_DUAL_BOX_PRO 0x8802#define USB_DEVICE_ID_SUPER_JOY_BOX_5_PRO 0x8804 +#define USB_VENDOR_ID_WISTRON 0x0fb8 +#define USB_DEVICE_ID_WISTRON_OPTICAL_TOUCH 0x1109 +#define USB_VENDOR_ID_X_TENSIONS 0x1ae7#define USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE 0x9001
drivers/hid/hid-multitouch.c +6 -0
@@ -1353,6 +1353,12 @@ static const struct hid_device_id mt_dev { .driver_data = MT_CLS_NSMU,MT_USB_DEVICE (USB_VENDOR_ID_UNITEC , USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) }, + + /* Wistron panels */ + { .driver_data = MT_CLS_NSMU, +MT_USB_DEVICE (USB_VENDOR_ID_WISTRON , + USB_DEVICE_ID_WISTRON_OPTICAL_TOUCH) }, + /* XAT */ { .driver_data = MT_CLS_NSMU, MT_USB_DEVICE(USB_VENDOR_ID_XAT,
Greg Kroah-Hartman
maintainerPATCH 132/173 HID:hid-lg4ff: Scale autocentering force properly on Logitech wheel
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Wood <[email protected]>
commit f8c231569a7a455dfa1907294a46ba52b3aa8859 upstream.
Adjust the scaling and lineartity to match that of the Windows driver (from MOMO testing).
--- drivers/hid/hid-lg4ff.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/hid/hid-lg4ff.c +12 -3
@@ -218,12 +218,21 @@ static void hid_lg4ff_set_autocenter_defstruct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT ].report_list; struct hid_report *report = list_entry(report_list->next, struct hid_report, list);__s32 *value = report->field[0 ]->value; +__u32 expand_a, expand_b; + +if (magnitude <=0xaaaa ) { + expand_a =0x0c * magnitude; + expand_b =0x80 * magnitude; + }else { + expand_a = (0x0c *0xaaaa ) +0x06 * (magnitude -0xaaaa ); + expand_b = (0x80 *0xaaaa ) +0xff * (magnitude -0xaaaa ); + } value[0 ] =0xfe ; value[1 ] =0x0d ; - value[2 ] = magnitude >>13 ; - value[3 ] = magnitude >>13 ; - value[4 ] = magnitude >>8 ; + value[2 ] = expand_a /0xaaaa ; + value[3 ] = expand_a /0xaaaa ; + value[4 ] = expand_b /0xaaaa ; value[5 ] =0x00 ; value[6 ] =0x00 ;
Greg Kroah-Hartman
maintainerPATCH 133/173 HID:hid-lg4ff: Switch autocentering off when strength is set to zero.
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Wood <[email protected]>
commit d2c02da549b468bbb28e67d269bd3c9e10683ff5 upstream.
When the autocenter is set to zero, this patch issues a command to totally disable the autocenter - this results in less resistance in the wheel.
--- drivers/hid/hid-lg4ff.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/hid/hid-lg4ff.c +25 -0
@@ -220,6 +220,20 @@ static void hid_lg4ff_set_autocenter_def__s32 *value = report->field[0 ]->value;__u32 expand_a, expand_b; +/* De-activate Auto-Center */ +if (magnitude ==0 ) { + value[0 ] =0xf5 ; + value[1 ] =0x00 ; + value[2 ] =0x00 ; + value[3 ] =0x00 ; + value[4 ] =0x00 ; + value[5 ] =0x00 ; + value[6 ] =0x00 ; + +hid_hw_request (hid, report,HID_REQ_SET_REPORT ); +return ; + } +if (magnitude <=0xaaaa ) { expand_a =0x0c * magnitude; expand_b =0x80 * magnitude;
@@ -236,6 +250,17 @@ static void hid_lg4ff_set_autocenter_def value[5 ] =0x00 ; value[6 ] =0x00 ; +hid_hw_request (hid, report,HID_REQ_SET_REPORT ); + +/* Activate Auto-Center */ + value[0 ] =0x14 ; + value[1 ] =0x00 ; + value[2 ] =0x00 ; + value[3 ] =0x00 ; + value[4 ] =0x00 ; + value[5 ] =0x00 ; + value[6 ] =0x00 ; +hid_hw_request (hid, report,HID_REQ_SET_REPORT ); }
Greg Kroah-Hartman
maintainerPATCH 134/173 HID:hid-lg4ff: Initialize device properties before we touch autocentering.
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Wood <[email protected]>
commit 114a55cf9dd1576e7ac56189832cd4d7dc56c218 upstream.
Re-arrange code slightly to ensure that device properties are configured before calling auto-center command.
--- drivers/hid/hid-lg4ff.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/hid/hid-lg4ff.c +11 -11
@@ -574,17 +574,6 @@ int lg4ff_init(struct hid_device *hid)if (error)return error; -/* Check if autocentering is available and -* set the centering force to zero by default */ -if (test_bit (FF_AUTOCENTER , dev->ffbit)) { -if (rev_maj ==FFEX_REV_MAJ && rev_min ==FFEX_REV_MIN )/* Formula Force EX expects different autocentering command */ - dev->ff->set_autocenter = hid_lg4ff_set_autocenter_ffex; -else - dev->ff->set_autocenter = hid_lg4ff_set_autocenter_default; - - dev->ff->set_autocenter (dev,0 ); - } -/* Get private driver data */ drv_data =hid_get_drvdata (hid);if (!drv_data) {
@@ -605,6 +594,17 @@ int lg4ff_init(struct hid_device *hid) entry->max_range = lg4ff_devices[i].max_range; entry->set_range = lg4ff_devices[i].set_range; +/* Check if autocentering is available and +* set the centering force to zero by default */ +if (test_bit (FF_AUTOCENTER , dev->ffbit)) { +if (rev_maj ==FFEX_REV_MAJ && rev_min ==FFEX_REV_MIN )/* Formula Force EX expects different autocentering command */ + dev->ff->set_autocenter = hid_lg4ff_set_autocenter_ffex; +else + dev->ff->set_autocenter = hid_lg4ff_set_autocenter_default; + + dev->ff->set_autocenter (dev,0 ); + } +/* Create sysfs interface */ error =device_create_file (&hid->dev, &dev_attr_range);if (error)
Greg Kroah-Hartman
maintainerPATCH 135/173 HID: lg: fix ReportDescriptor for Logitech Formula Vibration
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Wood <[email protected]>
commit 7f50547059bd55ac6a98c29fd1989421bdc36ec9 upstream.
By default the Logitech Formula Vibration presents a combined accel/brake axis ('Y'). This patch modifies the HID descriptor to present seperate accel/brake axes ('Y' and 'Z').
--- drivers/hid/hid-lg.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+)
drivers/hid/hid-lg.c +77 -0
@@ -45,6 +45,7 @@/* Size of the original descriptors of the Driving Force (and Pro) wheels */ #define DF_RDESC_ORIG_SIZE 130#define DFP_RDESC_ORIG_SIZE 97 +#define FV_RDESC_ORIG_SIZE 130#define MOMO_RDESC_ORIG_SIZE 87/* Fixed report descriptors for Logitech Driving Force (and Pro)
@@ -170,6 +171,73 @@ static __u8 dfp_rdesc_fixed[] = {0xC0 /* End Collection */ }; +static __u8 fv_rdesc_fixed[] = { +0x05 ,0x01 ,/* Usage Page (Desktop), */ +0x09 ,0x04 ,/* Usage (Joystik), */ +0xA1 ,0x01 ,/* Collection (Application), */ +0xA1 ,0x02 ,/* Collection (Logical), */ +0x95 ,0x01 ,/* Report Count (1), */ +0x75 ,0x0A ,/* Report Size (10), */ +0x15 ,0x00 ,/* Logical Minimum (0), */ +0x26 ,0xFF ,0x03 ,/* Logical Maximum (1023), */ +0x35 ,0x00 ,/* Physical Minimum (0), */ +0x46 ,0xFF ,0x03 ,/* Physical Maximum (1023), */ +0x09 ,0x30 ,/* Usage (X), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x95 ,0x0C ,/* Report Count (12), */ +0x75 ,0x01 ,/* Report Size (1), */ +0x25 ,0x01 ,/* Logical Maximum (1), */ +0x45 ,0x01 ,/* Physical Maximum (1), */ +0x05 ,0x09 ,/* Usage Page (Button), */ +0x19 ,0x01 ,/* Usage Minimum (01h), */ +0x29 ,0x0C ,/* Usage Maximum (0Ch), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x95 ,0x02 ,/* Report Count (2), */ +0x06 ,0x00 ,0xFF ,/* Usage Page (FF00h), */ +0x09 ,0x01 ,/* Usage (01h), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x09 ,0x02 ,/* Usage (02h), */ +0x26 ,0xFF ,0x00 ,/* Logical Maximum (255), */ +0x46 ,0xFF ,0x00 ,/* Physical Maximum (255), */ +0x95 ,0x01 ,/* Report Count (1), */ +0x75 ,0x08 ,/* Report Size (8), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x05 ,0x01 ,/* Usage Page (Desktop), */ +0x25 ,0x07 ,/* Logical Maximum (7), */ +0x46 ,0x3B ,0x01 ,/* Physical Maximum (315), */ +0x75 ,0x04 ,/* Report Size (4), */ +0x65 ,0x14 ,/* Unit (Degrees), */ +0x09 ,0x39 ,/* Usage (Hat Switch), */ +0x81 ,0x42 ,/* Input (Variable, Null State), */ +0x75 ,0x01 ,/* Report Size (1), */ +0x95 ,0x04 ,/* Report Count (4), */ +0x65 ,0x00 ,/* Unit, */ +0x06 ,0x00 ,0xFF ,/* Usage Page (FF00h), */ +0x09 ,0x01 ,/* Usage (01h), */ +0x25 ,0x01 ,/* Logical Maximum (1), */ +0x45 ,0x01 ,/* Physical Maximum (1), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x05 ,0x01 ,/* Usage Page (Desktop), */ +0x95 ,0x01 ,/* Report Count (1), */ +0x75 ,0x08 ,/* Report Size (8), */ +0x26 ,0xFF ,0x00 ,/* Logical Maximum (255), */ +0x46 ,0xFF ,0x00 ,/* Physical Maximum (255), */ +0x09 ,0x31 ,/* Usage (Y), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x09 ,0x32 ,/* Usage (Z), */ +0x81 ,0x02 ,/* Input (Variable), */ +0xC0 ,/* End Collection, */ +0xA1 ,0x02 ,/* Collection (Logical), */ +0x26 ,0xFF ,0x00 ,/* Logical Maximum (255), */ +0x46 ,0xFF ,0x00 ,/* Physical Maximum (255), */ +0x95 ,0x07 ,/* Report Count (7), */ +0x75 ,0x08 ,/* Report Size (8), */ +0x09 ,0x03 ,/* Usage (03h), */ +0x91 ,0x02 ,/* Output (Variable), */ +0xC0 ,/* End Collection, */ +0xC0 /* End Collection */ +}; +static __u8 momo_rdesc_fixed[] = {0x05 ,0x01 ,/* Usage Page (Desktop), */ 0x09 ,0x04 ,/* Usage (Joystik), */
@@ -275,6 +343,15 @@ static __u8 *lg_report_fixup(struct hid_ }break ; +case USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL : +if (*rsize ==FV_RDESC_ORIG_SIZE ) { +hid_info (hdev, +"fixing up Logitech Formula Vibration report descriptor\n" ); + rdesc = fv_rdesc_fixed; + *rsize =sizeof (fv_rdesc_fixed); + } +break ; +case USB_DEVICE_ID_LOGITECH_DFP_WHEEL :if (*rsize ==DFP_RDESC_ORIG_SIZE ) { hid_info(hdev,
Greg Kroah-Hartman
maintainerPATCH 136/173 gpio: pl061: move irqdomain initialization
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Walleij <[email protected]>
commit 2ba3154d9cb13697b97723cce75633b48adfe826 upstream.
The PL061 driver had the irqdomain initialization in an unfortunate
place: when used with device tree (and thus passing the base IRQ
0) the driver would work, as this registers an irqdomain and waits for mappings to be done dynamically as the devices request their IRQs, whereas when booting using platform data the irqdomain core would attempt to allocate IRQ descriptors dynamically (which works fine) but also to associate the irq_domain_associate_many() on all IRQs, which in turn will call the mapping function which at this point will try to set the type of the IRQ and then tries to acquire a non-initialized spinlock yielding a backtrace like this:
CPU: 0 PID: 1 Comm: swapper Not tainted 3.13.0-rc1+ #652 Backtrace: [<c0016f0c>] (dump_backtrace) from [<c00172ac>] (show_stack+0x18/0x1c) r6:c798ace0 r5:00000000 r4:c78257e0 r3:00200140 [<c0017294>] (show_stack) from [<c0329ea0>] (dump_stack+0x20/0x28) [<c0329e80>] (dump_stack) from [<c004fa80>] (__lock_acquire+0x1c0/0x1b80) [<c004f8c0>] (__lock_acquire) from [<c0051970>] (lock_acquire+0x6c/0x80) r10:00000000 r9:c0455234 r8:00000060 r7:c047d798 r6:600000d3 r5:00000000 r4:c782c000 [<c0051904>] (lock_acquire) from [<c032e484>] (_raw_spin_lock_irqsave+0x60/0x74) r6:c01a1100 r5:800000d3 r4:c798acd0 [<c032e424>] (_raw_spin_lock_irqsave) from [<c01a1100>] (pl061_irq_type+0x28/0x) r6:00000000 r5:00000000 r4:c798acd0 [<c01a10d8>] (pl061_irq_type) from [<c0059ef4>] (__irq_set_trigger+0x70/0x104) r6:00000000 r5:c01a10d8 r4:c046da1c r3:c01a10d8 [<c0059e84>] (__irq_set_trigger) from [<c005b348>] (irq_set_irq_type+0x40/0x60) r10:c043240c r8:00000060 r7:00000000 r6:c046da1c r5:00000060 r4:00000000 [<c005b308>] (irq_set_irq_type) from [<c01a1208>] (pl061_irq_map+0x40/0x54) r6:c79693c0 r5:c798acd0 r4:00000060 [<c01a11c8>] (pl061_irq_map) from [<c005d27c>] (irq_domain_associate+0xc0/0x190) r5:00000060 r4:c046da1c
[<c005d1bc>] (irq_domain_associate) from [<c005d604>] (irq_domain_associate_man)
r8:00000008 r7:00000000 r6:c79693c0 r5:00000060 r4:00000000
[<c005d5d0>] (irq_domain_associate_many) from [<c005d864>] (irq_domain_add_simp)
r8:c046578c r7:c035b72c r6:c79693c0 r5:00000060 r4:00000008 r3:00000008
[<c005d814>] (irq_domain_add_simple) from [<c01a1380>] (pl061_probe+0xc4/0x22c)
r6:00000060 r5:c0464380 r4:c798acd0
[<c01a12bc>] (pl061_probe) from [<c01c0450>] (amba_probe+0x74/0xe0)
r10:c043240c r9:c0455234 r8:00000000 r7:c047d7f8 r6:c047d744 r5:00000000 r4:c0464380
This moves the irqdomain initialization to a point where the spinlock and GPIO chip are both fully propulated, so the callbacks can be used without crashes.
I had some problem reproducing the crash, as the devm_kzalloc():ed zeroed memory would seemingly mask the spinlock as something OK, but by poisoning the lock like this:
u32 *dum;
dum = (u32 *) &chip->lock;
*dum = 0xaaaaaaaaU;
I could reproduce, fix and test the patch.
--- drivers/gpio/gpio-pl061.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpio/gpio-pl061.c +5 -5
@@ -286,11 +286,6 @@ static int pl061_probe(struct amba_devicif (!chip->base)return -ENOMEM ; - chip->domain =irq_domain_add_simple (adev->dev.of_node,PL061_GPIO_NR , - irq_base, &pl061_domain_ops, chip); -if (!chip->domain) -return -ENODEV ; -spin_lock_init (&chip->lock); chip->gc.request = pl061_gpio_request;
@@ -320,6 +315,11 @@ static int pl061_probe(struct amba_devicirq_set_chained_handler (irq, pl061_irq_handler);irq_set_handler_data (irq, chip); + chip->domain =irq_domain_add_simple (adev->dev.of_node,PL061_GPIO_NR , + irq_base, &pl061_domain_ops, chip); +if (!chip->domain) +return -ENODEV ; +for (i =0 ; i <PL061_GPIO_NR ; i++) {if (pdata) {if (pdata->directions & (1 << i))
Greg Kroah-Hartman
maintainerPATCH 137/173 cgroup: use a dedicated workqueue for cgroup destruction
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit e5fca243abae1445afbfceebda5f08462ef869d3 upstream.
Since be44562613851 ("cgroup: remove synchronize_rcu() from cgroup_diput()"), cgroup destruction path makes use of workqueue. css freeing is performed from a work item from that point on and a later commit, ea15f8ccdb430 ("cgroup: split cgroup destruction into two steps"), moves css offlining to workqueue too.
As cgroup destruction isn't depended upon for memory reclaim, the destruction work items were put on the system_wq; unfortunately, some controller may block in the destruction path for considerable duration while holding cgroup_mutex. As large part of destruction path is synchronized through cgroup_mutex, when combined with high rate of cgroup removals, this has potential to fill up system_wq's max_active of 256.
Also, it turns out that memcg's css destruction path ends up queueing and waiting for work items on system_wq through work_on_cpu(). If such operation happens while system_wq is fully occupied by cgroup destruction work items, work_on_cpu() can't make forward progress because system_wq is full and other destruction work items on system_wq can't make forward progress because the work item waiting for work_on_cpu() is holding cgroup_mutex, leading to deadlock.
This can be fixed by queueing destruction work items on a separate workqueue. This patch creates a dedicated workqueue - cgroup_destroy_wq - for this purpose. As these work items shouldn't have inter-dependencies and mostly serialized by cgroup_mutex anyway, giving high concurrency level doesn't buy anything and the workqueue's @max_active is set to 1 so that destruction work items are executed one by one on each CPU.
Hugh Dickins: Because cgroup_init() is run before init_workqueues(), cgroup_destroy_wq can't be allocated from cgroup_init(). Do it from a separate core_initcall(). In the future, we probably want to reorder so that workqueue init happens before cgroup_init().
--- kernel/cgroup.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
kernel/cgroup.c +26 -2
@@ -92,6 +92,14 @@ static DEFINE_MUTEX(cgroup_mutex);static DEFINE_MUTEX (cgroup_root_mutex);/* +* cgroup destruction makes heavy use of work items and there can be a lot +* of concurrent destructions. Use a separate workqueue so that cgroup +* destruction work items don't end up filling up max_active of system_wq +* which may lead to deadlock. +*/ +static struct workqueue_struct *cgroup_destroy_wq; + +/* * Generate an array of cgroup subsystem pointers. At boot time, this is * populated with the built in subsystems, and modular subsystems are * registered after that. The mutable section of this array is protected by
@@ -873,7 +881,7 @@ static void cgroup_free_rcu(struct rcu_h { struct cgroup *cgrp = container_of(head, struct cgroup, rcu_head); -schedule_work (&cgrp->free_work); +queue_work (cgroup_destroy_wq, &cgrp->free_work); }static void cgroup_diput (struct dentry *dentry,struct inode *inode)
@@ -4686,6 +4694,22 @@ out:return err; } +static int __init cgroup_wq_init (void ) +{ +/* +* There isn't much point in executing destruction path in +* parallel. Good chunk is serialized with cgroup_mutex anyway. +* Use 1 for @max_active. +* +* We would prefer to do this in cgroup_init() above, but that +* is called before init_workqueues(): so leave this until after. +*/ + cgroup_destroy_wq =alloc_workqueue ("cgroup_destroy" ,0 ,1 ); +BUG_ON (!cgroup_destroy_wq); +return 0 ; +} +core_initcall (cgroup_wq_init); +/* * proc_cgroup_show() * - Print task's cgroup paths into seq_file, one line for each hierarchy
@@ -4996,7 +5020,7 @@ void __css_put(struct cgroup_subsys_stat v =css_unbias_refcnt (atomic_dec_return (&css->refcnt));if (v ==0 ) -schedule_work (&css->dput_work); +queue_work (cgroup_destroy_wq, &css->dput_work); }EXPORT_SYMBOL_GPL (__css_put);
Greg Kroah-Hartman
maintainerPATCH 138/173 drm/radeon/vm: dont attempt to update ptes if ib allocation fails
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 4cc948b94a222c310ae089c36718aac7a03aec90 upstream.
If we fail to allocate an indirect buffer (ib) when updating the ptes, return an error instead of trying to use the ib. Avoids a null pointer dereference.
Bug:
https://bugzilla.kernel.org/show_bug.cgi?id=58621
v2 (chk): rebased on drm-fixes-3.12 for stable inclusion
--- drivers/gpu/drm/radeon/radeon_gart.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/radeon/radeon_gart.c +2 -0
@@ -1157,6 +1157,8 @@ int radeon_vm_bo_update_pte(struct radeoreturn -ENOMEM ; r =radeon_ib_get (rdev, ridx, &ib,NULL , ndw *4 ); +if (r) +return r; ib.length_dw =0 ; r =radeon_vm_update_pdes (rdev, vm, &ib, bo_va->soffset, bo_va->eoffset);
Greg Kroah-Hartman
maintainerPATCH 139/173 cfg80211: fix scheduled scan pointer access
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit 79845c662eeb95c9a180b9bd0d3ad848ee65b94c upstream.
Since rdev->sched_scan_req is dereferenced outside the lock protecting it, this might be done at the wrong time, causing crashes. Move the dereference to where it should be - inside the RTNL locked section.
--- net/wireless/scan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/wireless/scan.c +2 -2
@@ -253,10 +253,10 @@ void __cfg80211_sched_scan_results(struc rdev = container_of(wk, struct cfg80211_registered_device, sched_scan_results_wk); - request = rdev->sched_scan_req; -mutex_lock (&rdev->sched_scan_mtx); + request = rdev->sched_scan_req; +/* we don't have sched_scan_req anymore if the scan is stopping */ if (request) {if (request->flags &NL80211_SCAN_FLAG_FLUSH ) {
Greg Kroah-Hartman
maintainerPATCH 140/173 media: mxl111sf: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit c98300a0e8cf160aaea60bc05d2cd156a7666173 upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
drivers/media/usb/dvb-usb-v2/mxl111sf.c:74:1: warning: 'mxl111sf_ctrl_msg' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer to be the max size of
a control URB payload data (64 bytes).
--- drivers/media/usb/dvb-usb-v2/mxl111sf.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/media/usb/dvb-usb-v2/mxl111sf.c +9 -1
@@ -23,6 +23,9 @@#include "lgdt3305.h" #include "lg2160.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +int dvb_usb_mxl111sf_debug;module_param_named (debug, dvb_usb_mxl111sf_debug, int,0644 ); MODULE_PARM_DESC(debug, "set debugging level "
@@ -63,7 +66,12 @@ int mxl111sf_ctrl_msg(struct dvb_usb_dev {int wo = (rbuf ==NULL || rlen ==0 );/* write-only */ int ret; -u8 sndbuf[1 +wlen]; +u8 sndbuf[MAX_XFER_SIZE ]; + +if (1 + wlen >sizeof (sndbuf)) { +pr_warn ("%s: len=%d is too big!\n" , __func__, wlen); +return -EOPNOTSUPP ; + }deb_adv ("%s(wlen = %d, rlen = %d)\n" , __func__, wlen, rlen);
Greg Kroah-Hartman
maintainerPATCH 141/173 media: af9035: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 7760e148350bf6df95662bc0db3734e9d991cb03 upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
drivers/media/usb/dvb-usb-v2/af9035.c:142:1: warning: 'af9035_wr_regs' uses dynamic stack allocation [enabled by default] drivers/media/usb/dvb-usb-v2/af9035.c:305:1: warning: 'af9035_i2c_master_xfer' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer to be the max size of
a control URB payload data (64 bytes).
--- drivers/media/usb/dvb-usb-v2/af9035.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-)
drivers/media/usb/dvb-usb-v2/af9035.c +26 -3
@@ -21,6 +21,9 @@#include "af9035.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +DVB_DEFINE_MOD_OPT_ADAPTER_NR (adapter_nr);static u16 af9035_checksum (const u8 *buf,size_t len)
@@ -125,10 +128,16 @@ exit:/* write multiple registers */ static int af9035_wr_regs (struct dvb_usb_device *d,u32 reg,u8 *val,int len) { -u8 wbuf[6 + len]; +u8 wbuf[MAX_XFER_SIZE ];u8 mbox = (reg >>16 ) &0xff ;struct usb_req req = {CMD_MEM_WR , mbox,sizeof (wbuf), wbuf,0 ,NULL }; +if (6 + len >sizeof (wbuf)) { +dev_warn (&d->udev->dev,"%s: i2c wr: len=%d is too big!\n" , +KBUILD_MODNAME , len); +return -EOPNOTSUPP ; + } + wbuf[0 ] = len; wbuf[1 ] =2 ; wbuf[2 ] =0 ;
@@ -227,9 +236,16 @@ static int af9035_i2c_master_xfer(struct msg[1].len); }else {/* I2C */ -u8 buf[5 + msg[0 ].len]; +u8 buf[MAX_XFER_SIZE ];struct usb_req req = {CMD_I2C_RD ,0 ,sizeof (buf), buf, msg[1 ].len, msg[1 ].buf }; + +if (5 + msg[0 ].len >sizeof (buf)) { +dev_warn (&d->udev->dev, +"%s: i2c xfer: len=%d is too big!\n" , +KBUILD_MODNAME , msg[0 ].len); +return -EOPNOTSUPP ; + } req.mbox |= ((msg[0 ].addr &0x80 ) >>3 ); buf[0 ] = msg[1 ].len; buf[1 ] = msg[0 ].addr <<1 ;
@@ -256,9 +272,16 @@ static int af9035_i2c_master_xfer(struct msg[0].len - 3); }else {/* I2C */ -u8 buf[5 + msg[0 ].len]; +u8 buf[MAX_XFER_SIZE ];struct usb_req req = {CMD_I2C_WR ,0 ,sizeof (buf), buf,0 ,NULL }; + +if (5 + msg[0 ].len >sizeof (buf)) { +dev_warn (&d->udev->dev, +"%s: i2c xfer: len=%d is too big!\n" , +KBUILD_MODNAME , msg[0 ].len); +return -EOPNOTSUPP ; + } req.mbox |= ((msg[0 ].addr &0x80 ) >>3 ); buf[0 ] = msg[0 ].len; buf[1 ] = msg[0 ].addr <<1 ;
Greg Kroah-Hartman
maintainerPATCH 142/173 media: af9015: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 65e2f1cb3fe0f0630834b9517ba8f631936f325c upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
drivers/media/usb/dvb-usb-v2/af9015.c:433:1: warning: 'af9015_eeprom_hash' uses dynamic stack allocation [enabled by default]
In this specific case, it is a gcc bug, as the size is a const, but
it is easy to just change it from const to a #define, getting rid of
the gcc warning.
--- drivers/media/usb/dvb-usb-v2/af9015.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/dvb-usb-v2/af9015.c +2 -1
@@ -397,12 +397,13 @@ error:return ret; } +#define AF9015_EEPROM_SIZE 256 +/* hash (and dump) eeprom */ static int af9015_eeprom_hash (struct dvb_usb_device *d) {struct af9015_state *state =d_to_priv (d);int ret, i; -static const unsigned int AF9015_EEPROM_SIZE =256 ;u8 buf[AF9015_EEPROM_SIZE ];struct req_t req = {READ_I2C ,AF9015_I2C_EEPROM ,0 ,0 ,1 ,1 ,NULL };
Greg Kroah-Hartman
maintainerPATCH 143/173 media: dw2102: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 0065a79a8698a953e4b201c5fce8db8940530578 upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
drivers/media/usb/dvb-usb/dw2102.c:368:1: warning: 'dw2102_earda_i2c_transfer' uses dynamic stack allocation [enabled by default] drivers/media/usb/dvb-usb/dw2102.c:449:1: warning: 'dw2104_i2c_transfer' uses dynamic stack allocation [enabled by default] drivers/media/usb/dvb-usb/dw2102.c:512:1: warning: 'dw3101_i2c_transfer' uses dynamic stack allocation [enabled by default] drivers/media/usb/dvb-usb/dw2102.c:621:1: warning: 's6x0_i2c_transfer' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer to be the max size of
a control URB payload data (64 bytes).
--- drivers/media/usb/dvb-usb/dw2102.c | 90 ++++++++++++++++++++++++++++++++----- 1 file changed, 80 insertions(+), 10 deletions(-)
drivers/media/usb/dvb-usb/dw2102.c +80 -10
@@ -30,6 +30,9 @@#include "stb6100_proc.h" #include "m88rs2000.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +#ifndef USB_PID_DW2102 #define USB_PID_DW2102 0x2102#endif
@@ -308,7 +311,14 @@ static int dw2102_earda_i2c_transfer(strcase 2 : {/* read */ /* first write first register number */ -u8 ibuf[msg[1 ].len +2 ], obuf[3 ]; +u8 ibuf[MAX_XFER_SIZE ], obuf[3 ]; + +if (2 + msg[1 ].len >sizeof (ibuf)) { +warn ("i2c rd: len=%d is too big!\n" , + msg[1 ].len); +return -EOPNOTSUPP ; + } + obuf[0 ] = msg[0 ].addr <<1 ; obuf[1 ] = msg[0 ].len; obuf[2 ] = msg[0 ].buf[0 ];
@@ -325,7 +335,14 @@ static int dw2102_earda_i2c_transfer(strswitch (msg[0 ].addr) {case 0x68 : {/* write to register */ -u8 obuf[msg[0 ].len +2 ]; +u8 obuf[MAX_XFER_SIZE ]; + +if (2 + msg[0 ].len >sizeof (obuf)) { +warn ("i2c wr: len=%d is too big!\n" , + msg[1 ].len); +return -EOPNOTSUPP ; + } + obuf[0 ] = msg[0 ].addr <<1 ; obuf[1 ] = msg[0 ].len;memcpy (obuf +2 , msg[0 ].buf, msg[0 ].len);
@@ -335,7 +352,14 @@ static int dw2102_earda_i2c_transfer(str }case 0x61 : {/* write to tuner */ -u8 obuf[msg[0 ].len +2 ]; +u8 obuf[MAX_XFER_SIZE ]; + +if (2 + msg[0 ].len >sizeof (obuf)) { +warn ("i2c wr: len=%d is too big!\n" , + msg[1 ].len); +return -EOPNOTSUPP ; + } + obuf[0 ] = msg[0 ].addr <<1 ; obuf[1 ] = msg[0 ].len;memcpy (obuf +2 , msg[0 ].buf, msg[0 ].len);
@@ -401,7 +425,14 @@ static int dw2104_i2c_transfer(struct i2default : {if (msg[j].flags ==I2C_M_RD ) {/* read registers */ -u8 ibuf[msg[j].len +2 ]; +u8 ibuf[MAX_XFER_SIZE ]; + +if (2 + msg[j].len >sizeof (ibuf)) { +warn ("i2c rd: len=%d is too big!\n" , + msg[j].len); +return -EOPNOTSUPP ; + } + dw210x_op_rw(d->udev, 0xc3, (msg[j].addr << 1) + 1, 0, ibuf, msg[j].len + 2,
@@ -430,7 +461,14 @@ static int dw2104_i2c_transfer(struct i2 }while (len >0 ); }else {/* write registers */ -u8 obuf[msg[j].len +2 ]; +u8 obuf[MAX_XFER_SIZE ]; + +if (2 + msg[j].len >sizeof (obuf)) { +warn ("i2c wr: len=%d is too big!\n" , + msg[j].len); +return -EOPNOTSUPP ; + } + obuf[0 ] = msg[j].addr <<1 ; obuf[1 ] = msg[j].len;memcpy (obuf +2 , msg[j].buf, msg[j].len);
@@ -463,7 +501,13 @@ static int dw3101_i2c_transfer(struct i2case 2 : {/* read */ /* first write first register number */ -u8 ibuf[msg[1 ].len +2 ], obuf[3 ]; +u8 ibuf[MAX_XFER_SIZE ], obuf[3 ]; + +if (2 + msg[1 ].len >sizeof (ibuf)) { +warn ("i2c rd: len=%d is too big!\n" , + msg[1 ].len); +return -EOPNOTSUPP ; + } obuf[0 ] = msg[0 ].addr <<1 ; obuf[1 ] = msg[0 ].len; obuf[2 ] = msg[0 ].buf[0 ];
@@ -481,7 +525,13 @@ static int dw3101_i2c_transfer(struct i2case 0x60 :case 0x0c : {/* write to register */ -u8 obuf[msg[0 ].len +2 ]; +u8 obuf[MAX_XFER_SIZE ]; + +if (2 + msg[0 ].len >sizeof (obuf)) { +warn ("i2c wr: len=%d is too big!\n" , + msg[0 ].len); +return -EOPNOTSUPP ; + } obuf[0 ] = msg[0 ].addr <<1 ; obuf[1 ] = msg[0 ].len;memcpy (obuf +2 , msg[0 ].buf, msg[0 ].len);
@@ -563,7 +613,14 @@ static int s6x0_i2c_transfer(struct i2c_default : {if (msg[j].flags ==I2C_M_RD ) {/* read registers */ -u8 ibuf[msg[j].len]; +u8 ibuf[MAX_XFER_SIZE ]; + +if (msg[j].len >sizeof (ibuf)) { +warn ("i2c rd: len=%d is too big!\n" , + msg[j].len); +return -EOPNOTSUPP ; + } +dw210x_op_rw (d->udev,0x91 ,0 ,0 , ibuf, msg[j].len,DW210X_READ_MSG );
@@ -590,7 +647,14 @@ static int s6x0_i2c_transfer(struct i2c_ }while (len >0 ); }else if (j < (num -1 )) {/* write register addr before read */ -u8 obuf[msg[j].len +2 ]; +u8 obuf[MAX_XFER_SIZE ]; + +if (2 + msg[j].len >sizeof (obuf)) { +warn ("i2c wr: len=%d is too big!\n" , + msg[j].len); +return -EOPNOTSUPP ; + } + obuf[0 ] = msg[j +1 ].len; obuf[1 ] = (msg[j].addr <<1 );memcpy (obuf +2 , msg[j].buf, msg[j].len);
@@ -602,7 +666,13 @@ static int s6x0_i2c_transfer(struct i2c_break ; }else {/* write registers */ -u8 obuf[msg[j].len +2 ]; +u8 obuf[MAX_XFER_SIZE ]; + +if (2 + msg[j].len >sizeof (obuf)) { +warn ("i2c wr: len=%d is too big!\n" , + msg[j].len); +return -EOPNOTSUPP ; + } obuf[0 ] = msg[j].len +1 ; obuf[1 ] = (msg[j].addr <<1 );memcpy (obuf +2 , msg[j].buf, msg[j].len);
Greg Kroah-Hartman
maintainerPATCH 144/173 media: dibusb-common: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 1d7fa359d4c0fbb2756fa01cc47212908d90b7b0 upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
drivers/media/usb/dvb-usb/dibusb-common.c:124:1: warning: 'dibusb_i2c_msg' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer to be the max size of
a control URB payload data (64 bytes).
--- drivers/media/usb/dvb-usb/dibusb-common.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/media/usb/dvb-usb/dibusb-common.c +9 -1
@@ -12,6 +12,9 @@#include <linux/kconfig.h> #include "dibusb.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +static int debug;module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"set debugging level (1=info (|-able))." DVB_USB_DEBUG_STATUS );
@@ -105,11 +108,16 @@ EXPORT_SYMBOL(dibusb2_0_power_ctrl);static int dibusb_i2c_msg (struct dvb_usb_device *d,u8 addr,u8 *wbuf,u16 wlen,u8 *rbuf,u16 rlen) { -u8 sndbuf[wlen+4 ];/* lead(1) devaddr,direction(1) addr(2) data(wlen) (len(2) (when reading)) */ +u8 sndbuf[MAX_XFER_SIZE ];/* lead(1) devaddr,direction(1) addr(2) data(wlen) (len(2) (when reading)) */ /* write only ? */ int wo = (rbuf ==NULL || rlen ==0 ), len =2 + wlen + (wo ?0 :2 ); +if (4 + wlen >sizeof (sndbuf)) { +warn ("i2c wr: len=%d is too big!\n" , wlen); +return -EOPNOTSUPP ; + } + sndbuf[0 ] = wo ?DIBUSB_REQ_I2C_WRITE :DIBUSB_REQ_I2C_READ ; sndbuf[1 ] = (addr <<1 ) | (wo ?0 :1 );
Greg Kroah-Hartman
maintainerPATCH 145/173 media: cxusb: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 64f7ef8afbf89f3c72c4d2472e4914ca198c0668 upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
drivers/media/usb/dvb-usb/cxusb.c:209:1: warning: 'cxusb_i2c_xfer' uses dynamic stack allocation [enabled by default] drivers/media/usb/dvb-usb/cxusb.c:69:1: warning: 'cxusb_ctrl_msg' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer to be the max size of
a control URB payload data (64 bytes).
--- drivers/media/usb/dvb-usb/cxusb.c | 41 ++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-)
drivers/media/usb/dvb-usb/cxusb.c +37 -4
@@ -43,6 +43,9 @@#include "lgs8gxx.h" #include "atbm8830.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +/* debug */ static int dvb_usb_cxusb_debug;module_param_named (debug, dvb_usb_cxusb_debug, int,0644 );
@@ -57,7 +60,14 @@ static int cxusb_ctrl_msg(struct dvb_usb u8 cmd, u8 *wbuf, int wlen, u8 *rbuf, int rlen) { int wo = (rbuf == NULL || rlen == 0); /* write-only */ -u8 sndbuf[1 +wlen]; +u8 sndbuf[MAX_XFER_SIZE ]; + +if (1 + wlen >sizeof (sndbuf)) { +warn ("i2c wr: len=%d is too big!\n" , + wlen); +return -EOPNOTSUPP ; + } +memset (sndbuf,0 ,1 +wlen); sndbuf[0 ] = cmd;
@@ -158,7 +168,13 @@ static int cxusb_i2c_xfer(struct i2c_adaif (msg[i].flags &I2C_M_RD ) {/* read only */ -u8 obuf[3 ], ibuf[1 +msg[i].len]; +u8 obuf[3 ], ibuf[MAX_XFER_SIZE ]; + +if (1 + msg[i].len >sizeof (ibuf)) { +warn ("i2c rd: len=%d is too big!\n" , + msg[i].len); +return -EOPNOTSUPP ; + } obuf[0 ] =0 ; obuf[1 ] = msg[i].len; obuf[2 ] = msg[i].addr;
@@ -172,7 +188,18 @@ static int cxusb_i2c_xfer(struct i2c_ada }else if (i+1 < num && (msg[i+1 ].flags &I2C_M_RD ) && msg[i].addr == msg[i+1 ].addr) {/* write to then read from same address */ -u8 obuf[3 +msg[i].len], ibuf[1 +msg[i+1 ].len]; +u8 obuf[MAX_XFER_SIZE ], ibuf[MAX_XFER_SIZE ]; + +if (3 + msg[i].len >sizeof (obuf)) { +warn ("i2c wr: len=%d is too big!\n" , + msg[i].len); +return -EOPNOTSUPP ; + } +if (1 + msg[i +1 ].len >sizeof (ibuf)) { +warn ("i2c rd: len=%d is too big!\n" , + msg[i +1 ].len); +return -EOPNOTSUPP ; + } obuf[0 ] = msg[i].len; obuf[1 ] = msg[i+1 ].len; obuf[2 ] = msg[i].addr;
@@ -191,7 +218,13 @@ static int cxusb_i2c_xfer(struct i2c_ada i++; }else {/* write only */ -u8 obuf[2 +msg[i].len], ibuf; +u8 obuf[MAX_XFER_SIZE ], ibuf; + +if (2 + msg[i].len >sizeof (obuf)) { +warn ("i2c wr: len=%d is too big!\n" , + msg[i].len); +return -EOPNOTSUPP ; + } obuf[0 ] = msg[i].addr; obuf[1 ] = msg[i].len;memcpy (&obuf[2 ], msg[i].buf, msg[i].len);
Greg Kroah-Hartman
maintainerPATCH 146/173 media: av7110_hw: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 5bf30b3bc4ff80ef71a733a1f459cca4fa507892 upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
drivers/media/pci/ttpci/av7110_hw.c:510:1: warning: 'av7110_fw_cmd' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer.
In the specific case of this driver, the maximum fw command size
is 6 + 2, as checked using:
$ git grep -A1 av7110_fw_cmd drivers/media/pci/ttpci/ So, use 8 for the buffer size.
--- drivers/media/pci/ttpci/av7110_hw.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/media/pci/ttpci/av7110_hw.c +17 -2
@@ -22,7 +22,7 @@* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Or, point your browser to http://www.gnu.org/copyleft/gpl.html * -* the project's page is at http://www.linuxtv.org/ +* the project's page is at http://www.linuxtv.org/ */ /* for debugging ARM communication: */
@@ -40,6 +40,14 @@#define _NOHANDSHAKE +/* +* Max transfer size done by av7110_fw_cmd() +* +* The maximum size passed to this function is 6 bytes. The buffer also +* uses two additional ones for type and size. So, 8 bytes is enough. +*/ +#define MAX_XFER_SIZE 8 +/**************************************************************************** * DEBI functions ****************************************************************************/
@@ -488,11 +496,18 @@ static int av7110_send_fw_cmd(struct av7int av7110_fw_cmd (struct av7110 *av7110,int type,int com,int num, ...) {va_list args; -u16 buf[num +2 ]; +u16 buf[MAX_XFER_SIZE ];int i, ret;// dprintk(4, "%p\n", av7110); +if (2 + num >sizeof (buf)) { +printk (KERN_WARNING +"%s: %s len=%d is too big!\n" , +KBUILD_MODNAME , __func__, num); +return -EINVAL ; + } + buf[0 ] = ((type <<8 ) | com); buf[1 ] = num;
Greg Kroah-Hartman
maintainerPATCH 147/173 media: cimax2: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 278ba83a3a1932805be726bdd7dfb3156286d33a upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
drivers/media/pci/cx23885/cimax2.c:149:1: warning: 'netup_write_i2c' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer. Considering that I2C
transfers are generally limited, and that devices used on USB has a
max data length of 64 bytes for the control URBs.
So, it seem safe to use 64 bytes as the hard limit for all those devices.
On most cases, the limit is a way lower than that, but this limit
is small enough to not affect the Kernel stack, and it is a no brain
limit, as using smaller ones would require to either carefully each
driver or to take a look on each datasheet.
--- drivers/media/pci/cx23885/cimax2.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/media/pci/cx23885/cimax2.c +12 -1
@@ -26,6 +26,10 @@#include "cx23885.h" #include "cimax2.h" #include "dvb_ca_en50221.h" + +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +/**** Bit definitions for MC417_RWD and MC417_OEN registers *** bits 31-16 +-----------+
@@ -125,7 +129,7 @@ static int netup_write_i2c(struct i2c_ad u8 *buf, int len) { int ret; -u8 buffer[len +1 ]; +u8 buffer[MAX_XFER_SIZE ]; struct i2c_msg msg = { .addr = addr,
@@ -134,6 +138,13 @@ static int netup_write_i2c(struct i2c_ad .len = len + 1 }; +if (1 + len >sizeof (buffer)) { +printk (KERN_WARNING +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + buffer[0 ] = reg;memcpy (&buffer[1 ], buf, len);
Greg Kroah-Hartman
maintainerPATCH 148/173 media: cx18: struct i2c_client is too big for stack
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 1d212cf0c2d89adf3d0a6d62d729076f49f087dc upstream.
drivers/media/pci/cx18/cx18-driver.c: In function 'cx18_read_eeprom': drivers/media/pci/cx18/cx18-driver.c:357:1: warning: the frame size of 1072 bytes is larger than 1024 bytes [-Wframe-larger-than=]
That happens because the routine allocates 256 bytes for an eeprom buffer, plus the size of struct i2c_client, with is big.
Change the logic to dynamically allocate/deallocate space for struct i2c_client, instead of using the stack.
--- drivers/media/pci/cx18/cx18-driver.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/media/pci/cx18/cx18-driver.c +12 -8
@@ -324,23 +324,24 @@ static void cx18_eeprom_dump(struct cx18/* Hauppauge card? get values from tveeprom */ void cx18_read_eeprom (struct cx18 *cx,struct tveeprom *tv) { -struct i2c_client c; +struct i2c_client *c;u8 eedata[256 ]; -memset (&c,0 ,sizeof (c)); -strlcpy (c.name,"cx18 tveeprom tmp" ,sizeof (c.name)); - c.adapter = &cx->i2c_adap[0 ]; - c.addr =0xA0 >>1 ; + c =kzalloc (sizeof (*c),GFP_KERNEL ); + +strlcpy (c->name,"cx18 tveeprom tmp" ,sizeof (c->name)); + c->adapter = &cx->i2c_adap[0 ]; + c->addr =0xa0 >>1 ;memset (tv,0 ,sizeof (*tv)); -if (tveeprom_read (&c, eedata,sizeof (eedata))) -return ; +if (tveeprom_read (c, eedata,sizeof (eedata))) + goto ret;switch (cx->card->type) {case CX18_CARD_HVR_1600_ESMT :case CX18_CARD_HVR_1600_SAMSUNG :case CX18_CARD_HVR_1600_S5H1411 : -tveeprom_hauppauge_analog (&c, tv, eedata); +tveeprom_hauppauge_analog (c, tv, eedata);break ;case CX18_CARD_YUAN_MPC718 :case CX18_CARD_GOTVIEW_PCI_DVD3 :
@@ -354,6 +355,9 @@ void cx18_read_eeprom(struct cx18 *cx, scx18_eeprom_dump (cx, eedata,sizeof (eedata));break ; } + +ret: +kfree (c); }static void cx18_process_eeprom (struct cx18 *cx)
Greg Kroah-Hartman
maintainerPATCH 149/173 media: lirc_zilog: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit ac5b4b6bf0c84c48d7e2e3fce22e35b04282ba76 upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
ompilation complains about it on some archs:
drivers/staging/media/lirc/lirc_zilog.c:967:1: warning: 'read' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer to be 64. That should
be more than enough.
--- drivers/staging/media/lirc/lirc_zilog.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/staging/media/lirc/lirc_zilog.c +11 -1
@@ -61,6 +61,9 @@#include <media/lirc_dev.h> #include <media/lirc.h> +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +struct IR ;struct IR_rx {
@@ -941,7 +944,14 @@ static ssize_t read(struct file *filep,schedule ();set_current_state (TASK_INTERRUPTIBLE ); }else { -unsigned char buf[rbuf->chunk_size]; +unsigned char buf[MAX_XFER_SIZE ]; + +if (rbuf->chunk_size >sizeof (buf)) { +zilog_error ("chunk_size is too big (%d)!\n" , + rbuf->chunk_size); + ret = -EINVAL ; +break ; + } m =lirc_buffer_read (rbuf, buf);if (m == rbuf->chunk_size) { ret = copy_to_user((void *)outbuf+written, buf,
Greg Kroah-Hartman
maintainerPATCH 150/173 media: tuner-xc2028: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 56ac033725ec93a45170caf3979eb2b1211a59a8 upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
drivers/media/tuners/tuner-xc2028.c:651:1: warning: 'load_firmware' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer.
In the specific case of this driver, the maximum limit is 80, used only
on tm6000 driver. This limit is due to the size of the USB control URBs.
Ok, it would be theoretically possible to use a bigger size on PCI
devices, but the firmware load time is already good enough. Anyway,
if some usage requires more, it is just a matter of also increasing
the buffer size at load_firmware().
--- drivers/media/tuners/tuner-xc2028.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/media/tuners/tuner-xc2028.c +7 -1
@@ -24,6 +24,9 @@#include <linux/dvb/frontend.h> #include "dvb_frontend.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 80 +/* Registers (Write-only) */ #define XREG_INIT 0x00#define XREG_RF_FREQ 0x02
@@ -547,7 +550,10 @@ static int load_firmware(struct dvb_fron {struct xc2028_data *priv = fe->tuner_priv;int pos, rc; -unsigned char *p, *endp, buf[priv->ctrl.max_len]; +unsigned char *p, *endp, buf[MAX_XFER_SIZE ]; + +if (priv->ctrl.max_len >sizeof (buf)) + priv->ctrl.max_len =sizeof (buf);tuner_dbg ("%s called\n" , __func__);
Greg Kroah-Hartman
maintainerPATCH 151/173 media: tuners: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit f1baab870f6e93b668af7b34d6f6ba49f1b0e982 upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
drivers/media/tuners/e4000.c:50:1: warning: 'e4000_wr_regs' uses dynamic stack allocation [enabled by default] drivers/media/tuners/e4000.c:83:1: warning: 'e4000_rd_regs' uses dynamic stack allocation [enabled by default] drivers/media/tuners/fc2580.c:66:1: warning: 'fc2580_wr_regs.constprop.1' uses dynamic stack allocation [enabled by default] drivers/media/tuners/fc2580.c:98:1: warning: 'fc2580_rd_regs.constprop.0' uses dynamic stack allocation [enabled by default] drivers/media/tuners/tda18212.c:57:1: warning: 'tda18212_wr_regs' uses dynamic stack allocation [enabled by default] drivers/media/tuners/tda18212.c:90:1: warning: 'tda18212_rd_regs.constprop.0' uses dynamic stack allocation [enabled by default] drivers/media/tuners/tda18218.c:60:1: warning: 'tda18218_wr_regs' uses dynamic stack allocation [enabled by default] drivers/media/tuners/tda18218.c:92:1: warning: 'tda18218_rd_regs.constprop.0' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer. Considering that I2C
transfers are generally limited, and that devices used on USB has a
max data length of 64 bytes for the control URBs.
So, it seem safe to use 64 bytes as the hard limit for all those devices.
On most cases, the limit is a way lower than that, but this limit
is small enough to not affect the Kernel stack, and it is a no brain
limit, as using smaller ones would require to either carefully each
driver or to take a look on each datasheet.
--- drivers/media/tuners/e4000.c | 25 +++++++++++++++++++++---- drivers/media/tuners/fc2580.c | 25 +++++++++++++++++++++---- drivers/media/tuners/tda18212.c | 25 +++++++++++++++++++++---- drivers/media/tuners/tda18218.c | 23 ++++++++++++++++++++--- 4 files changed, 83 insertions(+), 15 deletions(-)
drivers/media/tuners/e4000.c +21 -4
@@ -20,20 +20,30 @@#include "e4000_priv.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +/* write multiple registers */ static int e4000_wr_regs (struct e4000_priv *priv,u8 reg,u8 *val,int len) {int ret; -u8 buf[1 + len]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[1 ] = { { .addr = priv->cfg->i2c_addr, .flags =0 , - .len =sizeof (buf), + .len =1 + len, .buf = buf, } }; +if (1 + len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + buf[0 ] = reg;memcpy (&buf[1 ], val, len);
@@ -52,7 +62,7 @@ static int e4000_wr_regs(struct e4000_prstatic int e4000_rd_regs (struct e4000_priv *priv,u8 reg,u8 *val,int len) {int ret; -u8 buf[len]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[2 ] = { { .addr = priv->cfg->i2c_addr,
@@ -62,11 +72,18 @@ static int e4000_rd_regs(struct e4000_pr }, { .addr = priv->cfg->i2c_addr, .flags = I2C_M_RD, - .len = sizeof(buf), + .len = len, .buf = buf, } }; +if (len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c rd reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + ret =i2c_transfer (priv->i2c, msg,2 );if (ret ==2 ) {memcpy (val, buf, len);
drivers/media/tuners/fc2580.c +21 -4
@@ -20,6 +20,9 @@#include "fc2580_priv.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +/* * TODO: * I2C write and read works only for one single register. Multiple registers
@@ -41,16 +44,23 @@static int fc2580_wr_regs (struct fc2580_priv *priv,u8 reg,u8 *val,int len) {int ret; -u8 buf[1 + len]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[1 ] = { { .addr = priv->cfg->i2c_addr, .flags =0 , - .len =sizeof (buf), + .len =1 + len, .buf = buf, } }; +if (1 + len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + buf[0 ] = reg;memcpy (&buf[1 ], val, len);
@@ -69,7 +79,7 @@ static int fc2580_wr_regs(struct fc2580_static int fc2580_rd_regs (struct fc2580_priv *priv,u8 reg,u8 *val,int len) {int ret; -u8 buf[len]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[2 ] = { { .addr = priv->cfg->i2c_addr,
@@ -79,11 +89,18 @@ static int fc2580_rd_regs(struct fc2580_ }, { .addr = priv->cfg->i2c_addr, .flags = I2C_M_RD, - .len = sizeof(buf), + .len = len, .buf = buf, } }; +if (len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c rd reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + ret =i2c_transfer (priv->i2c, msg,2 );if (ret ==2 ) {memcpy (val, buf, len);
drivers/media/tuners/tda18212.c +21 -4
@@ -20,6 +20,9 @@#include "tda18212.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +struct tda18212_priv {struct tda18212_config *cfg;struct i2c_adapter *i2c;
@@ -32,16 +35,23 @@ static int tda18212_wr_regs(struct tda18 int len) {int ret; -u8 buf[len+1 ]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[1 ] = { { .addr = priv->cfg->i2c_address, .flags =0 , - .len =sizeof (buf), + .len =1 + len, .buf = buf, } }; +if (1 + len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + buf[0 ] = reg;memcpy (&buf[1 ], val, len);
@@ -61,7 +71,7 @@ static int tda18212_rd_regs(struct tda18 int len) {int ret; -u8 buf[len]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[2 ] = { { .addr = priv->cfg->i2c_address,
@@ -71,11 +81,18 @@ static int tda18212_rd_regs(struct tda18 }, { .addr = priv->cfg->i2c_address, .flags = I2C_M_RD, - .len = sizeof(buf), + .len = len, .buf = buf, } }; +if (len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c rd reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + ret =i2c_transfer (priv->i2c, msg,2 );if (ret ==2 ) {memcpy (val, buf, len);
drivers/media/tuners/tda18218.c +20 -3
@@ -20,11 +20,14 @@#include "tda18218_priv.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +/* write multiple registers */ static int tda18218_wr_regs (struct tda18218_priv *priv,u8 reg,u8 *val,u8 len) {int ret =0 , len2, remaining; -u8 buf[1 + len]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[1 ] = { { .addr = priv->cfg->i2c_address,
@@ -33,6 +36,13 @@ static int tda18218_wr_regs(struct tda18 } }; +if (1 + len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } +for (remaining = len; remaining >0 ; remaining -= (priv->cfg->i2c_wr_max -1 )) { len2 = remaining;
@@ -63,7 +73,7 @@ static int tda18218_wr_regs(struct tda18static int tda18218_rd_regs (struct tda18218_priv *priv,u8 reg,u8 *val,u8 len) {int ret; -u8 buf[reg+len];/* we must start read always from reg 0x00 */ +u8 buf[MAX_XFER_SIZE ];/* we must start read always from reg 0x00 */ struct i2c_msg msg[2 ] = { { .addr = priv->cfg->i2c_address,
@@ -73,11 +83,18 @@ static int tda18218_rd_regs(struct tda18 }, { .addr = priv->cfg->i2c_address, .flags = I2C_M_RD, - .len = sizeof(buf), + .len = reg + len, .buf = buf, } }; +if (reg + len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + ret =i2c_transfer (priv->i2c, msg,2 );if (ret ==2 ) {memcpy (val, &buf[reg], len);
Greg Kroah-Hartman
maintainerPATCH 152/173 media: stv090x: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit f7a35df15b1f7de7823946aebc9164854e66ea07 upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and compilation complains about it on some archs:
drivers/media/dvb-frontends/stv090x.c:750:1: warning: 'stv090x_write_regs.constprop.6' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer. Considering that I2C transfers are generally limited, and that devices used on USB has a
max data length of 64 bytes for the control URBs.
So, it seem safe to use 64 bytes as the hard limit for all those devices.
On most cases, the limit is a way lower than that, but this limit
is small enough to not affect the Kernel stack, and it is a no brain limit, as using smaller ones would require to either carefully each driver or to take a look on each datasheet.
--- drivers/media/dvb-frontends/stv090x.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/media/dvb-frontends/stv090x.c +11 -1
@@ -35,6 +35,9 @@#include "stv090x.h" #include "stv090x_priv.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +static unsigned int verbose;module_param (verbose, int,0644 );
@@ -722,9 +725,16 @@ static int stv090x_write_regs(struct stv {const struct stv090x_config *config = state->config;int ret; -u8 buf[2 + count]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg i2c_msg = { .addr = config->address, .flags =0 , .buf = buf, .len =2 + count }; +if (2 + count >sizeof (buf)) { +printk (KERN_WARNING +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, count); +return -EINVAL ; + } + buf[0 ] = reg >>8 ; buf[1 ] = reg &0xff ;memcpy (&buf[2 ], data, count);
Greg Kroah-Hartman
maintainerPATCH 153/173 media: stv0367: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 9aca4fb0571ce9cfef680ceb08d19dd008015307 upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
drivers/media/dvb-frontends/stv0367.c:791:1: warning: 'stv0367_writeregs.constprop.4' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer. Considering that I2C
transfers are generally limited, and that devices used on USB has a
max data length of 64 bytes for the control URBs.
So, it seem safe to use 64 bytes as the hard limit for all those devices.
On most cases, the limit is a way lower than that, but this limit
is small enough to not affect the Kernel stack, and it is a no brain
limit, as using smaller ones would require to either carefully each
driver or to take a look on each datasheet.
--- drivers/media/dvb-frontends/stv0367.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/media/dvb-frontends/stv0367.c +12 -1
@@ -33,6 +33,9 @@#include "stv0367_regs.h" #include "stv0367_priv.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +static int stvdebug;module_param_named (debug, stvdebug, int,0644 );
@@ -767,7 +770,7 @@ static struct st_register def0367cab[STVstatic int stv0367_writeregs (struct stv0367_state *state,u16 reg,u8 *data,int len) { -u8 buf[len +2 ]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg = { .addr = state->config->demod_address, .flags =0 ,
@@ -776,6 +779,14 @@ int stv0367_writeregs(struct stv0367_sta };int ret; +if (2 + len >sizeof (buf)) { +printk (KERN_WARNING +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + + buf[0 ] =MSB (reg); buf[1 ] =LSB (reg);memcpy (buf +2 , data, len);
Greg Kroah-Hartman
maintainerPATCH 154/173 media: stb0899_drv: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit ba4746423488aafa435739c32bfe0758f3dd5d77 upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
drivers/media/dvb-frontends/stb0899_drv.c:540:1: warning: 'stb0899_write_regs' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer. Considering that I2C
transfers are generally limited, and that devices used on USB has a
max data length of 64 bytes for the control URBs.
So, it seem safe to use 64 bytes as the hard limit for all those devices.
On most cases, the limit is a way lower than that, but this limit
is small enough to not affect the Kernel stack, and it is a no brain
limit, as using smaller ones would require to either carefully each
driver or to take a look on each datasheet.
--- drivers/media/dvb-frontends/stb0899_drv.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/media/dvb-frontends/stb0899_drv.c +11 -1
@@ -32,6 +32,9 @@#include "stb0899_priv.h" #include "stb0899_reg.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +static unsigned int verbose =0 ;//1; module_param (verbose, int,0644 );
@@ -499,7 +502,7 @@ err:int stb0899_write_regs (struct stb0899_state *state,unsigned int reg,u8 *data,u32 count) {int ret; -u8 buf[2 + count]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg i2c_msg = { .addr = state->config->demod_address, .flags =0 ,
@@ -507,6 +510,13 @@ int stb0899_write_regs(struct stb0899_st .len = 2 + count }; +if (2 + count >sizeof (buf)) { +printk (KERN_WARNING +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, count); +return -EINVAL ; + } + buf[0 ] = reg >>8 ; buf[1 ] = reg &0xff ;memcpy (&buf[2 ], data, count);
Greg Kroah-Hartman
maintainerPATCH 155/173 media: dvb-frontends: Dont use dynamic static allocation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 37ebaf6891ee81687bb558e8375c0712d8264ed8 upstream.
Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
drivers/media/dvb-frontends/af9013.c:77:1: warning: 'af9013_wr_regs_i2c' uses dynamic stack allocation [enabled by default] drivers/media/dvb-frontends/af9033.c:188:1: warning: 'af9033_wr_reg_val_tab' uses dynamic stack allocation [enabled by default] drivers/media/dvb-frontends/af9033.c:68:1: warning: 'af9033_wr_regs' uses dynamic stack allocation [enabled by default] drivers/media/dvb-frontends/bcm3510.c:230:1: warning: 'bcm3510_do_hab_cmd' uses dynamic stack allocation [enabled by default] drivers/media/dvb-frontends/cxd2820r_core.c:84:1: warning: 'cxd2820r_rd_regs_i2c.isra.1' uses dynamic stack allocation [enabled by default] drivers/media/dvb-frontends/rtl2830.c:56:1: warning: 'rtl2830_wr' uses dynamic stack allocation [enabled by default] drivers/media/dvb-frontends/rtl2832.c:187:1: warning: 'rtl2832_wr' uses dynamic stack allocation [enabled by default] drivers/media/dvb-frontends/tda10071.c:52:1: warning: 'tda10071_wr_regs' uses dynamic stack allocation [enabled by default] drivers/media/dvb-frontends/tda10071.c:84:1: warning: 'tda10071_rd_regs' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer. Considering that I2C
transfers are generally limited, and that devices used on USB has a
max data length of 64 bytes for the control URBs.
So, it seem safe to use 64 bytes as the hard limit for all those devices.
On most cases, the limit is a way lower than that, but this limit
is small enough to not affect the Kernel stack, and it is a no brain
limit, as using smaller ones would require to either carefully each
driver or to take a look on each datasheet.
--- drivers/media/dvb-frontends/af9013.c | 14 ++++++++++++-- drivers/media/dvb-frontends/af9033.c | 23 ++++++++++++++++++++--- drivers/media/dvb-frontends/cxd2820r_core.c | 21 +++++++++++++++++++-- drivers/media/dvb-frontends/rtl2830.c | 14 ++++++++++++-- drivers/media/dvb-frontends/rtl2832.c | 14 ++++++++++++-- drivers/media/dvb-frontends/tda10071.c | 25 +++++++++++++++++++++---- 6 files changed, 96 insertions(+), 15 deletions(-)
drivers/media/dvb-frontends/af9013.c +12 -2
@@ -24,6 +24,9 @@#include "af9013_priv.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +struct af9013_state {struct i2c_adapter *i2c;struct dvb_frontend fe;
@@ -50,16 +53,23 @@ static int af9013_wr_regs_i2c(struct af9 const u8 *val, int len) { int ret; -u8 buf[3 +len]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[1 ] = { { .addr = priv->config.i2c_addr, .flags =0 , - .len =sizeof (buf), + .len =3 + len, .buf = buf, } }; +if (3 + len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + buf[0 ] = (reg >>8 ) &0xff ; buf[1 ] = (reg >>0 ) &0xff ; buf[2 ] = mbox;
drivers/media/dvb-frontends/af9033.c +20 -3
@@ -21,6 +21,9 @@#include "af9033_priv.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +struct af9033_state {struct i2c_adapter *i2c;struct dvb_frontend fe;
@@ -40,16 +43,23 @@ static int af9033_wr_regs(struct af9033_ int len) {int ret; -u8 buf[3 + len]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[1 ] = { { .addr = state->cfg.i2c_addr, .flags =0 , - .len =sizeof (buf), + .len =3 + len, .buf = buf, } }; +if (3 + len >sizeof (buf)) { +dev_warn (&state->i2c->dev, +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + buf[0 ] = (reg >>16 ) &0xff ; buf[1 ] = (reg >>8 ) &0xff ; buf[2 ] = (reg >>0 ) &0xff ;
@@ -161,7 +171,14 @@ static int af9033_wr_reg_val_tab(struct const struct reg_val *tab, int tab_len) { int ret, i, j; -u8 buf[tab_len]; +u8 buf[MAX_XFER_SIZE ]; + +if (tab_len >sizeof (buf)) { +dev_warn (&state->i2c->dev, +"%s: i2c wr len=%d is too big!\n" , +KBUILD_MODNAME , tab_len); +return -EINVAL ; + }dev_dbg (&state->i2c->dev,"%s: tab_len=%d\n" , __func__, tab_len);
drivers/media/dvb-frontends/cxd2820r_core.c +19 -2
@@ -21,12 +21,15 @@#include "cxd2820r_priv.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +/* write multiple registers */ static int cxd2820r_wr_regs_i2c (struct cxd2820r_priv *priv,u8 i2c,u8 reg,u8 *val,int len) {int ret; -u8 buf[len+1 ]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[1 ] = { { .addr = i2c,
@@ -36,6 +39,13 @@ static int cxd2820r_wr_regs_i2c(struct c } }; +if (1 + len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + buf[0 ] = reg;memcpy (&buf[1 ], val, len);
@@ -55,7 +65,7 @@ static int cxd2820r_rd_regs_i2c(struct c u8 *val, int len) { int ret; -u8 buf[len]; +u8 buf[MAX_XFER_SIZE ]; struct i2c_msg msg[2] = { { .addr = i2c,
@@ -70,6 +80,13 @@ static int cxd2820r_rd_regs_i2c(struct c } }; +if (len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + ret =i2c_transfer (priv->i2c, msg,2 );if (ret ==2 ) {memcpy (val, buf, len);
drivers/media/dvb-frontends/rtl2830.c +12 -2
@@ -27,20 +27,30 @@#include "rtl2830_priv.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +/* write multiple hardware registers */ static int rtl2830_wr (struct rtl2830_priv *priv,u8 reg,const u8 *val,int len) {int ret; -u8 buf[1 +len]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[1 ] = { { .addr = priv->cfg.i2c_addr, .flags =0 , - .len =1 +len, + .len =1 + len, .buf = buf, } }; +if (1 + len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + buf[0 ] = reg;memcpy (&buf[1 ], val, len);
drivers/media/dvb-frontends/rtl2832.c +12 -2
@@ -22,6 +22,9 @@#include "dvb_math.h" #include <linux/bitops.h> +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +int rtl2832_debug;module_param_named (debug, rtl2832_debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
@@ -162,16 +165,23 @@ static const struct rtl2832_reg_entry restatic int rtl2832_wr (struct rtl2832_priv *priv,u8 reg,u8 *val,int len) {int ret; -u8 buf[1 +len]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[1 ] = { { .addr = priv->cfg.i2c_addr, .flags =0 , - .len =1 +len, + .len =1 + len, .buf = buf, } }; +if (1 + len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + buf[0 ] = reg;memcpy (&buf[1 ], val, len);
drivers/media/dvb-frontends/tda10071.c +21 -4
@@ -20,6 +20,9 @@#include "tda10071_priv.h" +/* Max transfer size done by I2C transfer functions */ +#define MAX_XFER_SIZE 64 +static struct dvb_frontend_ops tda10071_ops;/* write multiple registers */
@@ -27,16 +30,23 @@ static int tda10071_wr_regs(struct tda10 int len) {int ret; -u8 buf[len+1 ]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[1 ] = { { .addr = priv->cfg.demod_i2c_addr, .flags =0 , - .len =sizeof (buf), + .len =1 + len, .buf = buf, } }; +if (1 + len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + buf[0 ] = reg;memcpy (&buf[1 ], val, len);
@@ -56,7 +66,7 @@ static int tda10071_rd_regs(struct tda10 int len) {int ret; -u8 buf[len]; +u8 buf[MAX_XFER_SIZE ];struct i2c_msg msg[2 ] = { { .addr = priv->cfg.demod_i2c_addr,
@@ -66,11 +76,18 @@ static int tda10071_rd_regs(struct tda10 }, { .addr = priv->cfg.demod_i2c_addr, .flags = I2C_M_RD, - .len = sizeof(buf), + .len = len, .buf = buf, } }; +if (len >sizeof (buf)) { +dev_warn (&priv->i2c->dev, +"%s: i2c wr reg=%04x: len=%d is too big!\n" , +KBUILD_MODNAME , reg, len); +return -EINVAL ; + } + ret =i2c_transfer (priv->i2c, msg,2 );if (ret ==2 ) {memcpy (val, buf, len);