Linux 4.9.141
Greg KH
maintainerI'm announcing the release of the 4.9.141 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.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/arm64/include/asm/percpu.h | 3 arch/s390/kernel/vdso32/Makefile | 6 - arch/s390/kernel/vdso64/Makefile | 6 - arch/s390/numa/numa.c | 1 arch/um/os-Linux/skas/process.c | 5 + drivers/acpi/acpi_platform.c | 1 drivers/acpi/acpi_watchdog.c | 77 +++++++++++++++++++--- drivers/block/zram/zram_drv.c | 26 +------ drivers/bluetooth/Kconfig | 1 drivers/clk/clk-fixed-factor.c | 1 drivers/clk/clk-fixed-rate.c | 1 drivers/clk/samsung/clk-exynos5420.c | 1 drivers/gpu/drm/drm_edid.c | 3 drivers/hid/uhid.c | 13 +++ drivers/hwmon/ibmpowernv.c | 7 -- drivers/media/v4l2-core/v4l2-event.c | 43 ++++++------ drivers/media/v4l2-core/videobuf2-core.c | 9 -- drivers/misc/atmel-ssc.c | 2 drivers/misc/sgi-gru/grukdump.c | 4 + drivers/net/ethernet/qlogic/qed/qed_sp.h | 3 drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 16 ++++ drivers/net/ethernet/qlogic/qed/qed_spq.c | 57 ++++++++-------- drivers/platform/x86/acerhdf.c | 1 drivers/platform/x86/intel_telemetry_debugfs.c | 8 +- drivers/s390/net/qeth_l3_main.c | 8 +- drivers/uio/uio.c | 7 +- drivers/usb/class/cdc-acm.c | 3 drivers/usb/core/quirks.c | 8 ++ drivers/usb/misc/appledisplay.c | 1 fs/btrfs/disk-io.c | 19 ++++- fs/btrfs/extent-tree.c | 63 +++++++++++------- fs/btrfs/ioctl.c | 11 ++- fs/cifs/cifsfs.c | 7 +- fs/exofs/super.c | 5 + fs/gfs2/rgrp.c | 3 fs/hfs/brec.c | 4 + fs/hfsplus/brec.c | 4 + fs/reiserfs/xattr.c | 7 ++ include/linux/netfilter/ipset/ip_set_comment.h | 4 - include/linux/uaccess.h | 3 lib/raid6/test/Makefile | 4 - net/ceph/messenger.c | 12 ++- net/netfilter/ipset/ip_set_hash_netportnet.c | 8 +- net/netfilter/xt_IDLETIMER.c | 20 +++++ net/sunrpc/xdr.c | 2 46 files changed, 350 insertions(+), 150 deletions(-)
Al Viro (1):
new helper: uaccess_kernel()
Alan Tull (1):
clk: fixed-rate: fix of_node_get-put imbalance
Andreas Gruenbacher (1):
gfs2: Put bitmap buffers in put_super
Chengguang Xu (1):
fs/exofs: fix potential memory leak in mount option parsing
Colin Ian King (1):
cifs: don't dereference smb_file_target before null check
Dan Carpenter (1):
uio: Fix an Oops on load
Denis Bolotin (2):
qed: Fix memory/entry leak in qed_init_sp_request()
qed: Fix blocking/unlimited SPQ entries leak
Emmanuel Pescosta (1):
usb: quirks: Add delay-init quirk for Corsair K70 LUX RGB
Eric Biggers (1):
HID: uhid: forbid UHID_CREATE under KERNEL_DS or elevated privileges
Eric Westbrook (1):
netfilter: ipset: actually allow allowable CIDR 0 in hash:net,port,net
Ernesto A. Fernández (2):
hfs: prevent btree data loss on root split
hfsplus: prevent btree data loss on root split
Geert Uytterhoeven (1):
hwmon: (ibmpowernv) Remove bogus __init annotations
Greg Kroah-Hartman (2):
Revert "Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV" Linux 4.9.141
Gustavo A. R. Silva (1):
drivers/misc/sgi-gru: fix Spectre v1 vulnerability
Hans Verkuil (1):
Revert "media: videobuf2-core: don't call memop 'finish' when queueing"
Hans de Goede (1):
ACPI / platform: Add SMB0001 HID to forbidden_id_list
Ilya Dryomov (1):
libceph: fall back to sendmsg for slab pages
Jann Horn (1):
reiserfs: propagate errors from fill_with_dentries() properly
Jeremy Linton (1):
lib/raid6: Fix arm64 test build
Jozsef Kadlecsik (1):
netfilter: ipset: Correct rcu_dereference() call in ip_set_put_comment()
Julian Wiedmann (1):
s390/qeth: fix HiperSockets sniffer
Justin M. Forbes (1):
s390/mm: Fix ERROR: "__node_distance" undefined!
Kai-Heng Feng (1):
USB: quirks: Add no-lpm quirk for Raydium touchscreens
Lee, Shawn C (1):
drm/edid: Add 6 bpc quirk for BOE panel.
Lu Fengqi (1):
btrfs: fix pinned underflow after transaction aborted
Maarten Jacobs (1):
usb: cdc-acm: add entry for Hiro (Conexant) modem
Marek Szyprowski (1):
clk: samsung: exynos5420: Enable PERIS clocks for suspend
Mattias Jacobsson (1):
USB: misc: appledisplay: add 20" Apple Cinema Display
Mika Westerberg (2):
ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70
ACPI / watchdog: Prefer iTCO_wdt always when WDAT table uses RTC SRAM
Minchan Kim (1):
zram: close udev startup race condition as default groups
Nathan Chancellor (2):
arm64: percpu: Initialize ret in the default case
misc: atmel-ssc: Fix section annotation on atmel_ssc_get_driver_data
Paul Gortmaker (1):
platform/x86: acerhdf: Add BIOS entry for Gateway LT31 v1.3307
Qu Wenruo (2):
btrfs: Enhance btrfs_trim_fs function to handle error better
btrfs: Ensure btrfs_trim_fs can trim the whole filesystem
Rajneesh Bhardwaj (1):
platform/x86: intel_telemetry: report debugfs failure
Ricardo Ribalda Delgado (1):
clk: fixed-factor: fix of_node_get-put imbalance
Richard Weinberger (1):
um: Give start_idle_thread() a return code
Sakari Ailus (1):
media: v4l: event: Add subscription to list before calling "add" operation
Taehee Yoo (1):
netfilter: xt_IDLETIMER: add sysfs filename checking routine
Vasily Gorbik (1):
s390/vdso: add missing FORCE to build targets
YueHaibing (1):
SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer()
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 140 +SUBLEVEL = 141 EXTRAVERSION = NAME = Roaring Lionus
arch/arm64/include/asm/percpu.h +3 -0
@@ -92,6 +92,7 @@ static inline unsigned long __percpu_##op(void *ptr, \ : [val] "Ir" (val)); \break ; \default : \ + ret =0 ; \BUILD_BUG (); \ } \ \
@@ -121,6 +122,7 @@ static inline unsigned long __percpu_read(void *ptr, int size) ret =ACCESS_ONCE (*(u64 *)ptr);break ;default : + ret =0 ;BUILD_BUG (); }
@@ -190,6 +192,7 @@ static inline unsigned long __percpu_xchg(void *ptr, unsigned long val, : [val] "r" (val));break ;default : + ret =0 ;BUILD_BUG (); }
arch/s390/kernel/vdso32/Makefile +3 -3
@@ -32,7 +32,7 @@ UBSAN_SANITIZE := n $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so # link rule for the .so file, .lds has to be first -$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) +$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) FORCE $(call if_changed,vdso32ld) # strip rule for the .so file
@@ -41,12 +41,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE $(call if_changed,objcopy) # assembly rules for the .S files -$(obj-vdso32): %.o: %.S +$(obj-vdso32): %.o: %.S FORCE $(call if_changed_dep,vdso32as) # actual build commands quiet_cmd_vdso32ld = VDSO32L $@ - cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ + cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@ quiet_cmd_vdso32as = VDSO32A $@ cmd_vdso32as = $(CC) $(a_flags) -c -o $@ $<
arch/s390/kernel/vdso64/Makefile +3 -3
@@ -32,7 +32,7 @@ UBSAN_SANITIZE := n $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so # link rule for the .so file, .lds has to be first -$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) +$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) FORCE $(call if_changed,vdso64ld) # strip rule for the .so file
@@ -41,12 +41,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE $(call if_changed,objcopy) # assembly rules for the .S files -$(obj-vdso64): %.o: %.S +$(obj-vdso64): %.o: %.S FORCE $(call if_changed_dep,vdso64as) # actual build commands quiet_cmd_vdso64ld = VDSO64L $@ - cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ + cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@ quiet_cmd_vdso64as = VDSO64A $@ cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
arch/s390/numa/numa.c +1 -0
@@ -53,6 +53,7 @@ int __node_distance(int a, int b) {return mode->distance ? mode->distance (a, b) :0 ; } +EXPORT_SYMBOL (__node_distance);int numa_debug_enabled;
arch/um/os-Linux/skas/process.c +5 -0
@@ -578,6 +578,11 @@ int start_idle_thread(void *stack, jmp_buf *switch_buf)fatal_sigsegv (); }longjmp (*switch_buf,1 ); + +/* unreachable */ +printk (UM_KERN_ERR "impossible long jump!" ); +fatal_sigsegv (); +return 0 ; }void initial_thread_cb_skas (void (*proc)(void *),void *arg)
drivers/acpi/acpi_platform.c +1 -0
@@ -30,6 +30,7 @@ static const struct acpi_device_id forbidden_id_list[] = { {"PNP0200", 0}, /* AT DMA Controller */ {"ACPI0009", 0}, /* IOxAPIC */ {"ACPI000A", 0}, /* IOAPIC */ + {"SMB0001", 0}, /* ACPI SMBUS virtual device */ {"", 0}, };
drivers/acpi/acpi_watchdog.c +67 -10
97 lines not on this page · raw message
drivers/block/zram/zram_drv.c +6 -20
@@ -1223,6 +1223,11 @@ static struct attribute_group zram_disk_attr_group = { .attrs = zram_disk_attrs, }; +static const struct attribute_group *zram_disk_attr_groups[] = { + &zram_disk_attr_group, +NULL , +}; +/* * Allocate and initialize new zram device. the function returns * '>= 0' device_id upon success, and negative value otherwise.
@@ -1303,24 +1308,15 @@ static int zram_add(void) zram->disk->queue->limits.discard_zeroes_data =0 ;queue_flag_set_unlocked (QUEUE_FLAG_DISCARD , zram->disk->queue); +disk_to_dev (zram->disk)->groups = zram_disk_attr_groups;add_disk (zram->disk); - ret =sysfs_create_group (&disk_to_dev (zram->disk)->kobj, - &zram_disk_attr_group); -if (ret <0 ) { -pr_err ("Error creating sysfs group for device %d\n" , - device_id); - goto out_free_disk; - }strlcpy (zram->compressor, default_compressor,sizeof (zram->compressor)); zram->meta =NULL ;pr_info ("Added device: %s\n" , zram->disk->disk_name);return device_id; -out_free_disk: -del_gendisk (zram->disk); -put_disk (zram->disk); out_free_queue:blk_cleanup_queue (queue); out_free_idr:
@@ -1348,16 +1344,6 @@ static int zram_remove(struct zram *zram) zram->claim = true;mutex_unlock (&bdev->bd_mutex); -/* -* Remove sysfs first, so no one will perform a disksize -* store while we destroy the devices. This also helps during -* hot_remove -- zram_reset_device() is the last holder of -* ->init_lock, no later/concurrent disksize_store() or any -* other sysfs handlers are possible. -*/ -sysfs_remove_group (&disk_to_dev (zram->disk)->kobj, - &zram_disk_attr_group); -/* Make sure all the pending I/O are finished */ fsync_bdev (bdev);zram_reset_device (zram);
drivers/bluetooth/Kconfig +0 -1
@@ -125,7 +125,6 @@ config BT_HCIUART_LL config BT_HCIUART_3WIRE bool "Three-wire UART (H5) protocol support" depends on BT_HCIUART - depends on BT_HCIUART_SERDEV help The HCI Three-wire UART Transport Layer makes it possible to user the Bluetooth HCI over a serial port interface. The HCI
drivers/clk/clk-fixed-factor.c +1 -0
@@ -210,6 +210,7 @@ static int of_fixed_factor_clk_remove(struct platform_device *pdev) {struct clk *clk =platform_get_drvdata (pdev); +of_clk_del_provider (pdev->dev.of_node);clk_unregister_fixed_factor (clk);return 0 ;
drivers/clk/clk-fixed-rate.c +1 -0
@@ -200,6 +200,7 @@ static int of_fixed_clk_remove(struct platform_device *pdev) {struct clk *clk =platform_get_drvdata (pdev); +of_clk_del_provider (pdev->dev.of_node);clk_unregister_fixed_rate (clk);return 0 ;
drivers/clk/samsung/clk-exynos5420.c +1 -0
@@ -280,6 +280,7 @@ static const struct samsung_clk_reg_dump exynos5420_set_clksrc[] = { { .offset = GATE_BUS_TOP, .value = 0xffffffff, }, { .offset = GATE_BUS_DISP1, .value = 0xffffffff, }, { .offset = GATE_IP_PERIC, .value = 0xffffffff, }, + { .offset = GATE_IP_PERIS, .value = 0xffffffff, }, }; static int exynos5420_clk_suspend(void)
drivers/gpu/drm/drm_edid.c +3 -0
@@ -116,6 +116,9 @@ static const struct edid_quirk {/* SDC panel of Lenovo B50-80 reports 8 bpc, but is a 6 bpc panel */ { "SDC", 0x3652, EDID_QUIRK_FORCE_6BPC }, +/* BOE model 0x0771 reports 8 bpc, but is a 6 bpc panel */ + { "BOE", 0x0771, EDID_QUIRK_FORCE_6BPC }, +/* Belinea 10 15 55 */ { "MAX", 1516, EDID_QUIRK_PREFER_LARGE_60 }, { "MAX", 0x77e, EDID_QUIRK_PREFER_LARGE_60 },
drivers/hid/uhid.c +13 -0
@@ -12,6 +12,7 @@#include <linux/atomic.h> #include <linux/compat.h> +#include <linux/cred.h> #include <linux/device.h> #include <linux/fs.h> #include <linux/hid.h>
@@ -24,6 +25,7 @@#include <linux/spinlock.h> #include <linux/uhid.h> #include <linux/wait.h> +#include <linux/uaccess.h> #define UHID_NAME "uhid"#define UHID_BUFSIZE 32
@@ -721,6 +723,17 @@ static ssize_t uhid_char_write(struct file *file, const char __user *buffer,switch (uhid->input_buf.type) {case UHID_CREATE : +/* +* 'struct uhid_create_req' contains a __user pointer which is +* copied from, so it's unsafe to allow this with elevated +* privileges (e.g. from a setuid binary) or via kernel_write(). +*/ +if (file->f_cred !=current_cred () ||uaccess_kernel ()) { +pr_err_once ("UHID_CREATE from different security context by process %d (%s), this is not allowed.\n" , +task_tgid_vnr (current), current->comm); + ret = -EACCES ; + goto unlock; + } ret =uhid_dev_create (uhid, &uhid->input_buf);break ;case UHID_CREATE2 :
drivers/hwmon/ibmpowernv.c +3 -4
@@ -114,7 +114,7 @@ static ssize_t show_label(struct device *dev, struct device_attribute *devattr,return sprintf (buf,"%s\n" , sdata->label); } -static int __init get_logical_cpu (int hwcpu) +static int get_logical_cpu (int hwcpu) {int cpu;
@@ -125,9 +125,8 @@ static int __init get_logical_cpu(int hwcpu)return -ENOENT ; } -static void __init make_sensor_label (struct device_node *np, -struct sensor_data *sdata, -const char *label) +static void make_sensor_label (struct device_node *np, +struct sensor_data *sdata,const char *label) {u32 id;size_t n;
drivers/media/v4l2-core/v4l2-event.c +24 -19
78 lines not on this page · raw message
drivers/media/v4l2-core/videobuf2-core.c +3 -6
@@ -914,12 +914,9 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)dprintk (4 ,"done processing on buffer %d, state: %d\n" , vb->index, state); -if (state !=VB2_BUF_STATE_QUEUED && - state !=VB2_BUF_STATE_REQUEUEING ) { -/* sync buffers */ -for (plane =0 ; plane < vb->num_planes; ++plane) -call_void_memop (vb, finish, vb->planes[plane].mem_priv); - } +/* sync buffers */ +for (plane =0 ; plane < vb->num_planes; ++plane) +call_void_memop (vb, finish, vb->planes[plane].mem_priv);spin_lock_irqsave (&q->done_lock, flags); if (state == VB2_BUF_STATE_QUEUED ||
drivers/misc/atmel-ssc.c +1 -1
@@ -130,7 +130,7 @@ static const struct of_device_id atmel_ssc_dt_ids[] = {MODULE_DEVICE_TABLE (of, atmel_ssc_dt_ids);#endif -static inline const struct atmel_ssc_platform_data *__init +static inline const struct atmel_ssc_platform_data *atmel_ssc_get_driver_data (struct platform_device *pdev) {if (pdev->dev.of_node) {
drivers/misc/sgi-gru/grukdump.c +4 -0
@@ -27,6 +27,9 @@#include <linux/delay.h> #include <linux/bitops.h> #include <asm/uv/uv_hub.h> + +#include <linux/nospec.h> +#include "gru.h" #include "grutables.h" #include "gruhandles.h"
@@ -196,6 +199,7 @@ int gru_dump_chiplet_request(unsigned long arg)/* Currently, only dump by gid is implemented */ if (req.gid >= gru_max_gids)return -EINVAL ; + req.gid =array_index_nospec (req.gid, gru_max_gids); gru =GID_TO_GRU (req.gid); ubuf = req.buf;
drivers/net/ethernet/qlogic/qed/qed_sp.h +3 -0
@@ -132,6 +132,9 @@ struct qed_spq_entry {enum spq_mode comp_mode;struct qed_spq_comp_cb comp_cb;struct qed_spq_comp_done comp_done;/* SPQ_MODE_EBLOCK */ + +/* Posted entry for unlimited list entry in EBLOCK mode */ +struct qed_spq_entry *post_ent; };struct qed_eq {
drivers/net/ethernet/qlogic/qed/qed_sp_commands.c +14 -2
@@ -56,7 +56,7 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,case QED_SPQ_MODE_BLOCK :if (!p_data->p_comp_data) -return -EINVAL ; + goto err; p_ent->comp_cb.cookie = p_data->p_comp_data->cookie;break ;
@@ -71,7 +71,7 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,default :DP_NOTICE (p_hwfn,"Unknown SPQE completion mode %d\n" , p_ent->comp_mode); -return -EINVAL ; + goto err; } DP_VERBOSE(p_hwfn, QED_MSG_SPQ,
@@ -85,6 +85,18 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,memset (&p_ent->ramrod,0 ,sizeof (p_ent->ramrod));return 0 ; + +err: +/* qed_spq_get_entry() can either get an entry from the free_pool, +* or, if no entries are left, allocate a new entry and add it to +* the unlimited_pending list. +*/ +if (p_ent->queue == &p_hwfn->p_spq->unlimited_pending) +kfree (p_ent); +else +qed_spq_return_entry (p_hwfn, p_ent); + +return -EINVAL ; }static enum tunnel_clss qed_tunn_get_clss_type (u8 type)
drivers/net/ethernet/qlogic/qed/qed_spq.c +30 -27
96 lines not on this page · raw message
drivers/platform/x86/acerhdf.c +1 -0
@@ -233,6 +233,7 @@ static const struct bios_settings bios_tbl[] = { {"Gateway", "LT31", "v1.3201", 0x55, 0x58, {0x9e, 0x00}, 0}, {"Gateway", "LT31", "v1.3302", 0x55, 0x58, {0x9e, 0x00}, 0}, {"Gateway", "LT31", "v1.3303t", 0x55, 0x58, {0x9e, 0x00}, 0}, + {"Gateway", "LT31", "v1.3307", 0x55, 0x58, {0x9e, 0x00}, 0},/* Packard Bell */ {"Packard Bell", "DOA150", "v0.3104", 0x55, 0x58, {0x21, 0x00}, 0}, {"Packard Bell", "DOA150", "v0.3105", 0x55, 0x58, {0x20, 0x00}, 0},
drivers/platform/x86/intel_telemetry_debugfs.c +6 -2
@@ -953,12 +953,16 @@ static int __init telemetry_debugfs_init(void) debugfs_conf = (struct telemetry_debugfs_conf *)id->driver_data; err =telemetry_pltconfig_valid (); -if (err <0 ) +if (err <0 ) { +pr_info ("Invalid pltconfig, ensure IPC1 device is enabled in BIOS\n" );return -ENODEV ; + } err =telemetry_debugfs_check_evts (); -if (err <0 ) +if (err <0 ) { +pr_info ("telemetry_debugfs_check_evts failed\n" );return -EINVAL ; + }#ifdef CONFIG_PM_SLEEP
drivers/s390/net/qeth_l3_main.c +5 -3
@@ -363,9 +363,6 @@ static void qeth_l3_clear_ip_htable(struct qeth_card *card, int recover)QETH_CARD_TEXT (card,4 ,"clearip" ); -if (recover && card->options.sniffer) -return ; -spin_lock_bh (&card->ip_lock);hash_for_each_safe (card->ip_htable, i, tmp, addr, hnode) {
@@ -823,6 +820,8 @@ static int qeth_l3_register_addr_entry(struct qeth_card *card,int rc =0 ;int cnt =3 ; +if (card->options.sniffer) +return 0 ;if (addr->proto ==QETH_PROT_IPV4 ) {QETH_CARD_TEXT (card,2 ,"setaddr4" );
@@ -858,6 +857,9 @@ static int qeth_l3_deregister_addr_entry(struct qeth_card *card, {int rc =0 ; +if (card->options.sniffer) +return 0 ; +if (addr->proto ==QETH_PROT_IPV4 ) {QETH_CARD_TEXT (card,2 ,"deladdr4" );QETH_CARD_HEX (card,3 , &addr->u.a4.addr,sizeof (int ));
drivers/uio/uio.c +5 -2
@@ -850,6 +850,8 @@ int __uio_register_device(struct module *owner,if (ret) goto err_uio_dev_add_attributes; + info->uio_dev = idev; +if (info->irq && (info->irq !=UIO_IRQ_CUSTOM )) {/* * Note that we deliberately don't use devm_request_irq
@@ -861,11 +863,12 @@ int __uio_register_device(struct module *owner,*/ ret =request_irq (info->irq, uio_interrupt, info->irq_flags, info->name, idev); -if (ret) +if (ret) { + info->uio_dev =NULL ; goto err_request_irq; + } } - info->uio_dev = idev;return 0 ; err_request_irq:
drivers/usb/class/cdc-acm.c +3 -0
@@ -1659,6 +1659,9 @@ static const struct usb_device_id acm_ids[] = { { USB_DEVICE(0x0572, 0x1328), /* Shiro / Aztech USB MODEM UM-3100 */ .driver_info =NO_UNION_NORMAL ,/* has no union descriptor */ }, + { USB_DEVICE(0x0572, 0x1349), /* Hiro (Conexant) USB MODEM H50228 */ + .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ + }, { USB_DEVICE(0x20df, 0x0001), /* Simtec Electronics Entropy Key */ .driver_info = QUIRK_CONTROL_LINE_STATE, }, { USB_DEVICE(0x2184, 0x001c) }, /* GW Instek AFG-2225 */
drivers/usb/core/quirks.c +8 -0
@@ -243,6 +243,9 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT | USB_QUIRK_DELAY_CTRL_MSG }, + /* Corsair K70 LUX RGB */ + { USB_DEVICE(0x1b1c, 0x1b33), .driver_info = USB_QUIRK_DELAY_INIT }, + /* Corsair K70 LUX */ { USB_DEVICE(0x1b1c, 0x1b36), .driver_info = USB_QUIRK_DELAY_INIT },
@@ -263,6 +266,11 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x2040, 0x7200), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, + /* Raydium Touchscreen */ + { USB_DEVICE(0x2386, 0x3114), .driver_info = USB_QUIRK_NO_LPM }, + + { USB_DEVICE(0x2386, 0x3119), .driver_info = USB_QUIRK_NO_LPM }, + /* DJI CineSSD */ { USB_DEVICE(0x2ca3, 0x0031), .driver_info = USB_QUIRK_NO_LPM },
drivers/usb/misc/appledisplay.c +1 -0
@@ -63,6 +63,7 @@ static const struct usb_device_id appledisplay_table[] = { { APPLEDISPLAY_DEVICE(0x9219) }, { APPLEDISPLAY_DEVICE(0x921c) }, { APPLEDISPLAY_DEVICE(0x921d) }, + { APPLEDISPLAY_DEVICE(0x9222) }, { APPLEDISPLAY_DEVICE(0x9236) },/* Terminating entry */
fs/btrfs/disk-io.c +15 -4
@@ -4491,6 +4491,7 @@ static int btrfs_destroy_marked_extents(struct btrfs_root *root,static int btrfs_destroy_pinned_extent (struct btrfs_root *root,struct extent_io_tree *pinned_extents) { +struct btrfs_fs_info *fs_info = root->fs_info;struct extent_io_tree *unpin;u64 start;u64 end;
@@ -4500,21 +4501,31 @@ static int btrfs_destroy_pinned_extent(struct btrfs_root *root, unpin = pinned_extents; again:while (1 ) { +/* +* The btrfs_finish_extent_commit() may get the same range as +* ours between find_first_extent_bit and clear_extent_dirty. +* Hence, hold the unused_bg_unpin_mutex to avoid double unpin +* the same extent range. +*/ +mutex_lock (&fs_info->unused_bg_unpin_mutex); ret =find_first_extent_bit (unpin,0 , &start, &end,EXTENT_DIRTY ,NULL ); -if (ret) +if (ret) { +mutex_unlock (&fs_info->unused_bg_unpin_mutex);break ; + }clear_extent_dirty (unpin, start, end);btrfs_error_unpin_extent_range (root, start, end); +mutex_unlock (&fs_info->unused_bg_unpin_mutex);cond_resched (); }if (loop) { -if (unpin == &root->fs_info->freed_extents[0 ]) - unpin = &root->fs_info->freed_extents[1 ]; +if (unpin == &fs_info->freed_extents[0 ]) + unpin = &fs_info->freed_extents[1 ];else - unpin = &root->fs_info->freed_extents[0 ]; + unpin = &fs_info->freed_extents[0 ]; loop = false; goto again; }
fs/btrfs/extent-tree.c +41 -22
106 lines not on this page · raw message
fs/btrfs/ioctl.c +7 -4
@@ -380,7 +380,6 @@ static noinline int btrfs_ioctl_fitrim(struct file *file, void __user *arg)struct fstrim_range range;u64 minlen =ULLONG_MAX ;u64 num_devices =0 ; -u64 total_bytes =btrfs_super_total_bytes (fs_info->super_copy);int ret;if (!capable (CAP_SYS_ADMIN ))
@@ -404,11 +403,15 @@ static noinline int btrfs_ioctl_fitrim(struct file *file, void __user *arg)return -EOPNOTSUPP ;if (copy_from_user (&range, arg,sizeof (range)))return -EFAULT ; -if (range.start > total_bytes || - range.len < fs_info->sb->s_blocksize) + +/* +* NOTE: Don't truncate the range using super->total_bytes. Bytenr of +* block group is in the logical address space, which can be any +* sectorsize aligned bytenr in the range [0, U64_MAX]. +*/ +if (range.len < fs_info->sb->s_blocksize)return -EINVAL ; - range.len =min (range.len, total_bytes - range.start); range.minlen =max (range.minlen, minlen); ret =btrfs_trim_fs (fs_info->tree_root, &range);if (ret <0 )
fs/cifs/cifsfs.c +5 -2
@@ -927,8 +927,8 @@ static int cifs_clone_file_range(struct file *src_file, loff_t off,struct inode *src_inode =file_inode (src_file);struct inode *target_inode =file_inode (dst_file);struct cifsFileInfo *smb_file_src = src_file->private_data; -struct cifsFileInfo *smb_file_target = dst_file->private_data; -struct cifs_tcon *target_tcon =tlink_tcon (smb_file_target->tlink); +struct cifsFileInfo *smb_file_target; +struct cifs_tcon *target_tcon;unsigned int xid;int rc;
@@ -942,6 +942,9 @@ static int cifs_clone_file_range(struct file *src_file, loff_t off, goto out; } + smb_file_target = dst_file->private_data; + target_tcon =tlink_tcon (smb_file_target->tlink); +/* * Note: cifs case is easier than btrfs since server responsible for * checks for proper open modes and file type and if it wants
fs/exofs/super.c +4 -1
@@ -100,6 +100,7 @@ static int parse_options(char *options, struct exofs_mountopt *opts) token =match_token (p, tokens, args);switch (token) {case Opt_name: +kfree (opts->dev_name); opts->dev_name =match_strdup (&args[0 ]);if (unlikely (!opts->dev_name)) {EXOFS_ERR ("Error allocating dev_name" );
@@ -868,8 +869,10 @@ static struct dentry *exofs_mount(struct file_system_type *type,int ret; ret =parse_options (data, &opts); -if (ret) +if (ret) { +kfree (opts.dev_name);return ERR_PTR (ret); + }if (!opts.dev_name) opts.dev_name = dev_name;
fs/gfs2/rgrp.c +2 -1
@@ -715,6 +715,7 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp)spin_lock (&gl->gl_lockref.lock); gl->gl_object =NULL ;spin_unlock (&gl->gl_lockref.lock); +gfs2_rgrp_brelse (rgd);gfs2_glock_add_to_lru (gl);gfs2_glock_put (gl); }
@@ -1125,7 +1126,7 @@ static u32 count_unlinked(struct gfs2_rgrpd *rgd)* @rgd: the struct gfs2_rgrpd describing the RG to read in * * Read in all of a Resource Group's header and bitmap blocks. -* Caller must eventually call gfs2_rgrp_relse() to free the bitmaps. +* Caller must eventually call gfs2_rgrp_brelse() to free the bitmaps. * * Returns: errno */
fs/hfs/brec.c +4 -0
@@ -424,6 +424,10 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd)if (new_node) {__be32 cnid; +if (!new_node->parent) { +hfs_btree_inc_height (tree); + new_node->parent = tree->root; + } fd->bnode =hfs_bnode_find (tree, new_node->parent);/* create index key and entry */ hfs_bnode_read_key (new_node, fd->search_key,14 );
fs/hfsplus/brec.c +4 -0
@@ -427,6 +427,10 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd)if (new_node) {__be32 cnid; +if (!new_node->parent) { +hfs_btree_inc_height (tree); + new_node->parent = tree->root; + } fd->bnode =hfs_bnode_find (tree, new_node->parent);/* create index key and entry */ hfs_bnode_read_key (new_node, fd->search_key,14 );
fs/reiserfs/xattr.c +7 -0
@@ -184,6 +184,7 @@ struct reiserfs_dentry_buf {struct dir_context ctx;struct dentry *xadir;int count; +int err;struct dentry *dentries[8 ]; };
@@ -206,6 +207,7 @@ fill_with_dentries(struct dir_context *ctx, const char *name, int namelen, dentry =lookup_one_len (name, dbuf->xadir, namelen);if (IS_ERR (dentry)) { + dbuf->err =PTR_ERR (dentry);return PTR_ERR (dentry); }else if (d_really_is_negative (dentry)) {/* A directory entry exists, but no file? */
@@ -214,6 +216,7 @@ fill_with_dentries(struct dir_context *ctx, const char *name, int namelen,"not found for file %pd.\n" , dentry, dbuf->xadir);dput (dentry); + dbuf->err = -EIO ;return -EIO ; }
@@ -261,6 +264,10 @@ static int reiserfs_for_each_xattr(struct inode *inode, err =reiserfs_readdir_inode (d_inode (dir), &buf.ctx);if (err)break ; +if (buf.err) { + err = buf.err; +break ; + }if (!buf.count)break ;for (i =0 ; !err && i < buf.count && buf.dentries[i]; i++) {
include/linux/netfilter/ipset/ip_set_comment.h +2 -2
@@ -41,11 +41,11 @@ ip_set_init_comment(struct ip_set_comment *comment,rcu_assign_pointer (comment->c, c); } -/* Used only when dumping a set, protected by rcu_read_lock_bh() */ +/* Used only when dumping a set, protected by rcu_read_lock() */ static inline int ip_set_put_comment (struct sk_buff *skb,struct ip_set_comment *comment) { -struct ip_set_comment_rcu *c =rcu_dereference_bh (comment->c); +struct ip_set_comment_rcu *c =rcu_dereference (comment->c);if (!c)return 0 ;
include/linux/uaccess.h +3 -0
@@ -2,6 +2,9 @@#define __LINUX_UACCESS_H__#include <linux/sched.h> + +#define uaccess_kernel () segment_eq(get_fs(), KERNEL_DS) +#include <asm/uaccess.h> static __always_inline void pagefault_disabled_inc(void)
lib/raid6/test/Makefile +2 -2
@@ -26,7 +26,7 @@ ifeq ($(ARCH),arm) CFLAGS += -I../../../arch/arm/include -mfpu=neon HAS_NEON = yes endif -ifeq ($(ARCH),arm64) +ifeq ($(ARCH),aarch64) CFLAGS += -I../../../arch/arm64/include HAS_NEON = yes endif
@@ -40,7 +40,7 @@ ifeq ($(IS_X86),yes) gcc -c -x assembler - >&/dev/null && \ rm ./-.o && echo -DCONFIG_AS_AVX512=1) else ifeq ($(HAS_NEON),yes) - OBJS += neon.o neon1.o neon2.o neon4.o neon8.o + OBJS += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1 else HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\
net/ceph/messenger.c +9 -3
@@ -588,9 +588,15 @@ static int ceph_tcp_sendpage(struct socket *sock, struct page *page,int ret;struct kvec iov; -/* sendpage cannot properly handle pages with page_count == 0, -* we need to fallback to sendmsg if that's the case */ -if (page_count (page) >=1 ) +/* +* sendpage cannot properly handle pages with page_count == 0, +* we need to fall back to sendmsg if that's the case. +* +* Same goes for slab pages: skb_can_coalesce() allows +* coalescing neighboring slab objects into a single frag which +* triggers one of hardened usercopy checks. +*/ +if (page_count (page) >=1 && !PageSlab (page))return __ceph_tcp_sendpage (sock, page, offset, size, more); iov.iov_base =kmap (page) + offset;
net/netfilter/ipset/ip_set_hash_netportnet.c +4 -4
@@ -213,13 +213,13 @@ hash_netportnet4_uadt(struct ip_set *set, struct nlattr *tb[],if (tb[IPSET_ATTR_CIDR ]) { e.cidr[0 ] =nla_get_u8 (tb[IPSET_ATTR_CIDR ]); -if (!e.cidr[0 ] || e.cidr[0 ] >HOST_MASK ) +if (e.cidr[0 ] >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; }if (tb[IPSET_ATTR_CIDR2 ]) { e.cidr[1 ] =nla_get_u8 (tb[IPSET_ATTR_CIDR2 ]); -if (!e.cidr[1 ] || e.cidr[1 ] >HOST_MASK ) +if (e.cidr[1 ] >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; }
@@ -492,13 +492,13 @@ hash_netportnet6_uadt(struct ip_set *set, struct nlattr *tb[],if (tb[IPSET_ATTR_CIDR ]) { e.cidr[0 ] =nla_get_u8 (tb[IPSET_ATTR_CIDR ]); -if (!e.cidr[0 ] || e.cidr[0 ] >HOST_MASK ) +if (e.cidr[0 ] >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; }if (tb[IPSET_ATTR_CIDR2 ]) { e.cidr[1 ] =nla_get_u8 (tb[IPSET_ATTR_CIDR2 ]); -if (!e.cidr[1 ] || e.cidr[1 ] >HOST_MASK ) +if (e.cidr[1 ] >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; }
net/netfilter/xt_IDLETIMER.c +20 -0
@@ -116,6 +116,22 @@ static void idletimer_tg_expired(unsigned long data)schedule_work (&timer->work); } +static int idletimer_check_sysfs_name (const char *name,unsigned int size) +{ +int ret; + + ret =xt_check_proc_name (name, size); +if (ret <0 ) +return ret; + +if (!strcmp (name,"power" ) || + !strcmp (name,"subsystem" ) || + !strcmp (name,"uevent" )) +return -EINVAL ; + +return 0 ; +} +static int idletimer_tg_create (struct idletimer_tg_info *info) {int ret;
@@ -126,6 +142,10 @@ static int idletimer_tg_create(struct idletimer_tg_info *info) goto out; } + ret =idletimer_check_sysfs_name (info->label,sizeof (info->label)); +if (ret <0 ) + goto out_free_timer; +sysfs_attr_init (&info->timer->attr.attr); info->timer->attr.attr.name =kstrdup (info->label,GFP_KERNEL );if (!info->timer->attr.attr.name) {
net/sunrpc/xdr.c +1 -1
@@ -512,7 +512,7 @@ EXPORT_SYMBOL_GPL(xdr_commit_encode);static __be32 *xdr_get_next_encode_buffer (struct xdr_stream *xdr,size_t nbytes) { -static __be32 *p; +__be32 *p;int space_left;int frag1bytes, frag2bytes;