Linux 4.13.10
Greg KH
maintainerI'm announcing the release of the 4.13.10 kernel.
All users of the 4.13 kernel series must upgrade.
The updated 4.13.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.13.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/sun6i-a31.dtsi | 16 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 4 arch/parisc/kernel/syscall.S | 6 arch/parisc/kernel/time.c | 5 arch/s390/kernel/smp.c | 3 arch/x86/kernel/cpu/microcode/intel.c | 19 + crypto/asymmetric_keys/pkcs7_parser.c | 3 drivers/block/nbd.c | 2 drivers/bus/mvebu-mbus.c | 2 drivers/clocksource/cs5535-clockevt.c | 3 drivers/gpu/drm/i915/intel_ddi.c | 4 drivers/gpu/drm/nouveau/nv50_display.c | 5 drivers/gpu/drm/nouveau/nvkm/engine/bsp/g84.c | 2 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c | 2 drivers/i2c/busses/i2c-ismt.c | 5 drivers/i2c/busses/i2c-piix4.c | 30 + drivers/iio/dummy/iio_simple_dummy_events.c | 1 drivers/input/touchscreen/stmfts.c | 6 drivers/media/cec/cec-adap.c | 13 drivers/media/dvb-frontends/dib3000mc.c | 50 ++ drivers/media/dvb-frontends/dvb-pll.c | 22 - drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c | 3 drivers/media/platform/s5p-cec/s5p_cec.c | 11 drivers/media/platform/s5p-cec/s5p_cec.h | 2 drivers/media/tuners/mt2060.c | 59 ++- drivers/mmc/host/sdhci-pci-core.c | 2 drivers/net/can/flexcan.c | 91 ++++- drivers/net/can/usb/esd_usb2.c | 2 drivers/net/can/usb/gs_usb.c | 10 drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c | 3 drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c | 197 +++++------ drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 2 drivers/scsi/qla2xxx/qla_os.c | 3 drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c | 19 - drivers/usb/class/cdc-acm.c | 3 drivers/usb/core/config.c | 6 drivers/usb/core/devio.c | 6 drivers/usb/core/hub.c | 11 drivers/usb/core/quirks.c | 4 drivers/usb/host/xhci-hub.c | 23 + drivers/usb/host/xhci-ring.c | 21 - drivers/usb/host/xhci.c | 3 drivers/usb/musb/musb_core.c | 21 - drivers/usb/musb/musb_core.h | 2 drivers/usb/musb/musb_cppi41.c | 94 ++++- drivers/usb/musb/sunxi.c | 2 drivers/usb/serial/metro-usb.c | 1 fs/crypto/keyinfo.c | 5 fs/ecryptfs/ecryptfs_kernel.h | 24 - fs/ecryptfs/keystore.c | 9 fs/fscache/object-list.c | 7 fs/iomap.c | 14 fs/xfs/libxfs/xfs_ag_resv.c | 12 fs/xfs/libxfs/xfs_alloc.c | 8 fs/xfs/libxfs/xfs_bmap.c | 11 fs/xfs/libxfs/xfs_bmap.h | 1 fs/xfs/libxfs/xfs_log_format.h | 27 - fs/xfs/xfs_acl.c | 22 - fs/xfs/xfs_aops.c | 50 ++ fs/xfs/xfs_attr_inactive.c | 2 fs/xfs/xfs_bmap_util.c | 40 ++ fs/xfs/xfs_bmap_util.h | 13 fs/xfs/xfs_error.c | 2 fs/xfs/xfs_file.c | 35 + fs/xfs/xfs_fsmap.c | 58 +-- fs/xfs/xfs_inode.c | 8 fs/xfs/xfs_inode_item.c | 81 ++-- fs/xfs/xfs_iomap.c | 7 fs/xfs/xfs_iomap.h | 2 fs/xfs/xfs_ondisk.h | 2 fs/xfs/xfs_pnfs.c | 2 fs/xfs/xfs_reflink.c | 9 include/linux/key.h | 47 +- include/linux/mbus.h | 4 include/sound/control.h | 3 lib/digsig.c | 6 net/can/af_can.c | 14 net/dns_resolver/dns_key.c | 2 samples/trace_events/trace-events-sample.c | 14 security/keys/big_key.c | 4 security/keys/encrypted-keys/encrypted.c | 9 security/keys/gc.c | 8 security/keys/key.c | 41 +- security/keys/keyctl.c | 9 security/keys/keyring.c | 10 security/keys/proc.c | 7 security/keys/process_keys.c | 2 security/keys/request_key.c | 7 security/keys/request_key_auth.c | 2 security/keys/trusted.c | 2 security/keys/user_defined.c | 4 sound/core/seq/seq_lock.c | 4 sound/core/seq/seq_lock.h | 12 sound/core/vmaster.c | 31 + sound/hda/hdac_controller.c | 5 sound/pci/hda/hda_codec.c | 97 +++-- sound/usb/quirks.c | 1 tools/power/x86/turbostat/turbostat.c | 10 99 files changed, 1090 insertions(+), 522 deletions(-)
Adrian Hunter (1):
mmc: sdhci-pci: Fix default d3_retune for Intel host controllers
Alan Stern (1):
USB: core: fix out-of-bounds access bug in usb_get_bos_descriptor()
Alexandre Bailon (3):
usb: musb: musb_cppi41: Fix the address of teardown and autoreq registers
usb: musb: musb_cppi41: Fix cppi41_set_dma_mode() for DA8xx
usb: musb: musb_cppi41: Configure the number of channels for DA8xx
Arnd Bergmann (2):
brcmsmac: make some local variables 'static const' to reduce stack size
xfs: move two more RT specific functions into CONFIG_XFS_RT
Ben Hutchings (1):
ALSA: seq: Enable 'use' locking in all configurations
Ben Skeggs (2):
drm/nouveau/kms/nv50: fix oops during DP IRQ handling on non-MST boards drm/nouveau/mmu: flush tlbs before deleting page tables
Borislav Petkov (1):
x86/microcode/intel: Disable late loading on model 79
Brian Foster (2):
xfs: reinit btree pointer on attr tree inactivation walk
xfs: trim writepage mapping to within eof
Carlos Maiolino (1):
xfs: Capture state of the right inode in xfs_iflush_done
Chandan Rajendra (1):
iomap_dio_rw: Allocate AIO completion queue before submitting dio
Chanwoo Choi (1):
Input: stmfts - fix setting ABS_MT_POSITION_* maximum size
Chen-Yu Tsai (1):
ARM: dts: sun6i: Fix endpoint IDs in second display pipeline
Chris Wilson (1):
drm/i915: Use bdw_ddi_translations_fdi for Broadwell
Christian Borntraeger (1):
s390/cputime: fix guest/irq/softirq times after CPU hotplug
Christoph Hellwig (1):
xfs: handle racy AIO in xfs_reflink_end_cow
Darrick J. Wong (4):
xfs: don't unconditionally clear the reflink flag on zero-block files
xfs: evict CoW fork extents when performing finsert/fcollapse
xfs: perag initialization should only touch m_ag_max_usable for AG 0
xfs: always swap the cow forks when swapping extents
Dave Chinner (4):
xfs: Don't log uninitialised fields in inode structures
xfs: move more RT specific code under CONFIG_XFS_RT
xfs: don't change inode mode if ACL update fails
xfs: cancel dirty pages on invalidation
David Howells (2):
KEYS: Fix race between updating and finding a negative key
KEYS: don't let add_key() update an uninstantiated key
David Kozub (1):
clockevents/drivers/cs5535: Improve resilience to spurious interrupts
Eric Biggers (5):
KEYS: encrypted: fix dereference of NULL user_key_payload lib/digsig: fix dereference of NULL user_key_payload
fscrypt: fix dereference of NULL user_key_payload
ecryptfs: fix dereference of NULL user_key_payload
FS-Cache: fix dereference of NULL user_key_payload
Eric Sandeen (1):
xfs: handle error if xfs_btree_get_bufs fails
Eric Sesterhenn (1):
pkcs7: Prevent NULL pointer dereference, since sinfo is not always set.
Eryu Guan (2):
xfs: report zeroed or not correctly in xfs_zero_range()
xfs: update i_size after unwritten conversion in dio completion
Felipe Balbi (1):
usb: quirks: add quirk for WORLDE MINI MIDI keyboard
Greg Kroah-Hartman (1):
Linux 4.13.10
Guenter Roeck (1):
i2c: piix4: Fix SMBus port selection for AMD Family 17h chips
Hans Verkuil (1):
media: s5p-cec: add NACK detection support
Hans de Goede (1):
USB: devio: Revert "USB: devio: Don't corrupt user memory"
Helge Deller (2):
parisc: Fix detection of nonsynchronous cr16 cycle counters fs/xfs: Use %pS printk format for direct addresses
Ilia Mirkin (1):
drm/nouveau/bsp/g92: disable by default
Jan Luebbe (1):
bus: mbus: fix window size calculation for 4GB windows
Jeffy Chen (1):
xhci: Cleanup current_cmd in xhci_cleanup_command_queue()
Johan Hovold (3):
USB: serial: metro-usb: add MS7820 device id
USB: musb: fix session-bit runtime-PM quirk
USB: musb: fix late external abort on suspend
John David Anglin (1):
parisc: Fix double-word compare and exchange in LWS code on 32-bit kernels
Jonathan Liu (2):
usb: musb: sunxi: Explicitly release USB PHY on exit
usb: musb: Check for host-mode using is_host_active() on reset interrupt
Jose Abreu (1):
media: cec: Respond to unregistered initiators, when applicable
Josef Bacik (1):
nbd: don't set the device size until we're connected
Jussi Laako (1):
ALSA: usb-audio: Add native DSD support for Pro-Ject Pre Box S2 Digital
Kevin Cernekee (1):
brcmfmac: Add check for short event packets
Larry Finger (1):
rtlwifi: rtl8821ae: Fix connection lost problem
Lars-Peter Clausen (1):
iio: dummy: events: Add missing break
Len Brown (1):
Revert "tools/power turbostat: stop migrating, unless '-m'"
Lu Baolu (1):
usb: xhci: Reset halted endpoint if trb is noop
Maksim Salau (1):
usb: cdc_acm: Add quirk for Elatec TWN3
Marc Kleine-Budde (1):
can: af_can: can_pernet_init(): add missing error handling for kzalloc returning NULL
Mathias Nyman (2):
usb: hub: Allow reset retry for USB2 devices on connect bounce
xhci: Identify USB 3.1 capable hosts by their port protocol capability
Mayank Rana (1):
usb: xhci: Handle error condition in xhci_stop_device()
Phil Elwell (1):
staging: bcm2835-audio: Fix memory corruption
Pontus Andersson (1):
i2c: ismt: Separate I2C block read from SMBus block read
Quinn Tran (1):
scsi: qla2xxx: Fix uninitialized work element
Sean Young (1):
media: dvb: i2c transfers over usb cannot be done from stack
Shawn Lin (1):
arm64: dts: rockchip: correct vqmmc voltage for rk3399 platforms
Stefan Mätje (1):
can: esd_usb2: Fix can_dlc value for received RTR, frames
Steven Rostedt (VMware) (1):
tracing/samples: Fix creation and deletion of simple_thread_fn creation
Takashi Iwai (3):
ALSA: hda: Remove superfluous '-' added by printk conversion
ALSA: hda: Abort capability probe at invalid register read
ALSA: hda - Fix incorrect TLV callback check introduced during set_fs() removal
Wolfgang Grandegger (1):
can: gs_usb: fix busy loop if no more TX context is available
ZHU Yi (ST-FIR/ENG1-Zhu) (6):
can: flexcan: fix state transition regression
can: flexcan: rename legacy error state quirk
can: flexcan: implement error passive state quirk
can: flexcan: fix i.MX6 state transition issue
can: flexcan: fix i.MX28 state transition issue
can: flexcan: fix p1010 state transition issue
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 13 -SUBLEVEL = 9 +SUBLEVEL = 10 EXTRAVERSION = NAME = Fearless Coyote
arch/arm/boot/dts/sun6i-a31.dtsi +8 -8
@@ -311,8 +311,8 @@ #size-cells = <0>; reg = <0>; - tcon1_in_drc1: endpoint@0 { - reg = <0>; + tcon1_in_drc1: endpoint@1 { + reg = <1>; remote-endpoint = <&drc1_out_tcon1>; }; };
@@ -1012,8 +1012,8 @@ #size-cells = <0>; reg = <1>; - be1_out_drc1: endpoint@0 { - reg = <0>; + be1_out_drc1: endpoint@1 { + reg = <1>; remote-endpoint = <&drc1_in_be1>; }; };
@@ -1042,8 +1042,8 @@ #size-cells = <0>; reg = <0>; - drc1_in_be1: endpoint@0 { - reg = <0>; + drc1_in_be1: endpoint@1 { + reg = <1>; remote-endpoint = <&be1_out_drc1>; }; };
@@ -1053,8 +1053,8 @@ #size-cells = <0>; reg = <1>; - drc1_out_tcon1: endpoint@0 { - reg = <0>; + drc1_out_tcon1: endpoint@1 { + reg = <1>; remote-endpoint = <&tcon1_in_drc1>; }; };
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +2 -2
@@ -370,10 +370,10 @@ regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; + regulator-max-microvolt = <3000000>; regulator-state-mem { regulator-on-in-suspend; - regulator-suspend-microvolt = <3300000>; + regulator-suspend-microvolt = <3000000>; }; };
arch/parisc/kernel/syscall.S +3 -3
@@ -742,7 +742,7 @@ lws_compare_and_swap_2: 10: ldd 0(%r25), %r25 11: ldd 0(%r24), %r24 #else - /* Load new value into r22/r23 - high/low */ + /* Load old value into r22/r23 - high/low */ 10: ldw 0(%r25), %r22 11: ldw 4(%r25), %r23 /* Load new value into fr4 for atomic store later */
@@ -834,11 +834,11 @@ cas2_action: copy %r0, %r28 #else /* Compare first word */ -19: ldw,ma 0(%r26), %r29 +19: ldw 0(%r26), %r29 sub,= %r29, %r22, %r0 b,n cas2_end /* Compare second word */ -20: ldw,ma 4(%r26), %r29 +20: ldw 4(%r26), %r29 sub,= %r29, %r23, %r0 b,n cas2_end /* Perform the store */
arch/parisc/kernel/time.c +4 -1
@@ -253,7 +253,10 @@ static int __init init_cr16_clocksource(void) cpu0_loc =per_cpu (cpu_data,0 ).cpu_loc;for_each_online_cpu (cpu) { -if (cpu0_loc ==per_cpu (cpu_data, cpu).cpu_loc) +if (cpu ==0 ) +continue ; +if ((cpu0_loc !=0 ) && + (cpu0_loc ==per_cpu (cpu_data, cpu).cpu_loc))continue ; clocksource_cr16.name ="cr16_unstable" ;
arch/s390/kernel/smp.c +3 -0
@@ -293,7 +293,10 @@ static void pcpu_attach_task(struct pcpu *pcpu, struct task_struct *tsk) lc->lpp =LPP_MAGIC ; lc->current_pid = tsk->pid; lc->user_timer = tsk->thread.user_timer; + lc->guest_timer = tsk->thread.guest_timer; lc->system_timer = tsk->thread.system_timer; + lc->hardirq_timer = tsk->thread.hardirq_timer; + lc->softirq_timer = tsk->thread.softirq_timer; lc->steal_timer =0 ; }
arch/x86/kernel/cpu/microcode/intel.c +19 -0
@@ -34,6 +34,7 @@#include <linux/mm.h> #include <asm/microcode_intel.h> +#include <asm/intel-family.h> #include <asm/processor.h> #include <asm/tlbflush.h> #include <asm/setup.h>
@@ -917,6 +918,18 @@ static int get_ucode_fw(void *to, const void *from, size_t n)return 0 ; } +static bool is_blacklisted (unsigned int cpu) +{ +struct cpuinfo_x86 *c = &cpu_data (cpu); + +if (c->x86 ==6 && c->x86_model ==INTEL_FAM6_BROADWELL_X ) { +pr_err_once ("late loading on model 79 is disabled.\n" ); +return true; + } + +return false; +} +static enum ucode_state request_microcode_fw (int cpu,struct device *device,bool refresh_fw) {
@@ -925,6 +938,9 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,const struct firmware *firmware;enum ucode_state ret; +if (is_blacklisted (cpu)) +return UCODE_NFOUND ; +sprintf (name,"intel-ucode/%02x-%02x-%02x" , c->x86, c->x86_model, c->x86_mask);
@@ -949,6 +965,9 @@ static int get_ucode_user(void *to, const void *from, size_t n)static enum ucode_state request_microcode_user (int cpu,const void __user *buf,size_t size) { +if (is_blacklisted (cpu)) +return UCODE_NFOUND ; +return generic_load_microcode (cpu, (void *)buf, size, &get_ucode_user); }
crypto/asymmetric_keys/pkcs7_parser.c +3 -0
@@ -88,6 +88,9 @@ static int pkcs7_check_authattrs(struct pkcs7_message *msg)bool want = false; sinfo = msg->signed_infos; +if (!sinfo) + goto inconsistent; +if (sinfo->authattrs) { want = true; msg->have_authattrs = true;
drivers/block/nbd.c +1 -1
@@ -243,7 +243,6 @@ static void nbd_size_set(struct nbd_device *nbd, loff_t blocksize,struct nbd_config *config = nbd->config; config->blksize = blocksize; config->bytesize = blocksize * nr_blocks; -nbd_size_update (nbd); }static void nbd_complete_rq (struct request *req)
@@ -1090,6 +1089,7 @@ static int nbd_start_device(struct nbd_device *nbd) args->index = i;queue_work (recv_workqueue, &args->work); } +nbd_size_update (nbd);return error; }
drivers/bus/mvebu-mbus.c +1 -1
@@ -720,7 +720,7 @@ mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus)if (mbus->hw_io_coherency) w->mbus_attr |=ATTR_HW_COHERENCY ; w->base = base &DDR_BASE_CS_LOW_MASK ; - w->size = (size | ~DDR_SIZE_MASK ) +1 ; + w->size = (u64)(size | ~DDR_SIZE_MASK ) +1 ; } } mvebu_mbus_dram_info.num_cs = cs;
drivers/clocksource/cs5535-clockevt.c +2 -1
@@ -117,7 +117,8 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id)/* Turn off the clock (and clear the event) */ disable_timer (cs5535_event_clock); -if (clockevent_state_shutdown (&cs5535_clockevent)) +if (clockevent_state_detached (&cs5535_clockevent) || +clockevent_state_shutdown (&cs5535_clockevent))return IRQ_HANDLED ;/* Clear the counter */
drivers/gpu/drm/i915/intel_ddi.c +2 -2
@@ -664,8 +664,8 @@ intel_ddi_get_buf_trans_fdi(struct drm_i915_private *dev_priv, int *n_entries) {if (IS_BROADWELL (dev_priv)) { - *n_entries =ARRAY_SIZE (hsw_ddi_translations_fdi); -return hsw_ddi_translations_fdi; + *n_entries =ARRAY_SIZE (bdw_ddi_translations_fdi); +return bdw_ddi_translations_fdi; }else if (IS_HASWELL (dev_priv)) { *n_entries =ARRAY_SIZE (hsw_ddi_translations_fdi);return hsw_ddi_translations_fdi;
drivers/gpu/drm/nouveau/nv50_display.c +4 -1
@@ -3281,11 +3281,14 @@ nv50_mstm = {void nv50_mstm_service (struct nv50_mstm *mstm) { -struct drm_dp_aux *aux = mstm->mgr.aux; +struct drm_dp_aux *aux = mstm ? mstm->mgr.aux :NULL ;bool handled = true;int ret;u8 esi[8 ] = {}; +if (!aux) +return ; +while (handled) { ret =drm_dp_dpcd_read (aux,DP_SINK_COUNT_ESI , esi,8 );if (ret !=8 ) {
drivers/gpu/drm/nouveau/nvkm/engine/bsp/g84.c +1 -1
@@ -39,5 +39,5 @@ int g84_bsp_new(struct nvkm_device *device, int index, struct nvkm_engine **pengine) { return nvkm_xtensa_new_(&g84_bsp, device, index, - true, 0x103000, pengine); + device->chipset != 0x92, 0x103000, pengine); }
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c +2 -0
@@ -241,6 +241,8 @@ nvkm_vm_unmap_pgt(struct nvkm_vm *vm, int big, u32 fpde, u32 lpde) mmu->func->map_pgt (vpgd->obj, pde, vpgt->mem); } + mmu->func->flush (vm); +nvkm_memory_del (&pgt); } }
drivers/i2c/busses/i2c-ismt.c +4 -1
@@ -340,12 +340,15 @@ static int ismt_process_desc(const struct ismt_desc *desc, data->word = dma_buffer[0 ] | (dma_buffer[1 ] <<8 );break ;case I2C_SMBUS_BLOCK_DATA : -case I2C_SMBUS_I2C_BLOCK_DATA :if (desc->rxbytes != dma_buffer[0 ] +1 )return -EMSGSIZE ;memcpy (data->block, dma_buffer, desc->rxbytes);break ; +case I2C_SMBUS_I2C_BLOCK_DATA : +memcpy (&data->block[1 ], dma_buffer, desc->rxbytes); + data->block[0 ] = desc->rxbytes; +break ; }return 0 ; }
drivers/i2c/busses/i2c-piix4.c +26 -4
@@ -94,6 +94,12 @@#define SB800_PIIX4_PORT_IDX_ALT 0x2e#define SB800_PIIX4_PORT_IDX_SEL 0x2f#define SB800_PIIX4_PORT_IDX_MASK 0x06 +#define SB800_PIIX4_PORT_IDX_SHIFT 1 + +/* On kerncz, SmBus0Sel is at bit 20:19 of PMx00 DecodeEn */ +#define SB800_PIIX4_PORT_IDX_KERNCZ 0x02 +#define SB800_PIIX4_PORT_IDX_MASK_KERNCZ 0x18 +#define SB800_PIIX4_PORT_IDX_SHIFT_KERNCZ 3/* insmod parameters */
@@ -149,6 +155,8 @@ static const struct dmi_system_id piix4_dmi_ibm[] = {*/ static DEFINE_MUTEX (piix4_mutex_sb800);static u8 piix4_port_sel_sb800; +static u8 piix4_port_mask_sb800; +static u8 piix4_port_shift_sb800;static const char *piix4_main_port_names_sb800[PIIX4_MAX_ADAPTERS ] = {" port 0" ," port 2" ," port 3" ," port 4" };
@@ -347,7 +355,19 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,/* Find which register is used for port selection */ if (PIIX4_dev->vendor ==PCI_VENDOR_ID_AMD ) { - piix4_port_sel_sb800 =SB800_PIIX4_PORT_IDX_ALT ; +switch (PIIX4_dev->device) { +case PCI_DEVICE_ID_AMD_KERNCZ_SMBUS : + piix4_port_sel_sb800 =SB800_PIIX4_PORT_IDX_KERNCZ ; + piix4_port_mask_sb800 =SB800_PIIX4_PORT_IDX_MASK_KERNCZ ; + piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT_KERNCZ ; +break ; +case PCI_DEVICE_ID_AMD_HUDSON2_SMBUS : +default : + piix4_port_sel_sb800 =SB800_PIIX4_PORT_IDX_ALT ; + piix4_port_mask_sb800 =SB800_PIIX4_PORT_IDX_MASK ; + piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT ; +break ; + } }else {mutex_lock (&piix4_mutex_sb800);outb_p (SB800_PIIX4_PORT_IDX_SEL ,SB800_PIIX4_SMB_IDX );
@@ -355,6 +375,8 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, piix4_port_sel_sb800 = (port_sel &0x01 ) ?SB800_PIIX4_PORT_IDX_ALT :SB800_PIIX4_PORT_IDX ; + piix4_port_mask_sb800 =SB800_PIIX4_PORT_IDX_MASK ; + piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT ;mutex_unlock (&piix4_mutex_sb800); }
@@ -616,8 +638,8 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16 addr, smba_en_lo =inb_p (SB800_PIIX4_SMB_IDX +1 ); port = adapdata->port; -if ((smba_en_lo &SB800_PIIX4_PORT_IDX_MASK ) != port) -outb_p ((smba_en_lo & ~SB800_PIIX4_PORT_IDX_MASK ) | port, +if ((smba_en_lo & piix4_port_mask_sb800) != port) +outb_p ((smba_en_lo & ~piix4_port_mask_sb800) | port,SB800_PIIX4_SMB_IDX +1 ); retval = piix4_access(adap, addr, flags, read_write,
@@ -706,7 +728,7 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba, adapdata->smba = smba; adapdata->sb800_main = sb800_main; - adapdata->port = port <<1 ; + adapdata->port = port << piix4_port_shift_sb800;/* set up the sysfs linkage to our parent device */ adap->dev.parent = &dev->dev;
drivers/iio/dummy/iio_simple_dummy_events.c +1 -0
@@ -72,6 +72,7 @@ int iio_simple_dummy_write_event_config(struct iio_dev *indio_dev, st->event_en = state; else return -EINVAL; +break ;default :return -EINVAL ; }
drivers/input/touchscreen/stmfts.c +2 -4
@@ -663,12 +663,10 @@ static int stmfts_probe(struct i2c_client *client, sdata->input->open = stmfts_input_open; sdata->input->close = stmfts_input_close; +input_set_capability (sdata->input,EV_ABS ,ABS_MT_POSITION_X ); +input_set_capability (sdata->input,EV_ABS ,ABS_MT_POSITION_Y );touchscreen_parse_properties (sdata->input, true, &sdata->prop); -input_set_abs_params (sdata->input,ABS_MT_POSITION_X ,0 , - sdata->prop.max_x,0 ,0 ); -input_set_abs_params (sdata->input,ABS_MT_POSITION_Y ,0 , - sdata->prop.max_y,0 ,0 );input_set_abs_params (sdata->input,ABS_MT_TOUCH_MAJOR ,0 ,255 ,0 ,0 );input_set_abs_params (sdata->input,ABS_MT_TOUCH_MINOR ,0 ,255 ,0 ,0 );input_set_abs_params (sdata->input,ABS_MT_ORIENTATION ,0 ,255 ,0 ,0 );
drivers/media/cec/cec-adap.c +10 -3
@@ -1726,12 +1726,19 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg,*/ switch (msg->msg[1 ]) {case CEC_MSG_GET_CEC_VERSION : -case CEC_MSG_GIVE_DEVICE_VENDOR_ID :case CEC_MSG_ABORT :case CEC_MSG_GIVE_DEVICE_POWER_STATUS : -case CEC_MSG_GIVE_PHYSICAL_ADDR :case CEC_MSG_GIVE_OSD_NAME : +/* +* These messages reply with a directed message, so ignore if +* the initiator is Unregistered. +*/ +if (!adap->passthrough && from_unregistered) +return 0 ; +/* Fall through */ +case CEC_MSG_GIVE_DEVICE_VENDOR_ID :case CEC_MSG_GIVE_FEATURES : +case CEC_MSG_GIVE_PHYSICAL_ADDR :/* * Skip processing these messages if the passthrough mode * is on.
@@ -1739,7 +1746,7 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg,if (adap->passthrough) goto skip_processing;/* Ignore if addressing is wrong */ -if (is_broadcast || from_unregistered) +if (is_broadcast)return 0 ;break ;
drivers/media/dvb-frontends/dib3000mc.c +39 -11
68 lines not on this page · raw message
drivers/media/dvb-frontends/dvb-pll.c +17 -5
@@ -753,13 +753,19 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr,struct i2c_adapter *i2c, unsigned int pll_desc_id) { - u8 b1 [] = { 0 }; -struct i2c_msg msg = { .addr = pll_addr, .flags =I2C_M_RD , - .buf = b1, .len =1 }; + u8 *b1; +struct i2c_msg msg = { .addr = pll_addr, .flags =I2C_M_RD , .len =1 };struct dvb_pll_priv *priv =NULL ;int ret;const struct dvb_pll_desc *desc; + b1 =kmalloc (1 ,GFP_KERNEL ); +if (!b1) +return NULL ; + + b1[0 ] =0 ; + msg.buf = b1; +if ((id[dvb_pll_devcount] >DVB_PLL_UNDEFINED ) && (id[dvb_pll_devcount] <ARRAY_SIZE (pll_list))) pll_desc_id = id[dvb_pll_devcount];
@@ -773,15 +779,19 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, fe->ops.i2c_gate_ctrl (fe,1 ); ret =i2c_transfer (i2c, &msg,1 ); -if (ret !=1 ) +if (ret !=1 ) { +kfree (b1);return NULL ; + }if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl (fe,0 ); } priv =kzalloc (sizeof (struct dvb_pll_priv ),GFP_KERNEL ); -if (priv ==NULL ) +if (!priv) { +kfree (b1);return NULL ; + } priv->pll_i2c_address = pll_addr; priv->i2c = i2c;
@@ -811,6 +821,8 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, "insmod option" : "autodetected"); } +kfree (b1); +return fe; }EXPORT_SYMBOL (dvb_pll_attach);
drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c +2 -1
@@ -172,7 +172,8 @@ u32 s5p_cec_get_status(struct s5p_cec_dev *cec) {u32 status =0 ; - status =readb (cec->reg +S5P_CEC_STATUS_0 ); + status =readb (cec->reg +S5P_CEC_STATUS_0 ) &0xf ; + status |= (readb (cec->reg +S5P_CEC_TX_STAT1 ) &0xf ) <<4 ; status |=readb (cec->reg +S5P_CEC_STATUS_1 ) <<8 ; status |=readb (cec->reg +S5P_CEC_STATUS_2 ) <<16 ; status |=readb (cec->reg +S5P_CEC_STATUS_3 ) <<24 ;
drivers/media/platform/s5p-cec/s5p_cec.c +10 -1
@@ -92,7 +92,10 @@ static irqreturn_t s5p_cec_irq_handler(int irq, void *priv)dev_dbg (cec->dev,"irq received\n" );if (status &CEC_STATUS_TX_DONE ) { -if (status &CEC_STATUS_TX_ERROR ) { +if (status &CEC_STATUS_TX_NACK ) { +dev_dbg (cec->dev,"CEC_STATUS_TX_NACK set\n" ); + cec->tx =STATE_NACK ; + }else if (status &CEC_STATUS_TX_ERROR ) {dev_dbg (cec->dev,"CEC_STATUS_TX_ERROR set\n" ); cec->tx =STATE_ERROR ; }else {
@@ -135,6 +138,12 @@ static irqreturn_t s5p_cec_irq_handler_thread(int irq, void *priv)cec_transmit_done (cec->adap,CEC_TX_STATUS_OK ,0 ,0 ,0 ,0 ); cec->tx =STATE_IDLE ;break ; +case STATE_NACK : +cec_transmit_done (cec->adap, +CEC_TX_STATUS_MAX_RETRIES |CEC_TX_STATUS_NACK , +0 ,1 ,0 ,0 ); + cec->tx =STATE_IDLE ; +break ;case STATE_ERROR : cec_transmit_done(cec->adap, CEC_TX_STATUS_MAX_RETRIES | CEC_TX_STATUS_ERROR,
drivers/media/platform/s5p-cec/s5p_cec.h +2 -0
@@ -35,6 +35,7 @@#define CEC_STATUS_TX_TRANSFERRING (1 << 1)#define CEC_STATUS_TX_DONE (1 << 2)#define CEC_STATUS_TX_ERROR (1 << 3) +#define CEC_STATUS_TX_NACK (1 << 4)#define CEC_STATUS_TX_BYTES (0xFF << 8)#define CEC_STATUS_RX_RUNNING (1 << 16)#define CEC_STATUS_RX_RECEIVING (1 << 17)
@@ -55,6 +56,7 @@ enum cec_state {STATE_IDLE ,STATE_BUSY ,STATE_DONE , +STATE_NACK , STATE_ERROR };
drivers/media/tuners/mt2060.c +47 -12
99 lines not on this page · raw message
drivers/mmc/host/sdhci-pci-core.c +2 -0
@@ -449,6 +449,8 @@ static void intel_dsm_init(struct intel_host *intel_host, struct device *dev,int err;u32 val; + intel_host->d3_retune = true; + err =__intel_dsm (intel_host, dev,INTEL_DSM_FNS , &intel_host->dsm_fns);if (err) { pr_debug("%s: DSM not supported, error %d\n",
drivers/net/can/flexcan.c +76 -15
145 lines not on this page · raw message
drivers/net/can/usb/esd_usb2.c +1 -1
@@ -333,7 +333,7 @@ static void esd_usb2_rx_can_msg(struct esd_usb2_net_priv *priv, } cf->can_id = id &ESD_IDMASK ; - cf->can_dlc =get_can_dlc (msg->msg.rx.dlc); + cf->can_dlc =get_can_dlc (msg->msg.rx.dlc & ~ESD_RTR );if (id &ESD_EXTID ) cf->can_id |=CAN_EFF_FLAG ;
drivers/net/can/usb/gs_usb.c +2 -8
@@ -375,6 +375,8 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)gs_free_tx_context (txc); +atomic_dec (&dev->active_tx_urbs); +netif_wake_queue (netdev); }
@@ -463,14 +465,6 @@ static void gs_usb_xmit_callback(struct urb *urb) urb->transfer_buffer_length, urb->transfer_buffer, urb->transfer_dma); - -atomic_dec (&dev->active_tx_urbs); - -if (!netif_device_present (netdev)) -return ; - -if (netif_queue_stopped (netdev)) -netif_wake_queue (netdev); } static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb,
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c +2 -1
@@ -429,7 +429,8 @@ void brcmf_fweh_process_event(struct brcmf_pub *drvr,if (code !=BRCMF_E_IF && !fweh->evt_handler[code])return ; -if (datalen >BRCMF_DCMD_MAXLEN ) +if (datalen >BRCMF_DCMD_MAXLEN || + datalen +sizeof (*event_packet) > packet_len)return ;if (in_interrupt ())
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c +97 -100
374 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +1 -1
@@ -1122,7 +1122,7 @@ static u8 _rtl8821ae_dbi_read(struct rtl_priv *rtlpriv, u16 addr) }if (0 == tmp) { read_addr =REG_DBI_RDATA + addr %4 ; - ret =rtl_read_byte (rtlpriv, read_addr); + ret =rtl_read_word (rtlpriv, read_addr); }return ret; }
drivers/scsi/qla2xxx/qla_os.c +2 -1
@@ -3165,6 +3165,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) host->can_queue, base_vha->req, base_vha->mgmt_svr_loop_id, host->sg_tablesize); +INIT_WORK (&base_vha->iocb_work, qla2x00_iocb_work_fn); +if (ha->mqenable) {bool mq = false;bool startit = false;
@@ -3213,7 +3215,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)*/ qla2xxx_wake_dpc (base_vha); -INIT_WORK (&base_vha->iocb_work, qla2x00_iocb_work_fn);INIT_WORK (&ha->board_disable, qla2x00_disable_board_on_pci_error);if (IS_QLA8031 (ha) ||IS_MCTP_CAPABLE (ha)) {
drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c +7 -12
@@ -390,8 +390,7 @@ static int bcm2835_audio_open_connection(struct bcm2835_alsa_stream *alsa_stream __func__, instance); instance->alsa_stream = alsa_stream; alsa_stream->instance = instance; - ret =0 ;// xxx todo -1; - goto err_free_mem; +return 0 ; }/* Initialize and create a VCHI connection */
@@ -401,16 +400,15 @@ static int bcm2835_audio_open_connection(struct bcm2835_alsa_stream *alsa_streamLOG_ERR ("%s: failed to initialise VCHI instance (ret=%d)\n" , __func__, ret); - ret = -EIO ; - goto err_free_mem; +return -EIO ; } ret =vchi_connect (NULL ,0 , vchi_instance);if (ret) {LOG_ERR ("%s: failed to connect VCHI instance (ret=%d)\n" , __func__, ret); - ret = -EIO ; - goto err_free_mem; +kfree (vchi_instance); +return -EIO ; } initted =1 ; }
@@ -421,19 +419,16 @@ static int bcm2835_audio_open_connection(struct bcm2835_alsa_stream *alsa_streamif (IS_ERR (instance)) {LOG_ERR ("%s: failed to initialize audio service\n" , __func__); - ret =PTR_ERR (instance); - goto err_free_mem; +/* vchi_instance is retained for use the next time. */ +return PTR_ERR (instance); } instance->alsa_stream = alsa_stream; alsa_stream->instance = instance;LOG_DBG (" success !\n" ); - ret =0 ; -err_free_mem: -kfree (vchi_instance); -return ret; +return 0 ; }int bcm2835_audio_open (struct bcm2835_alsa_stream *alsa_stream)
drivers/usb/class/cdc-acm.c +3 -0
@@ -1832,6 +1832,9 @@ static const struct usb_device_id acm_ids[] = { { USB_DEVICE(0xfff0, 0x0100), /* DATECS FP-2000 */ .driver_info =NO_UNION_NORMAL ,/* reports zero length descriptor */ }, + { USB_DEVICE(0x09d8, 0x0320), /* Elatec GmbH TWN3 */ + .driver_info = NO_UNION_NORMAL, /* has misplaced union descriptor */ + }, { USB_DEVICE(0x2912, 0x0001), /* ATOL FPrint */ .driver_info = CLEAR_HALT_CONDITIONS,
drivers/usb/core/config.c +4 -2
@@ -960,10 +960,12 @@ int usb_get_bos_descriptor(struct usb_device *dev)for (i =0 ; i < num; i++) { buffer += length; cap = (struct usb_dev_cap_header *)buffer; - length = cap->bLength; -if (total_len < length) +if (total_len <sizeof (*cap) || total_len < cap->bLength) { + dev->bos->desc->bNumDeviceCaps = i;break ; + } + length = cap->bLength; total_len -= length;if (cap->bDescriptorType !=USB_DT_DEVICE_CAPABILITY ) {
drivers/usb/core/devio.c +1 -5
@@ -1576,11 +1576,7 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb totlen += isopkt[u].length; } u *=sizeof (struct usb_iso_packet_descriptor ); -if (totlen <= uurb->buffer_length) - uurb->buffer_length = totlen; -else -WARN_ONCE (1 ,"uurb->buffer_length is too short %d vs %d" , - totlen, uurb->buffer_length); + uurb->buffer_length = totlen;break ;default :
drivers/usb/core/hub.c +7 -4
@@ -2710,13 +2710,16 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,if (!(portstatus &USB_PORT_STAT_CONNECTION ))return -ENOTCONN ; -/* bomb out completely if the connection bounced. A USB 3.0 -* connection may bounce if multiple warm resets were issued, +/* Retry if connect change is set but status is still connected. +* A USB 3.0 connection may bounce if multiple warm resets were issued, * but the device may have successfully re-connected. Ignore it. */ if (!hub_is_superspeed (hub->hdev) && - (portchange &USB_PORT_STAT_C_CONNECTION )) -return -ENOTCONN ; + (portchange &USB_PORT_STAT_C_CONNECTION )) { +usb_clear_port_feature (hub->hdev, port1, +USB_PORT_FEAT_C_CONNECTION ); +return -EAGAIN ; + }if (!(portstatus &USB_PORT_STAT_ENABLE ))return -EBUSY ;
drivers/usb/core/quirks.c +4 -0
@@ -221,6 +221,10 @@ static const struct usb_device_id usb_quirk_list[] = {/* Corsair Strafe RGB */ { USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT }, + /* MIDI keyboard WORLDE MINI */ + { USB_DEVICE(0x1c75, 0x0204), .driver_info = + USB_QUIRK_CONFIG_INTF_STRINGS }, + /* Acer C120 LED Projector */ { USB_DEVICE(0x1de1, 0xc102), .driver_info = USB_QUIRK_NO_LPM },
drivers/usb/host/xhci-hub.c +18 -5
@@ -420,14 +420,25 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend) GFP_NOWAIT);if (!command) {spin_unlock_irqrestore (&xhci->lock, flags); -xhci_free_command (xhci, cmd); -return -ENOMEM ; + ret = -ENOMEM ; + goto cmd_cleanup; + } + + ret =xhci_queue_stop_endpoint (xhci, command, slot_id, + i, suspend); +if (ret) { +spin_unlock_irqrestore (&xhci->lock, flags); +xhci_free_command (xhci, command); + goto cmd_cleanup; } -xhci_queue_stop_endpoint (xhci, command, slot_id, i, - suspend); } } -xhci_queue_stop_endpoint (xhci, cmd, slot_id,0 , suspend); + ret =xhci_queue_stop_endpoint (xhci, cmd, slot_id,0 , suspend); +if (ret) { +spin_unlock_irqrestore (&xhci->lock, flags); + goto cmd_cleanup; + } +xhci_ring_cmd_db (xhci);spin_unlock_irqrestore (&xhci->lock, flags);
@@ -439,6 +450,8 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend)xhci_warn (xhci,"Timeout while waiting for stop endpoint command\n" ); ret = -ETIME ; } + +cmd_cleanup:xhci_free_command (xhci, cmd);return ret; }
drivers/usb/host/xhci-ring.c +14 -7
@@ -1309,6 +1309,7 @@ static void xhci_complete_del_and_free_cmd(struct xhci_command *cmd, u32 status)void xhci_cleanup_command_queue (struct xhci_hcd *xhci) {struct xhci_command *cur_cmd, *tmp_cmd; + xhci->current_cmd =NULL ;list_for_each_entry_safe (cur_cmd, tmp_cmd, &xhci->cmd_list, cmd_list)xhci_complete_del_and_free_cmd (cur_cmd,COMP_COMMAND_ABORTED ); }
@@ -2577,15 +2578,21 @@ static int handle_tx_event(struct xhci_hcd *xhci, (struct xhci_generic_trb *) ep_trb);/* -* No-op TRB should not trigger interrupts. -* If ep_trb is a no-op TRB, it means the -* corresponding TD has been cancelled. Just ignore -* the TD. +* No-op TRB could trigger interrupts in a case where +* a URB was killed and a STALL_ERROR happens right +* after the endpoint ring stopped. Reset the halted +* endpoint. Otherwise, the endpoint remains stalled +* indefinitely. */ if (trb_is_noop (ep_trb)) { -xhci_dbg (xhci, -"ep_trb is a no-op TRB. Skip it for slot %u ep %u\n" , - slot_id, ep_index); +if (trb_comp_code ==COMP_STALL_ERROR || +xhci_requires_manual_halt_cleanup (xhci, ep_ctx, + trb_comp_code)) +xhci_cleanup_halted_endpoint (xhci, slot_id, + ep_index, + ep_ring->stream_id, + td, ep_trb, +EP_HARD_RESET ); goto cleanup; }
drivers/usb/host/xhci.c +2 -1
@@ -4805,7 +4805,8 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)*/ hcd->has_tt =1 ; }else { -if (xhci->sbrn ==0x31 ) { +/* Some 3.1 hosts return sbrn 0x30, can't rely on sbrn alone */ +if (xhci->sbrn ==0x31 || xhci->usb3_rhub.min_rev >=1 ) {xhci_info (xhci,"Host supports USB 3.1 Enhanced SuperSpeed\n" ); hcd->speed =HCD_USB31 ; hcd->self.root_hub->speed =USB_SPEED_SUPER_PLUS ;
drivers/usb/musb/musb_core.c +13 -8
@@ -906,7 +906,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,*/ if (int_usb &MUSB_INTR_RESET ) { handled =IRQ_HANDLED ; -if (devctl &MUSB_DEVCTL_HM ) { +if (is_host_active (musb)) {/* * When BABBLE happens what we can depends on which * platform MUSB is running, because some platforms
@@ -916,9 +916,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,* drop the session. */ dev_err (musb->controller,"Babble\n" ); - -if (is_host_active (musb)) -musb_recover_from_babble (musb); +musb_recover_from_babble (musb); }else {musb_dbg (musb,"BUS RESET as %s" ,usb_otg_state_string (musb->xceiv->otg->state));
@@ -1861,22 +1859,22 @@ static void musb_pm_runtime_check_session(struct musb *musb)MUSB_DEVCTL_HR ;switch (devctl & ~s) {case MUSB_QUIRK_B_INVALID_VBUS_91 : -if (musb->quirk_retries--) { +if (musb->quirk_retries && !musb->flush_irq_work) {musb_dbg (musb,"Poll devctl on invalid vbus, assume no session" );schedule_delayed_work (&musb->irq_work,msecs_to_jiffies (1000 )); - + musb->quirk_retries--;return ; }/* fall through */ case MUSB_QUIRK_A_DISCONNECT_19 : -if (musb->quirk_retries--) { +if (musb->quirk_retries && !musb->flush_irq_work) {musb_dbg (musb,"Poll devctl on possible host mode disconnect" );schedule_delayed_work (&musb->irq_work,msecs_to_jiffies (1000 )); - + musb->quirk_retries--;return ; }if (!musb->session)
@@ -2681,8 +2679,15 @@ static int musb_suspend(struct device *dev)musb_platform_disable (musb);musb_disable_interrupts (musb); + + musb->flush_irq_work = true; +while (flush_delayed_work (&musb->irq_work)) + ; + musb->flush_irq_work = false; +if (!(musb->io.quirks &MUSB_PRESERVE_SESSION ))musb_writeb (musb->mregs,MUSB_DEVCTL ,0 ); +WARN_ON (!list_empty (&musb->pending_list));spin_lock_irqsave (&musb->lock, flags);
drivers/usb/musb/musb_core.h +2 -0
@@ -428,6 +428,8 @@ struct musb { unsigned test_mode:1; unsigned softconnect:1; + unsigned flush_irq_work:1; +u8 address;u8 test_mode_nr;u16 ackpend;/* ep0 */
drivers/usb/musb/musb_cppi41.c +82 -12
195 lines not on this page · raw message
drivers/usb/musb/sunxi.c +2 -0
@@ -297,6 +297,8 @@ static int sunxi_musb_exit(struct musb *musb)if (test_bit (SUNXI_MUSB_FL_HAS_SRAM , &glue->flags))sunxi_sram_release (musb->controller->parent); +devm_usb_put_phy (glue->dev, glue->xceiv); +return 0 ; }
drivers/usb/serial/metro-usb.c +1 -0
@@ -45,6 +45,7 @@ struct metrousb_private {static const struct usb_device_id id_table[] = { {USB_DEVICE (FOCUS_VENDOR_ID ,FOCUS_PRODUCT_ID_BI ) }, {USB_DEVICE (FOCUS_VENDOR_ID ,FOCUS_PRODUCT_ID_UNI ) }, + {USB_DEVICE_INTERFACE_CLASS (0x0c2e ,0x0730 ,0xff ) },/* MS7820 */ { },/* Terminating entry. */ };MODULE_DEVICE_TABLE (usb, id_table);
fs/crypto/keyinfo.c +5 -0
@@ -109,6 +109,11 @@ static int validate_user_key(struct fscrypt_info *crypt_info, goto out; } ukp =user_key_payload_locked (keyring_key); +if (!ukp) { +/* key was revoked before we acquired its semaphore */ + res = -EKEYREVOKED ; + goto out; + }if (ukp->datalen !=sizeof (struct fscrypt_key )) { res = -EINVAL ; goto out;
fs/ecryptfs/ecryptfs_kernel.h +17 -7
@@ -84,11 +84,16 @@ struct ecryptfs_page_crypt_context {static inline struct ecryptfs_auth_tok *ecryptfs_get_encrypted_key_payload_data (struct key *key) { -if (key->type == &key_type_encrypted) -return (struct ecryptfs_auth_tok *) - (&((struct encrypted_key_payload *)key->payload.data[0 ])->payload_data); -else +struct encrypted_key_payload *payload; + +if (key->type != &key_type_encrypted)return NULL ; + + payload = key->payload.data[0 ]; +if (!payload) +return ERR_PTR (-EKEYREVOKED ); + +return (struct ecryptfs_auth_tok *)payload->payload_data; }static inline struct key *ecryptfs_get_encrypted_key (char *sig)
@@ -114,12 +119,17 @@ static inline struct ecryptfs_auth_tok * ecryptfs_get_key_payload_data(struct key *key) {struct ecryptfs_auth_tok *auth_tok; +struct user_key_payload *ukp; auth_tok =ecryptfs_get_encrypted_key_payload_data (key); -if (!auth_tok) -return (struct ecryptfs_auth_tok *)user_key_payload_locked (key)->data; -else +if (auth_tok)return auth_tok; + + ukp =user_key_payload_locked (key); +if (!ukp) +return ERR_PTR (-EKEYREVOKED ); + +return (struct ecryptfs_auth_tok *)ukp->data; }#define ECRYPTFS_MAX_KEYSET_SIZE 1024
fs/ecryptfs/keystore.c +8 -1
@@ -459,7 +459,8 @@ static int ecryptfs_verify_version(u16 version)* @auth_tok_key: key containing the authentication token * @auth_tok: authentication token * -* Returns zero on valid auth tok; -EINVAL otherwise +* Returns zero on valid auth tok; -EINVAL if the payload is invalid; or +* -EKEYREVOKED if the key was revoked before we acquired its semaphore. */ static int ecryptfs_verify_auth_tok_from_key(struct key *auth_tok_key,
@@ -468,6 +469,12 @@ ecryptfs_verify_auth_tok_from_key(struct key *auth_tok_key,int rc =0 ; (*auth_tok) =ecryptfs_get_key_payload_data (auth_tok_key); +if (IS_ERR (*auth_tok)) { + rc =PTR_ERR (*auth_tok); + *auth_tok =NULL ; + goto out; + } +if (ecryptfs_verify_version ((*auth_tok)->version)) {printk (KERN_ERR "Data structure version mismatch. Userspace " "tools must match eCryptfs kernel module with major "
fs/fscache/object-list.c +7 -0
@@ -330,6 +330,13 @@ static void fscache_objlist_config(struct fscache_objlist_data *data)rcu_read_lock (); confkey =user_key_payload_rcu (key); +if (!confkey) { +/* key was revoked */ +rcu_read_unlock (); +key_put (key); + goto no_config; + } + buf = confkey->data;for (len = confkey->datalen -1 ; len >=0 ; len--) {
fs/iomap.c +7 -7
@@ -993,6 +993,13 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,WARN_ON_ONCE (ret); ret =0 ; +if (iov_iter_rw (iter) ==WRITE && !is_sync_kiocb (iocb) && + !inode->i_sb->s_dio_done_wq) { + ret =sb_init_dio_done_wq (inode->i_sb); +if (ret <0 ) + goto out_free_dio; + } +inode_dio_begin (inode);blk_start_plug (&plug);
@@ -1015,13 +1022,6 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,if (ret <0 )iomap_dio_set_error (dio, ret); -if (ret >=0 &&iov_iter_rw (iter) ==WRITE && !is_sync_kiocb (iocb) && - !inode->i_sb->s_dio_done_wq) { - ret =sb_init_dio_done_wq (inode->i_sb); -if (ret <0 ) -iomap_dio_set_error (dio, ret); - } -if (!atomic_dec_and_test (&dio->ref)) {if (!is_sync_kiocb (iocb))return -EIOCBQUEUED ;
fs/xfs/libxfs/xfs_ag_resv.c +10 -2
@@ -156,7 +156,8 @@ __xfs_ag_resv_free(trace_xfs_ag_resv_free (pag, type,0 ); resv =xfs_perag_resv (pag, type); - pag->pag_mount->m_ag_max_usable += resv->ar_asked; +if (pag->pag_agno ==0 ) + pag->pag_mount->m_ag_max_usable += resv->ar_asked;/* * AGFL blocks are always considered "free", so whatever * was reserved at mount time must be given back at umount.
@@ -216,7 +217,14 @@ __xfs_ag_resv_init(return error; } - mp->m_ag_max_usable -= ask; +/* +* Reduce the maximum per-AG allocation length by however much we're +* trying to reserve for an AG. Since this is a filesystem-wide +* counter, we only make the adjustment for AG 0. This assumes that +* there aren't any AGs hungrier for per-AG reservation than AG 0. +*/ +if (pag->pag_agno ==0 ) + mp->m_ag_max_usable -= ask; resv =xfs_perag_resv (pag, type); resv->ar_asked = ask;
fs/xfs/libxfs/xfs_alloc.c +8 -0
@@ -1584,6 +1584,10 @@ xfs_alloc_ag_vextent_small( bp =xfs_btree_get_bufs (args->mp, args->tp, args->agno, fbno,0 ); +if (!bp) { + error = -EFSCORRUPTED ; + goto error0; + }xfs_trans_binval (args->tp, bp); } args->len =1 ;
@@ -2141,6 +2145,10 @@ xfs_alloc_fix_freelist(if (error) goto out_agbp_relse; bp =xfs_btree_get_bufs (mp, tp, args->agno, bno,0 ); +if (!bp) { + error = -EFSCORRUPTED ; + goto out_agbp_relse; + }xfs_trans_binval (tp, bp); }
fs/xfs/libxfs/xfs_bmap.c +11 -0
@@ -3860,6 +3860,17 @@ xfs_trim_extent( } } +/* trim extent to within eof */ +void +xfs_trim_extent_eof ( +struct xfs_bmbt_irec *irec, +struct xfs_inode *ip) + +{ +xfs_trim_extent (irec,0 ,XFS_B_TO_FSB (ip->i_mount, +i_size_read (VFS_I (ip)))); +} +/* * Trim the returned map to the required bounds */
fs/xfs/libxfs/xfs_bmap.h +1 -0
@@ -208,6 +208,7 @@ void xfs_bmap_trace_exlist(struct xfs_inode *ip, xfs_extnum_t cnt,void xfs_trim_extent (struct xfs_bmbt_irec *irec,xfs_fileoff_t bno,xfs_filblks_t len); +void xfs_trim_extent_eof (struct xfs_bmbt_irec *,struct xfs_inode *);int xfs_bmap_add_attrfork (struct xfs_inode *ip,int size,int rsvd);void xfs_bmap_local_to_extents_empty (struct xfs_inode *ip,int whichfork); void xfs_bmap_add_free(struct xfs_mount *mp, struct xfs_defer_ops *dfops,
fs/xfs/libxfs/xfs_log_format.h +8 -19
@@ -270,6 +270,7 @@ typedef struct xfs_inode_log_format {uint32_t ilf_fields;/* flags for fields logged */ uint16_t ilf_asize;/* size of attr d/ext/root */ uint16_t ilf_dsize;/* size of data/ext/root */ +uint32_t ilf_pad;/* pad for 64 bit boundary */ uint64_t ilf_ino;/* inode number */ union {uint32_t ilfu_rdev;/* rdev value for dev inode*/
@@ -280,29 +281,17 @@ typedef struct xfs_inode_log_format {int32_t ilf_boffset;/* off of inode in buffer */ } xfs_inode_log_format_t; -typedef struct xfs_inode_log_format_32 { -uint16_t ilf_type;/* inode log item type */ -uint16_t ilf_size;/* size of this item */ -uint32_t ilf_fields;/* flags for fields logged */ -uint16_t ilf_asize;/* size of attr d/ext/root */ -uint16_t ilf_dsize;/* size of data/ext/root */ -uint64_t ilf_ino;/* inode number */ -union { -uint32_t ilfu_rdev;/* rdev value for dev inode*/ -uuid_t ilfu_uuid;/* mount point value */ - } ilf_u; -int64_t ilf_blkno;/* blkno of inode buffer */ -int32_t ilf_len;/* len of inode buffer */ -int32_t ilf_boffset;/* off of inode in buffer */ -} __attribute__((packed))xfs_inode_log_format_32_t ; - -typedef struct xfs_inode_log_format_64 { +/* +* Old 32 bit systems will log in this format without the 64 bit +* alignment padding. Recovery will detect this and convert it to the +* correct format. +*/ +struct xfs_inode_log_format_32 {uint16_t ilf_type;/* inode log item type */ uint16_t ilf_size;/* size of this item */ uint32_t ilf_fields;/* flags for fields logged */ uint16_t ilf_asize;/* size of attr d/ext/root */ uint16_t ilf_dsize;/* size of data/ext/root */ - uint32_t ilf_pad; /* pad for 64 bit boundary */uint64_t ilf_ino;/* inode number */ union {uint32_t ilfu_rdev;/* rdev value for dev inode*/
@@ -311,7 +300,7 @@ typedef struct xfs_inode_log_format_64 {int64_t ilf_blkno;/* blkno of inode buffer */ int32_t ilf_len;/* len of inode buffer */ int32_t ilf_boffset;/* off of inode in buffer */ -} xfs_inode_log_format_64_t; +} __attribute__((packed));/*
fs/xfs/xfs_acl.c +16 -6
@@ -247,6 +247,8 @@ xfs_set_mode(struct inode *inode, umode_t mode)int xfs_set_acl (struct inode *inode,struct posix_acl *acl,int type) { +umode_t mode; +bool set_mode = false;int error =0 ;if (!acl)
@@ -257,16 +259,24 @@ xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)return error;if (type ==ACL_TYPE_ACCESS ) { -umode_t mode; - error =posix_acl_update_mode (inode, &mode, &acl);if (error)return error; - error =xfs_set_mode (inode, mode); -if (error) -return error; + set_mode = true; } set_acl: -return __xfs_set_acl (inode, acl, type); + error =__xfs_set_acl (inode, acl, type); +if (error) +return error; + +/* +* We set the mode after successfully updating the ACL xattr because the +* xattr update can fail at ENOSPC and we don't want to change the mode +* if the ACL update hasn't been applied. +*/ +if (set_mode) + error =xfs_set_mode (inode, mode); + +return error; }
fs/xfs/xfs_aops.c +37 -13
81 lines not on this page · raw message
fs/xfs/xfs_attr_inactive.c +2 -0
@@ -302,6 +302,8 @@ xfs_attr3_node_inactive( &bp, XFS_ATTR_FORK);if (error)return error; + node = bp->b_addr; + btree = dp->d_ops->node_tree_p (node); child_fsb =be32_to_cpu (btree[i +1 ].before);xfs_trans_brelse (*trans, bp); }
fs/xfs/xfs_bmap_util.c +37 -3
@@ -84,6 +84,7 @@ xfs_zero_extent( GFP_NOFS, 0); } +#ifdef CONFIG_XFS_RT int xfs_bmap_rtalloc (struct xfs_bmalloca *ap)/* bmap alloc argument struct */
@@ -190,6 +191,7 @@ xfs_bmap_rtalloc( }return 0 ; } +#endif /* CONFIG_XFS_RT */ /* * Check if the endoff is outside the last extent. If so the caller will grow
@@ -1459,7 +1461,19 @@ xfs_shift_file_space(return error;/* -* The extent shiting code works on extent granularity. So, if +* Clean out anything hanging around in the cow fork now that +* we've flushed all the dirty data out to disk to avoid having +* CoW extents at the wrong offsets. +*/ +if (xfs_is_reflink_inode (ip)) { + error =xfs_reflink_cancel_cow_range (ip, offset,NULLFILEOFF , + true); +if (error) +return error; + } + +/* +* The extent shifting code works on extent granularity. So, if * stop_fsb is not the starting block of extent, we need to split * the extent at stop_fsb. */
@@ -2109,11 +2123,31 @@ xfs_swap_extents( ip->i_d.di_flags2 |= tip->i_d.di_flags2 &XFS_DIFLAG2_REFLINK ; tip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK ; tip->i_d.di_flags2 |= f &XFS_DIFLAG2_REFLINK ; + } + +/* Swap the cow forks. */ +if (xfs_sb_version_hasreflink (&mp->m_sb)) { +xfs_extnum_t extnum; + +ASSERT (ip->i_cformat ==XFS_DINODE_FMT_EXTENTS ); +ASSERT (tip->i_cformat ==XFS_DINODE_FMT_EXTENTS ); + + extnum = ip->i_cnextents; + ip->i_cnextents = tip->i_cnextents; + tip->i_cnextents = extnum; + cowfp = ip->i_cowfp; ip->i_cowfp = tip->i_cowfp; tip->i_cowfp = cowfp; -xfs_inode_set_cowblocks_tag (ip); -xfs_inode_set_cowblocks_tag (tip); + +if (ip->i_cowfp && ip->i_cnextents) +xfs_inode_set_cowblocks_tag (ip); +else +xfs_inode_clear_cowblocks_tag (ip); +if (tip->i_cowfp && tip->i_cnextents) +xfs_inode_set_cowblocks_tag (tip); +else +xfs_inode_clear_cowblocks_tag (tip); }xfs_trans_log_inode (tp, ip, src_log_flags);
fs/xfs/xfs_bmap_util.h +13 -0
@@ -28,7 +28,20 @@ struct xfs_mount;struct xfs_trans ;struct xfs_bmalloca ; +#ifdef CONFIG_XFS_RT int xfs_bmap_rtalloc (struct xfs_bmalloca *ap); +#else /* !CONFIG_XFS_RT */ +/* +* Attempts to allocate RT extents when RT is disable indicates corruption and +* should trigger a shutdown. +*/ +static inline int +xfs_bmap_rtalloc (struct xfs_bmalloca *ap) +{ +return -EFSCORRUPTED ; +} +#endif /* CONFIG_XFS_RT */ +int xfs_bmap_eof (struct xfs_inode *ip,xfs_fileoff_t endoff,int whichfork,int *eof); int xfs_bmap_punch_delalloc_range(struct xfs_inode *ip,
fs/xfs/xfs_error.c +1 -1
@@ -344,7 +344,7 @@ xfs_verifier_error( {struct xfs_mount *mp = bp->b_target->bt_mount; -xfs_alert (mp,"Metadata %s detected at %pF, %s block 0x%llx" , +xfs_alert (mp,"Metadata %s detected at %pS, %s block 0x%llx" , bp->b_error == -EFSBADCRC ?"CRC error" :"corruption" , __return_address, bp->b_ops->name, bp->b_bn);
fs/xfs/xfs_file.c +20 -15
@@ -58,7 +58,7 @@ xfs_zero_range(xfs_off_t count, bool *did_zero) { - return iomap_zero_range(VFS_I(ip), pos, count, NULL, &xfs_iomap_ops); + return iomap_zero_range(VFS_I(ip), pos, count, did_zero, &xfs_iomap_ops); }int
@@ -432,7 +432,6 @@ xfs_dio_write_end_io(struct inode *inode =file_inode (iocb->ki_filp);struct xfs_inode *ip =XFS_I (inode);loff_t offset = iocb->ki_pos; -bool update_size = false;int error =0 ;trace_xfs_end_io_direct_write (ip, offset, size);
@@ -443,6 +442,21 @@ xfs_dio_write_end_io(if (size <=0 )return size; +if (flags &IOMAP_DIO_COW ) { + error =xfs_reflink_end_cow (ip, offset, size); +if (error) +return error; + } + +/* +* Unwritten conversion updates the in-core isize after extent +* conversion but before updating the on-disk size. Updating isize any +* earlier allows a racing dio read to find unwritten extents before +* they are converted. +*/ +if (flags &IOMAP_DIO_UNWRITTEN ) +return xfs_iomap_write_unwritten (ip, offset, size, true); +/* * We need to update the in-core inode size here so that we don't end up * with the on-disk inode size being outside the in-core inode size. We
@@ -457,20 +471,11 @@ xfs_dio_write_end_io(spin_lock (&ip->i_flags_lock);if (offset + size >i_size_read (inode)) {i_size_write (inode, offset + size); - update_size = true; - } -spin_unlock (&ip->i_flags_lock); - -if (flags &IOMAP_DIO_COW ) { - error =xfs_reflink_end_cow (ip, offset, size); -if (error) -return error; - } - -if (flags &IOMAP_DIO_UNWRITTEN ) - error =xfs_iomap_write_unwritten (ip, offset, size); -else if (update_size) +spin_unlock (&ip->i_flags_lock); error =xfs_setfilesize (ip, offset, size); + }else { +spin_unlock (&ip->i_flags_lock); + }return error; }
fs/xfs/xfs_fsmap.c +35 -23
93 lines not on this page · raw message
fs/xfs/xfs_inode.c +5 -3
@@ -1623,10 +1623,12 @@ xfs_itruncate_extents( goto out;/* -* Clear the reflink flag if we truncated everything. +* Clear the reflink flag if there are no data fork blocks and +* there are no extents staged in the cow fork. */ -if (ip->i_d.di_nblocks ==0 &&xfs_is_reflink_inode (ip)) { - ip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK ; +if (xfs_is_reflink_inode (ip) && ip->i_cnextents ==0 ) { +if (ip->i_d.di_nblocks ==0 ) + ip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK ;xfs_inode_clear_cowblocks_tag (ip); }
fs/xfs/xfs_inode_item.c +42 -39
120 lines not on this page · raw message
fs/xfs/xfs_iomap.c +5 -2
@@ -829,7 +829,8 @@ intxfs_iomap_write_unwritten ( xfs_inode_t *ip, xfs_off_t offset, - xfs_off_t count) + xfs_off_t count, + bool update_isize) {xfs_mount_t *mp = ip->i_mount;xfs_fileoff_t offset_fsb;
@@ -840,6 +841,7 @@ xfs_iomap_write_unwritten(xfs_trans_t *tp;xfs_bmbt_irec_t imap;struct xfs_defer_ops dfops; +struct inode *inode =VFS_I (ip);xfs_fsize_t i_size;uint resblks;int error;
@@ -899,7 +901,8 @@ xfs_iomap_write_unwritten( i_size =XFS_FSB_TO_B (mp, offset_fsb + count_fsb);if (i_size > offset + count) i_size = offset + count; - +if (update_isize && i_size >i_size_read (inode)) +i_size_write (inode, i_size); i_size =xfs_new_eof (ip, i_size);if (i_size) { ip->i_d.di_size = i_size;
fs/xfs/xfs_iomap.h +1 -1
@@ -27,7 +27,7 @@ int xfs_iomap_write_direct(struct xfs_inode *, xfs_off_t, size_t, struct xfs_bmbt_irec *, int);int xfs_iomap_write_allocate (struct xfs_inode *,int ,xfs_off_t ,struct xfs_bmbt_irec *); -int xfs_iomap_write_unwritten (struct xfs_inode *,xfs_off_t ,xfs_off_t ); +int xfs_iomap_write_unwritten (struct xfs_inode *,xfs_off_t ,xfs_off_t ,bool );void xfs_bmbt_to_iomap (struct xfs_inode *,struct iomap *,struct xfs_bmbt_irec *);
fs/xfs/xfs_ondisk.h +1 -1
@@ -134,7 +134,7 @@ xfs_check_ondisk_structs(void) XFS_CHECK_STRUCT_SIZE(struct xfs_icreate_log, 28); XFS_CHECK_STRUCT_SIZE(struct xfs_ictimestamp, 8); XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format_32, 52); - XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format_64, 56); + XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format, 56); XFS_CHECK_STRUCT_SIZE(struct xfs_qoff_logformat, 20); XFS_CHECK_STRUCT_SIZE(struct xfs_trans_header, 16); }
fs/xfs/xfs_pnfs.c +1 -1
@@ -274,7 +274,7 @@ xfs_fs_commit_blocks( (end - 1) >> PAGE_SHIFT);WARN_ON_ONCE (error); - error =xfs_iomap_write_unwritten (ip, start, length); + error =xfs_iomap_write_unwritten (ip, start, length, false);if (error) goto out_drop_iolock; }
fs/xfs/xfs_reflink.c +8 -1
@@ -735,7 +735,13 @@ xfs_reflink_end_cow(/* If there is a hole at end_fsb - 1 go to the previous extent */ if (!xfs_iext_lookup_extent (ip, ifp, end_fsb -1 , &idx, &got) || got.br_startoff > end_fsb) { -ASSERT (idx >0 ); +/* +* In case of racing, overlapping AIO writes no COW extents +* might be left by the time I/O completes for the loser of +* the race. In that case we are done. +*/ +if (idx <=0 ) + goto out_cancel;xfs_iext_get_extent (ifp, --idx, &got); }
@@ -807,6 +813,7 @@ xfs_reflink_end_cow( out_defer:xfs_defer_cancel (&dfops); +out_cancel:xfs_trans_cancel (tp);xfs_iunlock (ip,XFS_ILOCK_EXCL ); out:
include/linux/key.h +30 -17
84 lines not on this page · raw message
include/linux/mbus.h +2 -2
@@ -31,8 +31,8 @@ struct mbus_dram_target_infostruct mbus_dram_window {u8 cs_index;u8 mbus_attr; -u32 base; -u32 size; +u64 base; +u64 size; } cs[4 ]; };
include/sound/control.h +3 -0
@@ -248,6 +248,9 @@ int snd_ctl_add_vmaster_hook(struct snd_kcontrol *kctl, void *private_data);void snd_ctl_sync_vmaster (struct snd_kcontrol *kctl,bool hook_only);#define snd_ctl_sync_vmaster_hook (kctl) snd_ctl_sync_vmaster(kctl, true) +int snd_ctl_apply_vmaster_slaves (struct snd_kcontrol *kctl, +int (*func)(struct snd_kcontrol *,void *), +void *arg);/* * Helper functions for jack-detection controls
lib/digsig.c +6 -0
@@ -87,6 +87,12 @@ static int digsig_verify_rsa(struct key *key,down_read (&key->sem); ukp =user_key_payload_locked (key); +if (!ukp) { +/* key was revoked before we acquired its semaphore */ + err = -EKEYREVOKED ; + goto err1; + } +if (ukp->datalen <sizeof (*pkh)) goto err1;
net/can/af_can.c +13 -1
@@ -875,9 +875,14 @@ static int can_pernet_init(struct net *net)spin_lock_init (&net->can.can_rcvlists_lock); net->can.can_rx_alldev_list =kzalloc (sizeof (struct dev_rcv_lists ),GFP_KERNEL ); - +if (!net->can.can_rx_alldev_list) + goto out; net->can.can_stats =kzalloc (sizeof (struct s_stats ),GFP_KERNEL ); +if (!net->can.can_stats) + goto out_free_alldev_list; net->can.can_pstats =kzalloc (sizeof (struct s_pstats ),GFP_KERNEL ); +if (!net->can.can_pstats) + goto out_free_can_stats;if (IS_ENABLED (CONFIG_PROC_FS )) {/* the statistics are updated every second (timer triggered) */
@@ -892,6 +897,13 @@ static int can_pernet_init(struct net *net) }return 0 ; + + out_free_can_stats: +kfree (net->can.can_stats); + out_free_alldev_list: +kfree (net->can.can_rx_alldev_list); + out: +return -ENOMEM ; }static void can_pernet_exit (struct net *net)
net/dns_resolver/dns_key.c +1 -1
@@ -224,7 +224,7 @@ static int dns_resolver_match_preparse(struct key_match_data *match_data)static void dns_resolver_describe (const struct key *key,struct seq_file *m) {seq_puts (m, key->description); -if (key_is_instantiated (key)) { +if (key_is_positive (key)) {int err =PTR_ERR (key->payload.data[dns_key_error]);if (err)
samples/trace_events/trace-events-sample.c +11 -3
@@ -78,29 +78,37 @@ static int simple_thread_fn(void *arg) }static DEFINE_MUTEX (thread_mutex); +static bool simple_thread_cnt;int foo_bar_reg (void ) { +mutex_lock (&thread_mutex); +if (simple_thread_cnt++) + goto out; +pr_info ("Starting thread for foo_bar_fn\n" );/* * We shouldn't be able to start a trace when the module is * unloading (there's other locks to prevent that). But * for consistency sake, we still take the thread_mutex. */ -mutex_lock (&thread_mutex); simple_tsk_fn =kthread_run (simple_thread_fn,NULL ,"event-sample-fn" ); + out:mutex_unlock (&thread_mutex);return 0 ; }void foo_bar_unreg (void ) { -pr_info ("Killing thread for foo_bar_fn\n" ); -/* protect against module unloading */ mutex_lock (&thread_mutex); +if (--simple_thread_cnt) + goto out; + +pr_info ("Killing thread for foo_bar_fn\n" );if (simple_tsk_fn)kthread_stop (simple_tsk_fn); simple_tsk_fn =NULL ; + out:mutex_unlock (&thread_mutex); }
security/keys/big_key.c +2 -2
@@ -247,7 +247,7 @@ void big_key_revoke(struct key *key)/* clear the quota */ key_payload_reserve (key,0 ); -if (key_is_instantiated (key) && +if (key_is_positive (key) && (size_t )key->payload.data[big_key_len] >BIG_KEY_FILE_THRESHOLD )vfs_truncate (path,0 ); }
@@ -279,7 +279,7 @@ void big_key_describe(const struct key *key, struct seq_file *m)seq_puts (m, key->description); -if (key_is_instantiated (key)) +if (key_is_positive (key))seq_printf (m,": %zu [%s]" , datalen, datalen >BIG_KEY_FILE_THRESHOLD ?"file" :"buff" );
security/keys/encrypted-keys/encrypted.c +8 -1
@@ -309,6 +309,13 @@ static struct key *request_user_key(const char *master_desc, const u8 **master_kdown_read (&ukey->sem); upayload =user_key_payload_locked (ukey); +if (!upayload) { +/* key was revoked before we acquired its semaphore */ +up_read (&ukey->sem); +key_put (ukey); + ukey =ERR_PTR (-EKEYREVOKED ); + goto error; + } *master_key = upayload->data; *master_keylen = upayload->datalen; error:
@@ -847,7 +854,7 @@ static int encrypted_update(struct key *key, struct key_preparsed_payload *prep)size_t datalen = prep->datalen;int ret =0 ; -if (test_bit (KEY_FLAG_NEGATIVE , &key->flags)) +if (key_is_negative (key))return -ENOKEY ;if (datalen <=0 || datalen >32767 || !prep->data)return -EINVAL ;
security/keys/gc.c +4 -4
@@ -129,15 +129,15 @@ static noinline void key_gc_unused_keys(struct list_head *keys)while (!list_empty (keys)) {struct key *key = list_entry(keys->next, struct key, graveyard_link); +short state = key->state; +list_del (&key->graveyard_link);kdebug ("- %u" , key->serial);key_check (key);/* Throw away the key data if the key is instantiated */ -if (test_bit (KEY_FLAG_INSTANTIATED , &key->flags) && - !test_bit (KEY_FLAG_NEGATIVE , &key->flags) && - key->type->destroy) +if (state ==KEY_IS_POSITIVE && key->type->destroy) key->type->destroy (key);security_key_free (key);
@@ -151,7 +151,7 @@ static noinline void key_gc_unused_keys(struct list_head *keys) }atomic_dec (&key->user->nkeys); -if (test_bit (KEY_FLAG_INSTANTIATED , &key->flags)) +if (state !=KEY_IS_UNINSTANTIATED )atomic_dec (&key->user->nikeys);key_user_put (key->user);
security/keys/key.c +30 -11
85 lines not on this page · raw message
security/keys/keyctl.c +4 -5
@@ -766,10 +766,9 @@ long keyctl_read_key(key_serial_t keyid, char __user *buffer, size_t buflen) key =key_ref_to_ptr (key_ref); -if (test_bit (KEY_FLAG_NEGATIVE , &key->flags)) { - ret = -ENOKEY ; - goto error2; - } + ret =key_read_state (key); +if (ret <0 ) + goto error2;/* Negatively instantiated */ /* see if we can read it directly */ ret =key_permission (key_ref,KEY_NEED_READ );
@@ -901,7 +900,7 @@ long keyctl_chown_key(key_serial_t id, uid_t user, gid_t group)atomic_dec (&key->user->nkeys);atomic_inc (&newowner->nkeys); -if (test_bit (KEY_FLAG_INSTANTIATED , &key->flags)) { +if (key->state !=KEY_IS_UNINSTANTIATED ) {atomic_dec (&key->user->nikeys);atomic_inc (&newowner->nikeys); }
security/keys/keyring.c +5 -5
@@ -414,7 +414,7 @@ static void keyring_describe(const struct key *keyring, struct seq_file *m)else seq_puts (m,"[anon]" ); -if (key_is_instantiated (keyring)) { +if (key_is_positive (keyring)) {if (keyring->keys.nr_leaves_on_tree !=0 )seq_printf (m,": %lu" , keyring->keys.nr_leaves_on_tree);else
@@ -553,7 +553,8 @@ static int keyring_search_iterator(const void *object, void *iterator_data) {struct keyring_search_context *ctx = iterator_data;const struct key *key =keyring_ptr_to_key (object); -unsigned long kflags = key->flags; +unsigned long kflags =READ_ONCE (key->flags); +short state =READ_ONCE (key->state);kenter ("{%d}" , key->serial);
@@ -597,9 +598,8 @@ static int keyring_search_iterator(const void *object, void *iterator_data)if (ctx->flags &KEYRING_SEARCH_DO_STATE_CHECK ) {/* we set a different error code if we pass a negative key */ -if (kflags & (1 <<KEY_FLAG_NEGATIVE )) { -smp_rmb (); - ctx->result =ERR_PTR (key->reject_error); +if (state <0 ) { + ctx->result =ERR_PTR (state);kleave (" = %d [neg]" , ctx->skipped_ret); goto skipped; }
security/keys/proc.c +5 -2
@@ -182,6 +182,7 @@ static int proc_keys_show(struct seq_file *m, void *v)unsigned long timo;key_ref_t key_ref, skey_ref;char xbuf[16 ]; +short state;int rc;struct keyring_search_context ctx = {
@@ -240,17 +241,19 @@ static int proc_keys_show(struct seq_file *m, void *v)sprintf (xbuf,"%luw" , timo / (60 *60 *24 *7 )); } + state =key_read_state (key); +#define showflag (KEY ,LETTER ,FLAG ) \ (test_bit(FLAG, &(KEY)->flags) ? LETTER : '-') seq_printf(m, "%08x %c%c%c%c%c%c%c %5d %4s %08x %5d %5d %-9.9s ", key->serial, - showflag(key, 'I', KEY_FLAG_INSTANTIATED), + state != KEY_IS_UNINSTANTIATED ? 'I' : '-', showflag(key, 'R', KEY_FLAG_REVOKED), showflag(key, 'D', KEY_FLAG_DEAD), showflag(key, 'Q', KEY_FLAG_IN_QUOTA), showflag(key, 'U', KEY_FLAG_USER_CONSTRUCT), - showflag(key, 'N', KEY_FLAG_NEGATIVE), + state < 0 ? 'N' : '-', showflag(key, 'i', KEY_FLAG_INVALIDATED), refcount_read(&key->usage), xbuf,
security/keys/process_keys.c +1 -1
@@ -730,7 +730,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags, ret = -EIO ;if (!(lflags &KEY_LOOKUP_PARTIAL ) && - !test_bit (KEY_FLAG_INSTANTIATED , &key->flags)) +key_read_state (key) ==KEY_IS_UNINSTANTIATED ) goto invalid_key;/* check the permissions */
security/keys/request_key.c +3 -4
@@ -595,10 +595,9 @@ int wait_for_key_construction(struct key *key, bool intr) intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);if (ret)return -ERESTARTSYS ; -if (test_bit (KEY_FLAG_NEGATIVE , &key->flags)) { -smp_rmb (); -return key->reject_error; - } + ret =key_read_state (key); +if (ret <0 ) +return ret;return key_validate (key); }EXPORT_SYMBOL (wait_for_key_construction);
security/keys/request_key_auth.c +1 -1
@@ -73,7 +73,7 @@ static void request_key_auth_describe(const struct key *key,seq_puts (m,"key:" );seq_puts (m, key->description); -if (key_is_instantiated (key)) +if (key_is_positive (key))seq_printf (m," pid:%d ci:%zu" , rka->pid, rka->callout_len); }
security/keys/trusted.c +1 -1
@@ -1066,7 +1066,7 @@ static int trusted_update(struct key *key, struct key_preparsed_payload *prep)char *datablob;int ret =0 ; -if (test_bit (KEY_FLAG_NEGATIVE , &key->flags)) +if (key_is_negative (key))return -ENOKEY ; p = key->payload.data[0 ];if (!p->migratable)
security/keys/user_defined.c +2 -2
@@ -114,7 +114,7 @@ int user_update(struct key *key, struct key_preparsed_payload *prep)/* attach the new data, displacing the old */ key->expiry = prep->expiry; -if (!test_bit (KEY_FLAG_NEGATIVE , &key->flags)) +if (key_is_positive (key)) zap =dereference_key_locked (key);rcu_assign_keypointer (key, prep->payload.data[0 ]); prep->payload.data[0 ] =NULL ;
@@ -162,7 +162,7 @@ EXPORT_SYMBOL_GPL(user_destroy);void user_describe (const struct key *key,struct seq_file *m) {seq_puts (m, key->description); -if (key_is_instantiated (key)) +if (key_is_positive (key))seq_printf (m,": %u" , key->datalen); }
sound/core/seq/seq_lock.c +0 -4
@@ -23,8 +23,6 @@#include <sound/core.h> #include "seq_lock.h" -#if defined(CONFIG_SMP ) || defined(CONFIG_SND_DEBUG ) -/* wait until all locks are released */ void snd_use_lock_sync_helper (snd_use_lock_t *lockp,const char *file,int line) {
@@ -41,5 +39,3 @@ void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line) } }EXPORT_SYMBOL (snd_use_lock_sync_helper); - -#endif
sound/core/seq/seq_lock.h +0 -12
@@ -3,8 +3,6 @@#include <linux/sched.h> -#if defined(CONFIG_SMP ) || defined(CONFIG_SND_DEBUG ) -typedef atomic_t snd_use_lock_t ;/* initialize lock */
@@ -20,14 +18,4 @@ typedef atomic_t snd_use_lock_t;void snd_use_lock_sync_helper (snd_use_lock_t *lock,const char *file,int line);#define snd_use_lock_sync (lockp) snd_use_lock_sync_helper(lockp, __BASE_FILE__, __LINE__) -#else /* SMP || CONFIG_SND_DEBUG */ - -typedef spinlock_t snd_use_lock_t ;/* dummy */ -#define snd_use_lock_init (lockp)/**/ -#define snd_use_lock_use (lockp)/**/ -#define snd_use_lock_free (lockp)/**/ -#define snd_use_lock_sync (lockp)/**/ - -#endif /* SMP || CONFIG_SND_DEBUG */ -#endif /* __SND_SEQ_LOCK_H */
sound/core/vmaster.c +31 -0
@@ -484,3 +484,34 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kcontrol, bool hook_only) master->hook (master->hook_private_data, master->val); }EXPORT_SYMBOL_GPL (snd_ctl_sync_vmaster); + +/**
Lines of this file are not shown. View the raw message.
sound/pci/hda/hda_codec.c +55 -42
97 lines not on this page · 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.