Linux 4.4.169
Greg KH
maintainerI'm announcing the release of the 4.4.169 kernel.
All users of the 4.4 kernel series must upgrade.
The updated 4.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arc/include/asm/io.h | 72 +++++++++++++++++++ arch/arm/mm/cache-v7.S | 8 +- arch/powerpc/boot/Makefile | 3 arch/powerpc/kernel/msi.c | 7 + arch/x86/platform/efi/early_printk.c | 2 drivers/ata/libata-core.c | 1 drivers/clk/mmp/clk.c | 2 drivers/gpu/drm/msm/msm_atomic.c | 5 + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 6 - drivers/i2c/busses/i2c-axxia.c | 40 +++++++--- drivers/i2c/busses/i2c-scmi.c | 10 +- drivers/ide/pmac.c | 1 drivers/input/keyboard/omap4-keypad.c | 18 +++- drivers/mmc/host/omap.c | 11 ++ drivers/net/bonding/bond_3ad.c | 3 drivers/net/dsa/mv88e6060.c | 10 -- drivers/net/wireless/mac80211_hwsim.c | 12 +-- drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 2 drivers/rtc/rtc-snvs.c | 104 ++++++++++++++++++---------- drivers/sbus/char/display7seg.c | 1 drivers/sbus/char/envctrl.c | 2 drivers/scsi/libiscsi.c | 4 - drivers/scsi/vmw_pvscsi.c | 4 - drivers/tty/serial/suncore.c | 1 fs/aio.c | 2 fs/cifs/Kconfig | 2 fs/f2fs/segment.c | 5 + kernel/time/timer_list.c | 2 kernel/trace/ftrace.c | 1 kernel/trace/trace_events_trigger.c | 6 + lib/interval_tree_test.c | 93 ++++++++++++++++--------- lib/rbtree_test.c | 55 +++++++++----- net/mac80211/mlme.c | 3 net/sunrpc/xprt.c | 11 ++ sound/isa/wavefront/wavefront_synth.c | 9 ++ 36 files changed, 375 insertions(+), 145 deletions(-)
Aaro Koskinen (1):
MMC: OMAP: fix broken MMC on OMAP15XX/OMAP5910/OMAP310
Adamski, Krzysztof (Nokia - PL/Wroclaw) (1):
i2c: axxia: properly handle master timeout
Alexey Khoroshilov (1):
mac80211_hwsim: fix module init error paths for netlink
Anderson Luiz Alves (1):
mv88e6060: disable hardware level MAC learning
Brian Norris (1):
Revert "drm/rockchip: Allow driver to be shutdown on reboot/kexec"
Cathy Avery (1):
scsi: vmw_pscsi: Rearrange code to avoid multiple calls to free_irq during unload
Chen-Yu Tsai (1):
pinctrl: sunxi: a83t: Fix IRQ offset typo for PH11
Chris Cole (1):
ARM: 8814/1: mm: improve/fix ARM v7_dma_inv_range() unaligned address handling
Dan Carpenter (2):
clk: mmp: Off by one in mmp_clk_add()
ALSA: isa/wavefront: prevent some out of bound writes
Davidlohr Bueso (5):
lib/interval_tree_test.c: make test options module parameters lib/interval_tree_test.c: allow full tree search lib/rbtree_test.c: make input module parameters lib/rbtree-test: lower default params lib/interval_tree_test.c: allow users to limit scope of endpoint
Emmanuel Grumbach (1):
mac80211: don't WARN on bad WMM parameters from buggy APs
Fred Herard (1):
scsi: libiscsi: Fix NULL pointer dereference in iscsi_eh_session_reset
Greg Kroah-Hartman (1):
Linux 4.4.169
Guenter Roeck (1):
powerpc/boot: Fix random libfdt related build errors
Guy Shapiro (1):
rtc: snvs: add a missing write sync
Hans de Goede (1):
i2c: scmi: Fix probe error on devices with an empty SMB0001 ACPI device node
Ilan Peer (1):
mac80211: Fix condition validating WMM IE
Ingo Molnar (1):
timer/debug: Change /proc/timer_list from 0444 to 0400
Jeff Moyer (1):
aio: fix spectre gadget in lookup_ioctx
Jose Abreu (1):
ARC: io.h: Implement reads{x}()/writes{x}()Juha-Matti Tilli (1):
libata: whitelist all SAMSUNG MZ7KM* solid-state disks
Radu Rendec (1):
powerpc/msi: Fix NULL pointer access in teardown code
Sean Paul (1):
drm/msm: Grab a vblank reference when waiting for commit_done
Steve French (1):
cifs: In Kconfig CONFIG_CIFS_POSIX needs depends on legacy (insecure cifs)
Steven Rostedt (VMware) (2):
tracing: Fix memory leak in set_trigger_filter()
tracing: Fix memory leak of instance function hash filters
Toni Peltonen (1):
bonding: fix 802.3ad state sent to partner when unbinding slave
Tony Lindgren (1):
Input: omap-keypad - fix keyboard debounce configuration
Trent Piepho (1):
rtc: snvs: Add timeouts to avoid kernel lockups
Trond Myklebust (1):
SUNRPC: Fix a potential race in xprt_connect()
Yangtao Li (4):
sbus: char: add of_node_put()
drivers/sbus/char: add of_node_put()
drivers/tty: add missing of_node_put()
ide: pmac: add of_node_put()
YiFei Zhu (1):
x86/earlyprintk/efi: Fix infinite loop on some screen widths
Yunlei He (1):
f2fs: fix a panic caused by NULL flush_cmd_control
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 168 +SUBLEVEL = 169 EXTRAVERSION = NAME = Blurry Fish Butt
arch/arc/include/asm/io.h +72 -0
100 lines not on this page · raw message
arch/arm/mm/cache-v7.S +5 -3
@@ -359,14 +359,16 @@ v7_dma_inv_range: ALT_UP(W(nop)) #endif mcrne p15, 0, r0, c7, c14, 1 @ clean & invalidate D / U line + addne r0, r0, r2 tst r1, r3 bic r1, r1, r3 mcrne p15, 0, r1, c7, c14, 1 @ clean & invalidate D / U line -1: - mcr p15, 0, r0, c7, c6, 1 @ invalidate D / U line - add r0, r0, r2 cmp r0, r1 +1: + mcrlo p15, 0, r0, c7, c6, 1 @ invalidate D / U line + addlo r0, r0, r2 + cmplo r0, r1 blo 1b dsb st ret lr
arch/powerpc/boot/Makefile +2 -1
@@ -70,7 +70,8 @@ $(addprefix $(obj)/,$(zlib) cuboot-c2k.o gunzip_util.o main.o): \ libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c libfdtheader := fdt.h libfdt.h libfdt_internal.h -$(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o): \ +$(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o \ + treeboot-akebono.o treeboot-currituck.o treeboot-iss4xx.o): \ $(addprefix $(obj)/,$(libfdtheader)) src-wlib-y := string.S crt0.S crtsavres.S stdio.c main.c \
arch/powerpc/kernel/msi.c +6 -1
@@ -34,5 +34,10 @@ void arch_teardown_msi_irqs(struct pci_dev *dev) {struct pci_controller *phb =pci_bus_to_host (dev->bus); - phb->controller_ops.teardown_msi_irqs (dev); +/* +* We can be called even when arch_setup_msi_irqs() returns -ENOSYS, +* so check the pointer again. +*/ +if (phb->controller_ops.teardown_msi_irqs) + phb->controller_ops.teardown_msi_irqs (dev); }
arch/x86/platform/efi/early_printk.c +1 -1
@@ -179,7 +179,7 @@ early_efi_write(struct console *con, const char *str, unsigned int num) num--; } -if (efi_x >= si->lfb_width) { +if (efi_x + font->width > si->lfb_width) { efi_x =0 ; efi_y += font->height; }
drivers/ata/libata-core.c +1 -0
@@ -4297,6 +4297,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "SSD*INTEL*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "Samsung*SSD*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "SAMSUNG*SSD*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, }, + { "SAMSUNG*MZ7KM*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "ST[1248][0248]0[FH]*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, },/*
drivers/clk/mmp/clk.c +1 -1
@@ -182,7 +182,7 @@ void mmp_clk_add(struct mmp_clk_unit *unit, unsigned int id,pr_err ("CLK %d has invalid pointer %p\n" , id, clk);return ; } -if (id > unit->nr_clks) { +if (id >= unit->nr_clks) {pr_err ("CLK %d is invalid\n" , id);return ; }
drivers/gpu/drm/msm/msm_atomic.c +5 -0
@@ -107,7 +107,12 @@ static void msm_atomic_wait_for_commit_done(struct drm_device *dev,if (old_state->legacy_cursor_update)continue ; +if (drm_crtc_vblank_get (crtc)) +continue ; + kms->funcs->wait_for_crtc_commit_done (kms, crtc); + +drm_crtc_vblank_put (crtc); } }
drivers/gpu/drm/rockchip/rockchip_drm_drv.c +0 -6
@@ -547,11 +547,6 @@ static int rockchip_drm_platform_remove(struct platform_device *pdev)return 0 ; } -static void rockchip_drm_platform_shutdown (struct platform_device *pdev) -{ -rockchip_drm_platform_remove (pdev); -} -static const struct of_device_id rockchip_drm_dt_ids[] = { { .compatible ="rockchip,display-subsystem" , }, {/* sentinel */ },
@@ -561,7 +556,6 @@ MODULE_DEVICE_TABLE(of, rockchip_drm_dt_ids);static struct platform_driver rockchip_drm_platform_driver = { .probe = rockchip_drm_platform_probe, .remove = rockchip_drm_platform_remove, - .shutdown = rockchip_drm_platform_shutdown, .driver = { .name ="rockchip-drm" , .of_match_table = rockchip_drm_dt_ids,
drivers/i2c/busses/i2c-axxia.c +29 -11
@@ -74,8 +74,7 @@ MST_STATUS_ND)#define MST_STATUS_ERR (MST_STATUS_NAK | \ MST_STATUS_AL | \ - MST_STATUS_IP | \ - MST_STATUS_TSS) + MST_STATUS_IP)#define MST_TX_BYTES_XFRD 0x50#define MST_RX_BYTES_XFRD 0x54#define SCL_HIGH_PERIOD 0x80
@@ -241,7 +240,7 @@ static int axxia_i2c_empty_rx_fifo(struct axxia_i2c_dev *idev)*/ if (c <=0 || c >I2C_SMBUS_BLOCK_MAX ) { idev->msg_err = -EPROTO ; -i2c_int_disable (idev, ~0 ); +i2c_int_disable (idev, ~MST_STATUS_TSS );complete (&idev->msg_complete);break ; }
@@ -299,14 +298,19 @@ static irqreturn_t axxia_i2c_isr(int irq, void *_dev)if (status &MST_STATUS_SCC ) {/* Stop completed */ -i2c_int_disable (idev, ~0 ); +i2c_int_disable (idev, ~MST_STATUS_TSS );complete (&idev->msg_complete); }else if (status &MST_STATUS_SNS ) {/* Transfer done */ -i2c_int_disable (idev, ~0 ); +i2c_int_disable (idev, ~MST_STATUS_TSS );if (i2c_m_rd (idev->msg) && idev->msg_xfrd < idev->msg->len)axxia_i2c_empty_rx_fifo (idev);complete (&idev->msg_complete); + }else if (status &MST_STATUS_TSS ) { +/* Transfer timeout */ + idev->msg_err = -ETIMEDOUT ; +i2c_int_disable (idev, ~MST_STATUS_TSS ); +complete (&idev->msg_complete); }else if (unlikely (status &MST_STATUS_ERR )) {/* Transfer error */ i2c_int_disable (idev, ~0 );
@@ -339,10 +343,10 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)u32 rx_xfer, tx_xfer;u32 addr_1, addr_2;unsigned long time_left; +unsigned int wt_value; idev->msg = msg; idev->msg_xfrd =0 ; - idev->msg_err =0 ;reinit_completion (&idev->msg_complete);if (i2c_m_ten (msg)) {
@@ -382,9 +386,18 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)else if (axxia_i2c_fill_tx_fifo (idev) !=0 ) int_mask |=MST_STATUS_TFL ; + wt_value =WT_VALUE (readl (idev->base +WAIT_TIMER_CONTROL )); +/* Disable wait timer temporarly */ +writel (wt_value, idev->base +WAIT_TIMER_CONTROL ); +/* Check if timeout error happened */ +if (idev->msg_err) + goto out; +/* Start manual mode */ writel (CMD_MANUAL , idev->base +MST_COMMAND ); +writel (WT_EN | wt_value, idev->base +WAIT_TIMER_CONTROL ); +i2c_int_enable (idev, int_mask); time_left = wait_for_completion_timeout(&idev->msg_complete,
@@ -395,13 +408,15 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)if (readl (idev->base +MST_COMMAND ) &CMD_BUSY )dev_warn (idev->dev,"busy after xfer\n" ); -if (time_left ==0 ) +if (time_left ==0 ) { idev->msg_err = -ETIMEDOUT ; - -if (idev->msg_err == -ETIMEDOUT )i2c_recover_bus (&idev->adapter); +axxia_i2c_init (idev); + } -if (unlikely (idev->msg_err) && idev->msg_err != -ENXIO ) +out: +if (unlikely (idev->msg_err) && idev->msg_err != -ENXIO && + idev->msg_err != -ETIMEDOUT )axxia_i2c_init (idev);return idev->msg_err;
@@ -409,7 +424,7 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)static int axxia_i2c_stop (struct axxia_i2c_dev *idev) { -u32 int_mask =MST_STATUS_ERR |MST_STATUS_SCC ; +u32 int_mask =MST_STATUS_ERR |MST_STATUS_SCC |MST_STATUS_TSS ;unsigned long time_left;reinit_completion (&idev->msg_complete);
@@ -436,6 +451,9 @@ axxia_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)int i;int ret =0 ; + idev->msg_err =0 ; +i2c_int_enable (idev,MST_STATUS_TSS ); +for (i =0 ; ret ==0 && i < num; ++i) ret =axxia_i2c_xfer_msg (idev, &msgs[i]);
drivers/i2c/busses/i2c-scmi.c +7 -3
@@ -364,6 +364,7 @@ static int acpi_smbus_cmi_add(struct acpi_device *device) {struct acpi_smbus_cmi *smbus_cmi;const struct acpi_device_id *id; +int ret; smbus_cmi =kzalloc (sizeof (struct acpi_smbus_cmi ),GFP_KERNEL );if (!smbus_cmi)
@@ -385,8 +386,10 @@ static int acpi_smbus_cmi_add(struct acpi_device *device)acpi_walk_namespace (ACPI_TYPE_METHOD , smbus_cmi->handle,1 , acpi_smbus_cmi_query_methods,NULL , smbus_cmi,NULL ); -if (smbus_cmi->cap_info ==0 ) +if (smbus_cmi->cap_info ==0 ) { + ret = -ENODEV ; goto err; + } snprintf(smbus_cmi->adapter.name, sizeof(smbus_cmi->adapter.name), "SMBus CMI adapter %s",
@@ -397,7 +400,8 @@ static int acpi_smbus_cmi_add(struct acpi_device *device) smbus_cmi->adapter.class =I2C_CLASS_HWMON |I2C_CLASS_SPD ; smbus_cmi->adapter.dev.parent = &device->dev; -if (i2c_add_adapter (&smbus_cmi->adapter)) { + ret =i2c_add_adapter (&smbus_cmi->adapter); +if (ret) {dev_err (&device->dev,"Couldn't register adapter!\n" ); goto err; }
@@ -407,7 +411,7 @@ static int acpi_smbus_cmi_add(struct acpi_device *device) err:kfree (smbus_cmi); device->driver_data =NULL ; -return -EIO ; +return ret; }static int acpi_smbus_cmi_remove (struct acpi_device *device)
drivers/ide/pmac.c +1 -0
@@ -920,6 +920,7 @@ static u8 pmac_ide_cable_detect(ide_hwif_t *hwif)struct device_node *root =of_find_node_by_path ("/" );const char *model =of_get_property (root,"model" ,NULL ); +of_node_put (root);/* Get cable type from device-tree. */ if (cable && !strncmp (cable,"80-" ,3 )) {/* Some drives fail to detect 80c cable in PowerBook */
drivers/input/keyboard/omap4-keypad.c +14 -4
@@ -60,8 +60,18 @@/* OMAP4 values */ #define OMAP4_VAL_IRQDISABLE 0x0 -#define OMAP4_VAL_DEBOUNCINGTIME 0x7 -#define OMAP4_VAL_PVT 0x7 + +/* +* Errata i689: If a key is released for a time shorter than debounce time, +* the keyboard will idle and never detect the key release. The workaround +* is to use at least a 12ms debounce time. See omap5432 TRM chapter +* "26.4.6.2 Keyboard Controller Timer" for more information. +*/ +#define OMAP4_KEYPAD_PTV_DIV_128 0x6 +#define OMAP4_KEYPAD_DEBOUNCINGTIME_MS (dbms, ptv) \ + ((((dbms) * 1000) / ((1 << ((ptv) + 1)) * (1000000 / 32768))) - 1) +#define OMAP4_VAL_DEBOUNCINGTIME_16MS \ + OMAP4_KEYPAD_DEBOUNCINGTIME_MS(16, OMAP4_KEYPAD_PTV_DIV_128)enum {KBD_REVISION_OMAP4 =0 ,
@@ -181,9 +191,9 @@ static int omap4_keypad_open(struct input_dev *input)kbd_writel (keypad_data,OMAP4_KBD_CTRL ,OMAP4_DEF_CTRL_NOSOFTMODE | - (OMAP4_VAL_PVT <<OMAP4_DEF_CTRL_PTV_SHIFT )); + (OMAP4_KEYPAD_PTV_DIV_128 <<OMAP4_DEF_CTRL_PTV_SHIFT ));kbd_writel (keypad_data,OMAP4_KBD_DEBOUNCINGTIME , -OMAP4_VAL_DEBOUNCINGTIME ); +OMAP4_VAL_DEBOUNCINGTIME_16MS );/* clear pending interrupts */ kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS ,kbd_read_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS ));
drivers/mmc/host/omap.c +9 -2
@@ -105,6 +105,7 @@ struct mmc_omap_slot {unsigned int vdd;u16 saved_con;u16 bus_mode; +u16 power_mode;unsigned int fclk_freq;struct tasklet_struct cover_tasklet;
@@ -1156,7 +1157,7 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)struct mmc_omap_slot *slot =mmc_priv (mmc);struct mmc_omap_host *host = slot->host;int i, dsor; -int clk_enabled; +int clk_enabled, init_stream;mmc_omap_select_slot (slot,0 );
@@ -1166,6 +1167,7 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) slot->vdd = ios->vdd; clk_enabled =0 ; + init_stream =0 ;switch (ios->power_mode) {case MMC_POWER_OFF :mmc_omap_set_power (slot,0 , ios->vdd);
@@ -1173,13 +1175,17 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)case MMC_POWER_UP :/* Cannot touch dsor yet, just power up MMC */ mmc_omap_set_power (slot,1 , ios->vdd); + slot->power_mode = ios->power_mode; goto exit;case MMC_POWER_ON :mmc_omap_fclk_enable (host,1 ); clk_enabled =1 ; dsor |=1 <<11 ; +if (slot->power_mode !=MMC_POWER_ON ) + init_stream =1 ;break ; } + slot->power_mode = ios->power_mode;if (slot->bus_mode != ios->bus_mode) {if (slot->pdata->set_bus_mode !=NULL )
@@ -1195,7 +1201,7 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)for (i =0 ; i <2 ; i++)OMAP_MMC_WRITE (host,CON , dsor); slot->saved_con = dsor; -if (ios->power_mode ==MMC_POWER_ON ) { +if (init_stream) {/* worst case at 400kHz, 80 cycles makes 200 microsecs */ int usecs =250 ;
@@ -1233,6 +1239,7 @@ static int mmc_omap_new_slot(struct mmc_omap_host *host, int id) slot->host = host; slot->mmc = mmc; slot->id = id; + slot->power_mode =MMC_POWER_UNDEFINED ; slot->pdata = &host->pdata->slots[id]; host->slots[id] = slot;
drivers/net/bonding/bond_3ad.c +3 -0
@@ -2011,6 +2011,9 @@ void bond_3ad_unbind_slave(struct slave *slave) aggregator->aggregator_identifier);/* Tell the partner that this port is not suitable for aggregation */ + port->actor_oper_port_state &= ~AD_STATE_SYNCHRONIZATION ; + port->actor_oper_port_state &= ~AD_STATE_COLLECTING ; + port->actor_oper_port_state &= ~AD_STATE_DISTRIBUTING ; port->actor_oper_port_state &= ~AD_STATE_AGGREGATION ;__update_lacpdu_from_port (port);ad_lacpdu_send (port);
drivers/net/dsa/mv88e6060.c +3 -7
@@ -98,8 +98,7 @@ static int mv88e6060_switch_reset(struct dsa_switch *ds)/* Reset the switch. */ REG_WRITE (REG_GLOBAL ,GLOBAL_ATU_CONTROL ,GLOBAL_ATU_CONTROL_SWRESET | -GLOBAL_ATU_CONTROL_ATUSIZE_1024 | -GLOBAL_ATU_CONTROL_ATE_AGE_5MIN ); +GLOBAL_ATU_CONTROL_LEARNDIS );/* Wait up to one second for reset to complete. */ timeout = jiffies +1 *HZ ;
@@ -124,13 +123,10 @@ static int mv88e6060_setup_global(struct dsa_switch *ds)*/ REG_WRITE (REG_GLOBAL ,GLOBAL_CONTROL ,GLOBAL_CONTROL_MAX_FRAME_1536 ); -/* Enable automatic address learning, set the address -* database size to 1024 entries, and set the default aging -* time to 5 minutes. +/* Disable automatic address learning. */ REG_WRITE (REG_GLOBAL ,GLOBAL_ATU_CONTROL , -GLOBAL_ATU_CONTROL_ATUSIZE_1024 | -GLOBAL_ATU_CONTROL_ATE_AGE_5MIN ); +GLOBAL_ATU_CONTROL_LEARNDIS );return 0 ; }
drivers/net/wireless/mac80211_hwsim.c +7 -5
@@ -3195,16 +3195,16 @@ static int __init init_mac80211_hwsim(void)if (err)return err; + err =hwsim_init_netlink (); +if (err) + goto out_unregister_driver; + hwsim_class =class_create (THIS_MODULE ,"mac80211_hwsim" );if (IS_ERR (hwsim_class)) { err =PTR_ERR (hwsim_class); - goto out_unregister_driver; + goto out_exit_netlink; } - err =hwsim_init_netlink (); -if (err <0 ) - goto out_unregister_driver; -for (i =0 ; i < radios; i++) {struct hwsim_new_radio_params param = {0 };
@@ -3310,6 +3310,8 @@ out_free_mon:free_netdev (hwsim_mon); out_free_radios:mac80211_hwsim_free (); +out_exit_netlink: +hwsim_exit_netlink (); out_unregister_driver:platform_driver_unregister (&mac80211_hwsim_driver);return err;
drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c +1 -1
@@ -568,7 +568,7 @@ static const struct sunxi_desc_pin sun8i_a83t_pins[] = {SUNXI_PIN (SUNXI_PINCTRL_PIN (H ,11 ),SUNXI_FUNCTION (0x0 ,"gpio_in" ),SUNXI_FUNCTION (0x1 ,"gpio_out" ), - SUNXI_FUNCTION_IRQ_BANK(0x6, 2, 1)), /* PH_EINT11 */ + SUNXI_FUNCTION_IRQ_BANK(0x6, 2, 11)), /* PH_EINT11 */ };static const struct sunxi_pinctrl_desc sun8i_a83t_pinctrl_data = {
drivers/rtc/rtc-snvs.c +70 -34
138 lines not on this page · raw message
drivers/sbus/char/display7seg.c +1 -0
@@ -221,6 +221,7 @@ static int d7s_probe(struct platform_device *op)dev_set_drvdata (&op->dev, p); d7s_device = p; err =0 ; +of_node_put (opts); out:return err;
drivers/sbus/char/envctrl.c +2 -0
@@ -910,8 +910,10 @@ static void envctrl_init_i2c_child(struct device_node *dp,for (len =0 ; len <PCF8584_MAX_CHANNELS ; ++len) { pchild->mon_type[len] =ENVCTRL_NOMON ; } +of_node_put (root_node);return ; } +of_node_put (root_node); }/* Get the monitor channels. */
drivers/scsi/libiscsi.c +2 -2
@@ -2416,8 +2416,8 @@ int iscsi_eh_session_reset(struct scsi_cmnd *sc) failed:ISCSI_DBG_EH (session,"failing session reset: Could not log back into " -"%s, %s [age %d]\n" , session->targetname, - conn->persistent_address, session->age); +"%s [age %d]\n" , session->targetname, + session->age);spin_unlock_bh (&session->frwd_lock);mutex_unlock (&session->eh_mutex);return FAILED ;
drivers/scsi/vmw_pvscsi.c +2 -2
@@ -1199,8 +1199,6 @@ static void pvscsi_shutdown_intr(struct pvscsi_adapter *adapter)static void pvscsi_release_resources (struct pvscsi_adapter *adapter) { -pvscsi_shutdown_intr (adapter); -if (adapter->workqueue)destroy_workqueue (adapter->workqueue);
@@ -1529,6 +1527,7 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id) out_reset_adapter:ll_adapter_reset (adapter); out_release_resources: +pvscsi_shutdown_intr (adapter);pvscsi_release_resources (adapter);scsi_host_put (host); out_disable_device:
@@ -1537,6 +1536,7 @@ out_disable_device:return error; out_release_resources_and_disable: +pvscsi_shutdown_intr (adapter);pvscsi_release_resources (adapter); goto out_disable_device; }
drivers/tty/serial/suncore.c +1 -0
@@ -111,6 +111,7 @@ void sunserial_console_termios(struct console *con, struct device_node *uart_dp) mode =of_get_property (dp, mode_prop,NULL );if (!mode) mode ="9600,8,n,1,-" ; +of_node_put (dp); } cflag =CREAD |HUPCL |CLOCAL ;
fs/aio.c +2 -0
@@ -40,6 +40,7 @@#include <linux/ramfs.h> #include <linux/percpu-refcount.h> #include <linux/mount.h> +#include <linux/nospec.h> #include <asm/kmap_types.h> #include <asm/uaccess.h>
@@ -1063,6 +1064,7 @@ static struct kioctx *lookup_ioctx(unsigned long ctx_id)if (!table || id >= table->nr) goto out; + id =array_index_nospec (id, table->nr); ctx =rcu_dereference (table->table[id]);if (ctx && ctx->user_id == ctx_id) {if (percpu_ref_tryget_live (&ctx->users))
fs/cifs/Kconfig +1 -1
@@ -111,7 +111,7 @@ config CIFS_XATTR config CIFS_POSIX bool "CIFS POSIX Extensions" - depends on CIFS_XATTR + depends on CIFS && CIFS_ALLOW_INSECURE_LEGACY && CIFS_XATTR help Enabling this option will cause the cifs client to attempt to negotiate a newer dialect with servers, such as Samba 3.0.5
fs/f2fs/segment.c +4 -1
@@ -398,6 +398,9 @@ int create_flush_cmd_control(struct f2fs_sb_info *sbi)init_waitqueue_head (&fcc->flush_wait_queue);init_llist_head (&fcc->issue_list);SM_I (sbi)->cmd_control_info = fcc; +if (!test_opt (sbi,FLUSH_MERGE )) +return err; + fcc->f2fs_issue_flush =kthread_run (issue_flush_thread, sbi,"f2fs_flush-%u:%u" ,MAJOR (dev),MINOR (dev));if (IS_ERR (fcc->f2fs_issue_flush)) {
@@ -2316,7 +2319,7 @@ int build_segment_manager(struct f2fs_sb_info *sbi)INIT_LIST_HEAD (&sm_info->sit_entry_set); -if (test_opt (sbi,FLUSH_MERGE ) && !f2fs_readonly (sbi->sb)) { +if (!f2fs_readonly (sbi->sb)) { err =create_flush_cmd_control (sbi);if (err)return err;
kernel/time/timer_list.c +1 -1
@@ -399,7 +399,7 @@ static int __init init_timer_list_procfs(void) {struct proc_dir_entry *pe; - pe =proc_create ("timer_list" ,0444 ,NULL , &timer_list_fops); + pe =proc_create ("timer_list" ,0400 ,NULL , &timer_list_fops);if (!pe)return -ENOMEM ;return 0 ;
kernel/trace/ftrace.c +1 -0
@@ -4767,6 +4767,7 @@ void ftrace_destroy_filter_files(struct ftrace_ops *ops)if (ops->flags &FTRACE_OPS_FL_ENABLED )ftrace_shutdown (ops,0 ); ops->flags |=FTRACE_OPS_FL_DELETED ; +ftrace_free_filter (ops);mutex_unlock (&ftrace_lock); }
kernel/trace/trace_events_trigger.c +4 -2
@@ -727,8 +727,10 @@ static int set_trigger_filter(char *filter_str,/* The filter is for the 'trigger' event, not the triggered event */ ret =create_event_filter (file->event_call, filter_str, false, &filter); -if (ret) - goto out; +/* +* If create_event_filter() fails, filter still needs to be freed. +* Which the calling code will do with data->filter. +*/ assign: tmp =rcu_access_pointer (data->filter);
lib/interval_tree_test.c +62 -31
153 lines not on this page · raw message
lib/rbtree_test.c +34 -21
124 lines not on this page · raw message
net/mac80211/mlme.c +2 -1
@@ -1886,7 +1886,8 @@ static bool ieee80211_sta_wmm_params(struct ieee80211_local *local, params[ac].acm = acm; params[ac].uapsd = uapsd; -if (params[ac].cw_min > params[ac].cw_max) { +if (params[ac].cw_min ==0 || + params[ac].cw_min > params[ac].cw_max) {sdata_info (sdata,"AP has invalid WMM params (CWmin/max=%d/%d for ACI %d), using defaults\n" , params[ac].cw_min, params[ac].cw_max, aci);
net/sunrpc/xprt.c +9 -2
@@ -758,8 +758,15 @@ void xprt_connect(struct rpc_task *task)return ;if (xprt_test_and_set_connecting (xprt))return ; - xprt->stat.connect_start = jiffies; - xprt->ops->connect (xprt, task); +/* Race breaker */ +if (!xprt_connected (xprt)) { + xprt->stat.connect_start = jiffies; + xprt->ops->connect (xprt, task); + }else { +xprt_clear_connecting (xprt); + task->tk_status =0 ; +rpc_wake_up_queued_task (&xprt->pending, task); + } }xprt_release_write (xprt, task); }
sound/isa/wavefront/wavefront_synth.c +9 -0
@@ -785,6 +785,9 @@ wavefront_send_patch (snd_wavefront_t *dev, wavefront_patch_info *header)DPRINT (WF_DEBUG_LOAD_PATCH ,"downloading patch %d\n" , header->number); +if (header->number >=ARRAY_SIZE (dev->patch_status)) +return -EINVAL ; + dev->patch_status[header->number] |=WF_SLOT_FILLED ; bptr = buf;
@@ -809,6 +812,9 @@ wavefront_send_program (snd_wavefront_t *dev, wavefront_patch_info *header)DPRINT (WF_DEBUG_LOAD_PATCH ,"downloading program %d\n" , header->number); +if (header->number >=ARRAY_SIZE (dev->prog_status)) +return -EINVAL ; + dev->prog_status[header->number] =WF_SLOT_USED ;/* XXX need to zero existing SLOT_USED bit for program_status[i]
@@ -898,6 +904,9 @@ wavefront_send_sample (snd_wavefront_t *dev, header->number = x; } +if (header->number >=WF_MAX_SAMPLE ) +return -EINVAL ; +if (header->size) {/* XXX it's a debatable point whether or not RDONLY semantics