Linux 4.4.187
Greg KH
maintainerI'm announcing the release of the 4.4.187 kernel.
All users of the 4.4 kernel series must upgrade.
The updated 4.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm64/crypto/sha1-ce-glue.c | 2 arch/arm64/crypto/sha2-ce-glue.c | 2 arch/arm64/kernel/acpi.c | 10 arch/mips/boot/compressed/Makefile | 2 arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 2 arch/mips/include/asm/mach-ath79/ar933x_uart.h | 4 arch/parisc/kernel/ptrace.c | 28 arch/powerpc/kernel/eeh.c | 15 arch/powerpc/kernel/exceptions-64s.S | 9 arch/powerpc/kernel/pci_of_scan.c | 2 arch/powerpc/kernel/signal_32.c | 3 arch/powerpc/kernel/signal_64.c | 5 arch/powerpc/kernel/swsusp_32.S | 73 arch/powerpc/platforms/powermac/sleep.S | 68 arch/powerpc/sysdev/uic.c | 1 arch/sh/include/asm/io.h | 6 arch/um/include/asm/mmu_context.h | 2 arch/x86/kernel/cpu/bugs.c | 2 arch/x86/kernel/cpu/mkcapflags.sh | 2 arch/x86/kernel/sysfb_efi.c | 46 arch/x86/kvm/pmu.c | 4 block/compat_ioctl.c | 340 ---- crypto/ghash-generic.c | 8 drivers/base/regmap/regmap.c | 2 drivers/block/floppy.c | 362 ++++ drivers/bluetooth/hci_ath.c | 3 drivers/bluetooth/hci_bcm.c | 3 drivers/bluetooth/hci_bcsp.c | 5 drivers/bluetooth/hci_intel.c | 3 drivers/bluetooth/hci_ldisc.c | 9 drivers/bluetooth/hci_uart.h | 1 drivers/char/hpet.c | 3 drivers/crypto/talitos.c | 4 drivers/dma/imx-sdma.c | 48 drivers/edac/edac_mc_sysfs.c | 24 drivers/edac/edac_module.h | 2 drivers/gpio/gpio-omap.c | 17 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c | 20 drivers/gpu/drm/panel/panel-simple.c | 9 drivers/gpu/drm/virtio/virtgpu_ioctl.c | 3 drivers/gpu/drm/virtio/virtgpu_vq.c | 2 drivers/gpu/ipu-v3/ipu-ic.c | 2 drivers/hwtracing/intel_th/msu.c | 2 drivers/input/tablet/gtco.c | 20 drivers/isdn/hardware/mISDN/hfcsusb.c | 3 drivers/mailbox/mailbox.c | 6 drivers/md/bcache/super.c | 2 drivers/md/dm-bufio.c | 4 drivers/media/dvb-frontends/tua6100.c | 22 drivers/media/i2c/Makefile | 2 drivers/media/i2c/adv7511-v4l2.c | 1600 +++++++++++++++++++ drivers/media/i2c/adv7511.c | 1595 ------------------ drivers/media/platform/coda/coda-bit.c | 9 drivers/media/platform/davinci/vpss.c | 5 drivers/media/platform/marvell-ccic/mcam-core.c | 5 drivers/media/radio/radio-raremono.c | 30 drivers/media/radio/wl128x/fmdrv_v4l2.c | 3 drivers/media/usb/cpia2/cpia2_usb.c | 3 drivers/media/usb/dvb-usb/dvb-usb-init.c | 7 drivers/media/v4l2-core/v4l2-ctrls.c | 9 drivers/memstick/core/memstick.c | 13 drivers/mfd/arizona-core.c | 2 drivers/mfd/mfd-core.c | 1 drivers/net/bonding/bond_main.c | 37 drivers/net/caif/caif_hsi.c | 2 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 57 drivers/net/ethernet/freescale/fec_main.c | 6 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 3 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 1 drivers/net/ethernet/marvell/sky2.c | 7 drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 6 drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 20 drivers/net/phy/phy_device.c | 6 drivers/net/wireless/ath/ath10k/hw.c | 2 drivers/net/wireless/ath/ath10k/mac.c | 4 drivers/net/wireless/ath/ath6kl/wmi.c | 10 drivers/net/wireless/ath/ath9k/hw.c | 32 drivers/net/wireless/ath/dfs_pattern_detector.c | 2 drivers/net/wireless/mediatek/mt7601u/dma.c | 54 drivers/net/wireless/mediatek/mt7601u/tx.c | 4 drivers/pci/pci-sysfs.c | 2 drivers/pci/pci.c | 7 drivers/phy/phy-rcar-gen2.c | 2 drivers/pinctrl/pinctrl-rockchip.c | 1 drivers/pps/pps.c | 8 drivers/regulator/s2mps11.c | 4 drivers/s390/cio/qdio_main.c | 1 drivers/staging/media/davinci_vpfe/vpfe_video.c | 3 drivers/tty/serial/cpm_uart/cpm_uart_core.c | 17 drivers/tty/serial/digicolor-usart.c | 6 drivers/tty/serial/max310x.c | 51 drivers/tty/serial/msm_serial.c | 4 drivers/tty/serial/sh-sci.c | 22 drivers/usb/core/hub.c | 35 drivers/usb/gadget/function/f_fs.c | 6 drivers/usb/host/hwa-hc.c | 2 drivers/usb/host/pci-quirks.c | 31 drivers/vhost/net.c | 2 fs/9p/vfs_addr.c | 6 fs/ceph/caps.c | 7 fs/coda/file.c | 69 fs/ecryptfs/crypto.c | 12 fs/exec.c | 2 fs/f2fs/segment.c | 5 fs/nfs/inode.c | 1 fs/nfs/nfs4file.c | 2 fs/nfs/nfs4proc.c | 41 fs/nfsd/nfs4state.c | 11 fs/nfsd/nfssvc.c | 2 fs/open.c | 19 include/linux/cred.h | 7 include/linux/elevator.h | 2 include/linux/rcupdate.h | 2 include/linux/sched.h | 4 include/net/tcp.h | 11 kernel/bpf/Makefile | 1 kernel/cred.c | 21 kernel/fork.c | 2 kernel/locking/lockdep.c | 18 kernel/locking/lockdep_proc.c | 8 kernel/padata.c | 12 kernel/pid_namespace.c | 2 kernel/sched/fair.c | 24 kernel/time/ntp.c | 4 kernel/time/timer_list.c | 36 kernel/trace/trace.c | 12 lib/reed_solomon/decode_rs.c | 18 lib/scatterlist.c | 9 mm/kmemleak.c | 2 mm/mmu_notifier.c | 2 mm/vmstat.c | 80 net/9p/trans_virtio.c | 8 net/batman-adv/translation-table.c | 2 net/bluetooth/6lowpan.c | 14 net/bluetooth/hci_event.c | 5 net/bluetooth/l2cap_core.c | 15 net/bluetooth/smp.c | 13 net/bridge/br_multicast.c | 32 net/bridge/br_stp_bpdu.c | 3 net/core/neighbour.c | 2 net/ipv4/devinet.c | 8 net/ipv4/tcp.c | 2 net/ipv6/ip6mr.c | 11 net/key/af_key.c | 8 net/netrom/af_netrom.c | 4 net/nfc/nci/data.c | 2 net/xfrm/xfrm_user.c | 19 scripts/kallsyms.c | 3 scripts/recordmcount.h | 3 sound/core/seq/seq_clientmgr.c | 11 sound/pci/hda/patch_conexant.c | 1 sound/usb/line6/podhd.c | 2 tools/iio/iio_utils.c | 4 tools/perf/tests/mmap-thread-lookup.c | 2 tools/perf/tests/parse-events.c | 27 tools/perf/util/evsel.c | 8 tools/power/cpupower/utils/cpufreq-set.c | 2 159 files changed, 3245 insertions(+), 2383 deletions(-)
Abhishek Goel (1):
cpupower : frequency-set -r option misses the last cpu in related cpu list
Al Viro (1):
take floppy compat ioctls to sodding floppy.c
Alexander Shishkin (1):
intel_th: msu: Fix single mode with disabled IOMMU
Alexey Kardashevskiy (1):
powerpc/pci/of: Fix OF flags parsing for 64bit BARs
Anders Roxell (1):
media: i2c: fix warning same module names
Andrzej Pietrasiewicz (1):
usb: gadget: Zero ffs_io_data
Anilkumar Kolli (1):
ath: DFS JP domain W56 fixed pulse type 3 RADAR detection
Anirudh Gupta (1):
xfrm: Fix xfrm sel prefix length validation
Ard Biesheuvel (1):
acpi/arm64: ignore 5.1 FADTs that are reported as 5.0
Arnaldo Carvalho de Melo (1):
perf evsel: Make perf_evsel__name() accept a NULL argument
Arnd Bergmann (2):
mfd: arizona: Fix undefined behavior locking/lockdep: Hide unused 'class' variable
Bastien Nocera (1):
iio: iio-utils: Fix possible incorrect mask calculation
Boris Brezillon (1):
media: v4l2: Test type instead of cfg->type in v4l2_ctrl_new_custom()
Brian King (1):
bnx2x: Prevent load reordering in tx completion processing
Christian Lamparter (1):
powerpc/4xx/uic: clear pending interrupt after irq type/pol change
Christoph Hellwig (1):
9p: pass the correct prototype to read_cache_page
Christoph Lameter (1):
vmstat: Remove BUG_ON from vmstat_update
Christoph Paasch (1):
tcp: Reset bytes_acked and bytes_received when disconnecting
Christophe Leroy (4):
crypto: talitos - fix skcipher failure due to wrong output IV lib/scatterlist: Fix mapping iterator when sg->offset is greater than PAGE_SIZE powerpc/32s: fix suspend/resume when IBATs 4-7 are used
tty: serial: cpm_uart - fix init when SMC is relocated
Coly Li (1):
bcache: check c->gc_thread by IS_ERR_OR_NULL in cache_set_flush()
Cong Wang (3):
netrom: fix a memory leak in nr_rx_frame()
netrom: hold sock when setting skb->destructor
bonding: validate ip header before check IPPROTO_IGMP
Dan Carpenter (2):
ath6kl: add some bounds checking
eCryptfs: fix a couple type promotion bugs
Daniel Jordan (1):
padata: use smp_mb in padata_reorder to avoid orphaned padata jobs
David Riley (1):
drm/virtio: Add memory barriers for capset cache.
David S. Miller (1):
tua6100: Avoid build warnings.
Denis Efremov (4):
floppy: fix div-by-zero in setup_format_params
floppy: fix out-of-bounds read in next_valid_format
floppy: fix invalid pointer dereference in drive_name
floppy: fix out-of-bounds read in copy_buffer
Dmitry Vyukov (1):
mm/kmemleak.c: fix check for softirq context
Eiichi Tsukata (2):
EDAC: Fix global-out-of-bounds write when setting edac_mc_poll_msec tracing/snapshot: Resize spare buffer if size changed
Elena Petrova (2):
crypto: arm64/sha1-ce - correct digest for empty data in finup
crypto: arm64/sha2-ce - correct digest for empty data in finup
Eric Biggers (2):
crypto: ghash - fix unaligned memory access in ghash_setkey()
elevator: fix truncation of icq_cache_name
Eric W. Biederman (1):
signal/pid_namespace: Fix reboot_pid_ns to use send_sig not force_sig
Ezequiel Garcia (1):
media: coda: Remove unbalanced and unneeded mutex unlock
Fabio Estevam (1):
net: fec: Do not use netdev messages too early
Ferdinand Blomqvist (2):
rslib: Fix decoding of shortened codes
rslib: Fix handling of of caller provided syndrome
Geert Uytterhoeven (1):
serial: sh-sci: Fix TX DMA buffer flushing and workqueue races
Grant Hernandez (1):
Input: gtco - bounds check collection indent level
Greg Kroah-Hartman (1):
Linux 4.4.187
Hans de Goede (1):
x86/sysfb_efi: Add quirks for some devices with swapped width and height
Helge Deller (1):
parisc: Fix kernel panic due invalid values in IAOQ0 or IAOQ1
Hui Wang (1):
ALSA: hda - Add a conexant codec entry to let mute led work
Imre Deak (1):
locking/lockdep: Fix merging of hlocks with non-zero references
Ioana Ciornei (1):
net: phy: Check against net_device being NULL
J. Bruce Fields (3):
nfsd: increase DRC cache limit
nfsd: give out fewer session slots as limit approaches
nfsd: fix performance-limiting session calculation
Jan Harkes (1):
coda: pass the host file in vma->vm_file on mmap
Jann Horn (1):
sched/fair: Don't free p->numa_faults with concurrent readers
Jason Wang (1):
vhost_net: disable zerocopy by default
Jean-Philippe Brucker (1):
mm/mmu_notifier: use hlist_add_head_rcu()
Jeremy Sowden (2):
batman-adv: fix for leaked TVLV handler.
af_key: fix leaks in key_pol_get_resp and dump_sp.
Johannes Berg (1):
um: Silence lockdep complaint about mmap_sem
Jorge Ramirez-Ortiz (1):
tty: serial: msm_serial: avoid system lockup condition
Jose Abreu (1):
net: stmmac: dwmac1000: Clear unused address entries
Josua Mayer (1):
Bluetooth: 6lowpan: search for destination address in all peers
Julian Wiedmann (1):
s390/qdio: handle PENDING state for QEBSM devices
Junxiao Bi (1):
dm bufio: fix deadlock with loop device
Justin Chen (1):
net: bcmgenet: use promisc for unsupported filters
Kai-Heng Feng (1):
ALSA: line6: Fix wrong altsetting for LINE6_PODHD500_1
Kangjie Lu (1):
media: vpss: fix a potential NULL pointer dereference
Kefeng Wang (3):
media: wl128x: Fix some error handling in fm_v4l2_init_video_device() tty/serial: digicolor: Fix digicolor-usart already registered warning
hpet: Fix division by zero in hpet_time_div()
Kevin Darbyshire-Bryant (1):
MIPS: fix build on non-linux hosts
Krzysztof Kozlowski (1):
regulator: s2mps11: Fix buck7 and buck8 wrong voltages
Lee, Chiasheng (1):
usb: Handle USB3 remote wakeup for LPM enabled devices correctly
Like Xu (1):
KVM: x86/vPMU: refine kvm_pmu err msg when event creation failed
Linus Torvalds (1):
access: avoid the RCU grace period for the temporary subjective credentials
Lorenzo Bianconi (3):
mt7601u: do not schedule rx_tasklet when the device has been disconnected
mt7601u: fix possible memory leak when the device is disconnected
net: neigh: fix multiple neigh timer scheduling
Lubomir Rintel (1):
media: marvell-ccic: fix DMA s/g desc number calculation
Luke Nowakowski-Krijger (1):
media: radio-raremono: change devm_k*alloc to k*alloc
Lyude Paul (1):
drm/nouveau/i2c: Enable i2c pads & busses during preinit
Marek Vasut (1):
PCI: sysfs: Ignore lockdep for remove attribute
Masahiro Yamada (1):
x86/build: Add 'set -e' to mkcapflags.sh to delete broken capflags.c
Matias Karhumaa (1):
Bluetooth: Check state in l2cap_disconnect_rsp
Matteo Croce (1):
ipv4: don't set IPv6 only flags to IPv4 addresses
Mauro S. M. Rodrigues (1):
ixgbe: Check DDM existence in transceiver before access
Miaoqing Pan (1):
ath10k: fix PCIE device wake up failed
Michael Neuling (1):
powerpc/tm: Fix oops on sigreturn on systems without TM
Michal Hocko (1):
mm, vmstat: make quiet_vmstat lighter
Mika Westerberg (1):
PCI: Do not poll for PME if the device is in D3cold
Miroslav Lichvar (2):
ntp: Limit TAI-UTC offset
drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl
Nathan Huckleberry (1):
timer_list: Guard procfs specific code
Naveen N. Rao (1):
recordmcount: Fix spurious mcount entries on powerpc
Nicolas Dichtel (1):
xfrm: fix sa selector validation
Nikolay Aleksandrov (3):
net: bridge: mcast: fix stale nsrcs pointer in igmp3/mld2 report handling
net: bridge: mcast: fix stale ipv6 hdr pointer when handling v6 query
net: bridge: stp: don't cache eth dest pointer before skb pull
Numfor Mbiziwo-Tiapo (1):
perf test mmap-thread-lookup: Initialize variable to suppress memory sanitizer warning
Ocean Chen (1):
f2fs: avoid out-of-range memory access
Oliver Neukum (2):
media: dvb: usb: fix use after free in dvb_usb_device_exit
media: cpia2_usb: first wake up, then free in disconnect
Oliver O'Halloran (1):
powerpc/eeh: Handle hugepages in ioremap space
Pan Bian (1):
EDAC/sysfs: Fix memory leak when creating a csrow object
Paul Menzel (1):
nfsd: Fix overflow causing non-working mounts on 1 TB machines
Peter Ujfalusi (1):
drm/panel: simple: Fix panel_simple_dsi_probe
Philipp Zabel (2):
media: coda: fix mpeg2 sequence number handling
media: coda: increment sequence offset for the last returned frame
Phong Tran (2):
usb: wusbcore: fix unbalanced get/put cluster_id
ISDN: hfcsusb: checking idx of ep configuration
Ravi Bangoria (1):
powerpc/watchpoint: Restore NV GPRs while returning from exception
Robert Hancock (2):
net: axienet: Fix race condition causing TX hang
mfd: core: Set fwnode for created devices
Russell King (2):
gpio: omap: fix lack of irqstatus_raw0 for OMAP4
gpio: omap: ensure irq is enabled before wakeup
Ryan Kennedy (1):
usb: pci-quirks: Correct AMD PLL quirk detection
Sam Ravnborg (1):
sh: prevent warnings when using iounmap
Serge Semin (1):
tty: max310x: Fix invalid baudrate divisors calculator
Shailendra Verma (1):
media: staging: media: davinci_vpfe: - Fix for memory leak if decoder initialization fails.
Soheil Hassas Yeganeh (1):
tcp: reset sk_send_head in tcp_write_queue_purge
Srinivas Kandagatla (1):
regmap: fix bulk writes on paged registers
Stefan Hellermann (1):
MIPS: ath79: fix ar933x uart parity mode
Steve Longerbeam (1):
gpu: ipu-v3: ipu-ic: Fix saturation bit offset in TPMEM
Surabhi Vishnoi (1):
ath10k: Do not send probe response template for mesh
Sven Van Asbroeck (1):
dmaengine: imx-sdma: fix use-after-free on probe error path
Szymon Janc (1):
Bluetooth: Add SMP workaround Microsoft Surface Precision Mouse bug
Taehee Yoo (1):
caif-hsi: fix possible deadlock in cfhsi_exit_module()
Takashi Iwai (2):
ALSA: seq: Break too long mutex context in the write loop
sky2: Disable MSI on ASUS P6T
Thinh Nguyen (1):
usb: core: hub: Disable hub-initiated U1/U2
Thomas Richter (1):
perf test 6: Fix missing kvm module load for s390
Tim Schumacher (1):
ath9k: Check for errors when reading SREV register
Tomas Bortoli (1):
Bluetooth: hci_bcsp: Fix memory leak in rx_skb
Trond Myklebust (2):
NFSv4: Handle the special Linux file open access mode
NFSv4: Fix open create exclusive when the server reboots
Valdis Kletnieks (1):
bpf: silence warning messages in core
Vasily Gorbik (1):
kallsyms: exclude kasan local symbols on s390
Vladis Dronov (1):
Bluetooth: hci_uart: check for missing tty operations
Waiman Long (1):
rcu: Force inlining of rcu_read_lock()
Wang Hai (1):
memstick: Fix error cleanup path of memstick_init
Wen Yang (1):
pinctrl: rockchip: fix leaked of_node references
Xin Long (1):
ipv6: check sk sk_type and protocol early in ip_mroute_set/getsockopt
Yan, Zheng (1):
ceph: hold i_ceph_lock when removing caps for freeing inode
Yang Wei (1):
nfc: fix potential illegal memory access
Yoshihiro Shimoda (1):
phy: renesas: rcar-gen2: Fix memory leak at error paths
YueHaibing (1):
9p/virtio: Add cleanup path in p9_virtio_init
Yuyang Du (1):
locking/lockdep: Fix lock used or unused stats error
Zhenzhong Duan (1):
x86/speculation/mds: Apply more accurate check on hypervisor platform
csonsino (1):
Bluetooth: validate BLE connection interval updates
morten petersen (1):
mailbox: handle failed named mailbox channel request
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 186 +SUBLEVEL = 187 EXTRAVERSION = NAME = Blurry Fish Butt
arch/arm64/crypto/sha1-ce-glue.c +1 -1
@@ -50,7 +50,7 @@ static int sha1_ce_finup(struct shash_desc *desc, const u8 *data, unsigned int len, u8 *out) { struct sha1_ce_state *sctx = shash_desc_ctx(desc); -bool finalize = !sctx->sst.count && !(len %SHA1_BLOCK_SIZE ); +bool finalize = !sctx->sst.count && !(len %SHA1_BLOCK_SIZE ) && len;/* * Allow the asm code to perform the finalization if there is no
arch/arm64/crypto/sha2-ce-glue.c +1 -1
@@ -52,7 +52,7 @@ static int sha256_ce_finup(struct shash_desc *desc, const u8 *data, unsigned int len, u8 *out) { struct sha256_ce_state *sctx = shash_desc_ctx(desc); -bool finalize = !sctx->sst.count && !(len %SHA256_BLOCK_SIZE ); +bool finalize = !sctx->sst.count && !(len %SHA256_BLOCK_SIZE ) && len;/* * Allow the asm code to perform the finalization if there is no
arch/arm64/kernel/acpi.c +7 -3
@@ -141,10 +141,14 @@ static int __init acpi_fadt_sanity_check(void)*/ if (table->revision <5 || (table->revision ==5 && fadt->minor_revision <1 )) { -pr_err ("Unsupported FADT revision %d.%d, should be 5.1+\n" , +pr_err (FW_BUG "Unsupported FADT revision %d.%d, should be 5.1+\n" , table->revision, fadt->minor_revision); - ret = -EINVAL ; - goto out; + +if (!fadt->arm_boot_flags) { + ret = -EINVAL ; + goto out; + } +pr_err ("FADT has ARM boot flags set, assuming 5.1\n" ); }if (!(fadt->flags &ACPI_FADT_HW_REDUCED )) {
arch/mips/boot/compressed/Makefile +2 -0
@@ -66,6 +66,8 @@ OBJCOPYFLAGS_piggy.o := --add-section=.image=$(obj)/vmlinux.bin.z \ $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE $(call if_changed,objcopy) +HOSTCFLAGS_calc_vmlinuz_load_addr.o += $(LINUXINCLUDE) + # Calculate the load address of the compressed kernel image hostprogs-y := calc_vmlinuz_load_addr
arch/mips/boot/compressed/calc_vmlinuz_load_addr.c +1 -1
@@ -13,7 +13,7 @@#include <stdint.h> #include <stdio.h> #include <stdlib.h> -#include "../../../../include/linux/sizes.h" +#include <linux/sizes.h> int main (int argc,char *argv[]) {
arch/mips/include/asm/mach-ath79/ar933x_uart.h +2 -2
@@ -27,8 +27,8 @@#define AR933X_UART_CS_PARITY_S 0#define AR933X_UART_CS_PARITY_M 0x3#define AR933X_UART_CS_PARITY_NONE 0 -#define AR933X_UART_CS_PARITY_ODD 1 -#define AR933X_UART_CS_PARITY_EVEN 2 +#define AR933X_UART_CS_PARITY_ODD 2 +#define AR933X_UART_CS_PARITY_EVEN 3#define AR933X_UART_CS_IF_MODE_S 2#define AR933X_UART_CS_IF_MODE_M 0x3#define AR933X_UART_CS_IF_MODE_NONE 0
arch/parisc/kernel/ptrace.c +18 -10
@@ -156,6 +156,9 @@ long arch_ptrace(struct task_struct *child, long request,if ((addr & (sizeof (unsigned long )-1 )) || addr >=sizeof (struct pt_regs ))break ; +if (addr ==PT_IAOQ0 || addr ==PT_IAOQ1 ) { + data |=3 ;/* ensure userspace privilege */ + } if ((addr >= PT_GR1 && addr <= PT_GR31) || addr == PT_IAOQ0 || addr == PT_IAOQ1 || (addr >= PT_FR0 && addr <= PT_FR31 + 4) ||
@@ -189,16 +192,18 @@ long arch_ptrace(struct task_struct *child, long request,static compat_ulong_t translate_usr_offset (compat_ulong_t offset) { -if (offset <0 ) -return sizeof (struct pt_regs ); -else if (offset <=32 *4 )/* gr[0..31] */ -return offset *2 +4 ; -else if (offset <=32 *4 +32 *8 )/* gr[0..31] + fr[0..31] */ -return offset +32 *4 ; -else if (offset <sizeof (struct pt_regs )/2 +32 *4 ) -return offset *2 +4 -32 *8 ; +compat_ulong_t pos; + +if (offset <32 *4 )/* gr[0..31] */ + pos = offset *2 +4 ; +else if (offset <32 *4 +32 *8 )/* fr[0] ... fr[31] */ + pos = (offset -32 *4 ) +PT_FR0 ; +else if (offset <sizeof (struct pt_regs )/2 +32 *4 )/* sr[0] ... ipsw */ + pos = (offset -32 *4 -32 *8 ) *2 +PT_SR0 +4 ;else -return sizeof (struct pt_regs ); + pos =sizeof (struct pt_regs ); + +return pos; } long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
@@ -242,9 +247,12 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, addr =translate_usr_offset (addr);if (addr >=sizeof (struct pt_regs ))break ; +if (addr ==PT_IAOQ0 +4 || addr ==PT_IAOQ1 +4 ) { + data |=3 ;/* ensure userspace privilege */ + }if (addr >=PT_FR0 && addr <=PT_FR31 +4 ) {/* Special case, fp regs are 64 bits anyway */ - *(__u64 *) ((char *)task_regs (child) + addr) = data; + *(__u32 *) ((char *)task_regs (child) + addr) = data; ret =0 ; } else if ((addr >= PT_GR1+4 && addr <= PT_GR31+4) ||
arch/powerpc/kernel/eeh.c +12 -3
@@ -363,10 +363,19 @@ static inline unsigned long eeh_token_to_phys(unsigned long token) NULL, &hugepage_shift);if (!ptep)return token; -WARN_ON (hugepage_shift); - pa =pte_pfn (*ptep) <<PAGE_SHIFT ; -return pa | (token & (PAGE_SIZE -1 )); + pa =pte_pfn (*ptep); + +/* On radix we can do hugepage mappings for io, so handle that */ +if (hugepage_shift) { + pa <<= hugepage_shift; + pa |= token & ((1ul << hugepage_shift) -1 ); + }else { + pa <<=PAGE_SHIFT ; + pa |= token & (PAGE_SIZE -1 ); + } + +return pa; }/*
arch/powerpc/kernel/exceptions-64s.S +7 -2
@@ -1719,7 +1719,7 @@ handle_page_fault: addi r3,r1,STACK_FRAME_OVERHEAD bl do_page_fault cmpdi r3,0 - beq+ 12f + beq+ ret_from_except_lite bl save_nvgprs mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD
@@ -1734,7 +1734,12 @@ handle_dabr_fault: ld r5,_DSISR(r1) addi r3,r1,STACK_FRAME_OVERHEAD bl do_break -12: b ret_from_except_lite + /* + * do_break() may have changed the NV GPRS while handling a breakpoint. + * If so, we need to restore them with their updated values. Don't use + * ret_from_except_lite here. + */ + b ret_from_except /* We have a page fault that hash_page could handle but HV refused
arch/powerpc/kernel/pci_of_scan.c +2 -0
@@ -45,6 +45,8 @@ static unsigned int pci_parse_of_flags(u32 addr0, int bridge)if (addr0 &0x02000000 ) { flags =IORESOURCE_MEM |PCI_BASE_ADDRESS_SPACE_MEMORY ; flags |= (addr0 >>22 ) &PCI_BASE_ADDRESS_MEM_TYPE_64 ; +if (flags &PCI_BASE_ADDRESS_MEM_TYPE_64 ) + flags |=IORESOURCE_MEM_64 ; flags |= (addr0 >>28 ) &PCI_BASE_ADDRESS_MEM_TYPE_1M ;if (addr0 &0x40000000 ) flags |=IORESOURCE_PREFETCH
arch/powerpc/kernel/signal_32.c +3 -0
@@ -1261,6 +1261,9 @@ long sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8, goto bad;if (MSR_TM_ACTIVE (msr_hi<<32 )) { +/* Trying to start TM on non TM system */ +if (!cpu_has_feature (CPU_FTR_TM )) + goto bad;/* We only recheckpoint on return if we're * transaction. */
arch/powerpc/kernel/signal_64.c +5 -0
@@ -695,6 +695,11 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,if (MSR_TM_ACTIVE (msr)) {/* We recheckpoint on return. */ struct ucontext __user *uc_transact; + +/* Trying to start TM on non TM system */ +if (!cpu_has_feature (CPU_FTR_TM )) + goto badframe; +if (__get_user (uc_transact, &uc->uc_link)) goto badframe; if (restore_tm_sigcontexts(regs, &uc->uc_mcontext,
arch/powerpc/kernel/swsusp_32.S +65 -8
109 lines not on this page · raw message
arch/powerpc/platforms/powermac/sleep.S +63 -5
101 lines not on this page · raw message
arch/powerpc/sysdev/uic.c +1 -0
@@ -158,6 +158,7 @@ static int uic_set_irq_type(struct irq_data *d, unsigned int flow_type)mtdcr (uic->dcrbase +UIC_PR , pr);mtdcr (uic->dcrbase +UIC_TR , tr); +mtdcr (uic->dcrbase +UIC_SR , ~mask);raw_spin_unlock_irqrestore (&uic->lock, flags);
arch/sh/include/asm/io.h +5 -1
@@ -370,7 +370,11 @@ static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }#define ioremap_nocache ioremap#define ioremap_uc ioremap -#define iounmap __iounmap + +static inline void iounmap (void __iomem *addr) +{ +__iounmap (addr); +}/* * Convert a physical pointer to a virtual kernel pointer for /dev/mem
arch/um/include/asm/mmu_context.h +1 -1
@@ -42,7 +42,7 @@ static inline void activate_mm(struct mm_struct *old, struct mm_struct *new)* when the new ->mm is used for the first time. */ __switch_mm (&new->context.id); -down_write (&new->mmap_sem); +down_write_nested (&new->mmap_sem,1 );uml_setup_stubs (new);up_write (&new->mmap_sem); }
arch/x86/kernel/cpu/bugs.c +1 -1
@@ -1094,7 +1094,7 @@ static void __init l1tf_select_mitigation(void)static ssize_t mds_show_state (char *buf) {#ifdef CONFIG_HYPERVISOR_GUEST -if (x86_hyper) { +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) {return sprintf (buf,"%s; SMT Host state unknown\n" , mds_strings[mds_mitigation]); }
arch/x86/kernel/cpu/mkcapflags.sh +2 -0
@@ -3,6 +3,8 @@ # Generate the x86_cap/bug_flags[] arrays from include/asm/cpufeatures.h # +set -e + IN=$1 OUT=$2
arch/x86/kernel/sysfb_efi.c +46 -0
55 lines not on this page · raw message
arch/x86/kvm/pmu.c +2 -2
@@ -124,8 +124,8 @@ static void pmc_reprogram_counter(struct kvm_pmc *pmc, u32 type, intr ? kvm_perf_overflow_intr : kvm_perf_overflow, pmc);if (IS_ERR (event)) { -printk_once ("kvm_pmu: event creation failed %ld\n" , -PTR_ERR (event)); +pr_debug_ratelimited ("kvm_pmu: event creation failed %ld for pmc->idx = %d\n" , +PTR_ERR (event), pmc->idx);return ; }
block/compat_ioctl.c +0 -340
364 lines not on this page · raw message
crypto/ghash-generic.c +7 -1
@@ -34,6 +34,7 @@ static int ghash_setkey(struct crypto_shash *tfm, const u8 *key, unsigned int keylen) {struct ghash_ctx *ctx =crypto_shash_ctx (tfm); +be128 k;if (keylen !=GHASH_BLOCK_SIZE ) {crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );
@@ -42,7 +43,12 @@ static int ghash_setkey(struct crypto_shash *tfm,if (ctx->gf128)gf128mul_free_4k (ctx->gf128); - ctx->gf128 =gf128mul_init_4k_lle ((be128 *)key); + +BUILD_BUG_ON (sizeof (k) !=GHASH_BLOCK_SIZE ); +memcpy (&k, key,GHASH_BLOCK_SIZE );/* avoid violating alignment rules */ + ctx->gf128 =gf128mul_init_4k_lle (&k); +memzero_explicit (&k,GHASH_BLOCK_SIZE ); +if (!ctx->gf128)return -ENOMEM ;
drivers/base/regmap/regmap.c +2 -0
@@ -1358,6 +1358,8 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg, map->format.reg_bytes + map->format.pad_bytes, val, val_len); + else + ret = -ENOTSUPP ;/* If that didn't work fall back on linearising by hand. */ if (ret == -ENOTSUPP ) {
drivers/block/floppy.c +360 -2
404 lines not on this page · raw message
drivers/bluetooth/hci_ath.c +3 -0
@@ -101,6 +101,9 @@ static int ath_open(struct hci_uart *hu)BT_DBG ("hu %p" , hu); +if (!hci_uart_has_flow_control (hu)) +return -EOPNOTSUPP ; + ath =kzalloc (sizeof (*ath),GFP_KERNEL );if (!ath)return -ENOMEM ;
drivers/bluetooth/hci_bcm.c +3 -0
@@ -279,6 +279,9 @@ static int bcm_open(struct hci_uart *hu)bt_dev_dbg (hu->hdev,"hu %p" , hu); +if (!hci_uart_has_flow_control (hu)) +return -EOPNOTSUPP ; + bcm =kzalloc (sizeof (*bcm),GFP_KERNEL );if (!bcm)return -ENOMEM ;
drivers/bluetooth/hci_bcsp.c +5 -0
@@ -729,6 +729,11 @@ static int bcsp_close(struct hci_uart *hu)skb_queue_purge (&bcsp->rel);skb_queue_purge (&bcsp->unrel); +if (bcsp->rx_skb) { +kfree_skb (bcsp->rx_skb); + bcsp->rx_skb =NULL ; + } +kfree (bcsp);return 0 ; }
drivers/bluetooth/hci_intel.c +3 -0
@@ -407,6 +407,9 @@ static int intel_open(struct hci_uart *hu)BT_DBG ("hu %p" , hu); +if (!hci_uart_has_flow_control (hu)) +return -EOPNOTSUPP ; + intel =kzalloc (sizeof (*intel),GFP_KERNEL );if (!intel)return -ENOMEM ;
drivers/bluetooth/hci_ldisc.c +9 -0
@@ -257,6 +257,15 @@ static int hci_uart_send_frame(struct hci_dev *hdev, struct sk_buff *skb)return 0 ; } +/* Check the underlying device or tty has flow control support */ +bool hci_uart_has_flow_control (struct hci_uart *hu) +{ +if (hu->tty->driver->ops->tiocmget && hu->tty->driver->ops->tiocmset) +return true; + +return false; +} +/* Flow control or un-flow control the device */ void hci_uart_set_flow_control (struct hci_uart *hu,bool enable) {
drivers/bluetooth/hci_uart.h +1 -0
@@ -105,6 +105,7 @@ int hci_uart_tx_wakeup(struct hci_uart *hu);int hci_uart_init_ready (struct hci_uart *hu);void hci_uart_init_tty (struct hci_uart *hu);void hci_uart_set_baudrate (struct hci_uart *hu,unsigned int speed); +bool hci_uart_has_flow_control (struct hci_uart *hu);void hci_uart_set_flow_control (struct hci_uart *hu,bool enable);void hci_uart_set_speeds (struct hci_uart *hu,unsigned int init_speed,unsigned int oper_speed);
drivers/char/hpet.c +1 -2
@@ -569,8 +569,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,unsigned long long m; m = hpets->hp_tick_freq + (dis >>1 ); -do_div (m, dis); -return (unsigned long )m; +return div64_ul (m, dis); } static int
drivers/crypto/talitos.c +4 -0
@@ -1446,11 +1446,15 @@ static void ablkcipher_done(struct device *dev, int err) {struct ablkcipher_request *areq = context; +struct crypto_ablkcipher *cipher =crypto_ablkcipher_reqtfm (areq); +struct talitos_ctx *ctx =crypto_ablkcipher_ctx (cipher); +unsigned int ivsize =crypto_ablkcipher_ivsize (cipher);struct talitos_edesc *edesc; edesc = container_of(desc, struct talitos_edesc, desc);common_nonsnoop_unmap (dev, edesc, areq); +memcpy (areq->info, ctx->iv, ivsize);kfree (edesc);
drivers/dma/imx-sdma.c +27 -21
60 lines not on this page · raw message
drivers/edac/edac_mc_sysfs.c +15 -9
@@ -26,7 +26,7 @@static int edac_mc_log_ue =1 ;static int edac_mc_log_ce =1 ;static int edac_mc_panic_on_ue; -static int edac_mc_poll_msec =1000 ; +static unsigned int edac_mc_poll_msec =1000 ;/* Getter functions for above */ int edac_mc_get_log_ue (void )
@@ -45,30 +45,30 @@ int edac_mc_get_panic_on_ue(void) }/* this is temporary */ -int edac_mc_get_poll_msec (void ) +unsigned int edac_mc_get_poll_msec (void ) {return edac_mc_poll_msec; }static int edac_set_poll_msec (const char *val,struct kernel_param *kp) { -unsigned long l; +unsigned int i;int ret;if (!val)return -EINVAL ; - ret =kstrtoul (val,0 , &l); + ret =kstrtouint (val,0 , &i);if (ret)return ret; -if (l <1000 ) +if (i <1000 )return -EINVAL ; - *((unsigned long *)kp->arg) = l; + *((unsigned int *)kp->arg) = i;/* notify edac_mc engine to reset the poll period */ -edac_mc_reset_delay_period (l); +edac_mc_reset_delay_period (i);return 0 ; }
@@ -82,7 +82,7 @@ MODULE_PARM_DESC(edac_mc_log_ue,module_param (edac_mc_log_ce, int,0644 );MODULE_PARM_DESC (edac_mc_log_ce,"Log correctable error to console: 0=off 1=on" ); -module_param_call (edac_mc_poll_msec, edac_set_poll_msec, param_get_int, +module_param_call (edac_mc_poll_msec, edac_set_poll_msec, param_get_uint, &edac_mc_poll_msec,0644 );MODULE_PARM_DESC (edac_mc_poll_msec,"Polling period in milliseconds" );
@@ -426,6 +426,8 @@ static inline int nr_pages_per_csrow(struct csrow_info *csrow)static int edac_create_csrow_object (struct mem_ctl_info *mci,struct csrow_info *csrow,int index) { +int err; + csrow->dev.type = &csrow_attr_type; csrow->dev.bus = mci->bus; csrow->dev.groups = csrow_dev_groups;
@@ -438,7 +440,11 @@ static int edac_create_csrow_object(struct mem_ctl_info *mci,edac_dbg (0 ,"creating (virtual) csrow node %s\n" ,dev_name (&csrow->dev)); -return device_add (&csrow->dev); + err =device_add (&csrow->dev); +if (err) +put_device (&csrow->dev); + +return err; }/* Create a CSROW object under specifed edac_mc_device */
drivers/edac/edac_module.h +1 -1
@@ -33,7 +33,7 @@ extern int edac_mc_get_log_ue(void);extern int edac_mc_get_log_ce (void );extern int edac_mc_get_panic_on_ue (void );extern int edac_get_poll_msec (void ); -extern int edac_mc_get_poll_msec (void ); +extern unsigned int edac_mc_get_poll_msec (void );unsigned edac_dimm_info_location (struct dimm_info *dimm,char *buf,unsigned len);
drivers/gpio/gpio-omap.c +10 -7
@@ -821,9 +821,9 @@ static void omap_gpio_irq_shutdown(struct irq_data *d)raw_spin_lock_irqsave (&bank->lock, flags); bank->irq_usage &= ~(BIT (offset)); -omap_set_gpio_irqenable (bank, offset,0 ); -omap_clear_gpio_irqstatus (bank, offset);omap_set_gpio_triggering (bank, offset,IRQ_TYPE_NONE ); +omap_clear_gpio_irqstatus (bank, offset); +omap_set_gpio_irqenable (bank, offset,0 );if (!LINE_USED (bank->mod_usage, offset))omap_clear_gpio_debounce (bank, offset);omap_disable_gpio_module (bank, offset);
@@ -865,8 +865,8 @@ static void omap_gpio_mask_irq(struct irq_data *d)unsigned long flags;raw_spin_lock_irqsave (&bank->lock, flags); -omap_set_gpio_irqenable (bank, offset,0 );omap_set_gpio_triggering (bank, offset,IRQ_TYPE_NONE ); +omap_set_gpio_irqenable (bank, offset,0 );raw_spin_unlock_irqrestore (&bank->lock, flags); }
@@ -878,9 +878,6 @@ static void omap_gpio_unmask_irq(struct irq_data *d)unsigned long flags;raw_spin_lock_irqsave (&bank->lock, flags); -if (trigger) -omap_set_gpio_triggering (bank, offset, trigger); -omap_set_gpio_irqenable (bank, offset,1 );/*
@@ -888,9 +885,13 @@ static void omap_gpio_unmask_irq(struct irq_data *d)* is cleared, thus after the handler has run. OMAP4 needs this done * after enabing the interrupt to clear the wakeup status. */ -if (bank->level_mask &BIT (offset)) +if (bank->regs->leveldetect0 && bank->regs->wkup_en && + trigger & (IRQ_TYPE_LEVEL_HIGH |IRQ_TYPE_LEVEL_LOW ))omap_clear_gpio_irqstatus (bank, offset); +if (trigger) +omap_set_gpio_triggering (bank, offset, trigger); +raw_spin_unlock_irqrestore (&bank->lock, flags); }
@@ -1611,6 +1612,8 @@ static struct omap_gpio_reg_offs omap4_gpio_regs = { .clr_dataout = OMAP4_GPIO_CLEARDATAOUT, .irqstatus = OMAP4_GPIO_IRQSTATUS0, .irqstatus2 = OMAP4_GPIO_IRQSTATUS1, + .irqstatus_raw0 = OMAP4_GPIO_IRQSTATUSRAW0, + .irqstatus_raw1 = OMAP4_GPIO_IRQSTATUSRAW1, .irqenable = OMAP4_GPIO_IRQSTATUSSET0, .irqenable2 = OMAP4_GPIO_IRQSTATUSSET1, .set_irqenable = OMAP4_GPIO_IRQSTATUSSET0,
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c +20 -0
@@ -184,6 +184,25 @@ nvkm_i2c_fini(struct nvkm_subdev *subdev, bool suspend)return 0 ; } +static int +nvkm_i2c_preinit (struct nvkm_subdev *subdev) +{ +struct nvkm_i2c *i2c =nvkm_i2c (subdev); +struct nvkm_i2c_bus *bus; +struct nvkm_i2c_pad *pad; + +/* +* We init our i2c busses as early as possible, since they may be +* needed by the vbios init scripts on some cards +*/ +list_for_each_entry (pad, &i2c->pad, head) +nvkm_i2c_pad_init (pad); +list_for_each_entry (bus, &i2c->bus, head) +nvkm_i2c_bus_init (bus); + +return 0 ; +} +static int nvkm_i2c_init (struct nvkm_subdev *subdev) {
@@ -238,6 +257,7 @@ nvkm_i2c_dtor(struct nvkm_subdev *subdev)static const struct nvkm_subdev_func nvkm_i2c = { .dtor = nvkm_i2c_dtor, + .preinit = nvkm_i2c_preinit, .init = nvkm_i2c_init, .fini = nvkm_i2c_fini, .intr = nvkm_i2c_intr,
drivers/gpu/drm/panel/panel-simple.c +8 -1
@@ -1389,7 +1389,14 @@ static int panel_simple_dsi_probe(struct mipi_dsi_device *dsi) dsi->format = desc->format; dsi->lanes = desc->lanes; -return mipi_dsi_attach (dsi); + err =mipi_dsi_attach (dsi); +if (err) { +struct panel_simple *panel =dev_get_drvdata (&dsi->dev); + +drm_panel_remove (&panel->base); + } + +return err; }static int panel_simple_dsi_remove (struct mipi_dsi_device *dsi)
drivers/gpu/drm/virtio/virtgpu_ioctl.c +3 -0
@@ -535,6 +535,9 @@ static int virtio_gpu_get_caps_ioctl(struct drm_device *dev, ret =wait_event_timeout (vgdev->resp_wq,atomic_read (&cache_ent->is_valid),5 *HZ ); +/* is_valid check must proceed before copy of the cache entry. */ +smp_rmb (); + ptr = cache_ent->caps_cache; copy_exit:
drivers/gpu/drm/virtio/virtgpu_vq.c +2 -0
@@ -618,6 +618,8 @@ static void virtio_gpu_cmd_capset_cb(struct virtio_gpu_device *vgdev, cache_ent->id == le32_to_cpu(cmd->capset_id)) {memcpy (cache_ent->caps_cache, resp->capset_data, cache_ent->size); +/* Copy must occur before is_valid is signalled. */ +smp_wmb ();atomic_set (&cache_ent->is_valid,1 );break ; }
drivers/gpu/ipu-v3/ipu-ic.c +1 -1
@@ -255,7 +255,7 @@ static int init_csc(struct ipu_ic *ic,writel (param, base++); param = ((a[0 ] &0x1fe0 ) >>5 ) | (params->scale <<8 ) | - (params->sat <<9 ); + (params->sat <<10 );writel (param, base++); param = ((a[1] & 0x1f) << 27) | ((c[0][1] & 0x1ff) << 18) |
drivers/hwtracing/intel_th/msu.c +1 -1
@@ -625,7 +625,7 @@ static int msc_buffer_contig_alloc(struct msc *msc, unsigned long size) goto err_out; ret = -ENOMEM ; - page =alloc_pages (GFP_KERNEL | __GFP_ZERO, order); + page =alloc_pages (GFP_KERNEL | __GFP_ZERO |GFP_DMA32 , order);if (!page) goto err_free_sgt;
drivers/input/tablet/gtco.c +17 -3
@@ -78,6 +78,7 @@ Scott Hill [email protected]/* Max size of a single report */ #define REPORT_MAX_SIZE 10 +#define MAX_COLLECTION_LEVELS 10/* Bitmask whether pen is in range */
@@ -224,8 +225,7 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report,char maintype ='x' ;char globtype[12 ];int indent =0 ; -char indentstr[10 ] ="" ; - +char indentstr[MAX_COLLECTION_LEVELS +1 ] = {0 };dev_dbg (ddev,"======>>>>>>PARSE<<<<<<======\n" );
@@ -351,6 +351,13 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report,case TAG_MAIN_COL_START : maintype ='S' ; +if (indent ==MAX_COLLECTION_LEVELS ) { +dev_err (ddev,"Collection level %d would exceed limit of %d\n" , + indent +1 , +MAX_COLLECTION_LEVELS ); +break ; + } +if (data ==0 ) {dev_dbg (ddev,"======>>>>>> Physical\n" );strcpy (globtype,"Physical" );
@@ -370,8 +377,15 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report,break ;case TAG_MAIN_COL_END : -dev_dbg (ddev,"<<<<<<======\n" ); maintype ='E' ; + +if (indent ==0 ) { +dev_err (ddev,"Collection level already at zero\n" ); +break ; + } + +dev_dbg (ddev,"<<<<<<======\n" ); + indent--;for (x =0 ; x < indent; x++) indentstr[x] ='-' ;
drivers/isdn/hardware/mISDN/hfcsusb.c +3 -0
@@ -1963,6 +1963,9 @@ hfcsusb_probe(struct usb_interface *intf, const struct usb_device_id *id)/* get endpoint base */ idx = ((ep_addr &0x7f ) -1 ) *2 ; +if (idx >15 ) +return -EIO ; +if (ep_addr &0x80 ) idx++; attr = ep->desc.bmAttributes;
drivers/mailbox/mailbox.c +4 -2
@@ -389,11 +389,13 @@ struct mbox_chan *mbox_request_channel_byname(struct mbox_client *cl,of_property_for_each_string (np,"mbox-names" , prop, mbox_name) {if (!strncmp (name, mbox_name,strlen (name))) -break ; +return mbox_request_channel (cl, index); index++; } -return mbox_request_channel (cl, index); +dev_err (cl->dev,"%s() could not locate channel named \"%s\"\n" , + __func__, name); +return ERR_PTR (-EINVAL ); }EXPORT_SYMBOL_GPL (mbox_request_channel_byname);
drivers/md/bcache/super.c +1 -1
@@ -1403,7 +1403,7 @@ static void cache_set_flush(struct closure *cl)kobject_put (&c->internal);kobject_del (&c->kobj); -if (c->gc_thread) +if (!IS_ERR_OR_NULL (c->gc_thread))kthread_stop (c->gc_thread);if (!IS_ERR_OR_NULL (c->root))
drivers/md/dm-bufio.c +1 -3
@@ -1561,9 +1561,7 @@ dm_bufio_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)unsigned long freed; c = container_of(shrink, struct dm_bufio_client, shrinker); -if (sc->gfp_mask & __GFP_FS) -dm_bufio_lock (c); -else if (!dm_bufio_trylock (c)) +if (!dm_bufio_trylock (c))return SHRINK_STOP ; freed =__scan (c, sc->nr_to_scan, sc->gfp_mask);
drivers/media/dvb-frontends/tua6100.c +11 -11
@@ -80,8 +80,8 @@ static int tua6100_set_params(struct dvb_frontend *fe)struct i2c_msg msg1 = { .addr = priv->i2c_address, .flags =0 , .buf = reg1, .len =4 };struct i2c_msg msg2 = { .addr = priv->i2c_address, .flags =0 , .buf = reg2, .len =3 }; -#define _R 4 -#define _P 32 +#define _R_VAL 4 +#define _P_VAL 32#define _ri 4000000// setup register 0
@@ -96,14 +96,14 @@ static int tua6100_set_params(struct dvb_frontend *fe)else reg1[1 ] =0x0c ; -if (_P ==64 ) +if (_P_VAL ==64 ) reg1[1 ] |=0x40 ;if (c->frequency >=1525000 ) reg1[1 ] |=0x80 ;// register 2 - reg2[1 ] = (_R >>8 ) &0x03 ; - reg2[2 ] = _R; + reg2[1 ] = (_R_VAL >>8 ) &0x03 ; + reg2[2 ] = _R_VAL;if (c->frequency <1455000 ) reg2[1 ] |=0x1c ;else if (c->frequency <1630000 )
@@ -115,18 +115,18 @@ static int tua6100_set_params(struct dvb_frontend *fe)* The N divisor ratio (note: c->frequency is in kHz, but we * need it in Hz) */ - prediv = (c->frequency * _R) / (_ri /1000 ); - div = prediv / _P; + prediv = (c->frequency * _R_VAL) / (_ri /1000 ); + div = prediv / _P_VAL; reg1[1 ] |= (div >>9 ) &0x03 ; reg1[2 ] = div >>1 ; reg1[3 ] = (div <<7 ); - priv->frequency = ((div * _P) * (_ri /1000 )) / _R; + priv->frequency = ((div * _P_VAL) * (_ri /1000 )) / _R_VAL;// Finally, calculate and store the value for A - reg1[3 ] |= (prediv - (div*_P)) &0x7f ; + reg1[3 ] |= (prediv - (div*_P_VAL)) &0x7f ; -#undef _R -#undef _P +#undef _R_VAL +#undef _P_VAL#undef _riif (fe->ops.i2c_gate_ctrl)
drivers/media/i2c/Makefile +1 -1
@@ -28,7 +28,7 @@ obj-$(CONFIG_VIDEO_ADV7393) += adv7393.o obj-$(CONFIG_VIDEO_ADV7604) += adv7604.o obj-$(CONFIG_VIDEO_ADV7842) += adv7842.o obj-$(CONFIG_VIDEO_AD9389B) += ad9389b.o -obj-$(CONFIG_VIDEO_ADV7511) += adv7511.o +obj-$(CONFIG_VIDEO_ADV7511) += adv7511-v4l2.o obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o obj-$(CONFIG_VIDEO_VS6624) += vs6624.o obj-$(CONFIG_VIDEO_BT819) += bt819.o
drivers/media/i2c/adv7511-v4l2.c new file +1600 -0
1,199 lines not on this page · raw message
drivers/media/i2c/adv7511.c deleted +0 -1595
1,595 lines not on this page · raw message
drivers/media/platform/marvell-ccic/mcam-core.c +3 -2
Lines of this file are not shown. View the raw message.
drivers/media/radio/wl128x/fmdrv_v4l2.c +3 -0
Lines of this file are not shown. View the raw message.
drivers/media/usb/dvb-usb/dvb-usb-init.c +5 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +3 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/genet/bcmgenet.c +26 -31
57 lines not on this page · raw message
drivers/net/ethernet/freescale/fec_main.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +2 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +6 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +17 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/dfs_pattern_detector.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt7601u/dma.c +34 -20
54 lines not on this page · raw message
drivers/net/wireless/mediatek/mt7601u/tx.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/staging/media/davinci_vpfe/vpfe_video.c +3 -0
Lines of this file are not shown. View the raw message.
drivers/tty/serial/cpm_uart/cpm_uart_core.c +11 -6
Lines of this file are not shown. View the raw message.
drivers/tty/serial/max310x.c +31 -20
51 lines not on this page · raw message
fs/coda/file.c +68 -1
69 lines not on this page · raw message
fs/nfs/nfs4proc.c +26 -15
41 lines not on this page · raw message
mm/vmstat.c +47 -33
80 lines not on this page · raw message
tools/power/cpupower/utils/cpufreq-set.c +2 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.