Linux 3.4.28
Greg KH
maintainerI'm announcing the release of the 3.4.28 kernel.
All users of the 3.4 kernel series must upgrade.
The updated 3.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.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 drivers/acpi/processor_idle.c | 4 + drivers/ata/ahci.c | 13 ++++ drivers/dma/ioat/dma_v3.c | 2 drivers/firmware/dmi_scan.c | 78 ++++++++++++++++++++++------- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 21 +++++++ drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/intel_display.c | 4 + drivers/pci/hotplug/pciehp.h | 2 drivers/pci/hotplug/pciehp_core.c | 11 ---- drivers/pci/hotplug/pciehp_ctrl.c | 8 +- drivers/pci/hotplug/pciehp_hpc.c | 11 +++- drivers/pci/hotplug/shpchp.h | 1 drivers/pci/hotplug/shpchp_core.c | 10 --- drivers/pci/hotplug/shpchp_ctrl.c | 2 drivers/pci/pcie/aer/aerdrv_core.c | 1 drivers/pci/pcie/aspm.c | 3 + drivers/scsi/sd.c | 13 ++-- drivers/usb/dwc3/gadget.c | 1 drivers/usb/host/uhci-hcd.c | 15 +++-- include/linux/sched.h | 11 +++- kernel/ptrace.c | 72 +++++++++++++++++++++----- kernel/sched/core.c | 3 - kernel/signal.c | 19 +++---- kernel/trace/ftrace.c | 2 security/integrity/evm/evm_crypto.c | 4 - sound/usb/endpoint.c | 6 -- 27 files changed, 230 insertions(+), 92 deletions(-)
Alan Cox (1):
ahci: Add identifiers for ASM106x devices
Alan Stern (1):
USB: UHCI: fix IRQ race during initialization
Betty Dall (1):
PCI/AER: pci_get_domain_bus_and_slot() call missing required pci_dev_put()
Bjorn Helgaas (1):
PCI: shpchp: Handle push button event asynchronously
Chris Wilson (1):
drm/i915: Invalidate the relocation presumed_offsets along the slow path
Colin Ian King (1):
PCI: Allow pcie_aspm=force even when FADT indicates it is unsupported
Daniel Vetter (1):
drm/i915: Implement WaDisableHiZPlanesWhenMSAAEnabled
Dmitry Kasatkin (1):
evm: checking if removexattr is not a NULL
Greg Kroah-Hartman (1):
Linux 3.4.28
Hugh Daschbach (1):
libata: ahci: Add support for Enmotus Bobcat device.
Joel D. Diaz (1):
SCSI: sd: Reshuffle init_sd to avoid crash
Konrad Rzeszutek Wilk (1):
ACPI / cpuidle: Fix NULL pointer issues when cpuidle is disabled
Oleg Nesterov (3):
ptrace: introduce signal_wake_up_state() and ptrace_signal_wake_up()
ptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL wake_up_process() should be never used to wakeup a TASK_STOPPED/TRACED task
Pratyush Anand (1):
usb: dwc3: gadget: fix ep->maxburst for ep0
Shuah Khan (1):
ioat: Fix DMA memory sync direction correct flag
Steven Rostedt (1):
ftrace: Be first to run code modification on modules
Takashi Iwai (1):
ALSA: usb-audio: Fix regression by disconnection-race-fix patch
Thomas Schlichter (1):
ACPI / processor: Get power info before updating the C-states
Yijing Wang (1):
PCI: pciehp: Use per-slot workqueues to avoid deadlock
Zhenzhong Duan (2):
drivers/firmware/dmi_scan.c: check dmi version when get system uuid drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 27 +SUBLEVEL = 28 EXTRAVERSION = NAME = Saber-toothed Squirrel
drivers/acpi/processor_idle.c +4 -0
@@ -1018,6 +1018,9 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr)return -EINVAL ; } +if (!dev) +return -EINVAL ; + dev->cpu = pr->id;if (max_cstate ==0 )
@@ -1205,6 +1208,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) }/* Populate Updated C-state information */ +acpi_processor_get_power_info (pr);acpi_processor_setup_cpuidle_states (pr);/* Enable all cpuidle devices */
drivers/ata/ahci.c +11 -2
@@ -53,6 +53,7 @@enum {AHCI_PCI_BAR_STA2X11 =0 , +AHCI_PCI_BAR_ENMOTUS =2 ,AHCI_PCI_BAR_STANDARD =5 , };
@@ -405,7 +406,13 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 *//* Asmedia */ - { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci }, /* ASM1061 */ + { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci }, /* ASM1060 */ + { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci }, /* ASM1060 */ + { PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci }, /* ASM1061 */ + { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci }, /* ASM1062 */ + +/* Enmotus */ + { PCI_DEVICE(0x1c44, 0x8000), board_ahci },/* Generic, PCI class code for AHCI */ { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -1079,9 +1086,11 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)dev_info (&pdev->dev,"PDC42819 can only drive SATA devices with this driver\n" ); -/* The Connext uses non-standard BAR */ +/* Both Connext and Enmotus devices use non-standard BARs */ if (pdev->vendor ==PCI_VENDOR_ID_STMICRO && pdev->device ==0xCC06 ) ahci_pci_bar =AHCI_PCI_BAR_STA2X11 ; +else if (pdev->vendor ==0x1c44 && pdev->device ==0x8000 ) + ahci_pci_bar =AHCI_PCI_BAR_ENMOTUS ;/* acquire resources */ rc =pcim_enable_device (pdev);
drivers/dma/ioat/dma_v3.c +1 -1
@@ -951,7 +951,7 @@ static int __devinit ioat_xor_val_self_test(struct ioatdma_device *device) goto free_resources; } } -dma_sync_single_for_device (dev, dest_dma,PAGE_SIZE ,DMA_TO_DEVICE ); +dma_sync_single_for_device (dev, dest_dma,PAGE_SIZE ,DMA_FROM_DEVICE );/* skip validate if the capability is not present */ if (!dma_has_cap (DMA_XOR_VAL , dma_chan->device->cap_mask))
drivers/firmware/dmi_scan.c +61 -17
137 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_execbuffer.c +21 -0
@@ -707,6 +707,8 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev, total =0 ;for (i =0 ; i < count; i++) {struct drm_i915_gem_relocation_entry __user *user_relocs; +u64 invalid_offset = (u64)-1 ; +int j; user_relocs = (void __user *)(uintptr_t )exec[i].relocs_ptr;
@@ -717,6 +719,25 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev, goto err; } +/* As we do not update the known relocation offsets after +* relocating (due to the complexities in lock handling), +* we need to mark them as invalid now so that we force the +* relocation processing next time. Just in case the target +* object is evicted and then rebound into its old +* presumed_offset before the next execbuffer - if that +* happened we would make the mistake of assuming that the +* relocations were valid. +*/ +for (j =0 ; j < exec[i].relocation_count; j++) { +if (copy_to_user (&user_relocs[j].presumed_offset, + &invalid_offset, +sizeof (invalid_offset))) { + ret = -EFAULT ; +mutex_lock (&dev->struct_mutex); + goto err; + } + } + reloc_offset[i] = total; total += exec[i].relocation_count; }
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -27,6 +27,8 @@#define _PIPE (pipe, a, b) ((a) + (pipe)*((b)-(a))) +#define _MASKED_BIT_ENABLE (a) (((a) << 16) | (a)) +/* * The Bridge device's PCI config space has information about the * fb aperture size and the amount of pre-reserved memory.
@@ -433,6 +435,7 @@* the enables for writing to the corresponding low bit. */ #define _3D_CHICKEN 0x02084 +#define _3D_CHICKEN_HIZ_PLANE_DISABLE_MSAA_4X_SNB (1 << 10)#define _3D_CHICKEN2 0x0208c/* Disables pipelining of read flushes past the SF-WIZ interface. * Required on all Ironlake steppings according to the B-Spec, but the
drivers/gpu/drm/i915/intel_display.c +4 -0
@@ -8592,6 +8592,10 @@ static void gen6_init_clock_gating(struct drm_device *dev)I915_READ (ILK_DISPLAY_CHICKEN2 ) | ILK_ELPIN_409_SELECT); +/* WaDisableHiZPlanesWhenMSAAEnabled */ +I915_WRITE (_3D_CHICKEN, +_MASKED_BIT_ENABLE (_3D_CHICKEN_HIZ_PLANE_DISABLE_MSAA_4X_SNB)); +I915_WRITE (WM3_LP_ILK ,0 );I915_WRITE (WM2_LP_ILK ,0 );I915_WRITE (WM1_LP_ILK ,0 );
drivers/pci/hotplug/pciehp.h +1 -1
@@ -44,7 +44,6 @@ extern bool pciehp_poll_mode;extern int pciehp_poll_time;extern bool pciehp_debug;extern bool pciehp_force; -extern struct workqueue_struct *pciehp_wq; #define dbg(format, arg...) \ do { \
@@ -78,6 +77,7 @@ struct slot {struct hotplug_slot *hotplug_slot;struct delayed_work work;/* work for button event */ struct mutex lock; +struct workqueue_struct *wq; };struct event_info {
drivers/pci/hotplug/pciehp_core.c +2 -9
@@ -42,7 +42,6 @@ bool pciehp_debug;bool pciehp_poll_mode;int pciehp_poll_time;bool pciehp_force; -struct workqueue_struct *pciehp_wq;#define DRIVER_VERSION "0.4"#define DRIVER_AUTHOR "Dan Zink <[email protected]>, Greg Kroah-Hartman <[email protected]>, Dely Sy <[email protected]>"
@@ -340,18 +339,13 @@ static int __init pcied_init(void) {int retval =0 ; - pciehp_wq =alloc_workqueue ("pciehp" ,0 ,0 ); -if (!pciehp_wq) -return -ENOMEM ; -pciehp_firmware_init (); retval =pcie_port_service_register (&hpdriver_portdrv);dbg ("pcie_port_service_register = %d\n" , retval);info (DRIVER_DESC " version: " DRIVER_VERSION "\n" ); -if (retval) { -destroy_workqueue (pciehp_wq); +if (retval)dbg ("Failure to register service\n" ); - } +return retval; }
@@ -359,7 +353,6 @@ static void __exit pcied_cleanup(void) {dbg ("unload_pciehpd()\n" );pcie_port_service_unregister (&hpdriver_portdrv); -destroy_workqueue (pciehp_wq);info (DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n" ); }
drivers/pci/hotplug/pciehp_ctrl.c +4 -4
@@ -49,7 +49,7 @@ static int queue_interrupt_event(struct slot *p_slot, u32 event_type) info->p_slot = p_slot;INIT_WORK (&info->work, interrupt_event_handler); -queue_work (pciehp_wq, &info->work); +queue_work (p_slot->wq, &info->work);return 0 ; }
@@ -344,7 +344,7 @@ void pciehp_queue_pushbutton_work(struct work_struct *work)kfree (info); goto out; } -queue_work (pciehp_wq, &info->work); +queue_work (p_slot->wq, &info->work); out:mutex_unlock (&p_slot->lock); }
@@ -377,7 +377,7 @@ static void handle_button_press_event(struct slot *p_slot)if (ATTN_LED (ctrl))pciehp_set_attention_status (p_slot,0 ); -queue_delayed_work (pciehp_wq, &p_slot->work,5 *HZ ); +queue_delayed_work (p_slot->wq, &p_slot->work,5 *HZ );break ;case BLINKINGOFF_STATE :case BLINKINGON_STATE :
@@ -439,7 +439,7 @@ static void handle_surprise_event(struct slot *p_slot)else p_slot->state =POWERON_STATE ; -queue_work (pciehp_wq, &info->work); +queue_work (p_slot->wq, &info->work); }static void interrupt_event_handler (struct work_struct *work)
drivers/pci/hotplug/pciehp_hpc.c +10 -1
@@ -874,23 +874,32 @@ static void pcie_shutdown_notification(struct controller *ctrl)static int pcie_init_slot (struct controller *ctrl) {struct slot *slot; +char name[32 ]; slot =kzalloc (sizeof (*slot),GFP_KERNEL );if (!slot)return -ENOMEM ; +snprintf (name,sizeof (name),"pciehp-%u" ,PSN (ctrl)); + slot->wq =alloc_workqueue (name,0 ,0 ); +if (!slot->wq) + goto abort; + slot->ctrl = ctrl;mutex_init (&slot->lock);INIT_DELAYED_WORK (&slot->work, pciehp_queue_pushbutton_work); ctrl->slot = slot;return 0 ; +abort: +kfree (slot); +return -ENOMEM ; }static void pcie_cleanup_slot (struct controller *ctrl) {struct slot *slot = ctrl->slot;cancel_delayed_work (&slot->work); -flush_workqueue (pciehp_wq); +destroy_workqueue (slot->wq);kfree (slot); }
drivers/pci/hotplug/shpchp.h +0 -1
@@ -47,7 +47,6 @@ extern bool shpchp_poll_mode;extern int shpchp_poll_time;extern bool shpchp_debug;extern struct workqueue_struct *shpchp_wq; -extern struct workqueue_struct *shpchp_ordered_wq; #define dbg(format, arg...) \ do { \
drivers/pci/hotplug/shpchp_core.c +0 -10
@@ -40,7 +40,6 @@ bool shpchp_debug;bool shpchp_poll_mode;int shpchp_poll_time;struct workqueue_struct *shpchp_wq; -struct workqueue_struct *shpchp_ordered_wq;#define DRIVER_VERSION "0.4"#define DRIVER_AUTHOR "Dan Zink <[email protected]>, Greg Kroah-Hartman <[email protected]>, Dely Sy <[email protected]>"
@@ -175,7 +174,6 @@ void cleanup_slots(struct controller *ctrl)list_del (&slot->slot_list);cancel_delayed_work (&slot->work);flush_workqueue (shpchp_wq); -flush_workqueue (shpchp_ordered_wq);pci_hp_deregister (slot->hotplug_slot); } }
@@ -364,17 +362,10 @@ static int __init shpcd_init(void)if (!shpchp_wq)return -ENOMEM ; - shpchp_ordered_wq =alloc_ordered_workqueue ("shpchp_ordered" ,0 ); -if (!shpchp_ordered_wq) { -destroy_workqueue (shpchp_wq); -return -ENOMEM ; - } - retval =pci_register_driver (&shpc_driver);dbg ("%s: pci_register_driver = %d\n" , __func__, retval);info (DRIVER_DESC " version: " DRIVER_VERSION "\n" );if (retval) { -destroy_workqueue (shpchp_ordered_wq);destroy_workqueue (shpchp_wq); }return retval;
@@ -384,7 +375,6 @@ static void __exit shpcd_cleanup(void) {dbg ("unload_shpchpd()\n" );pci_unregister_driver (&shpc_driver); -destroy_workqueue (shpchp_ordered_wq);destroy_workqueue (shpchp_wq);info (DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n" ); }
drivers/pci/hotplug/shpchp_ctrl.c +1 -1
@@ -456,7 +456,7 @@ void shpchp_queue_pushbutton_work(struct work_struct *work)kfree (info); goto out; } -queue_work (shpchp_ordered_wq, &info->work); +queue_work (shpchp_wq, &info->work); out:mutex_unlock (&p_slot->lock); }
drivers/pci/pcie/aer/aerdrv_core.c +1 -0
@@ -637,6 +637,7 @@ static void aer_recover_work_func(struct work_struct *work) continue; }do_recovery (pdev, entry.severity); +pci_dev_put (pdev); } }#endif
drivers/pci/pcie/aspm.c +3 -0
@@ -798,6 +798,9 @@ void pcie_clear_aspm(struct pci_bus *bus) {struct pci_dev *child; +if (aspm_force) +return ; +/* * Clear any ASPM setup that the firmware has carried out on this bus */
drivers/scsi/sd.c +8 -5
@@ -2919,10 +2919,6 @@ static int __init init_sd(void)if (err) goto err_out; - err =scsi_register_driver (&sd_template.gendrv); -if (err) - goto err_out_class; - sd_cdb_cache =kmem_cache_create ("sd_ext_cdb" ,SD_EXT_CDB_SIZE ,0 ,0 ,NULL );if (!sd_cdb_cache) {
@@ -2936,8 +2932,15 @@ static int __init init_sd(void) goto err_out_cache; } + err =scsi_register_driver (&sd_template.gendrv); +if (err) + goto err_out_driver; +return 0 ; +err_out_driver: +mempool_destroy (sd_cdb_pool); + err_out_cache:kmem_cache_destroy (sd_cdb_cache);
@@ -2960,10 +2963,10 @@ static void __exit exit_sd(void)SCSI_LOG_HLQUEUE (3 ,printk ("exit_sd: exiting sd driver\n" )); +scsi_unregister_driver (&sd_template.gendrv);mempool_destroy (sd_cdb_pool);kmem_cache_destroy (sd_cdb_cache); -scsi_unregister_driver (&sd_template.gendrv);class_unregister (&sd_disk_class);for (i =0 ; i <SD_MAJORS ; i++)
drivers/usb/dwc3/gadget.c +1 -0
@@ -1453,6 +1453,7 @@ static int __devinit dwc3_gadget_init_endpoints(struct dwc3 *dwc)if (epnum ==0 || epnum ==1 ) { dep->endpoint.maxpacket =512 ; + dep->endpoint.maxburst =1 ; dep->endpoint.ops = &dwc3_gadget_ep0_ops;if (!epnum) dwc->gadget.ep0 = &dep->endpoint;
drivers/usb/host/uhci-hcd.c +9 -6
@@ -447,6 +447,10 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)return IRQ_NONE ;uhci_writew (uhci, status,USBSTS );/* Clear it */ +spin_lock (&uhci->lock); +if (unlikely (!uhci->is_initialized))/* not yet configured */ + goto done; +if (status & ~(USBSTS_USBINT |USBSTS_ERROR |USBSTS_RD )) {if (status &USBSTS_HSE ) dev_err(uhci_dev(uhci), "host system error, "
@@ -455,7 +459,6 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)dev_err (uhci_dev (uhci),"host controller process " "error, something bad happened!\n" );if (status &USBSTS_HCH ) { -spin_lock (&uhci->lock);if (uhci->rh_state >=UHCI_RH_RUNNING ) {dev_err (uhci_dev (uhci), "host controller halted, "
@@ -473,15 +476,15 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)* pending unlinks */ mod_timer (&hcd->rh_timer, jiffies); } -spin_unlock (&uhci->lock); } } -if (status &USBSTS_RD ) +if (status &USBSTS_RD ) { +spin_unlock (&uhci->lock);usb_hcd_poll_rh_status (hcd); -else { -spin_lock (&uhci->lock); + }else {uhci_scan_schedule (uhci); + done:spin_unlock (&uhci->lock); }
@@ -662,9 +665,9 @@ static int uhci_start(struct usb_hcd *hcd)*/ mb (); +spin_lock_irq (&uhci->lock);configure_hc (uhci); uhci->is_initialized =1 ; -spin_lock_irq (&uhci->lock);start_rh (uhci);spin_unlock_irq (&uhci->lock);return 0 ;
include/linux/sched.h +10 -1
@@ -2695,7 +2695,16 @@ static inline void thread_group_cputime_init(struct signal_struct *sig)extern void recalc_sigpending_and_wake (struct task_struct *t);extern void recalc_sigpending (void ); -extern void signal_wake_up (struct task_struct *t,int resume_stopped); +extern void signal_wake_up_state (struct task_struct *t,unsigned int state); + +static inline void signal_wake_up (struct task_struct *t,bool resume) +{ +signal_wake_up_state (t, resume ?TASK_WAKEKILL :0 ); +} +static inline void ptrace_signal_wake_up (struct task_struct *t,bool resume) +{ +signal_wake_up_state (t, resume ? __TASK_TRACED :0 ); +}/* * Wrappers for p->thread_info->cpu access. No-op on UP.
kernel/ptrace.c +58 -14
128 lines not on this page · raw message
kernel/sched/core.c +2 -1
@@ -1688,7 +1688,8 @@ out:*/ int wake_up_process (struct task_struct *p) { -return try_to_wake_up (p,TASK_ALL ,0 ); +WARN_ON (task_is_stopped_or_traced (p)); +return try_to_wake_up (p,TASK_NORMAL ,0 ); }EXPORT_SYMBOL (wake_up_process);
kernel/signal.c +9 -10
@@ -677,23 +677,17 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)* No need to set need_resched since signal event passing * goes through ->blocked */ -void signal_wake_up (struct task_struct *t,int resume) +void signal_wake_up_state (struct task_struct *t,unsigned int state) { -unsigned int mask; -set_tsk_thread_flag (t,TIF_SIGPENDING ); -/* -* For SIGKILL, we want to wake it up in the stopped/traced/killable +* TASK_WAKEKILL also means wake it up in the stopped/traced/killable * case. We don't check t->state here because there is a race with it * executing another processor and just now entering stopped state. * By using wake_up_state, we ensure the process will wake up and * handle its death signal. */ - mask =TASK_INTERRUPTIBLE ; -if (resume) - mask |=TASK_WAKEKILL ; -if (!wake_up_state (t, mask)) +if (!wake_up_state (t, state |TASK_INTERRUPTIBLE ))kick_process (t); }
@@ -842,7 +836,7 @@ static void ptrace_trap_notify(struct task_struct *t)assert_spin_locked (&t->sighand->siglock);task_set_jobctl_pending (t,JOBCTL_TRAP_NOTIFY ); -signal_wake_up (t, t->jobctl &JOBCTL_LISTENING ); +ptrace_signal_wake_up (t, t->jobctl &JOBCTL_LISTENING ); }/*
@@ -1808,6 +1802,10 @@ static inline int may_ptrace_stop(void)* If SIGKILL was already sent before the caller unlocked * ->siglock we must see ->core_state != NULL. Otherwise it * is safe to enter schedule(). +* +* This is almost outdated, a task with the pending SIGKILL can't +* block in TASK_TRACED. But PTRACE_EVENT_EXIT can be reported +* after SIGKILL was already dequeued. */ if (unlikely (current->mm->core_state) &&unlikely (current->mm == current->parent->mm))
@@ -1933,6 +1931,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)if (gstop_done)do_notify_parent_cldstop (current, false, why); +/* tasklist protects us from ptrace_freeze_traced() */ __set_current_state (TASK_RUNNING );if (clear_code) current->exit_code =0 ;
kernel/trace/ftrace.c +1 -1
@@ -3869,7 +3869,7 @@ static int ftrace_module_notify(struct notifier_block *self,struct notifier_block ftrace_module_nb = { .notifier_call = ftrace_module_notify, - .priority =0 , + .priority =INT_MAX ,/* Run before anything that can use kprobes */ };extern unsigned long __start_mcount_loc[];
security/integrity/evm/evm_crypto.c +2 -2
@@ -205,9 +205,9 @@ int evm_update_evmxattr(struct dentry *dentry, const char *xattr_name, rc =__vfs_setxattr_noperm (dentry,XATTR_NAME_EVM , &xattr_data,sizeof (xattr_data),0 ); - } -else if (rc == -ENODATA ) + }else if (rc == -ENODATA && inode->i_op->removexattr) { rc = inode->i_op->removexattr (dentry,XATTR_NAME_EVM ); + }return rc; }
sound/usb/endpoint.c +2 -4
@@ -148,10 +148,8 @@ void snd_usb_release_substream_urbs(struct snd_usb_substream *subs, int force)int i;/* stop urbs (to be sure) */ -if (!subs->stream->chip->shutdown) { -deactivate_urbs (subs, force,1 ); -wait_clear_urbs (subs); - } +deactivate_urbs (subs, force,1 ); +wait_clear_urbs (subs);for (i =0 ; i <MAX_URBS ; i++)release_urb_ctx (&subs->dataurb[i]);