Linux 4.9.119
Greg KH
maintainerI'm announcing the release of the 4.9.119 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 +- drivers/i2c/busses/i2c-imx.c | 3 +-- drivers/infiniband/hw/hfi1/rc.c | 2 +- drivers/infiniband/hw/hfi1/uc.c | 4 ++-- drivers/infiniband/hw/hfi1/ud.c | 4 ++-- drivers/infiniband/hw/hfi1/verbs_txreq.c | 4 ++-- drivers/infiniband/hw/hfi1/verbs_txreq.h | 4 ++-- drivers/pci/pci-acpi.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 7 +++---- drivers/scsi/qla2xxx/qla_os.c | 5 +++-- fs/btrfs/extent_io.c | 3 +++ fs/ext4/super.c | 4 ++-- fs/jfs/xattr.c | 10 ++++++---- include/linux/ring_buffer.h | 1 + include/linux/thread_info.h | 7 +------ kernel/fork.c | 3 +++ kernel/irq/manage.c | 9 ++++++++- kernel/time/tick-sched.c | 2 +- kernel/trace/ring_buffer.c | 16 ++++++++++++++++ kernel/trace/trace.c | 6 ++++++ net/ipv4/tcp_input.c | 23 +++++++++++++++++++++-- net/netlink/af_netlink.c | 5 +++++ 22 files changed, 91 insertions(+), 35 deletions(-)
Anil Gurumurthy (1):
scsi: qla2xxx: Return error when TMF returns
Anna-Maria Gleixner (1):
nohz: Fix local_timer_softirq_pending()
Dmitry Safonov (3):
netlink: Do not subscribe to non-existent groups
netlink: Don't shift with UB on nlk->ngroups
netlink: Don't shift on 64 for ngroups
Eric Dumazet (1):
tcp: add tcp_ooo_try_coalesce() helper
Esben Haabendal (1):
i2c: imx: Fix reinit_completion() use
Filipe Manana (1):
Btrfs: fix file data corruption after cloning a range and fsync
Greg Kroah-Hartman (1):
Linux 4.9.119
Kees Cook (1):
fork: unconditionally clear stack on fork
Konstantin Khlebnikov (1):
kmemleak: clear stale pointers from task stacks
Masami Hiramatsu (1):
ring_buffer: tracing: Inherit the tracing setting to next ring buffer
Michael J. Ruhl (1):
IB/hfi1: Fix incorrect mixing of ERR_PTR and NULL return values
Quinn Tran (1):
scsi: qla2xxx: Fix ISP recovery on unload
Shankara Pailoor (1):
jfs: Fix inconsistency between memory allocation and ea_buf->max_size
Theodore Ts'o (1):
ext4: fix false negatives *and* false positives in ext4_check_descriptors()
Thomas Gleixner (1):
genirq: Make force irq threading setup more robust
Vitaly Kuznetsov (1):
ACPI / PCI: Bail early in acpi_pci_add_bus() if there is no ACPI handle
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 118 +SUBLEVEL = 119 EXTRAVERSION = NAME = Roaring Lionus
drivers/i2c/busses/i2c-imx.c +1 -2
@@ -376,6 +376,7 @@ static int i2c_imx_dma_xfer(struct imx_i2c_struct *i2c_imx, goto err_desc; } +reinit_completion (&dma->cmd_complete); txdesc->callback = i2c_imx_dma_callback; txdesc->callback_param = i2c_imx;if (dma_submit_error (dmaengine_submit (txdesc))) {
@@ -619,7 +620,6 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx,* The first byte must be transmitted by the CPU. */ imx_i2c_write_reg (msgs->addr <<1 , i2c_imx,IMX_I2C_I2DR ); -reinit_completion (&i2c_imx->dma->cmd_complete); time_left =wait_for_completion_timeout ( &i2c_imx->dma->cmd_complete,msecs_to_jiffies (DMA_TIMEOUT ));
@@ -678,7 +678,6 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx,if (result)return result; -reinit_completion (&i2c_imx->dma->cmd_complete); time_left =wait_for_completion_timeout ( &i2c_imx->dma->cmd_complete,msecs_to_jiffies (DMA_TIMEOUT ));
drivers/infiniband/hw/hfi1/rc.c +1 -1
@@ -397,7 +397,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)lockdep_assert_held (&qp->s_lock); ps->s_txreq =get_txreq (ps->dev, qp); -if (IS_ERR (ps->s_txreq)) +if (!ps->s_txreq) goto bail_no_tx; ohdr = &ps->s_txreq->phdr.hdr.u.oth;
drivers/infiniband/hw/hfi1/uc.c +2 -2
@@ -1,5 +1,5 @@/* -* Copyright(c) 2015, 2016 Intel Corporation. +* Copyright(c) 2015 - 2018 Intel Corporation. * * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license.
@@ -72,7 +72,7 @@ int hfi1_make_uc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)int middle =0 ; ps->s_txreq =get_txreq (ps->dev, qp); -if (IS_ERR (ps->s_txreq)) +if (!ps->s_txreq) goto bail_no_tx;if (!(ib_rvt_state_ops[qp->state] &RVT_PROCESS_SEND_OK )) {
drivers/infiniband/hw/hfi1/ud.c +2 -2
@@ -1,5 +1,5 @@/* -* Copyright(c) 2015, 2016 Intel Corporation. +* Copyright(c) 2015 - 2018 Intel Corporation. * * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license.
@@ -285,7 +285,7 @@ int hfi1_make_ud_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)u8 sc5; ps->s_txreq =get_txreq (ps->dev, qp); -if (IS_ERR (ps->s_txreq)) +if (!ps->s_txreq) goto bail_no_tx;if (!(ib_rvt_state_ops[qp->state] &RVT_PROCESS_NEXT_SEND_OK )) {
drivers/infiniband/hw/hfi1/verbs_txreq.c +2 -2
@@ -1,5 +1,5 @@/* -* Copyright(c) 2016 Intel Corporation. +* Copyright(c) 2016 - 2018 Intel Corporation. * * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license.
@@ -94,7 +94,7 @@ struct verbs_txreq *__get_txreq(struct hfi1_ibdev *dev, struct rvt_qp *qp) __must_hold(&qp->s_lock) { -struct verbs_txreq *tx =ERR_PTR (-EBUSY ); +struct verbs_txreq *tx =NULL ;write_seqlock (&dev->iowait_lock);if (ib_rvt_state_ops[qp->state] &RVT_PROCESS_RECV_OK ) {
drivers/infiniband/hw/hfi1/verbs_txreq.h +2 -2
@@ -1,5 +1,5 @@/* -* Copyright(c) 2016 Intel Corporation. +* Copyright(c) 2016 - 2018 Intel Corporation. * * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license.
@@ -82,7 +82,7 @@ static inline struct verbs_txreq *get_txreq(struct hfi1_ibdev *dev,if (unlikely (!tx)) {/* call slow path to get the lock */ tx =__get_txreq (dev, qp); -if (IS_ERR (tx)) +if (!tx)return tx; } tx->qp = qp;
drivers/pci/pci-acpi.c +1 -1
@@ -567,7 +567,7 @@ void acpi_pci_add_bus(struct pci_bus *bus)union acpi_object *obj;struct pci_host_bridge *bridge; -if (acpi_pci_disabled || !bus->bridge) +if (acpi_pci_disabled || !bus->bridge || !ACPI_HANDLE (bus->bridge))return ;acpi_pci_slot_enumerate (bus);
drivers/scsi/qla2xxx/qla_init.c +3 -4
@@ -329,11 +329,10 @@ qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t flags, uint32_t lun,wait_for_completion (&tm_iocb->u.tmf.comp); - rval = tm_iocb->u.tmf.comp_status ==CS_COMPLETE ? -QLA_SUCCESS :QLA_FUNCTION_FAILED ; + rval = tm_iocb->u.tmf.data; -if ((rval !=QLA_SUCCESS ) || tm_iocb->u.tmf.data) { -ql_dbg (ql_dbg_taskm, vha,0x8030 , +if (rval !=QLA_SUCCESS ) { +ql_log (ql_log_warn, vha,0x8030 ,"TM IOCB failed (%x).\n" , rval); }
drivers/scsi/qla2xxx/qla_os.c +3 -2
@@ -5218,8 +5218,9 @@ qla2x00_do_dpc(void *data) } } -if (test_and_clear_bit (ISP_ABORT_NEEDED , - &base_vha->dpc_flags)) { +if (test_and_clear_bit + (ISP_ABORT_NEEDED , &base_vha->dpc_flags) && + !test_bit (UNLOADING , &base_vha->dpc_flags)) {ql_dbg (ql_dbg_dpc, base_vha,0x4007 ,"ISP abort scheduled.\n" );
fs/btrfs/extent_io.c +3 -0
@@ -4298,6 +4298,7 @@ int try_release_extent_mapping(struct extent_map_tree *map,struct extent_map *em;u64 start =page_offset (page);u64 end = start +PAGE_SIZE -1 ; +struct btrfs_inode *btrfs_inode =BTRFS_I (page->mapping->host);if (gfpflags_allow_blocking (mask) && page->mapping->host->i_size >SZ_16M ) {
@@ -4320,6 +4321,8 @@ int try_release_extent_mapping(struct extent_map_tree *map, extent_map_end(em) - 1, EXTENT_LOCKED | EXTENT_WRITEBACK, 0, NULL)) { +set_bit (BTRFS_INODE_NEEDS_FULL_SYNC , + &btrfs_inode->runtime_flags);remove_extent_mapping (map, em);/* once for the rb tree */ free_extent_map (em);
fs/ext4/super.c +2 -2
@@ -2231,7 +2231,7 @@ static int ext4_check_descriptors(struct super_block *sb,struct ext4_sb_info *sbi =EXT4_SB (sb);ext4_fsblk_t first_block =le32_to_cpu (sbi->s_es->s_first_data_block);ext4_fsblk_t last_block; -ext4_fsblk_t last_bg_block = sb_block +ext4_bg_num_gdb (sb,0 ) +1 ; +ext4_fsblk_t last_bg_block = sb_block +ext4_bg_num_gdb (sb,0 );ext4_fsblk_t block_bitmap;ext4_fsblk_t inode_bitmap;ext4_fsblk_t inode_table;
@@ -3941,13 +3941,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) goto failed_mount2; } } + sbi->s_gdb_count = db_count;if (!ext4_check_descriptors (sb, logical_sb_block, &first_not_zeroed)) {ext4_msg (sb,KERN_ERR ,"group descriptors corrupted!" ); ret = -EFSCORRUPTED ; goto failed_mount2; } - sbi->s_gdb_count = db_count;get_random_bytes (&sbi->s_next_generation,sizeof (u32));spin_lock_init (&sbi->s_next_gen_lock);
fs/jfs/xattr.c +6 -4
@@ -491,15 +491,17 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size)if (size >PSIZE ) {/* * To keep the rest of the code simple. Allocate a -* contiguous buffer to work with +* contiguous buffer to work with. Make the buffer large +* enough to make use of the whole extent. */ - ea_buf->xattr =kmalloc (size,GFP_KERNEL ); + ea_buf->max_size = (size + sb->s_blocksize -1 ) & + ~(sb->s_blocksize -1 ); + + ea_buf->xattr =kmalloc (ea_buf->max_size,GFP_KERNEL );if (ea_buf->xattr ==NULL )return -ENOMEM ; ea_buf->flag =EA_MALLOC ; - ea_buf->max_size = (size + sb->s_blocksize -1 ) & - ~(sb->s_blocksize -1 );if (ea_size ==0 )return 0 ;
include/linux/ring_buffer.h +1 -0
@@ -162,6 +162,7 @@ void ring_buffer_record_enable(struct ring_buffer *buffer);void ring_buffer_record_off (struct ring_buffer *buffer);void ring_buffer_record_on (struct ring_buffer *buffer);int ring_buffer_record_is_on (struct ring_buffer *buffer); +int ring_buffer_record_is_set_on (struct ring_buffer *buffer);void ring_buffer_record_disable_cpu (struct ring_buffer *buffer,int cpu);void ring_buffer_record_enable_cpu (struct ring_buffer *buffer,int cpu);
include/linux/thread_info.h +1 -6
@@ -59,12 +59,7 @@ extern long do_no_restart_syscall(struct restart_block *parm);#ifdef __KERNEL__ -#ifdef CONFIG_DEBUG_STACK_USAGE -# define THREADINFO_GFP (GFP_KERNEL_ACCOUNT | __GFP_NOTRACK | \ - __GFP_ZERO) -#else -# define THREADINFO_GFP (GFP_KERNEL_ACCOUNT | __GFP_NOTRACK) -#endif +#define THREADINFO_GFP (GFP_KERNEL_ACCOUNT | __GFP_NOTRACK | __GFP_ZERO)/* * flag set/clear/test wrappers
kernel/fork.c +3 -0
@@ -184,6 +184,9 @@ static unsigned long *alloc_thread_stack_node(struct task_struct *tsk, int node)continue ;this_cpu_write (cached_stacks[i],NULL ); +/* Clear stale pointers from reused stack. */ +memset (s->addr,0 ,THREAD_SIZE ); + tsk->stack_vm_area = s;local_irq_enable ();return s->addr;
kernel/irq/manage.c +8 -1
@@ -1026,6 +1026,13 @@ static int irq_setup_forced_threading(struct irqaction *new)if (new->flags & (IRQF_NO_THREAD |IRQF_PERCPU |IRQF_ONESHOT ))return 0 ; +/* +* No further action required for interrupts which are requested as +* threaded interrupts already +*/ +if (new->handler == irq_default_primary_handler) +return 0 ; + new->flags |=IRQF_ONESHOT ;/*
@@ -1033,7 +1040,7 @@ static int irq_setup_forced_threading(struct irqaction *new)* thread handler. We force thread them as well by creating a * secondary action. */ -if (new->handler != irq_default_primary_handler && new->thread_fn) { +if (new->handler && new->thread_fn) {/* Allocate the secondary action */ new->secondary =kzalloc (sizeof (struct irqaction ),GFP_KERNEL );if (!new->secondary)
kernel/time/tick-sched.c +1 -1
@@ -665,7 +665,7 @@ static void tick_nohz_restart(struct tick_sched *ts, ktime_t now)static inline bool local_timer_softirq_pending (void ) { -return local_softirq_pending () &TIMER_SOFTIRQ ; +return local_softirq_pending () &BIT (TIMER_SOFTIRQ ); } static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts,
kernel/trace/ring_buffer.c +16 -0
@@ -3136,6 +3136,22 @@ int ring_buffer_record_is_on(struct ring_buffer *buffer)return !atomic_read (&buffer->record_disabled); } +/** +* ring_buffer_record_is_set_on - return true if the ring buffer is set writable +* @buffer: The ring buffer to see if write is set enabled +* +* Returns true if the ring buffer is set writable by ring_buffer_record_on(). +* Note that this does NOT mean it is in a writable state. +* +* It may return true when the ring buffer has been disabled by +* ring_buffer_record_disable(), as that is a temporary disabling of +* the ring buffer. +*/ +int ring_buffer_record_is_set_on (struct ring_buffer *buffer) +{ +return !(atomic_read (&buffer->record_disabled) &RB_BUFFER_OFF ); +} +/** * ring_buffer_record_disable_cpu - stop all writes into the cpu_buffer * @buffer: The ring buffer to stop writes to.
kernel/trace/trace.c +6 -0
@@ -1323,6 +1323,12 @@ update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu)arch_spin_lock (&tr->max_lock); +/* Inherit the recordable setting from trace_buffer */ +if (ring_buffer_record_is_set_on (tr->trace_buffer.buffer)) +ring_buffer_record_on (tr->max_buffer.buffer); +else +ring_buffer_record_off (tr->max_buffer.buffer); + buf = tr->trace_buffer.buffer; tr->trace_buffer.buffer = tr->max_buffer.buffer; tr->max_buffer.buffer = buf;
net/ipv4/tcp_input.c +21 -2
@@ -4370,6 +4370,23 @@ static bool tcp_try_coalesce(struct sock *sk,return true; } +static bool tcp_ooo_try_coalesce (struct sock *sk, +struct sk_buff *to, +struct sk_buff *from, +bool *fragstolen) +{ +bool res =tcp_try_coalesce (sk, to, from, fragstolen); + +/* In case tcp_drop() is called later, update to->gso_segs */ +if (res) { +u32 gso_segs =max_t (u16,1 ,skb_shinfo (to)->gso_segs) + +max_t (u16,1 ,skb_shinfo (from)->gso_segs); + +skb_shinfo (to)->gso_segs =min_t (u32, gso_segs,0xFFFF ); + } +return res; +} +static void tcp_drop (struct sock *sk,struct sk_buff *skb) {sk_drops_add (sk, skb);
@@ -4493,7 +4510,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)/* In the typical case, we are adding an skb to the end of the list. * Use of ooo_last_skb avoids the O(Log(N)) rbtree lookup. */ -if (tcp_try_coalesce (sk, tp->ooo_last_skb, skb, &fragstolen)) { +if (tcp_ooo_try_coalesce (sk, tp->ooo_last_skb, + skb, &fragstolen)) { coalesce_done:tcp_grow_window (sk, skb);kfree_skb_partial (skb, fragstolen);
@@ -4543,7 +4561,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)tcp_drop (sk, skb1); goto merge_right; } - }else if (tcp_try_coalesce (sk, skb1, skb, &fragstolen)) { + }else if (tcp_ooo_try_coalesce (sk, skb1, + skb, &fragstolen)) { goto coalesce_done; } p = &parent->rb_right;
net/netlink/af_netlink.c +5 -0
@@ -986,6 +986,11 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,return err; } +if (nlk->ngroups ==0 ) + groups =0 ; +else if (nlk->ngroups <8 *sizeof (groups)) + groups &= (1UL << nlk->ngroups) -1 ; + bound = nlk->bound;if (bound) {/* Ensure nlk->portid is up-to-date. */