Linux 3.14.37
Greg KH
maintainerI'm announcing the release of the 3.14.37 kernel.
All users of the 3.14 kernel series must upgrade.
The updated 3.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.14.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/boot/dts/dra7xx-clocks.dtsi | 90 ++++++++++++++- arch/arm/crypto/aesbs-core.S_shipped | 12 +- arch/arm/crypto/bsaes-armv7.pl | 12 +- arch/arm/mach-at91/pm.h | 2 arch/arm64/mm/dma-mapping.c | 6 - arch/sparc/kernel/perf_event.c | 15 -- arch/sparc/kernel/process_64.c | 4 arch/sparc/kernel/sys_sparc_64.c | 2 arch/sparc/lib/memmove.S | 35 +++++- arch/sparc/mm/srmmu.c | 11 + arch/x86/crypto/aesni-intel_glue.c | 4 arch/x86/include/asm/fpu-internal.h | 2 arch/x86/kernel/xsave.c | 7 - arch/x86/vdso/vdso32/sigreturn.S | 1 drivers/char/tpm/tpm_ibmvtpm.c | 10 - drivers/char/tpm/tpm_ibmvtpm.h | 6 - drivers/char/virtio_console.c | 19 +++ drivers/gpu/drm/radeon/atombios_crtc.c | 3 drivers/gpu/drm/radeon/cik.c | 3 drivers/gpu/drm/radeon/evergreen.c | 3 drivers/gpu/drm/radeon/r100.c | 4 drivers/gpu/drm/radeon/r600.c | 3 drivers/gpu/drm/radeon/radeon_cs.c | 4 drivers/gpu/drm/radeon/rs600.c | 4 drivers/gpu/drm/radeon/si.c | 9 - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 77 +++++++------ drivers/mtd/nand/pxa3xx_nand.c | 48 +++++++- drivers/net/can/dev.c | 8 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 drivers/net/usb/cx82310_eth.c | 11 + drivers/regulator/core.c | 34 +++--- drivers/scsi/libsas/sas_discover.c | 6 - drivers/spi/spi-atmel.c | 12 +- drivers/spi/spi-pl022.c | 2 drivers/staging/iio/adc/mxs-lradc.c | 1 drivers/target/iscsi/iscsi_target.c | 14 +- drivers/target/target_core_device.c | 4 drivers/target/target_core_pr.c | 130 ++++++++++++++++++----- drivers/target/target_core_pscsi.c | 2 drivers/target/target_core_transport.c | 4 drivers/tty/serial/8250/8250_pci.c | 2 drivers/xen/events/events_base.c | 18 ++- drivers/xen/xen-pciback/conf_space.c | 2 drivers/xen/xen-pciback/conf_space.h | 2 drivers/xen/xen-pciback/conf_space_header.c | 61 ++++++++-- fs/fuse/dev.c | 7 - fs/nilfs2/segment.c | 7 - fs/proc/task_mmu.c | 3 include/linux/workqueue.h | 3 kernel/cpuset.c | 3 kernel/printk/console_cmdline.h | 2 kernel/printk/printk.c | 1 kernel/workqueue.c | 56 +++++++++ lib/lz4/lz4_decompress.c | 3 net/caif/caif_socket.c | 2 net/can/af_can.c | 3 net/compat.c | 7 + net/core/sysctl_net_core.c | 10 + net/ipv4/inet_diag.c | 18 ++- net/ipv4/tcp_output.c | 68 ++++-------- net/ipv6/fib6_rules.c | 1 net/netfilter/ipvs/ip_vs_core.c | 33 +++-- net/netfilter/ipvs/ip_vs_sync.c | 3 net/netfilter/nft_compat.c | 12 +- net/netfilter/xt_socket.c | 21 ++- net/rds/iw_rdma.c | 40 +++---- net/rxrpc/ar-recvmsg.c | 2 sound/core/control.c | 4 sound/pci/hda/hda_generic.c | 47 ++++++-- sound/pci/hda/hda_intel.c | 2 sound/pci/hda/hda_proc.c | 38 +++++- sound/pci/hda/patch_cirrus.c | 2 sound/pci/hda/patch_conexant.c | 11 + sound/usb/quirks-table.h | 30 +++++ 75 files changed, 848 insertions(+), 305 deletions(-)
Al Viro (2):
caif: fix MSG_OOB test in caif_seqpkt_recvmsg()
rxrpc: bogus MSG_PEEK test in rxrpc_recvmsg()
Alex Deucher (7):
drm/radeon: do a posting read in evergreen_set_irq drm/radeon: do a posting read in r100_set_irq drm/radeon: do a posting read in r600_set_irq drm/radeon: do a posting read in cik_set_irq drm/radeon: do a posting read in si_set_irq drm/radeon: do a posting read in rs600_set_irq drm/radeon: fix interlaced modes on DCE8
Alexander Sverdlin (1):
spi: pl022: Fix race in giveback() leading to driver lock-up
Alexandre Belloni (1):
ARM: at91: pm: fix at91rm9200 standby
Alexey Kodanev (1):
net: sysctl_net_core: check SNDBUF and RCVBUF for min length
Andreas Larsson (1):
sparc32: destroy_context() and switch_mm() needs to disable interrupts.
Ard Biesheuvel (1):
crypto: arm/aes update NEON AES module to latest OpenSSL version
Arnd Bergmann (1):
rds: avoid potential stack overflow
Bart Van Assche (1):
target: Fix reference leak in target_get_sess_cmd() error path
Brian King (1):
bnx2x: Force fundamental reset for EEH recovery
Catalin Marinas (1):
net: compat: Update get_compat_msghdr() to match copy_msghdr_from_user() behaviour
Christian König (1):
drm/radeon: drop setting UPLL to sleep mode
Daniel Mack (1):
ALSA: snd-usb: add quirks for Roland UA-22
David Ahern (3):
sparc: perf: Remove redundant perf_pmu_{en|dis}able calls
sparc: perf: Make counting mode actually work
sparc: Touch NMI watchdog when walking cpus and calling printk
David S. Miller (1):
sparc64: Fix several bugs in memmove().
Doug Anderson (1):
regulator: core: Fix enable GPIO reference counting
Eric Dumazet (3):
inet_diag: fix possible overflow in inet_diag_dump_one_icsk()
tcp: make connect() mem charging friendly
netfilter: xt_socket: fix a stack corruption bug
Greg Kroah-Hartman (2):
iio: mxs-lradc: fix merge error
Linux 3.14.37
James Bottomley (1):
libsas: Fix Kernel Crash in smp_execute_task
Jan Beulich (1):
xen-pciback: limit guest control of command register
Jason Low (1):
cpuset: Fix cpuset sched_relax_domain_level
Javier Martinez Canillas (1):
regulator: Only enable disabled regulators on resume
JeHyeon Yeon (1):
LZ4 : fix the data abort issue
Jiri Slaby (1):
x86/vdso: Fix the build on GCC5
Josh Hunt (1):
tcp: fix tcp fin memory accounting
Juergen Gross (1):
xen/events: avoid NULL pointer dereference in dom0 on large machines
Julian Anastasov (2):
ipvs: add missing ip_vs_pe_put in sync code
ipvs: rerouting to local clients is not needed anymore
Kirill A. Shutemov (1):
pagemap: do not leak physical addresses to non-privileged userspace
Lee Duncan (1):
target: Allow Write Exclusive non-reservation holders to READ
Maxime Ripard (1):
mtd: nand: pxa3xx: Fix PIO FIFO draining
Michael S. Tsirkin (2):
virtio_console: init work unconditionally
virtio_console: avoid config access from irq
Miklos Szeredi (2):
fuse: set stolen page uptodate
fuse: notify: don't move pages
Nicholas Bellinger (6):
target: Fix virtual LUN=0 target_configure_device failure OOPs
iscsi-target: Avoid early conn_logout_comp for iser connections target/pscsi: Fix NULL pointer dereference in get_device_type
target: Fix R_HOLDER bit usage for AllRegistrants
target: Avoid dropping AllRegistrants reservation during unregister
target: Allow AllRegistrants to re-RESERVE existing reservation
Oleg Nesterov (2):
x86/fpu: Avoid math_state_restore() without used_math() in __restore_xstate_sig() x86/fpu: Drop_fpu() should not assume that tsk equals current
Oliver Hartkopp (1):
can: add missing initialisations in CAN related skbuffs
Ondrej Zary (1):
Revert "net: cx82310_eth: use common match macro"
Pablo Neira Ayuso (1):
netfilter: nft_compat: fix module refcount underflow
Peter Hurley (1):
console: Fix console name size mismatch
Ravikumar Kattekola (1):
ARM: dts: DRA7x: Fix the bypass clock source for dpll_iva and others
Rob Gardner (1):
sparc: semtimedop() unreachable due to comparison error
Russell King (1):
Change email address for 8250_pci
Ryusuke Konishi (1):
nilfs2: fix deadlock of segment constructor during recovery
Stephan Mueller (1):
crypto: aesni - fix memory usage in GCM decryption
Steven Barth (1):
ipv6: fix backtracking for throw routes
Suzuki K. Poulose (1):
arm64: Honor __GFP_ZERO in dma allocations
Takashi Iwai (7):
ALSA: control: Add sanity checks for user ctl id name string
ALSA: hda - Fix built-in mic on Compaq Presario CQ60
ALSA: hda - Don't access stereo amps for mono channel widgets
ALSA: hda - Set single_adc_amp flag for CS420x codecs
ALSA: hda - Add workaround for MacBook Air 5,2 built-in mic
ALSA: hda - Fix regression of HD-audio controller fallback modes
ALSA: hda - Treat stereo-to-mono mix properly
Tejun Heo (1):
workqueue: fix hang involving racing cancel[_delayed]_work_sync()'s for PREEMPT_NONE
Thomas Hellstrom (1):
drm/vmwgfx: Reorder device takedown somewhat
Tommi Rantala (1):
drm/radeon: fix DRM_IOCTL_RADEON_CS oops
Torsten Fleischer (1):
spi: atmel: Fix interrupt setup for PDC transfers
[email protected] (1):
tpm/ibmvtpm: Additional LE support for tpm_ibmvtpm_send
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 36 +SUBLEVEL = 37 EXTRAVERSION = NAME = Remembering Coco
arch/arm/boot/dts/dra7xx-clocks.dtsi +81 -9
171 lines not on this page · raw message
arch/arm/crypto/aesbs-core.S_shipped +8 -4
@@ -58,14 +58,18 @@ # define VFP_ABI_FRAME 0 # define BSAES_ASM_EXTENDED_KEY # define XTS_CHAIN_TWEAK -# define __ARM_ARCH__ 7 +# define __ARM_ARCH__ __LINUX_ARM_ARCH__ +# define __ARM_MAX_ARCH__ 7 #endif #ifdef __thumb__ # define adrl adr #endif -#if __ARM_ARCH__>=7 +#if __ARM_MAX_ARCH__>=7 +.arch armv7-a +.fpu neon + .text .syntax unified @ ARMv7-capable assembler is expected to handle this #ifdef __thumb2__
@@ -74,8 +78,6 @@ .code 32 #endif -.fpu neon - .type _bsaes_decrypt8,%function .align 4 _bsaes_decrypt8:
@@ -2095,9 +2097,11 @@ bsaes_xts_decrypt: vld1.8 {q8}, [r0] @ initial tweak adr r2, .Lxts_magic +#ifndef XTS_CHAIN_TWEAK tst r9, #0xf @ if not multiple of 16 it ne @ Thumb2 thing, sanity check in ARM subne r9, #0x10 @ subtract another 16 bytes +#endif subs r9, #0x80 blo .Lxts_dec_short
arch/arm/crypto/bsaes-armv7.pl +8 -4
@@ -701,14 +701,18 @@ $code.=<<___; # define VFP_ABI_FRAME 0 # define BSAES_ASM_EXTENDED_KEY # define XTS_CHAIN_TWEAK -# define __ARM_ARCH__ 7 +# define __ARM_ARCH__ __LINUX_ARM_ARCH__ +# define __ARM_MAX_ARCH__ 7 #endif #ifdef __thumb__ # define adrl adr #endif -#if __ARM_ARCH__>=7 +#if __ARM_MAX_ARCH__>=7 +.arch armv7-a +.fpu neon + .text .syntax unified @ ARMv7-capable assembler is expected to handle this #ifdef __thumb2__
@@ -717,8 +721,6 @@ $code.=<<___; .code 32 #endif -.fpu neon - .type _bsaes_decrypt8,%function .align 4 _bsaes_decrypt8:
@@ -2076,9 +2078,11 @@ bsaes_xts_decrypt: vld1.8 {@XMM[8]}, [r0] @ initial tweak adr $magic, .Lxts_magic +#ifndef XTS_CHAIN_TWEAK tst $len, #0xf @ if not multiple of 16 it ne @ Thumb2 thing, sanity check in ARM subne $len, #0x10 @ subtract another 16 bytes +#endif subs $len, #0x80 blo .Lxts_dec_short
arch/arm/mach-at91/pm.h +1 -1
@@ -45,7 +45,7 @@ static inline void at91rm9200_standby(void) " mcr p15, 0, %0, c7, c0, 4\n\t" " str %5, [%1, %2]" : - : "r" (0), "r" (AT91_BASE_SYS), "r" (AT91RM9200_SDRAMC_LPR), + : "r" (0), "r" (at91_ramc_base[0]), "r" (AT91RM9200_SDRAMC_LPR),"r" (1 ),"r" (AT91RM9200_SDRAMC_SRR ), "r" (lpr)); }
arch/arm64/mm/dma-mapping.c +5 -1
@@ -44,6 +44,7 @@ static void *arm64_swiotlb_alloc_coherent(struct device *dev, size_t size, flags |=GFP_DMA32 ;if (IS_ENABLED (CONFIG_DMA_CMA )) {struct page *page; +void *addr; size =PAGE_ALIGN (size); page = dma_alloc_from_contiguous(dev, size >> PAGE_SHIFT,
@@ -52,7 +53,10 @@ static void *arm64_swiotlb_alloc_coherent(struct device *dev, size_t size,return NULL ; *dma_handle =phys_to_dma (dev,page_to_phys (page)); -return page_address (page); + addr =page_address (page); +if (flags & __GFP_ZERO) +memset (addr,0 , size); +return addr; }else {return swiotlb_alloc_coherent (dev, size, dma_handle, flags); }
arch/sparc/kernel/perf_event.c +3 -12
@@ -960,6 +960,8 @@ out: cpuc->pcr[0 ] |= cpuc->event[0 ]->hw.config_base; } +static void sparc_pmu_start (struct perf_event *event,int flags); +/* On this PMU each PIC has it's own PCR control register. */ static void calculate_multiple_pcrs (struct cpu_hw_events *cpuc) {
@@ -972,20 +974,13 @@ static void calculate_multiple_pcrs(struct cpu_hw_events *cpuc)struct perf_event *cp = cpuc->event[i];struct hw_perf_event *hwc = &cp->hw;int idx = hwc->idx; -u64 enc;if (cpuc->current_idx[i] !=PIC_NO_INDEX )continue ; -sparc_perf_event_set_period (cp, hwc, idx); cpuc->current_idx[i] = idx; - enc =perf_event_get_enc (cpuc->events[i]); - cpuc->pcr[idx] &= ~mask_for_index (idx); -if (hwc->state &PERF_HES_STOPPED ) - cpuc->pcr[idx] |=nop_for_index (idx); -else - cpuc->pcr[idx] |=event_encoding (enc, idx); +sparc_pmu_start (cp,PERF_EF_RELOAD ); } out:for (i =0 ; i < cpuc->n_events; i++) {
@@ -1101,7 +1096,6 @@ static void sparc_pmu_del(struct perf_event *event, int _flags)int i;local_irq_save (flags); -perf_pmu_disable (event->pmu);for (i =0 ; i < cpuc->n_events; i++) {if (event == cpuc->event[i]) {
@@ -1127,7 +1121,6 @@ static void sparc_pmu_del(struct perf_event *event, int _flags) } } -perf_pmu_enable (event->pmu);local_irq_restore (flags); }
@@ -1361,7 +1354,6 @@ static int sparc_pmu_add(struct perf_event *event, int ef_flags)unsigned long flags;local_irq_save (flags); -perf_pmu_disable (event->pmu); n0 = cpuc->n_events;if (n0 >= sparc_pmu->max_hw_events)
@@ -1394,7 +1386,6 @@ nocheck: ret =0 ; out: -perf_pmu_enable (event->pmu);local_irq_restore (flags);return ret; }
arch/sparc/kernel/process_64.c +4 -0
@@ -281,6 +281,8 @@ void arch_trigger_all_cpu_backtrace(void)printk (" TPC[%lx] O7[%lx] I7[%lx] RPC[%lx]\n" , gp->tpc, gp->o7, gp->i7, gp->rpc); } + +touch_nmi_watchdog (); }memset (global_cpu_snapshot,0 ,sizeof (global_cpu_snapshot));
@@ -356,6 +358,8 @@ static void pmu_snapshot_all_cpus(void) (cpu == this_cpu ?'*' :' ' ), cpu, pp->pcr[0 ], pp->pcr[1 ], pp->pcr[2 ], pp->pcr[3 ], pp->pic[0], pp->pic[1], pp->pic[2], pp->pic[3]); + +touch_nmi_watchdog (); }memset (global_cpu_snapshot,0 ,sizeof (global_cpu_snapshot));
arch/sparc/kernel/sys_sparc_64.c +1 -1
@@ -332,7 +332,7 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, secondlong err;/* No need for backward compatibility. We can start fresh... */ -if (call <=SEMCTL ) { +if (call <=SEMTIMEDOP ) {switch (call) {case SEMOP : err = sys_semtimedop(first, ptr,
arch/sparc/lib/memmove.S +32 -3
@@ -8,9 +8,11 @@ .text ENTRY(memmove) /* o0=dst o1=src o2=len */ - mov %o0, %g1 + brz,pn %o2, 99f + mov %o0, %g1 + cmp %o0, %o1 - bleu,pt %xcc, memcpy + bleu,pt %xcc, 2f add %o1, %o2, %g7 cmp %g7, %o0 bleu,pt %xcc, memcpy
@@ -24,7 +26,34 @@ ENTRY(memmove) /* o0=dst o1=src o2=len */ stb %g7, [%o0] bne,pt %icc, 1b sub %o0, 1, %o0 - +99: retl mov %g1, %o0 + + /* We can't just call memcpy for these memmove cases. On some + * chips the memcpy uses cache initializing stores and when dst + * and src are close enough, those can clobber the source data + * before we've loaded it in. + */ +2: or %o0, %o1, %g7 + or %o2, %g7, %g7 + andcc %g7, 0x7, %g0 + bne,pn %xcc, 4f + nop + +3: ldx [%o1], %g7 + add %o1, 8, %o1 + subcc %o2, 8, %o2 + add %o0, 8, %o0 + bne,pt %icc, 3b + stx %g7, [%o0 - 0x8] + ba,a,pt %xcc, 99b + +4: ldub [%o1], %g7 + add %o1, 1, %o1 + subcc %o2, 1, %o2 + add %o0, 1, %o0 + bne,pt %icc, 4b + stb %g7, [%o0 - 0x1] + ba,a,pt %xcc, 99b ENDPROC(memmove)
arch/sparc/mm/srmmu.c +7 -4
@@ -460,10 +460,12 @@ static void __init sparc_context_init(int numctx)void switch_mm (struct mm_struct *old_mm,struct mm_struct *mm,struct task_struct *tsk) { +unsigned long flags; +if (mm->context ==NO_CONTEXT ) { -spin_lock (&srmmu_context_spinlock); +spin_lock_irqsave (&srmmu_context_spinlock, flags);alloc_context (old_mm, mm); -spin_unlock (&srmmu_context_spinlock); +spin_unlock_irqrestore (&srmmu_context_spinlock, flags);srmmu_ctxd_set (&srmmu_context_table[mm->context], mm->pgd); }
@@ -988,14 +990,15 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)void destroy_context (struct mm_struct *mm) { +unsigned long flags;if (mm->context !=NO_CONTEXT ) {flush_cache_mm (mm);srmmu_ctxd_set (&srmmu_context_table[mm->context], srmmu_swapper_pg_dir);flush_tlb_mm (mm); -spin_lock (&srmmu_context_spinlock); +spin_lock_irqsave (&srmmu_context_spinlock, flags);free_context (mm->context); -spin_unlock (&srmmu_context_spinlock); +spin_unlock_irqrestore (&srmmu_context_spinlock, flags); mm->context =NO_CONTEXT ; } }
arch/x86/crypto/aesni-intel_glue.c +2 -2
@@ -1109,7 +1109,7 @@ static int __driver_rfc4106_decrypt(struct aead_request *req) src =kmalloc (req->cryptlen + req->assoclen,GFP_ATOMIC );if (!src)return -ENOMEM ; - assoc = (src + req->cryptlen + auth_tag_len); + assoc = (src + req->cryptlen);scatterwalk_map_and_copy (src, req->src,0 , req->cryptlen,0 );scatterwalk_map_and_copy (assoc, req->assoc,0 , req->assoclen,0 );
@@ -1134,7 +1134,7 @@ static int __driver_rfc4106_decrypt(struct aead_request *req)scatterwalk_done (&src_sg_walk,0 ,0 );scatterwalk_done (&assoc_sg_walk,0 ,0 ); }else { -scatterwalk_map_and_copy (dst, req->dst,0 , req->cryptlen,1 ); +scatterwalk_map_and_copy (dst, req->dst,0 , tempCipherLen,1 );kfree (src); }return retval;
arch/x86/include/asm/fpu-internal.h +1 -1
@@ -368,7 +368,7 @@ static inline void drop_fpu(struct task_struct *tsk)preempt_disable (); tsk->thread.fpu_counter =0 ;__drop_fpu (tsk); -clear_used_math (); +clear_stopped_child_used_math (tsk);preempt_enable (); }
arch/x86/kernel/xsave.c +4 -3
@@ -375,7 +375,7 @@ int __restore_xstate_sig(void __user *buf, void __user *buf_fx, int size)* thread's fpu state, reconstruct fxstate from the fsave * header. Sanitize the copied state etc. */ -struct xsave_struct *xsave = &tsk->thread.fpu.state->xsave; +struct fpu *fpu = &tsk->thread.fpu;struct user_i387_ia32_struct env;int err =0 ;
@@ -389,14 +389,15 @@ int __restore_xstate_sig(void __user *buf, void __user *buf_fx, int size)*/ drop_fpu (tsk); -if (__copy_from_user (xsave, buf_fx, state_size) || +if (__copy_from_user (&fpu->state->xsave, buf_fx, state_size) ||__copy_from_user (&env, buf,sizeof (env))) { +fpu_finit (fpu); err =-1 ; }else {sanitize_restored_xstate (tsk, &env, xstate_bv, fx_only); -set_used_math (); } +set_used_math ();if (use_eager_fpu ()) {preempt_disable ();math_state_restore ();
arch/x86/vdso/vdso32/sigreturn.S +1 -0
@@ -17,6 +17,7 @@ .text .globl __kernel_sigreturn .type __kernel_sigreturn,@function + nop /* this guy is needed for .LSTARTFDEDLSI1 below (watch for HACK) */ ALIGN __kernel_sigreturn: .LSTART_sigreturn:
drivers/char/tpm/tpm_ibmvtpm.c +5 -5
@@ -124,7 +124,7 @@ static int tpm_ibmvtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) {struct ibmvtpm_dev *ibmvtpm;struct ibmvtpm_crq crq; -u64 *word = (u64 *) &crq; +__be64 *word = (__be64 *)&crq;int rc; ibmvtpm = (struct ibmvtpm_dev *)TPM_VPRIV (chip);
@@ -145,11 +145,11 @@ static int tpm_ibmvtpm_send(struct tpm_chip *chip, u8 *buf, size_t count)memcpy ((void *)ibmvtpm->rtce_buf, (void *)buf, count); crq.valid = (u8 )IBMVTPM_VALID_CMD ; crq.msg = (u8 )VTPM_TPM_COMMAND ; - crq.len = (u16 )count; - crq.data = ibmvtpm->rtce_dma_handle; + crq.len =cpu_to_be16 (count); + crq.data =cpu_to_be32 (ibmvtpm->rtce_dma_handle); - rc =ibmvtpm_send_crq (ibmvtpm->vdev,cpu_to_be64 (word[0 ]), -cpu_to_be64 (word[1 ])); + rc =ibmvtpm_send_crq (ibmvtpm->vdev,be64_to_cpu (word[0 ]), +be64_to_cpu (word[1 ]));if (rc !=H_SUCCESS ) {dev_err (ibmvtpm->dev,"tpm_ibmvtpm_send failed rc=%d\n" , rc); rc =0 ;
drivers/char/tpm/tpm_ibmvtpm.h +3 -3
@@ -22,9 +22,9 @@struct ibmvtpm_crq {u8 valid;u8 msg; -u16 len; -u32 data; -u64 reserved; +__be16 len; +__be32 data; +__be64 reserved; } __attribute__((packed,aligned (8 )));struct ibmvtpm_crq_queue {
drivers/char/virtio_console.c +18 -1
@@ -142,6 +142,7 @@ struct ports_device {* notification */ struct work_struct control_work; +struct work_struct config_work;struct list_head ports;
@@ -1832,10 +1833,21 @@ static void config_intr(struct virtio_device *vdev) portdev = vdev->priv; +if (!use_multiport (portdev)) +schedule_work (&portdev->config_work); +} + +static void config_work_handler (struct work_struct *work) +{ +struct ports_device *portdev; + + portdev = container_of(work, struct ports_device, control_work);if (!use_multiport (portdev)) { +struct virtio_device *vdev;struct port *port;u16 rows, cols; + vdev = portdev->vdev; virtio_cread(vdev, struct virtio_console_config, cols, &cols); virtio_cread(vdev, struct virtio_console_config, rows, &rows);
@@ -2024,12 +2036,14 @@ static int virtcons_probe(struct virtio_device *vdev)spin_lock_init (&portdev->ports_lock);INIT_LIST_HEAD (&portdev->ports); +INIT_WORK (&portdev->config_work, &config_work_handler); +INIT_WORK (&portdev->control_work, &control_work_handler); +if (multiport) {unsigned int nr_added_bufs;spin_lock_init (&portdev->c_ivq_lock);spin_lock_init (&portdev->c_ovq_lock); -INIT_WORK (&portdev->control_work, &control_work_handler); nr_added_bufs =fill_queue (portdev->c_ivq, &portdev->c_ivq_lock);
@@ -2097,6 +2111,8 @@ static void virtcons_remove(struct virtio_device *vdev)/* Finish up work that's lined up */ if (use_multiport (portdev))cancel_work_sync (&portdev->control_work); +else +cancel_work_sync (&portdev->config_work);list_for_each_entry_safe (port, port2, &portdev->ports, list)unplug_port (port);
@@ -2148,6 +2164,7 @@ static int virtcons_freeze(struct virtio_device *vdev)virtqueue_disable_cb (portdev->c_ivq);cancel_work_sync (&portdev->control_work); +cancel_work_sync (&portdev->config_work);/* * Once more: if control_work_handler() was running, it would * enable the cb as the last step.
drivers/gpu/drm/radeon/atombios_crtc.c +3 -0
@@ -1306,6 +1306,9 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, (x << 16) | y); viewport_w = crtc->mode.hdisplay; viewport_h = (crtc->mode.vdisplay +1 ) & ~1 ; +if ((rdev->family >=CHIP_BONAIRE ) && + (crtc->mode.flags &DRM_MODE_FLAG_INTERLACE )) + viewport_h *=2 ;WREG32 (EVERGREEN_VIEWPORT_SIZE + radeon_crtc->crtc_offset, (viewport_w <<16 ) | viewport_h);
drivers/gpu/drm/radeon/cik.c +3 -0
@@ -7069,6 +7069,9 @@ int cik_irq_set(struct radeon_device *rdev)WREG32 (DC_HPD5_INT_CONTROL , hpd5);WREG32 (DC_HPD6_INT_CONTROL , hpd6); +/* posting read */ +RREG32 (SRBM_STATUS ); +return 0 ; }
drivers/gpu/drm/radeon/evergreen.c +3 -0
@@ -4596,6 +4596,9 @@ int evergreen_irq_set(struct radeon_device *rdev)WREG32 (AFMT_AUDIO_PACKET_CONTROL +EVERGREEN_CRTC4_REGISTER_OFFSET , afmt5);WREG32 (AFMT_AUDIO_PACKET_CONTROL +EVERGREEN_CRTC5_REGISTER_OFFSET , afmt6); +/* posting read */ +RREG32 (SRBM_STATUS ); +return 0 ; }
drivers/gpu/drm/radeon/r100.c +4 -0
@@ -742,6 +742,10 @@ int r100_irq_set(struct radeon_device *rdev) tmp |=RADEON_FP2_DETECT_MASK ; }WREG32 (RADEON_GEN_INT_CNTL , tmp); + +/* read back to post the write */ +RREG32 (RADEON_GEN_INT_CNTL ); +return 0 ; }
drivers/gpu/drm/radeon/r600.c +3 -0
@@ -3647,6 +3647,9 @@ int r600_irq_set(struct radeon_device *rdev)WREG32 (RV770_CG_THERMAL_INT , thermal_int); } +/* posting read */ +RREG32 (R_000E50_SRBM_STATUS ); +return 0 ; }
drivers/gpu/drm/radeon/radeon_cs.c +3 -1
@@ -179,11 +179,13 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)u32 ring =RADEON_CS_RING_GFX ;s32 priority =0 ; +INIT_LIST_HEAD (&p->validated); +if (!cs->num_chunks) {return 0 ; } +/* get chunks */ -INIT_LIST_HEAD (&p->validated); p->idx =0 ; p->ib.sa_bo =NULL ; p->ib.semaphore =NULL ;
drivers/gpu/drm/radeon/rs600.c +4 -0
@@ -700,6 +700,10 @@ int rs600_irq_set(struct radeon_device *rdev)WREG32 (R_007D18_DC_HOT_PLUG_DETECT2_INT_CONTROL , hpd2);if (ASIC_IS_DCE2 (rdev))WREG32 (R_007408_HDMI0_AUDIO_PACKET_CONTROL , hdmi0); + +/* posting read */ +RREG32 (R_000040_GEN_INT_CNTL ); +return 0 ; }
drivers/gpu/drm/radeon/si.c +5 -4
@@ -5958,6 +5958,9 @@ int si_irq_set(struct radeon_device *rdev)WREG32 (CG_THERMAL_INT , thermal_int); +/* posting read */ +RREG32 (SRBM_STATUS ); +return 0 ; }
@@ -6875,8 +6878,7 @@ int si_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk)WREG32_P (CG_UPLL_FUNC_CNTL ,UPLL_BYPASS_EN_MASK , ~UPLL_BYPASS_EN_MASK );if (!vclk || !dclk) { -/* keep the Bypass mode, put PLL to sleep */ -WREG32_P (CG_UPLL_FUNC_CNTL ,UPLL_SLEEP_MASK , ~UPLL_SLEEP_MASK ); +/* keep the Bypass mode */ return 0 ; }
@@ -6892,8 +6894,7 @@ int si_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk)/* set VCO_MODE to 1 */ WREG32_P (CG_UPLL_FUNC_CNTL ,UPLL_VCO_MODE_MASK , ~UPLL_VCO_MODE_MASK ); -/* toggle UPLL_SLEEP to 1 then back to 0 */ -WREG32_P (CG_UPLL_FUNC_CNTL ,UPLL_SLEEP_MASK , ~UPLL_SLEEP_MASK ); +/* disable sleep mode */ WREG32_P (CG_UPLL_FUNC_CNTL ,0 , ~UPLL_SLEEP_MASK );/* deassert UPLL_RESET */
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +40 -37
113 lines not on this page · raw message
drivers/mtd/nand/pxa3xx_nand.c +42 -6
62 lines not on this page · raw message
drivers/net/can/dev.c +8 -0
@@ -502,6 +502,14 @@ struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf) skb->pkt_type =PACKET_BROADCAST ; skb->ip_summed =CHECKSUM_UNNECESSARY ; +skb_reset_mac_header (skb); +skb_reset_network_header (skb); +skb_reset_transport_header (skb); + +skb_reset_mac_header (skb); +skb_reset_network_header (skb); +skb_reset_transport_header (skb); +can_skb_reserve (skb);can_skb_prv (skb)->ifindex = dev->ifindex;
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +3 -0
@@ -12395,6 +12395,9 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev,pci_write_config_dword (bp->pdev,PCICFG_GRC_ADDRESS ,PCICFG_VENDOR_ID_OFFSET ); +/* Set PCIe reset type to fundamental for EEH recovery */ + pdev->needs_freset =1 ; +/* AER (Advanced Error reporting) configuration */ rc =pci_enable_pcie_error_reporting (pdev);if (!rc)
drivers/net/usb/cx82310_eth.c +10 -1
@@ -300,9 +300,18 @@ static const struct driver_info cx82310_info = { .tx_fixup = cx82310_tx_fixup, }; +#define USB_DEVICE_CLASS (vend, prod, cl, sc, pr) \ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \ + USB_DEVICE_ID_MATCH_DEV_INFO, \ + .idVendor = (vend), \ + .idProduct = (prod), \ + .bDeviceClass = (cl), \ + .bDeviceSubClass = (sc), \ + .bDeviceProtocol = (pr) +static const struct usb_device_id products[] = { { -USB_DEVICE_AND_INTERFACE_INFO (0x0572 ,0xcb01 ,0xff ,0 ,0 ), +USB_DEVICE_CLASS (0x0572 ,0xcb01 ,0xff ,0 ,0 ), .driver_info = (unsigned long ) &cx82310_info }, { },
drivers/regulator/core.c +17 -17
@@ -1764,10 +1764,12 @@ static int _regulator_do_enable(struct regulator_dev *rdev)trace_regulator_enable (rdev_get_name (rdev));if (rdev->ena_pin) { - ret =regulator_ena_gpio_ctrl (rdev, true); -if (ret <0 ) -return ret; - rdev->ena_gpio_state =1 ; +if (!rdev->ena_gpio_state) { + ret =regulator_ena_gpio_ctrl (rdev, true); +if (ret <0 ) +return ret; + rdev->ena_gpio_state =1 ; + } }else if (rdev->desc->ops->enable) { ret = rdev->desc->ops->enable (rdev);if (ret <0 )
@@ -1897,10 +1899,12 @@ static int _regulator_do_disable(struct regulator_dev *rdev)trace_regulator_disable (rdev_get_name (rdev));if (rdev->ena_pin) { - ret =regulator_ena_gpio_ctrl (rdev, false); -if (ret <0 ) -return ret; - rdev->ena_gpio_state =0 ; +if (rdev->ena_gpio_state) { + ret =regulator_ena_gpio_ctrl (rdev, false); +if (ret <0 ) +return ret; + rdev->ena_gpio_state =0 ; + } }else if (rdev->desc->ops->disable) { ret = rdev->desc->ops->disable (rdev);
@@ -3454,12 +3458,6 @@ regulator_register(const struct regulator_desc *regulator_desc, config->ena_gpio, ret); goto wash; } - -if (config->ena_gpio_flags &GPIOF_OUT_INIT_HIGH ) - rdev->ena_gpio_state =1 ; - -if (config->ena_gpio_invert) - rdev->ena_gpio_state = !rdev->ena_gpio_state; }/* set regulator constraints */
@@ -3631,9 +3629,11 @@ int regulator_suspend_finish(void)list_for_each_entry (rdev, ®ulator_list, list) {mutex_lock (&rdev->mutex);if (rdev->use_count >0 || rdev->constraints->always_on) { - error =_regulator_do_enable (rdev); -if (error) - ret = error; +if (!_regulator_is_enabled (rdev)) { + error =_regulator_do_enable (rdev); +if (error) + ret = error; + } }else {if (!have_full_constraints ()) goto unlock;
drivers/scsi/libsas/sas_discover.c +4 -2
@@ -500,6 +500,7 @@ static void sas_revalidate_domain(struct work_struct *work)struct sas_discovery_event *ev =to_sas_discovery_event (work);struct asd_sas_port *port = ev->port;struct sas_ha_struct *ha = port->ha; +struct domain_device *ddev = port->port_dev;/* prevent revalidation from finding sata links in recovery */ mutex_lock (&ha->disco_mutex);
@@ -514,8 +515,9 @@ static void sas_revalidate_domain(struct work_struct *work)SAS_DPRINTK ("REVALIDATING DOMAIN on port %d, pid:%d\n" , port->id,task_pid_nr (current)); -if (port->port_dev) - res =sas_ex_revalidate_domain (port->port_dev); +if (ddev && (ddev->dev_type ==SAS_FANOUT_EXPANDER_DEVICE || + ddev->dev_type ==SAS_EDGE_EXPANDER_DEVICE )) + res =sas_ex_revalidate_domain (ddev);SAS_DPRINTK ("done REVALIDATING DOMAIN on port %d, pid:%d, res 0x%x\n" , port->id,task_pid_nr (current), res);
drivers/spi/spi-atmel.c +6 -6
@@ -781,17 +781,17 @@ static void atmel_spi_pdc_next_xfer(struct spi_master *master, (unsigned long long)xfer->rx_dma); } -/* REVISIT: We're waiting for ENDRX before we start the next +/* REVISIT: We're waiting for RXBUFF before we start the next * transfer because we need to handle some difficult timing -* issues otherwise. If we wait for ENDTX in one transfer and -* then starts waiting for ENDRX in the next, it's difficult -* to tell the difference between the ENDRX interrupt we're -* actually waiting for and the ENDRX interrupt of the +* issues otherwise. If we wait for TXBUFE in one transfer and +* then starts waiting for RXBUFF in the next, it's difficult +* to tell the difference between the RXBUFF interrupt we're +* actually waiting for and the RXBUFF interrupt of the * previous transfer. * * It should be doable, though. Just not now... */ -spi_writel (as,IER ,SPI_BIT (ENDRX ) |SPI_BIT (OVRES )); +spi_writel (as,IER ,SPI_BIT (RXBUFF ) |SPI_BIT (OVRES ));spi_writel (as,PTCR ,SPI_BIT (TXTEN ) |SPI_BIT (RXTEN )); }
drivers/spi/spi-pl022.c +1 -1
@@ -503,12 +503,12 @@ static void giveback(struct pl022 *pl022) pl022->cur_msg =NULL ; pl022->cur_transfer =NULL ; pl022->cur_chip =NULL ; -spi_finalize_current_message (pl022->master);/* disable the SPI/SSP operation */ writew ((readw (SSP_CR1 (pl022->virtbase)) & (~SSP_CR1_MASK_SSE )),SSP_CR1 (pl022->virtbase)); +spi_finalize_current_message (pl022->master); }/**
drivers/staging/iio/adc/mxs-lradc.c +0 -1
@@ -1159,7 +1159,6 @@ static irqreturn_t mxs_lradc_handle_irq(int irq, void *data) LRADC_CTRL1_LRADC_IRQ(TOUCHSCREEN_VCHANNEL2)); } -if (iio_buffer_enabled (iio))if (iio_buffer_enabled (iio)) {if (reg & lradc->buffer_vchans)iio_trigger_poll (iio->trig,iio_get_time_ns ());
drivers/target/iscsi/iscsi_target.c +10 -4
@@ -4196,11 +4196,17 @@ int iscsit_close_connection(pr_debug ("Closing iSCSI connection CID %hu on SID:" " %u\n" , conn->cid, sess->sid);/* -* Always up conn_logout_comp just in case the RX Thread is sleeping -* and the logout response never got sent because the connection -* failed. +* Always up conn_logout_comp for the traditional TCP case just in case +* the RX Thread in iscsi_target_rx_opcode() is sleeping and the logout +* response never got sent because the connection failed. +* +* However for iser-target, isert_wait4logout() is using conn_logout_comp +* to signal logout response TX interrupt completion. Go ahead and skip +* this for iser since isert_rx_opcode() does not wait on logout failure, +* and to avoid iscsi_conn pointer dereference in iser-target code. */ -complete (&conn->conn_logout_comp); +if (conn->conn_transport->transport_type ==ISCSI_TCP ) +complete (&conn->conn_logout_comp);iscsi_release_thread_set (conn);
drivers/target/target_core_device.c +2 -2
@@ -1591,8 +1591,6 @@ int target_configure_device(struct se_device *dev) ret = dev->transport->configure_device (dev);if (ret) goto out; - dev->dev_flags |=DF_CONFIGURED ; -/* * XXX: there is not much point to have two different values here.. */
@@ -1654,6 +1652,8 @@ int target_configure_device(struct se_device *dev)list_add_tail (&dev->g_dev_node, &g_device_list);mutex_unlock (&g_device_mutex); + dev->dev_flags |=DF_CONFIGURED ; +return 0 ; out_free_alua:
drivers/target/target_core_pr.c +104 -26
269 lines not on this page · raw message
drivers/target/target_core_pscsi.c +1 -1
@@ -1111,7 +1111,7 @@ static u32 pscsi_get_device_type(struct se_device *dev)struct pscsi_dev_virt *pdv =PSCSI_DEV (dev);struct scsi_device *sd = pdv->pdv_sd; -return sd->type; +return (sd) ? sd->type :TYPE_NO_LUN ; }static sector_t pscsi_get_blocks (struct se_device *dev)
drivers/target/target_core_transport.c +4 -0
@@ -2327,6 +2327,10 @@ int target_get_sess_cmd(struct se_session *se_sess, struct se_cmd *se_cmd,list_add_tail (&se_cmd->se_cmd_list, &se_sess->sess_cmd_list); out:spin_unlock_irqrestore (&se_sess->sess_cmd_lock, flags); + +if (ret && ack_kref) +target_put_sess_cmd (se_sess, se_cmd); +return ret; }EXPORT_SYMBOL (target_get_sess_cmd);
drivers/tty/serial/8250/8250_pci.c +1 -1
@@ -66,7 +66,7 @@ static void moan_device(const char *str, struct pci_dev *dev)"Please send the output of lspci -vv, this\n" "message (0x%04x,0x%04x,0x%04x,0x%04x), the\n" "manufacturer and name of serial board or\n" -"modem board to [email protected].\n" , +"modem board to <[email protected]>.\n" ,pci_name (dev), str, dev->vendor, dev->device, dev->subsystem_vendor, dev->subsystem_device); }
drivers/xen/events/events_base.c +12 -6
@@ -547,20 +547,26 @@ static unsigned int __startup_pirq(unsigned int irq)pirq_query_unmask (irq); rc =set_evtchn_to_irq (evtchn, irq); -if (rc !=0 ) { -pr_err ("irq%d: Failed to set port to irq mapping (%d)\n" , - irq, rc); -xen_evtchn_close (evtchn); -return 0 ; - } +if (rc) + goto err; +bind_evtchn_to_cpu (evtchn,0 ); info->evtchn = evtchn; + rc =xen_evtchn_port_setup (info); +if (rc) + goto err; + out:unmask_evtchn (evtchn);eoi_pirq (irq_get_irq_data (irq));return 0 ; + +err: +pr_err ("irq%d: Failed to set port to irq mapping (%d)\n" , irq, rc); +xen_evtchn_close (evtchn); +return 0 ; }static unsigned int startup_pirq (struct irq_data *data)
drivers/xen/xen-pciback/conf_space.c +1 -1
@@ -16,7 +16,7 @@#include "conf_space.h" #include "conf_space_quirks.h" -static bool permissive; +bool permissive;module_param (permissive, bool,0644 );/* This is where xen_pcibk_read_config_byte, xen_pcibk_read_config_word,
drivers/xen/xen-pciback/conf_space.h +2 -0
@@ -64,6 +64,8 @@ struct config_field_entry {void *data; }; +extern bool permissive; +#define OFFSET (cfg_entry) ((cfg_entry)->base_offset+(cfg_entry)->field->offset)/* Add fields to a device - the add_fields macro expects to get a pointer to
drivers/xen/xen-pciback/conf_space_header.c +48 -13
94 lines not on this page · raw message
fs/fuse/dev.c +5 -2
@@ -819,8 +819,8 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) newpage = buf->page; -if (WARN_ON (!PageUptodate (newpage))) -return -EIO ; +if (!PageUptodate (newpage)) +SetPageUptodate (newpage);ClearPageMappedToDisk (newpage);
@@ -1726,6 +1726,9 @@ copy_finish:static int fuse_notify (struct fuse_conn *fc,enum fuse_notify_code code,unsigned int size,struct fuse_copy_state *cs) { +/* Don't try to move pages (yet) */ + cs->move_pages =0 ; +switch (code) {case FUSE_NOTIFY_POLL :return fuse_notify_poll (fc, size, cs);
fs/nilfs2/segment.c +4 -3
@@ -1906,6 +1906,7 @@ static void nilfs_segctor_drop_written_files(struct nilfs_sc_info *sci, struct the_nilfs *nilfs) {struct nilfs_inode_info *ii, *n; +int during_mount = !(sci->sc_super->s_flags &MS_ACTIVE );int defer_iput = false;spin_lock (&nilfs->ns_inode_lock);
@@ -1918,10 +1919,10 @@ static void nilfs_segctor_drop_written_files(struct nilfs_sc_info *sci,brelse (ii->i_bh); ii->i_bh =NULL ;list_del_init (&ii->i_dirty); -if (!ii->vfs_inode.i_nlink) { +if (!ii->vfs_inode.i_nlink || during_mount) {/* -* Defer calling iput() to avoid a deadlock -* over I_SYNC flag for inodes with i_nlink == 0 +* Defer calling iput() to avoid deadlocks if +* i_nlink == 0 or mount is not yet finished. */ list_add_tail (&ii->i_dirty, &sci->sc_iput_queue); defer_iput = true;
fs/proc/task_mmu.c +3 -0
@@ -1227,6 +1227,9 @@ out:static int pagemap_open (struct inode *inode,struct file *file) { +/* do not disclose physical addresses: attack vector */ +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ;pr_warn_once ("Bits 55-60 of /proc/PID/pagemap entries are about " "to stop being page-shift some time soon. See the " "linux/Documentation/vm/pagemap.txt for details.\n" );
include/linux/workqueue.h +2 -1
@@ -71,7 +71,8 @@ enum {/* data contains off-queue information when !WORK_STRUCT_PWQ */ WORK_OFFQ_FLAG_BASE =WORK_STRUCT_COLOR_SHIFT , - WORK_OFFQ_CANCELING = (1 << WORK_OFFQ_FLAG_BASE), + __WORK_OFFQ_CANCELING =WORK_OFFQ_FLAG_BASE , + WORK_OFFQ_CANCELING = (1 << __WORK_OFFQ_CANCELING),/* * When a work item is off queue, its high bits point to the last
kernel/cpuset.c +0 -3
@@ -503,9 +503,6 @@ static void update_domain_attr_tree(struct sched_domain_attr *dattr,rcu_read_lock ();cpuset_for_each_descendant_pre (cp, pos_css, root_cs) { -if (cp == root_cs) -continue ; -/* skip the whole subtree if @cp doesn't have any CPU */ if (cpumask_empty (cp->cpus_allowed)) { pos_css =css_rightmost_descendant (pos_css);
kernel/printk/console_cmdline.h +1 -1
@@ -3,7 +3,7 @@struct console_cmdline { -char name[8 ];/* Name of the driver */ +char name[16 ];/* Name of the driver */ int index;/* Minor dev. to use */ char *options;/* Options for the driver */ #ifdef CONFIG_A11Y_BRAILLE_CONSOLE
kernel/printk/printk.c +1 -0
@@ -2280,6 +2280,7 @@ void register_console(struct console *newcon)for (i =0 , c = console_cmdline; i <MAX_CMDLINECONSOLES && c->name[0 ]; i++, c++) { +BUILD_BUG_ON (sizeof (c->name) !=sizeof (newcon->name));if (strcmp (c->name, newcon->name) !=0 )continue ; if (newcon->index >= 0 &&
kernel/workqueue.c +52 -4
77 lines not on this page · raw message
lib/lz4/lz4_decompress.c +3 -0
@@ -139,6 +139,9 @@ static int lz4_uncompress(const char *source, char *dest, int osize)/* Error: request to write beyond destination buffer */ if (cpy > oend) goto _output_error; +if ((ref +COPYLENGTH ) > oend || + (op +COPYLENGTH ) > oend) + goto _output_error;LZ4_SECURECOPY (ref, op, (oend -COPYLENGTH ));while (op < cpy) *op++ = *ref++;
net/caif/caif_socket.c +1 -1
@@ -283,7 +283,7 @@ static int caif_seqpkt_recvmsg(struct kiocb *iocb, struct socket *sock,int copylen; ret = -EOPNOTSUPP ; -if (m->msg_flags&MSG_OOB ) +if (flags &MSG_OOB ) goto read_error; skb =skb_recv_datagram (sk, flags,0 , &ret);
net/can/af_can.c +3 -0
@@ -262,6 +262,9 @@ int can_send(struct sk_buff *skb, int loop) goto inval_skb; } + skb->ip_summed =CHECKSUM_UNNECESSARY ; + +skb_reset_mac_header (skb);skb_reset_network_header (skb);skb_reset_transport_header (skb);
net/compat.c +7 -0
@@ -71,6 +71,13 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)__get_user (kmsg->msg_controllen, &umsg->msg_controllen) || __get_user(kmsg->msg_flags, &umsg->msg_flags)) return -EFAULT; + +if (!tmp1) + kmsg->msg_namelen =0 ; + +if (kmsg->msg_namelen <0 ) +return -EINVAL ; +if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) kmsg->msg_namelen =sizeof (struct sockaddr_storage ); kmsg->msg_name =compat_ptr (tmp1);
net/core/sysctl_net_core.c +6 -4
@@ -25,6 +25,8 @@static int zero =0 ;static int one =1 ;static int ushort_max =USHRT_MAX ; +static int min_sndbuf =SOCK_MIN_SNDBUF ; +static int min_rcvbuf =SOCK_MIN_RCVBUF ;#ifdef CONFIG_RPS static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
@@ -223,7 +225,7 @@ static struct ctl_table net_core_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &one, + .extra1 = &min_sndbuf, }, { .procname = "rmem_max",
@@ -231,7 +233,7 @@ static struct ctl_table net_core_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &one, + .extra1 = &min_rcvbuf, }, { .procname = "wmem_default",
@@ -239,7 +241,7 @@ static struct ctl_table net_core_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &one, + .extra1 = &min_sndbuf, }, { .procname = "rmem_default",
@@ -247,7 +249,7 @@ static struct ctl_table net_core_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &one, + .extra1 = &min_rcvbuf, }, { .procname = "dev_weight",
net/ipv4/inet_diag.c +15 -3
@@ -71,6 +71,20 @@ static inline void inet_diag_unlock_handler(mutex_unlock (&inet_diag_table_mutex); } +static size_t inet_sk_attr_size (void ) +{ +return nla_total_size (sizeof (struct tcp_info )) + +nla_total_size (1 )/* INET_DIAG_SHUTDOWN */ + +nla_total_size (1 )/* INET_DIAG_TOS */ + +nla_total_size (1 )/* INET_DIAG_TCLASS */ + +nla_total_size (sizeof (struct inet_diag_meminfo )) + +nla_total_size (sizeof (struct inet_diag_msg )) + +nla_total_size (SK_MEMINFO_VARS *sizeof (u32)) + +nla_total_size (TCP_CA_NAME_MAX ) + +nla_total_size (sizeof (struct tcpvegas_info )) + +64 ; +} + int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, struct sk_buff *skb, struct inet_diag_req_v2 *req, struct user_namespace *user_ns,
@@ -324,9 +338,7 @@ int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *in_sif (err) goto out; - rep =nlmsg_new (sizeof (struct inet_diag_msg ) + -sizeof (struct inet_diag_meminfo ) + -sizeof (struct tcp_info ) +64 ,GFP_KERNEL ); + rep =nlmsg_new (inet_sk_attr_size (),GFP_KERNEL );if (!rep) { err = -ENOMEM ; goto out;
net/ipv4/tcp_output.c +28 -40
114 lines not on this page · raw message
net/ipv6/fib6_rules.c +1 -0
@@ -104,6 +104,7 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, goto again; flp6->saddr = saddr; } + err = rt->dst.error; goto out; } again:
net/netfilter/ipvs/ip_vs_core.c +22 -11
@@ -658,16 +658,24 @@ static inline int ip_vs_gather_frags(struct sk_buff *skb, u_int32_t user)return err; } -static int ip_vs_route_me_harder (int af,struct sk_buff *skb) +static int ip_vs_route_me_harder (int af,struct sk_buff *skb, +unsigned int hooknum) { +if (!sysctl_snat_reroute (skb)) +return 0 ; +/* Reroute replies only to remote clients (FORWARD and LOCAL_OUT) */ +if (NF_INET_LOCAL_IN == hooknum) +return 0 ;#ifdef CONFIG_IP_VS_IPV6 if (af ==AF_INET6 ) { -if (sysctl_snat_reroute (skb) &&ip6_route_me_harder (skb) !=0 ) +struct dst_entry *dst =skb_dst (skb); + +if (dst->dev && !(dst->dev->flags &IFF_LOOPBACK ) && +ip6_route_me_harder (skb) !=0 )return 1 ; } else#endif -if ((sysctl_snat_reroute (skb) || -skb_rtable (skb)->rt_flags &RTCF_LOCAL ) && +if (!(skb_rtable (skb)->rt_flags &RTCF_LOCAL ) &&ip_route_me_harder (skb,RTN_LOCAL ) !=0 )return 1 ;
@@ -790,7 +798,8 @@ static int handle_response_icmp(int af, struct sk_buff *skb,union nf_inet_addr *snet, __u8 protocol, struct ip_vs_conn *cp, struct ip_vs_protocol *pp, - unsigned int offset, unsigned int ihl) + unsigned int offset, unsigned int ihl, + unsigned int hooknum) { unsigned int verdict = NF_DROP;
@@ -820,7 +829,7 @@ static int handle_response_icmp(int af, struct sk_buff *skb,#endif ip_vs_nat_icmp (skb, pp, cp,1 ); -if (ip_vs_route_me_harder (af, skb)) +if (ip_vs_route_me_harder (af, skb, hooknum)) goto out;/* do the statistics and put it back */
@@ -915,7 +924,7 @@ static int ip_vs_out_icmp(struct sk_buff *skb, int *related, snet.ip = iph->saddr;return handle_response_icmp (AF_INET , skb, &snet, cih->protocol, cp, - pp, ciph.len, ihl); + pp, ciph.len, ihl, hooknum); }#ifdef CONFIG_IP_VS_IPV6
@@ -980,7 +989,8 @@ static int ip_vs_out_icmp_v6(struct sk_buff *skb, int *related, snet.in6 = ciph.saddr.in6; writable = ciph.len;return handle_response_icmp (AF_INET6 , skb, &snet, ciph.protocol, cp, - pp, writable, sizeof(struct ipv6hdr)); + pp, writable,sizeof (struct ipv6hdr ), + hooknum); }#endif
@@ -1039,7 +1049,8 @@ static inline bool is_new_conn(const struct sk_buff *skb,*/ static unsigned int handle_response (int af,struct sk_buff *skb,struct ip_vs_proto_data *pd, -struct ip_vs_conn *cp,struct ip_vs_iphdr *iph) +struct ip_vs_conn *cp,struct ip_vs_iphdr *iph, +unsigned int hooknum) {struct ip_vs_protocol *pp = pd->pp;
@@ -1077,7 +1088,7 @@ handle_response(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,* if it came from this machine itself. So re-compute * the routing information. */ -if (ip_vs_route_me_harder (af, skb)) +if (ip_vs_route_me_harder (af, skb, hooknum)) goto drop;IP_VS_DBG_PKT (10 , af, pp, skb,0 ,"After SNAT" );
@@ -1180,7 +1191,7 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af) cp = pp->conn_out_get (af, skb, &iph,0 );if (likely (cp)) -return handle_response (af, skb, pd, cp, &iph); +return handle_response (af, skb, pd, cp, &iph, hooknum); if (sysctl_nat_icmp_send(net) && (pp->protocol == IPPROTO_TCP || pp->protocol == IPPROTO_UDP ||
net/netfilter/ipvs/ip_vs_sync.c +3 -0
@@ -891,6 +891,8 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,IP_VS_DBG (2 ,"BACKUP, add new conn. failed\n" );return ; } +if (!(flags &IP_VS_CONN_F_TEMPLATE )) +kfree (param->pe_data); }if (opt)
@@ -1164,6 +1166,7 @@ static inline int ip_vs_proc_sync_conn(struct net *net, __u8 *p, __u8 *msg_end) (opt_flags &IPVS_OPT_F_SEQ_DATA ? &opt :NULL ) );#endif +ip_vs_pe_put (param.pe);return 0 ;/* Error exit */ out:
net/netfilter/nft_compat.c +10 -2
@@ -611,8 +611,12 @@ nft_match_select_ops(const struct nft_ctx *ctx,struct xt_match *match = nft_match->ops.data;if (strcmp (match->name, mt_name) ==0 && - match->revision == rev && match->family == family) + match->revision == rev && match->family == family) { +if (!try_module_get (match->me)) +return ERR_PTR (-ENOENT ); +return &nft_match->ops; + } } match =xt_request_find_match (family, mt_name, rev);
@@ -682,8 +686,12 @@ nft_target_select_ops(const struct nft_ctx *ctx,struct xt_target *target = nft_target->ops.data;if (strcmp (target->name, tg_name) ==0 && - target->revision == rev && target->family == family) + target->revision == rev && target->family == family) { +if (!try_module_get (target->me)) +return ERR_PTR (-ENOENT ); +return &nft_target->ops; + } } target =xt_request_find_target (family, tg_name, rev);
net/netfilter/xt_socket.c +12 -9
@@ -243,12 +243,13 @@ static int extract_icmp6_fields(const struct sk_buff *skb, unsigned int outside_hdrlen, int *protocol, - struct in6_addr **raddr, - struct in6_addr **laddr, + const struct in6_addr **raddr, + const struct in6_addr **laddr, __be16 *rport, - __be16 *lport) + __be16 *lport, + struct ipv6hdr *ipv6_var) { - struct ipv6hdr *inside_iph, _inside_iph; + const struct ipv6hdr *inside_iph;struct icmp6hdr *icmph, _icmph;__be16 *ports, _ports[2 ];u8 inside_nexthdr;
@@ -263,12 +264,14 @@ extract_icmp6_fields(const struct sk_buff *skb,if (icmph->icmp6_type &ICMPV6_INFOMSG_MASK )return 1 ; - inside_iph =skb_header_pointer (skb, outside_hdrlen +sizeof (_icmph),sizeof (_inside_iph), &_inside_iph); + inside_iph =skb_header_pointer (skb, outside_hdrlen +sizeof (_icmph), +sizeof (*ipv6_var), ipv6_var);if (inside_iph ==NULL )return 1 ; inside_nexthdr = inside_iph->nexthdr; - inside_hdrlen =ipv6_skip_exthdr (skb, outside_hdrlen +sizeof (_icmph) +sizeof (_inside_iph), + inside_hdrlen =ipv6_skip_exthdr (skb, outside_hdrlen +sizeof (_icmph) + +sizeof (*ipv6_var), &inside_nexthdr, &inside_fragoff);if (inside_hdrlen <0 )return 1 ;/* hjm: Packet has no/incomplete transport layer headers. */
@@ -315,10 +318,10 @@ xt_socket_get_sock_v6(struct net *net, const u8 protocol,static bool socket_mt6_v1_v2 (const struct sk_buff *skb,struct xt_action_param *par) { -struct ipv6hdr *iph =ipv6_hdr (skb); +struct ipv6hdr ipv6_var, *iph =ipv6_hdr (skb);struct udphdr _hdr, *hp =NULL ;struct sock *sk = skb->sk; -struct in6_addr *daddr =NULL , *saddr =NULL ; +const struct in6_addr *daddr =NULL , *saddr =NULL ;__be16 uninitialized_var (dport ),uninitialized_var (sport );int thoff =0 ,uninitialized_var (tproto );const struct xt_socket_mtinfo1 *info = (struct xt_socket_mtinfo1 *) par->matchinfo;
@@ -342,7 +345,7 @@ socket_mt6_v1_v2(const struct sk_buff *skb, struct xt_action_param *par) }else if (tproto ==IPPROTO_ICMPV6 ) {if (extract_icmp6_fields (skb, thoff, &tproto, &saddr, &daddr, - &sport, &dport)) + &sport, &dport, &ipv6_var))return false; }else {return false;
net/rds/iw_rdma.c +22 -18
@@ -88,7 +88,9 @@ static unsigned int rds_iw_unmap_fastreg_list(struct rds_iw_mr_pool *pool, int *unpinned);static void rds_iw_destroy_fastreg (struct rds_iw_mr_pool *pool,struct rds_iw_mr *ibmr); -static int rds_iw_get_device (struct rds_sock *rs,struct rds_iw_device **rds_iwdev,struct rdma_cm_id **cm_id) +static int rds_iw_get_device (struct sockaddr_in *src,struct sockaddr_in *dst, +struct rds_iw_device **rds_iwdev, +struct rdma_cm_id **cm_id) {struct rds_iw_device *iwdev;struct rds_iw_cm_id *i_cm_id;
@@ -112,15 +114,15 @@ static int rds_iw_get_device(struct rds_sock *rs, struct rds_iw_device **rds_iwd src_addr->sin_port, dst_addr->sin_addr.s_addr, dst_addr->sin_port, - rs->rs_bound_addr, - rs->rs_bound_port, - rs->rs_conn_addr, - rs->rs_conn_port); + src->sin_addr.s_addr, + src->sin_port, + dst->sin_addr.s_addr, + dst->sin_port);#ifdef WORKING_TUPLE_DETECTION -if (src_addr->sin_addr.s_addr == rs->rs_bound_addr && - src_addr->sin_port == rs->rs_bound_port && - dst_addr->sin_addr.s_addr == rs->rs_conn_addr && - dst_addr->sin_port == rs->rs_conn_port) { +if (src_addr->sin_addr.s_addr == src->sin_addr.s_addr && + src_addr->sin_port == src->sin_port && + dst_addr->sin_addr.s_addr == dst->sin_addr.s_addr && + dst_addr->sin_port == dst->sin_port) {#else /* FIXME - needs to compare the local and remote * ipaddr/port tuple, but the ipaddr is the only
@@ -128,7 +130,7 @@ static int rds_iw_get_device(struct rds_sock *rs, struct rds_iw_device **rds_iwd* zero'ed. It doesn't appear to be properly populated * during connection setup... */ -if (src_addr->sin_addr.s_addr == rs->rs_bound_addr) { +if (src_addr->sin_addr.s_addr == src->sin_addr.s_addr) {#endif spin_unlock_irq (&iwdev->spinlock); *rds_iwdev = iwdev;
@@ -180,19 +182,13 @@ int rds_iw_update_cm_id(struct rds_iw_device *rds_iwdev, struct rdma_cm_id *cm_i {struct sockaddr_in *src_addr, *dst_addr;struct rds_iw_device *rds_iwdev_old; -struct rds_sock rs;struct rdma_cm_id *pcm_id;int rc; src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr; dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr; - rs.rs_bound_addr = src_addr->sin_addr.s_addr; - rs.rs_bound_port = src_addr->sin_port; - rs.rs_conn_addr = dst_addr->sin_addr.s_addr; - rs.rs_conn_port = dst_addr->sin_port; - - rc =rds_iw_get_device (&rs, &rds_iwdev_old, &pcm_id); + rc =rds_iw_get_device (src_addr, dst_addr, &rds_iwdev_old, &pcm_id);if (rc)rds_iw_remove_cm_id (rds_iwdev, cm_id);
@@ -598,9 +594,17 @@ void *rds_iw_get_mr(struct scatterlist *sg, unsigned long nents,struct rds_iw_device *rds_iwdev;struct rds_iw_mr *ibmr =NULL ;struct rdma_cm_id *cm_id; +struct sockaddr_in src = { + .sin_addr.s_addr = rs->rs_bound_addr, + .sin_port = rs->rs_bound_port, + }; +struct sockaddr_in dst = { + .sin_addr.s_addr = rs->rs_conn_addr, + .sin_port = rs->rs_conn_port, + };int ret; - ret =rds_iw_get_device (rs, &rds_iwdev, &cm_id); + ret =rds_iw_get_device (&src, &dst, &rds_iwdev, &cm_id);if (ret || !cm_id) { ret = -ENODEV ; goto out;
net/rxrpc/ar-recvmsg.c +1 -1
@@ -87,7 +87,7 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock,if (!skb) {/* nothing remains on the queue */ if (copied && - (msg->msg_flags &MSG_PEEK || timeo ==0 )) + (flags &MSG_PEEK || timeo ==0 )) goto out;/* wait for a message to turn up */
sound/core/control.c +4 -0
@@ -1168,6 +1168,10 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file,if (info->count <1 )return -EINVAL ; +if (!*info->id.name) +return -EINVAL ; +if (strnlen (info->id.name,sizeof (info->id.name)) >=sizeof (info->id.name)) +return -EINVAL ; access = info->access == 0 ? SNDRV_CTL_ELEM_ACCESS_READWRITE : (info->access & (SNDRV_CTL_ELEM_ACCESS_READWRITE| SNDRV_CTL_ELEM_ACCESS_INACTIVE|
sound/pci/hda/hda_generic.c +39 -8
71 lines not on this page · raw message
sound/pci/hda/hda_intel.c +1 -1
@@ -959,7 +959,7 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus, } } -if (!bus->no_response_fallback) +if (bus->no_response_fallback)return -1 ;if (!chip->polling_mode && chip->poll_count <2 ) {
sound/pci/hda/hda_proc.c +30 -8
@@ -134,13 +134,38 @@ static void print_amp_caps(struct snd_info_buffer *buffer, (caps & AC_AMPCAP_MUTE) >> AC_AMPCAP_MUTE_SHIFT); } +/* is this a stereo widget or a stereo-to-mono mix? */ +static bool is_stereo_amps (struct hda_codec *codec,hda_nid_t nid, +int dir,unsigned int wcaps,int indices) +{ +hda_nid_t conn; + +if (wcaps &AC_WCAP_STEREO ) +return true; +/* check for a stereo-to-mono mix; it must be: +* only a single connection, only for input, and only a mixer widget +*/ +if (indices !=1 || dir !=HDA_INPUT || +get_wcaps_type (wcaps) !=AC_WID_AUD_MIX ) +return false; + +if (snd_hda_get_raw_connections (codec, nid, &conn,1 ) <0 ) +return false; +/* the connection source is a stereo? */ + wcaps =snd_hda_param_read (codec, conn,AC_PAR_AUDIO_WIDGET_CAP ); +return !!(wcaps &AC_WCAP_STEREO ); +} +static void print_amp_vals (struct snd_info_buffer *buffer,struct hda_codec *codec,hda_nid_t nid, -int dir,int stereo,int indices) +int dir,unsigned int wcaps,int indices) {unsigned int val; +bool stereo;int i; + stereo =is_stereo_amps (codec, nid, dir, wcaps, indices); + dir = dir ==HDA_OUTPUT ?AC_AMP_GET_OUTPUT :AC_AMP_GET_INPUT ;for (i =0 ; i < indices; i++) {snd_iprintf (buffer," [" );
@@ -757,12 +782,10 @@ static void print_codec_info(struct snd_info_entry *entry, (codec->single_adc_amp && wid_type == AC_WID_AUD_IN))print_amp_vals (buffer, codec, nid,HDA_INPUT , - wid_caps &AC_WCAP_STEREO , -1 ); + wid_caps,1 ); elseprint_amp_vals (buffer ,codec ,nid ,HDA_INPUT , - wid_caps & AC_WCAP_STEREO, - conn_len); +wid_caps ,conn_len ); }if (wid_caps &AC_WCAP_OUT_AMP ) {snd_iprintf (buffer," Amp-Out caps: " );
@@ -771,11 +794,10 @@ static void print_codec_info(struct snd_info_entry *entry,if (wid_type ==AC_WID_PIN && codec->pin_amp_workaround)print_amp_vals (buffer, codec, nid,HDA_OUTPUT , - wid_caps &AC_WCAP_STEREO , - conn_len); + wid_caps, conn_len);else print_amp_vals (buffer, codec, nid,HDA_OUTPUT , - wid_caps &AC_WCAP_STEREO ,1 ); + wid_caps,1 ); }switch (wid_type) {
sound/pci/hda/patch_cirrus.c +2 -0
@@ -396,6 +396,7 @@ static const struct snd_pci_quirk cs420x_fixup_tbl[] = {SND_PCI_QUIRK (0x106b ,0x1c00 ,"MacBookPro 8,1" ,CS420X_MBP81 ),SND_PCI_QUIRK (0x106b ,0x2000 ,"iMac 12,2" ,CS420X_IMAC27_122 ),SND_PCI_QUIRK (0x106b ,0x2800 ,"MacBookPro 10,1" ,CS420X_MBP101 ), +SND_PCI_QUIRK (0x106b ,0x5600 ,"MacBookAir 5,2" ,CS420X_MBP81 ),SND_PCI_QUIRK (0x106b ,0x5b00 ,"MacBookAir 4,2" ,CS420X_MBA42 ), SND_PCI_QUIRK_VENDOR(0x106b, "Apple", CS420X_APPLE), {} /* terminator */
@@ -587,6 +588,7 @@ static int patch_cs420x(struct hda_codec *codec)return -ENOMEM ; spec->gen.automute_hook = cs_automute; + codec->single_adc_amp =1 ;snd_hda_pick_fixup (codec, cs420x_models, cs420x_fixup_tbl, cs420x_fixups);
sound/pci/hda/patch_conexant.c +11 -0
@@ -3232,6 +3232,7 @@ enum {CXT_PINCFG_LENOVO_TP410 ,CXT_PINCFG_LEMOTE_A1004 ,CXT_PINCFG_LEMOTE_A1205 , +CXT_PINCFG_COMPAQ_CQ60 ,CXT_FIXUP_STEREO_DMIC ,CXT_FIXUP_INC_MIC_BOOST , CXT_FIXUP_HEADPHONE_MIC_PIN,
@@ -3368,6 +3369,15 @@ static const struct hda_fixup cxt_fixups[] = { .type = HDA_FIXUP_PINS, .v.pins = cxt_pincfg_lemote, }, + [CXT_PINCFG_COMPAQ_CQ60] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { +/* 0x17 was falsely set up as a mic, it should 0x1d */ + {0x17 ,0x400001f0 }, + {0x1d ,0x97a70120 }, + { } + } + }, [CXT_FIXUP_STEREO_DMIC] = { .type = HDA_FIXUP_FUNC, .v.func = cxt_fixup_stereo_dmic,
@@ -3411,6 +3421,7 @@ static const struct hda_fixup cxt_fixups[] = { };static const struct snd_pci_quirk cxt5051_fixups[] = { +SND_PCI_QUIRK (0x103c ,0x360b ,"Compaq CQ60" ,CXT_PINCFG_COMPAQ_CQ60 ),SND_PCI_QUIRK (0x17aa ,0x20f2 ,"Lenovo X200" ,CXT_PINCFG_LENOVO_X200 ), {} };
sound/usb/quirks-table.h +30 -0
@@ -1773,6 +1773,36 @@ YAMAHA_DEVICE(0x7010, "UB99"), } } }, +{ + USB_DEVICE(0x0582, 0x0159), + .driver_info = (unsigned long ) & (const struct snd_usb_audio_quirk ) { +/* .vendor_name = "Roland", */ +/* .product_name = "UA-22", */ + .ifnum =QUIRK_ANY_INTERFACE , + .type =QUIRK_COMPOSITE , + .data = (const struct snd_usb_audio_quirk []) { + { + .ifnum =0 , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum =1 , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum =2 , + .type =QUIRK_MIDI_FIXED_ENDPOINT , + .data = & (const struct snd_usb_midi_endpoint_info ) { + .out_cables =0x0001 , + .in_cables =0x0001 + } + }, + { + .ifnum =-1 + } + } + } +}, /* this catches most recent vendor-specific Roland devices */ { .match_flags = USB_DEVICE_ID_MATCH_VENDOR |