4.4.49-stable review
Subsystems (3)
Greg Kroah-Hartman
maintainerPATCH 1/20 ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vineet Gupta <[email protected]>
commit a524c218bc94c705886a0e0fedeee45d1931da32 upstream.
--- arch/arc/kernel/unaligned.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arc/kernel/unaligned.c +1 -1
@@ -243,7 +243,7 @@ int misaligned_fixup(unsigned long addre/* clear any remanants of delay slot */ if (delay_mode (regs)) { - regs->ret = regs->bta ~1U; + regs->ret = regs->bta & ~1U ; regs->status32 &= ~STATUS_DE_MASK ; }else { regs->ret += state.instr_len;
Greg Kroah-Hartman
maintainerPATCH 5/20 hns: avoid stack overflow with CONFIG_KASAN
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit b3f2d07f4649adcf6905953a10d217b5683e4077 upstream.
The use of ACCESS_ONCE() looks like a micro-optimization to force gcc to use an indexed load for the register address, but it has an absolutely detrimental effect on builds with gcc-5 and CONFIG_KASAN=y, leading to a very likely kernel stack overflow aside from very complex object code:
hisilicon/hns/hns_dsaf_gmac.c: In function 'hns_gmac_update_stats':hisilicon/hns/hns_dsaf_gmac.c:419:1: error: the frame size of 2912 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_ppe.c: In function 'hns_ppe_reset_common':hisilicon/hns/hns_dsaf_ppe.c:390:1: error: the frame size of 1184 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_ppe.c: In function 'hns_ppe_get_regs':hisilicon/hns/hns_dsaf_ppe.c:621:1: error: the frame size of 3632 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_rcb.c: In function 'hns_rcb_get_common_regs':hisilicon/hns/hns_dsaf_rcb.c:970:1: error: the frame size of 2784 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_gmac.c: In function 'hns_gmac_get_regs':hisilicon/hns/hns_dsaf_gmac.c:641:1: error: the frame size of 5728 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_rcb.c: In function 'hns_rcb_get_ring_regs':hisilicon/hns/hns_dsaf_rcb.c:1021:1: error: the frame size of 2208 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_main.c: In function 'hns_dsaf_comm_init':hisilicon/hns/hns_dsaf_main.c:1209:1: error: the frame size of 1904 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_xgmac.c: In function 'hns_xgmac_get_regs':hisilicon/hns/hns_dsaf_xgmac.c:748:1: error: the frame size of 4704 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_main.c: In function 'hns_dsaf_update_stats':hisilicon/hns/hns_dsaf_main.c:2420:1: error: the frame size of 1088 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_main.c: In function 'hns_dsaf_get_regs':hisilicon/hns/hns_dsaf_main.c:2753:1: error: the frame size of 10768 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
This does not seem to happen any more with gcc-7, but removing the ACCESS_ONCE seems safe anyway and it avoids a serious issue for some people. I have verified that with gcc-5.3.1, the object code we get is better in the new version both with and without CONFIG_KASAN, as we no longer allocate a 1344 byte stack frame for hns_dsaf_get_regs() but otherwise have practically identical object code.
With gcc-7.0.0, removing ACCESS_ONCE has no effect, the object code is already good either way.
This patch is probably not urgent to get into 4.11 as only KASAN=y builds with certain compilers are affected, but I still think it makes sense to backport into older kernels.
--- drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h +2 -6
@@ -900,9 +900,7 @@static inline void dsaf_write_reg (void __iomem *base,u32 reg,u32 value) { -u8 __iomem *reg_addr =ACCESS_ONCE (base); - -writel (value, reg_addr + reg); +writel (value, base + reg); }#define dsaf_write_dev (a, reg, value) \
@@ -910,9 +908,7 @@ static inline void dsaf_write_reg(void _static inline u32 dsaf_read_reg (u8 __iomem *base,u32 reg) { -u8 __iomem *reg_addr =ACCESS_ONCE (base); - -return readl (reg_addr + reg); +return readl (base + reg); }#define dsaf_read_dev (a, reg) \
Greg Kroah-Hartman
maintainerPATCH 11/20 ARM: 8642/1: LPAE: catch pending imprecise abort on unmask
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Sverdlin <[email protected]>
commit 97a98ae5b8acf08d07d972c087b2def060bc9b73 upstream.
Asynchronous external abort is coded differently in DFSR with LPAE enabled.
--- arch/arm/mm/fault.c | 4 ++-- arch/arm/mm/fault.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/mm/fault.c +2 -2
@@ -610,9 +610,9 @@ static int __init early_abort_handler(unvoid __init early_abt_enable (void ) { - fsr_info[22 ].fn = early_abort_handler; + fsr_info[FSR_FS_AEA ].fn = early_abort_handler;local_abt_enable (); - fsr_info[22 ].fn = do_bad; + fsr_info[FSR_FS_AEA ].fn = do_bad; }#ifndef CONFIG_ARM_LPAE
arch/arm/mm/fault.h +4 -0
@@ -11,11 +11,15 @@#define FSR_FS5_0 (0x3f)#ifdef CONFIG_ARM_LPAE +#define FSR_FS_AEA 17 +static inline int fsr_fs (unsigned int fsr) {return fsr &FSR_FS5_0 ; }#else +#define FSR_FS_AEA 22 +static inline int fsr_fs (unsigned int fsr) {return (fsr &FSR_FS3_0 ) | (fsr &FSR_FS4 ) >>6 ;
Greg Kroah-Hartman
maintainerPATCH 16/20 scsi: mpt3sas: disable ASPM for MPI2 controllers
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: ojab <[email protected]>
commit ffdadd68af5a397b8a52289ab39d62e1acb39e63 upstream.
MPI2 controllers sometimes got lost (i.e. disappear from /sys/bus/pci/devices) if ASMP is enabled.
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +3 -0
@@ -51,6 +51,7 @@#include <linux/workqueue.h> #include <linux/delay.h> #include <linux/pci.h> +#include <linux/pci-aspm.h> #include <linux/interrupt.h> #include <linux/aer.h> #include <linux/raid_class.h>
@@ -8483,6 +8484,8 @@ _scsih_probe(struct pci_dev *pdev, constswitch (hba_mpi_version) {case MPI2_VERSION : +pci_disable_link_state (pdev,PCIE_LINK_STATE_L0S | +PCIE_LINK_STATE_L1 |PCIE_LINK_STATE_CLKPM );/* Use mpt2sas driver host template for SAS 2.0 HBA's */ shost =scsi_host_alloc (&mpt2sas_driver_template,sizeof (struct MPT3SAS_ADAPTER ));
Greg Kroah-Hartman
maintainerPATCH 17/20 xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend()
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Ostrovsky <[email protected]>
commit 74470954857c264168d2b5a113904cf0cfd27d18 upstream.
rx_refill_timer should be deleted as soon as we disconnect from the backend since otherwise it is possible for the timer to go off before we get to xennet_destroy_queues(). If this happens we may dereference queue->rx.sring which is set to NULL in xennet_disconnect_backend().
--- drivers/net/xen-netfront.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/xen-netfront.c +2 -1
@@ -1391,6 +1391,8 @@ static void xennet_disconnect_backend(stfor (i =0 ; i < num_queues && info->queues; ++i) {struct netfront_queue *queue = &info->queues[i]; +del_timer_sync (&queue->rx_refill_timer); +if (queue->tx_irq && (queue->tx_irq == queue->rx_irq))unbind_from_irqhandler (queue->tx_irq, queue);if (queue->tx_irq && (queue->tx_irq != queue->rx_irq)) {
@@ -1745,7 +1747,6 @@ static void xennet_destroy_queues(structif (netif_running (info->netdev))napi_disable (&queue->napi); -del_timer_sync (&queue->rx_refill_timer);netif_napi_del (&queue->napi); }
Greg Kroah-Hartman
maintainerPATCH 18/20 ALSA: seq: Fix race at creating a queue
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 4842e98f26dd80be3623c4714a244ba52ea096a8 upstream.
When a sequencer queue is created in snd_seq_queue_alloc(),it adds the new queue element to the public list before referencing it. Thus the queue might be deleted before the call of snd_seq_queue_use(), and it results in the use-after-free error, as spotted by syzkaller.
The fix is to reference the queue object at the right time.
--- sound/core/seq/seq_queue.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)
sound/core/seq/seq_queue.c +20 -13
@@ -181,6 +181,8 @@ void __exit snd_seq_queues_delete(void) } } +static void queue_use (struct snd_seq_queue *queue,int client,int use); +/* allocate a new queue - * return queue index value or negative value for error */
@@ -192,11 +194,11 @@ int snd_seq_queue_alloc(int client, intif (q ==NULL )return -ENOMEM ; q->info_flags = info_flags; +queue_use (q, client,1 );if (queue_list_add (q) <0 ) {queue_delete (q);return -ENOMEM ; } -snd_seq_queue_use (q->queue, client,1 );/* use this queue */ return q->queue; }
@@ -502,19 +504,9 @@ int snd_seq_queue_timer_set_tempo(int qureturn result; } - -/* use or unuse this queue - -* if it is the first client, starts the timer. -* if it is not longer used by any clients, stop the timer. -*/ -int snd_seq_queue_use (int queueid,int client,int use) +/* use or unuse this queue */ +static void queue_use (struct snd_seq_queue *queue,int client,int use) { -struct snd_seq_queue *queue; - - queue =queueptr (queueid); -if (queue ==NULL ) -return -EINVAL ; -mutex_lock (&queue->timer_mutex);if (use) {if (!test_and_set_bit (client, queue->clients_bitmap)) queue->clients++;
@@ -529,6 +521,21 @@ int snd_seq_queue_use(int queueid, int c }else {snd_seq_timer_close (queue); } +} + +/* use or unuse this queue - +* if it is the first client, starts the timer. +* if it is not longer used by any clients, stop the timer. +*/ +int snd_seq_queue_use (int queueid,int client,int use) +{ +struct snd_seq_queue *queue; + + queue =queueptr (queueid); +if (queue ==NULL ) +return -EINVAL ; +mutex_lock (&queue->timer_mutex); +queue_use (queue, client, use);mutex_unlock (&queue->timer_mutex);queuefree (queue);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 10/20 target: Fix COMPARE_AND_WRITE ref leak for non GOOD status
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit 9b2792c3da1e80f2d460167d319302a24c9ca2b7 upstream.
This patch addresses a long standing bug where the commit phase of COMPARE_AND_WRITE would result in a se_cmd->cmd_kref reference leak if se_cmd->scsi_status returned non SAM_STAT_GOOD.
This would manifest first as a lost SCSI response, and eventual hung task during fabric driver logout or re-login, as existing shutdown logic waited for the COMPARE_AND_WRITE se_cmd->cmd_kref to reach zero.
To address this bug, compare_and_write_post() has been changed to drop the incorrect !cmd->scsi_status conditional that was preventing *post_ret = 1 for being set during non SAM_STAT_GOOD status.
This patch has been tested with SAM_STAT_CHECK_CONDITION status from normal target_complete_cmd() callback path, as well as the incoming __target_execute_cmd() submission failure path when se_cmd->execute_cmd() returns non zero status.
--- drivers/target/target_core_sbc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/target/target_core_sbc.c +6 -2
@@ -442,6 +442,7 @@ static sense_reason_t compare_and_write_ int *post_ret) {struct se_device *dev = cmd->se_dev; +sense_reason_t ret =TCM_NO_SENSE ;/* * Only set SCF_COMPARE_AND_WRITE_POST to force a response fall-through
@@ -449,9 +450,12 @@ static sense_reason_t compare_and_write_* sent to the backend driver. */ spin_lock_irq (&cmd->t_state_lock); -if ((cmd->transport_state &CMD_T_SENT ) && !cmd->scsi_status) { +if (cmd->transport_state &CMD_T_SENT ) { cmd->se_cmd_flags |=SCF_COMPARE_AND_WRITE_POST ; *post_ret =1 ; + +if (cmd->scsi_status ==SAM_STAT_CHECK_CONDITION ) + ret =TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ; }spin_unlock_irq (&cmd->t_state_lock);
@@ -461,7 +465,7 @@ static sense_reason_t compare_and_write_*/ up (&dev->caw_sem); -return TCM_NO_SENSE ; +return ret; } static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool success,
Greg Kroah-Hartman
maintainerPATCH 12/20 mac80211: Fix adding of mesh vendor IEs
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Horstmann <[email protected]>
commit da7061c82e4a1bc6a5e134ef362c86261906c860 upstream.
The function ieee80211_ie_split_vendor doesn't return 0 on errors. Instead it returns any offset < ielen when WLAN_EID_VENDOR_SPECIFIC is found. The return value in mesh_add_vendor_ies must therefore be checked against ifmsh->ie_len and not 0. Otherwise all ifmsh->ie starting with WLAN_EID_VENDOR_SPECIFIC will be rejected.
--- net/mac80211/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/mesh.c +1 -1
@@ -355,7 +355,7 @@ int mesh_add_vendor_ies(struct ieee80211/* fast-forward to vendor IEs */ offset =ieee80211_ie_split_vendor (ifmsh->ie, ifmsh->ie_len,0 ); -if (offset) { +if (offset < ifmsh->ie_len) { len = ifmsh->ie_len - offset; data = ifmsh->ie + offset;if (skb_tailroom (skb) < len)
Greg Kroah-Hartman
maintainerPATCH 4/20 cpumask: use nr_cpumask_bits for parsing functions
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit 4d59b6ccf000862beed6fc0765d3209f98a8d8a2 upstream.
Commit 513e3d2d11c9 ("cpumask: always use nr_cpu_ids in formatting and parsing functions") converted both cpumask printing and parsing functions to use nr_cpu_ids instead of nr_cpumask_bits. While this was okay for the printing functions as it just picked one of the two output formats that we were alternating between depending on a kernel config, doing the same for parsing wasn't okay.
nr_cpumask_bits can be either nr_cpu_ids or NR_CPUS. We can always use nr_cpu_ids but that is a variable while NR_CPUS is a constant, so it can be more efficient to use NR_CPUS when we can get away with it. Converting the printing functions to nr_cpu_ids makes sense because it affects how the masks get presented to userspace and doesn't break anything; however, using nr_cpu_ids for parsing functions can incorrectly leave the higher bits uninitialized while reading in these masks from userland. As all testing and comparison functions use nr_cpumask_bits which can be larger than nr_cpu_ids, the parsed cpumasks can erroneously yield false negative results.
This made the taskstats interface incorrectly return -EINVAL even when the inputs were correct.
Fix it by restoring the parse functions to use nr_cpumask_bits instead of nr_cpu_ids.
--- include/linux/cpumask.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/linux/cpumask.h +4 -4
@@ -556,7 +556,7 @@ static inline void cpumask_copy(struct cstatic inline int cpumask_parse_user (const char __user *buf,int len,struct cpumask *dstp) { -return bitmap_parse_user (buf, len,cpumask_bits (dstp), nr_cpu_ids); +return bitmap_parse_user (buf, len,cpumask_bits (dstp), nr_cpumask_bits); }/**
@@ -571,7 +571,7 @@ static inline int cpumask_parselist_user struct cpumask *dstp) {return bitmap_parselist_user (buf, len,cpumask_bits (dstp), - nr_cpu_ids); + nr_cpumask_bits); }/**
@@ -586,7 +586,7 @@ static inline int cpumask_parse(const chchar *nl =strchr (buf,'\n' );unsigned int len = nl ? (unsigned int )(nl - buf) :strlen (buf); -return bitmap_parse (buf, len,cpumask_bits (dstp), nr_cpu_ids); +return bitmap_parse (buf, len,cpumask_bits (dstp), nr_cpumask_bits); }/**
@@ -598,7 +598,7 @@ static inline int cpumask_parse(const ch*/ static inline int cpulist_parse (const char *buf,struct cpumask *dstp) { -return bitmap_parselist (buf,cpumask_bits (dstp), nr_cpu_ids); +return bitmap_parselist (buf,cpumask_bits (dstp), nr_cpumask_bits); }/**
Greg Kroah-Hartman
maintainerPATCH 6/20 ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Martin <[email protected]>
commit 228dbbfb5d77f8e047b2a1d78da14b7158433027 upstream.
Ensure that if userspace supplies insufficient data to PTRACE_SETREGSET to fill all the registers, the thread's old registers are preserved.
--- arch/arm/kernel/ptrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/kernel/ptrace.c +1 -1
@@ -600,7 +600,7 @@ static int gpr_set(struct task_struct *t const void *kbuf, const void __user *ubuf) { int ret; -struct pt_regs newregs; +struct pt_regs newregs = *task_pt_regs (target); ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &newregs,
Greg Kroah-Hartman
maintainerPATCH 8/20 target: Use correct SCSI status during EXTENDED_COPY exception
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit 0583c261e6325f392c1f7a1b9112e31298e1a4bd upstream.
This patch adds the missing target_complete_cmd() SCSI status parameter change in target_xcopy_do_work(), that was originally missing in commit 926317de33.
It correctly propigates up the correct SCSI status during EXTENDED_COPY exception cases, instead of always using the hardcoded SAM_STAT_CHECK_CONDITION from original code.
This is required for ESX host environments that expect to hit SAM_STAT_RESERVATION_CONFLICT for certain scenarios, and SAM_STAT_CHECK_CONDITION results in non-retriable status for these cases.
--- drivers/target/target_core_xcopy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/target_core_xcopy.c +1 -1
@@ -836,7 +836,7 @@ out: " CHECK_CONDITION -> sending response\n", rc); ec_cmd->scsi_status =SAM_STAT_CHECK_CONDITION ; } -target_complete_cmd (ec_cmd,SAM_STAT_CHECK_CONDITION ); +target_complete_cmd (ec_cmd, ec_cmd->scsi_status); }sense_reason_t target_do_xcopy (struct se_cmd *se_cmd)
Greg Kroah-Hartman
maintainerPATCH 9/20 target: Fix early transport_generic_handle_tmr abort scenario
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit c54eeffbe9338fa982dc853d816fda9202a13b5a upstream.
This patch fixes a bug where incoming task management requests can be explicitly aborted during an active LUN_RESET, but who's struct work_struct are canceled in-flight before execution.
This occurs when core_tmr_drain_tmr_list() invokes cancel_work_sync() for the incoming se_tmr_req->task_cmd->work, resulting in cmd->work for target_tmr_work() never getting invoked and the aborted TMR waiting indefinately within transport_wait_for_tasks().
To address this case, perform a CMD_T_ABORTED check early in transport_generic_handle_tmr(), and invoke the normal path via transport_cmd_check_stop_to_fabric() to complete any TMR kthreads blocked waiting for CMD_T_STOP in transport_wait_for_tasks().
Also, move the TRANSPORT_ISTATE_PROCESSING assignment earlier into transport_generic_handle_tmr() so the existing check in core_tmr_drain_tmr_list() avoids attempting abort the incoming se_tmr_req->task_cmd->work if it has already been queued into se_device->tmr_wq.
--- drivers/target/target_core_transport.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/target/target_core_transport.c +15 -2
@@ -3058,7 +3058,6 @@ static void target_tmr_work(struct work_spin_unlock_irqrestore (&cmd->t_state_lock, flags); goto check_stop; } - cmd->t_state =TRANSPORT_ISTATE_PROCESSING ;spin_unlock_irqrestore (&cmd->t_state_lock, flags); cmd->se_tfo->queue_tm_rsp (cmd);
@@ -3071,11 +3070,25 @@ int transport_generic_handle_tmr( struct se_cmd *cmd) {unsigned long flags; +bool aborted = false;spin_lock_irqsave (&cmd->t_state_lock, flags); - cmd->transport_state |=CMD_T_ACTIVE ; +if (cmd->transport_state &CMD_T_ABORTED ) { + aborted = true; + }else { + cmd->t_state =TRANSPORT_ISTATE_PROCESSING ; + cmd->transport_state |=CMD_T_ACTIVE ; + }spin_unlock_irqrestore (&cmd->t_state_lock, flags); +if (aborted) { +pr_warn_ratelimited ("handle_tmr caught CMD_T_ABORTED TMR %d" +"ref_tag: %llu tag: %llu\n" , cmd->se_tmr_req->function, + cmd->se_tmr_req->ref_task_tag, cmd->tag); +transport_cmd_check_stop_to_fabric (cmd); +return 0 ; + } +INIT_WORK (&cmd->work, target_tmr_work);queue_work (cmd->se_dev->tmr_wq, &cmd->work);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 2/20 selinux: fix off-by-one in setprocattr
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Smalley <[email protected]>
commit 0c461cb727d146c9ef2d3e86214f498b78b7d125 upstream.
SELinux tries to support setting/clearing of /proc/pid/attr attributes from the shell by ignoring terminating newlines and treating an attribute value that begins with a NUL or newline as an attempt to clear the attribute. However, the test for clearing attributes has always been wrong; it has an off-by-one error, and this could further lead to reading past the end of the allocated buffer since commit bb646cdb12e75d82258c2f2e7746d5952d3e321a ("proc_pid_attr_write():
switch to memdup_user()"). Fix the off-by-one error.
Even with this fix, setting and clearing /proc/pid/attr attributes from the shell is not straightforward since the interface does not support multiple write() calls (so shells that write the value and newline separately will set and then immediately clear the attribute, requiring use of echo -n to set the attribute), whereas trying to use echo -n "" to clear the attribute causes the shell to skip the write() call altogether since POSIX says that a zero-length write causes no side effects. Thus, one must use echo -n to set and echo without -n to clear, as in the following example:
$ echo -n unconfined_u:object_r:user_home_t:s0 > /proc/$$/attr/fscreate $ cat /proc/$$/attr/fscreate unconfined_u:object_r:user_home_t:s0 $ echo "" > /proc/$$/attr/fscreate $ cat /proc/$$/attr/fscreate
Note the use of /proc/$$ rather than /proc/self, as otherwise the cat command will read its own attribute value, not that of the shell.
There are no users of this facility to my knowledge; possibly we should just get rid of it.
UPDATE: Upon further investigation it appears that a local process with the process:setfscreate permission can cause a kernel panic as a result of this bug. This patch fixes CVE-2017-2618.
--- security/selinux/hooks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/selinux/hooks.c +1 -1
@@ -5640,7 +5640,7 @@ static int selinux_setprocattr(struct tareturn error;/* Obtain a SID for the context, if one was specified. */ -if (size && str[1 ] && str[1 ] !='\n' ) { +if (size && str[0 ] && str[0 ] !='\n' ) {if (str[size-1 ] =='\n' ) { str[size-1 ] =0 ; size--;
Greg Kroah-Hartman
maintainerPATCH 13/20 netvsc: Set maximum GSO size in the right place
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
Commit a50af86dd49e "netvsc: reduce maximum GSO size" was wrongly backported to 4.4-stable. The maximum size needs to be set before the net device is registered, in netvsc_probe().
--- drivers/net/hyperv/netvsc_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/hyperv/netvsc_drv.c +1 -1
@@ -854,7 +854,6 @@ static int netvsc_set_channels(struct ne } goto recover; } -netif_set_gso_max_size (net,NETVSC_GSO_MAX_SIZE ); out:netvsc_open (net);
@@ -1142,6 +1141,7 @@ static int netvsc_probe(struct hv_device nvdev =hv_get_drvdata (dev);netif_set_real_num_tx_queues (net, nvdev->num_chn);netif_set_real_num_rx_queues (net, nvdev->num_chn); +netif_set_gso_max_size (net,NETVSC_GSO_MAX_SIZE ); ret =register_netdev (net);if (ret !=0 ) {
Greg Kroah-Hartman
maintainerPATCH 7/20 target: Dont BUG_ON during NodeACL dynamic -> explicit conversion
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit 391e2a6de9781e4906dd7e0b1cc097050bf43e11 upstream.
After the v4.2+ RCU conversion to se_node_acl->lun_entry_hlist, a BUG_ON() was added in core_enable_device_list_for_node() to detect when the located orig->se_lun_acl contains an existing se_lun_acl pointer reference.
However, this scenario can happen when a dynamically generated NodeACL is being converted to an explicit NodeACL, when the explicit NodeACL contains a different LUN mapping than the default provided by the WWN endpoint.
So instead of triggering BUG_ON(), go ahead and fail instead following the original pre RCU conversion logic.
--- drivers/target/target_core_device.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/target/target_core_device.c +9 -1
@@ -362,7 +362,15 @@ int core_enable_device_list_for_node(kfree (new);return -EINVAL ; } -BUG_ON (orig->se_lun_acl !=NULL ); +if (orig->se_lun_acl !=NULL ) { +pr_warn_ratelimited ("Detected existing explicit" +" se_lun_acl->se_lun_group reference for %s" +" mapped_lun: %llu, failing\n" , + nacl->initiatorname, mapped_lun); +mutex_unlock (&nacl->lun_entry_mutex); +kfree (new); +return -EINVAL ; + }rcu_assign_pointer (new->se_lun, lun);rcu_assign_pointer (new->se_lun_acl, lun_acl);
Greg Kroah-Hartman
maintainerPATCH 14/20 scsi: zfcp: fix use-after-free by not tracing WKA port open/close on failed send
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steffen Maier <[email protected]>
commit 2dfa6688aafdc3f74efeb1cf05fb871465d67f79 upstream.
Dan Carpenter kindly reported:
<quote>
The patch d27a7cb91960: "zfcp: trace on request for open and close of WKA port" from Aug 10, 2016, leads to the following static checker warning:
drivers/s390/scsi/zfcp_fsf.c:1615 zfcp_fsf_open_wka_port() warn: 'req' was already freed.
drivers/s390/scsi/zfcp_fsf.c
1609 zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
1610 retval = zfcp_fsf_req_send(req);
1611 if (retval)
1612 zfcp_fsf_req_free(req);
^^^Freed.
1613 out:
1614 spin_unlock_irq(&qdio->req_q_lock);
1615 if (req && !IS_ERR(req))
1616 zfcp_dbf_rec_run_wka("fsowp_1", wka_port, req->req_id);
^^^^^^^^^^^Use after free.
1617 return retval;
1618 }
Same thing for zfcp_fsf_close_wka_port() as well.
</quote>
Rather than relying on req being NULL (or ERR_PTR) for all cases where we don't want to trace or should not trace,
simply check retval which is unconditionally initialized with -EIO != 0 and it can only become 0 on successful retval = zfcp_fsf_req_send(req). With that we can also remove the then again unnecessary unconditional initialization of req which was introduced with that earlier commit.
--- drivers/s390/scsi/zfcp_fsf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/s390/scsi/zfcp_fsf.c +4 -4
@@ -1583,7 +1583,7 @@ out:int zfcp_fsf_open_wka_port (struct zfcp_fc_wka_port *wka_port) {struct zfcp_qdio *qdio = wka_port->adapter->qdio; -struct zfcp_fsf_req *req =NULL ; +struct zfcp_fsf_req *req;int retval = -EIO ;spin_lock_irq (&qdio->req_q_lock);
@@ -1612,7 +1612,7 @@ int zfcp_fsf_open_wka_port(struct zfcp_fzfcp_fsf_req_free (req); out:spin_unlock_irq (&qdio->req_q_lock); -if (req && !IS_ERR (req)) +if (!retval)zfcp_dbf_rec_run_wka ("fsowp_1" , wka_port, req->req_id);return retval; }
@@ -1638,7 +1638,7 @@ static void zfcp_fsf_close_wka_port_handint zfcp_fsf_close_wka_port (struct zfcp_fc_wka_port *wka_port) {struct zfcp_qdio *qdio = wka_port->adapter->qdio; -struct zfcp_fsf_req *req =NULL ; +struct zfcp_fsf_req *req;int retval = -EIO ;spin_lock_irq (&qdio->req_q_lock);
@@ -1667,7 +1667,7 @@ int zfcp_fsf_close_wka_port(struct zfcp_zfcp_fsf_req_free (req); out:spin_unlock_irq (&qdio->req_q_lock); -if (req && !IS_ERR (req)) +if (!retval)zfcp_dbf_rec_run_wka ("fscwp_1" , wka_port, req->req_id);return retval; }
Greg Kroah-Hartman
maintainercover 4.4.49-stable review
This is the start of the stable review cycle for the 4.4.49 release. There are 20 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 15 13:03:55 UTC 2017. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.49-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.4.49-rc1
Andrey Ryabinin <[email protected]>
drm/i915: fix use-after-free in page_flip_completed()
Takashi Iwai <[email protected]>
ALSA: seq: Don't handle loop timeout at snd_seq_pool_done()
Takashi Iwai <[email protected]>
ALSA: seq: Fix race at creating a queue
Boris Ostrovsky <[email protected]>
xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend()
ojab <[email protected]>
scsi: mpt3sas: disable ASPM for MPI2 controllers
Dave Carroll <[email protected]>
scsi: aacraid: Fix INTx/MSI-x issue with older controllers
Steffen Maier <[email protected]>
scsi: zfcp: fix use-after-free by not tracing WKA port open/close on failed send
Ben Hutchings <[email protected]>
netvsc: Set maximum GSO size in the right place
Thorsten Horstmann <[email protected]>
mac80211: Fix adding of mesh vendor IEs
Alexander Sverdlin <[email protected]>
ARM: 8642/1: LPAE: catch pending imprecise abort on unmask
Nicholas Bellinger <[email protected]>
target: Fix COMPARE_AND_WRITE ref leak for non GOOD status
Nicholas Bellinger <[email protected]>
target: Fix early transport_generic_handle_tmr abort scenario
Nicholas Bellinger <[email protected]>
target: Use correct SCSI status during EXTENDED_COPY exception
Nicholas Bellinger <[email protected]>
target: Don't BUG_ON during NodeACL dynamic -> explicit conversion
Dave Martin <[email protected]>
ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write
Arnd Bergmann <[email protected]>
hns: avoid stack overflow with CONFIG_KASAN
Tejun Heo <[email protected]>
cpumask: use nr_cpumask_bits for parsing functions
Linus Torvalds <[email protected]>
Revert "x86/ioapic: Restore IO-APIC irq_chip retrigger callback"
Stephen Smalley <[email protected]>
selinux: fix off-by-one in setprocattr
Vineet Gupta <[email protected]>
ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup
-------------
Diffstat:
Makefile | 4 +-- arch/arc/kernel/unaligned.c | 2 +- arch/arm/kernel/ptrace.c | 2 +- arch/arm/mm/fault.c | 4 +-- arch/arm/mm/fault.h | 4 +++ arch/x86/kernel/apic/io_apic.c | 2 -- drivers/gpu/drm/i915/intel_display.c | 4 +-- drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 8 ++---- drivers/net/hyperv/netvsc_drv.c | 2 +- drivers/net/xen-netfront.c | 3 ++- drivers/s390/scsi/zfcp_fsf.c | 8 +++--- drivers/scsi/aacraid/comminit.c | 8 ++++-- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 +++ drivers/target/target_core_device.c | 10 ++++++- drivers/target/target_core_sbc.c | 8 ++++-- drivers/target/target_core_transport.c | 17 ++++++++++-- drivers/target/target_core_xcopy.c | 2 +- include/linux/cpumask.h | 8 +++--- net/mac80211/mesh.c | 2 +- security/selinux/hooks.c | 2 +- sound/core/seq/seq_memory.c | 9 +------ sound/core/seq/seq_queue.c | 33 ++++++++++++++--------- 22 files changed, 88 insertions(+), 57 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 19/20 ALSA: seq: Dont handle loop timeout at snd_seq_pool_done()
4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 37a7ea4a9b81f6a864c10a7cb0b96458df5310a3 upstream.
snd_seq_pool_done() syncs with closing of all opened threads, but it aborts the wait loop with a timeout, and proceeds to the release resource even if not all threads have been closed. The timeout was 5 seconds, and if you run a crazy stuff, it can exceed easily, and may result in the access of the invalid memory address -- this is what syzkaller detected in a bug report.
As a fix, let the code graduate from naiveness, simply remove the loop timeout.
--- sound/core/seq/seq_memory.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
sound/core/seq/seq_memory.c +1 -8
@@ -419,7 +419,6 @@ int snd_seq_pool_done(struct snd_seq_poo {unsigned long flags;struct snd_seq_event_cell *ptr; -int max_count =5 *HZ ;if (snd_BUG_ON (!pool))return -EINVAL ;
@@ -432,14 +431,8 @@ int snd_seq_pool_done(struct snd_seq_pooif (waitqueue_active (&pool->output_sleep))wake_up (&pool->output_sleep); -while (atomic_read (&pool->counter) >0 ) { -if (max_count ==0 ) { -pr_warn ("ALSA: snd_seq_pool_done timeout: %d cells remain\n" ,atomic_read (&pool->counter)); -break ; - } +while (atomic_read (&pool->counter) >0 )schedule_timeout_uninterruptible (1 ); - max_count--; - }/* release all resources */ spin_lock_irqsave (&pool->lock, flags);
Greg Kroah-Hartman
maintainerPATCH 20/20 drm/i915: fix use-after-free in page_flip_completed()
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Ryabinin <[email protected]>
commit 5351fbb1bf1413f6024892093528280769ca852f upstream.
page_flip_completed() dereferences 'work' variable after executing queue_work(). This is not safe as the 'work' item might be already freed by queued work:
BUG: KASAN: use-after-free in page_flip_completed+0x3ff/0x490 at addr ffff8803dc010f90
Call Trace:
__asan_report_load8_noabort+0x59/0x80
page_flip_completed+0x3ff/0x490
intel_finish_page_flip_mmio+0xe3/0x130
intel_pipe_handle_vblank+0x2d/0x40
gen8_irq_handler+0x4a7/0xed0
__handle_irq_event_percpu+0xf6/0x860
handle_irq_event_percpu+0x6b/0x160
handle_irq_event+0xc7/0x1b0
handle_edge_irq+0x1f4/0xa50
handle_irq+0x41/0x70
do_IRQ+0x9a/0x200
common_interrupt+0x89/0x89 Freed:
kfree+0x113/0x4d0
intel_unpin_work_fn+0x29a/0x3b0
process_one_work+0x79e/0x1b70
worker_thread+0x611/0x1460
kthread+0x241/0x3a0
ret_from_fork+0x27/0x40Move queue_work() after trace_i915_flip_complete() to fix this.
--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -3948,10 +3948,10 @@ static void page_flip_completed(struct idrm_crtc_vblank_put (&intel_crtc->base);wake_up_all (&dev_priv->pending_flip_queue); -queue_work (dev_priv->wq, &work->work); -trace_i915_flip_complete (intel_crtc->plane, work->pending_flip_obj); + +queue_work (dev_priv->wq, &work->work); }void intel_crtc_wait_for_pending_flips (struct drm_crtc *crtc)
Greg Kroah-Hartman
maintainerPATCH 3/20 Revert "x86/ioapic: Restore IO-APIC irq_chip retrigger callback"
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit d966564fcdc19e13eb6ba1fbe6b8101070339c3d upstream.
This reverts commit 020eb3daaba2857b32c4cf4c82f503d6a00a67de.
Gabriel C reports that it causes his machine to not boot, and we haven't tracked down the reason for it yet. Since the bug it fixes has been around for a longish time, we're better off reverting the fix for now.
Gabriel says:
"It hangs early and freezes with a lot RCU warnings.
I bisected it down to :
Quoted 2 lines
Ruslan Ruslichenko (1):
x86/ioapic: Restore IO-APICirq_chipretrigger callback
Reverting this one fixes the problem for me..
The box is a PRIMERGY TX200 S5 , 2 socket , 2 x E5520 CPU(s) installed"
and Ruslan and Thomas are currently stumped.
--- arch/x86/kernel/apic/io_apic.c | 2 -- 1 file changed, 2 deletions(-)
arch/x86/kernel/apic/io_apic.c +0 -2
@@ -1875,7 +1875,6 @@ static struct irq_chip ioapic_chip __rea .irq_ack = irq_chip_ack_parent, .irq_eoi = ioapic_ack_level, .irq_set_affinity = ioapic_set_affinity, - .irq_retrigger = irq_chip_retrigger_hierarchy, .flags = IRQCHIP_SKIP_SET_WAKE, };
@@ -1887,7 +1886,6 @@ static struct irq_chip ioapic_ir_chip __ .irq_ack = irq_chip_ack_parent, .irq_eoi = ioapic_ir_ack_level, .irq_set_affinity = ioapic_set_affinity, - .irq_retrigger = irq_chip_retrigger_hierarchy, .flags = IRQCHIP_SKIP_SET_WAKE, };
Greg Kroah-Hartman
maintainerPATCH 15/20 scsi: aacraid: Fix INTx/MSI-x issue with older controllers
In reply to Greg Kroah-Hartman4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Carroll <[email protected]>
commit 8af8e1c22f9994bb1849c01d66c24fe23f9bc9a0 upstream.
commit 78cbccd3bd68 ("aacraid: Fix for KDUMP driver hang")
caused a problem on older controllers which do not support MSI-x (namely ASR3405,ASR3805). This patch conditionalizes the previous patch to controllers which support MSI-x
--- drivers/scsi/aacraid/comminit.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/scsi/aacraid/comminit.c +6 -2
@@ -50,9 +50,13 @@ struct aac_common aac_config = {static inline int aac_is_msix_mode (struct aac_dev *dev) { -u32 status; +u32 status =0 ; - status =src_readl (dev, MUnit.OMR); +if (dev->pdev->device ==PMC_DEVICE_S6 || + dev->pdev->device ==PMC_DEVICE_S7 || + dev->pdev->device ==PMC_DEVICE_S8 ) { + status =src_readl (dev, MUnit.OMR); + }return (status &AAC_INT_MODE_MSIX ); }
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.4.49 release. There are 20 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 15 13:03:55 UTC 2017. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.49-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.4.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.4.49 release. There are 20 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 15 13:03:55 UTC 2017. Anything received after that time might be too late.
Build results:
total: 149 pass: 149 fail: 0
Qemu test results:
total: 115 pass: 115 fail: 0Details are available at http://kerneltests.org/builders.
Guenter
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.4.49 release. There are 20 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 15 13:03:55 UTC 2017. Anything received after that time might be too late.
Tested on a hardware I am working on atm.
Everything works, no regression.
Regards
Sudip
Greg Kroah-Hartman
maintainerQuoted 11 lines · Sudip Mukherjee
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.4.49 release. There are 20 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 15 13:03:55 UTC 2017. Anything received after that time might be too late.
Tested on a hardware I am working on atm.
Everything works, no regression.
Thanks for testing this and letting me know.
greg k-h