Linux 4.10.13
Greg KH
maintainerI'm announcing the release of the 4.10.13 kernel.
All users of the 4.10 kernel series must upgrade.
The updated 4.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.10.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/powerpc/kernel/entry_64.S | 6 +- arch/s390/include/asm/pgtable.h | 2 arch/x86/kernel/cpu/mcheck/mce-genpool.c | 2 arch/x86/kernel/cpu/mcheck/mce-internal.h | 2 arch/x86/kernel/cpu/mcheck/mce.c | 17 +---- arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 drivers/acpi/power.c | 1 drivers/dax/Kconfig | 1 drivers/dax/dax.c | 13 ++-- drivers/hid/wacom_wac.c | 2 drivers/input/mouse/elantech.c | 8 ++ drivers/mmc/host/dw_mmc.c | 23 +++++--- drivers/mmc/host/sdhci-esdhc-imx.c | 1 drivers/mtd/ubi/upd.c | 8 +- fs/cifs/cifsglob.h | 1 fs/cifs/smb1ops.c | 10 +++ fs/cifs/smb2pdu.c | 5 - fs/ubifs/dir.c | 10 ++- kernel/trace/ring_buffer.c | 16 ++++- kernel/trace/trace.c | 8 +- mm/migrate.c | 2 net/mac80211/rx.c | 86 +++++++++++++++++++++++------- security/keys/gc.c | 2 security/keys/keyctl.c | 20 +++--- security/keys/process_keys.c | 44 +++++++++------ 26 files changed, 195 insertions(+), 99 deletions(-)
Arnd Bergmann (1):
ACPI / power: Avoid maybe-uninitialized warning
Christian Borntraeger (1):
s390/mm: fix CMMA vs KSM vs others
Dan Williams (1):
device-dax: switch to srcu, fix rcu_read_lock() vs pte allocation
David Howells (2):
KEYS: Disallow keyrings beginning with '.' to be joined as session keyrings
KEYS: Change the name of the dead type to ".dead" to prevent user access
Douglas Anderson (1):
mmc: dw_mmc: Don't allow Runtime PM for SDIO cards
Eric Biggers (1):
KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings
Felix Fietkau (1):
ubifs: Fix RENAME_WHITEOUT support
Germano Percossi (1):
CIFS: remove bad_network_name flag
Greg Kroah-Hartman (1):
Linux 4.10.13
Haibo Chen (1):
mmc: sdhci-esdhc-imx: increase the pad I/O drive strength for DDR50 card
Jason Gerecke (1):
HID: wacom: Treat HID_DG_TOOLSERIALNUMBER as unsigned
Johannes Berg (2):
mac80211: reject ToDS broadcast data frames
mac80211: fix MU-MIMO follow-MAC mode
Rabin Vincent (1):
mm: prevent NR_ISOLATE_* stats from going negative
Ravi Bangoria (1):
powerpc/kprobe: Fix oops when kprobed on 'stdu' instruction
Richard Weinberger (1):
ubifs: Fix O_TMPFILE corner case in ubifs_link()
Sachin Prabhu (1):
cifs: Do not send echoes before Negotiate is complete
Sebastian Siewior (1):
ubi/upd: Always flush after prepared for an update
Shawn Lin (1):
mmc: dw_mmc: silent verbose log when calling from PM context
Steven Rostedt (VMware) (2):
tracing: Allocate the snapshot buffer before enabling probe
ring-buffer: Have ring_buffer_iter_empty() return true when empty
Thorsten Leemhuis (1):
Input: elantech - add Fujitsu Lifebook E547 to force crc_enabled
Vishal Verma (1):
x86/mce: Make the MCE notifier a blocking one
Yazen Ghannam (1):
x86/mce/AMD: Give a name to MCA bank 3 when accessed with legacy MSRs
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 10 -SUBLEVEL = 12 +SUBLEVEL = 13 EXTRAVERSION = NAME = Fearless Coyote
arch/powerpc/kernel/entry_64.S +3 -3
@@ -689,7 +689,7 @@ resume_kernel: addi r8,r1,INT_FRAME_SIZE /* Get the kprobed function entry */ - lwz r3,GPR1(r1) + ld r3,GPR1(r1) subi r3,r3,INT_FRAME_SIZE /* dst: Allocate a trampoline exception frame */ mr r4,r1 /* src: current exception frame */ mr r1,r3 /* Reroute the trampoline frame to r1 */
@@ -703,8 +703,8 @@ resume_kernel: addi r6,r6,8 bdnz 2b - /* Do real store operation to complete stwu */ - lwz r5,GPR1(r1) + /* Do real store operation to complete stdu */ + ld r5,GPR1(r1) std r8,0(r5) /* Clear _TIF_EMULATE_STACK_STORE flag */
arch/s390/include/asm/pgtable.h +2 -0
@@ -1029,6 +1029,8 @@ int get_guest_storage_key(struct mm_struct *mm, unsigned long addr,static inline void set_pte_at (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t entry) { +if (pte_present (entry)) +pte_val (entry) &= ~_PAGE_UNUSED;if (mm_has_pgste (mm))ptep_set_pte_at (mm, addr, ptep, entry);else
arch/x86/kernel/cpu/mcheck/mce-genpool.c +1 -1
@@ -85,7 +85,7 @@ void mce_gen_pool_process(void) head =llist_reverse_order (head);llist_for_each_entry_safe (node, tmp, head, llnode) { mce = &node->mce; -atomic_notifier_call_chain (&x86_mce_decoder_chain,0 , mce); +blocking_notifier_call_chain (&x86_mce_decoder_chain,0 , mce);gen_pool_free (mce_evt_pool, (unsigned long )node,sizeof (*node)); } }
arch/x86/kernel/cpu/mcheck/mce-internal.h +1 -1
@@ -13,7 +13,7 @@ enum severity_level { MCE_PANIC_SEVERITY, }; -extern struct atomic_notifier_head x86_mce_decoder_chain; +extern struct blocking_notifier_head x86_mce_decoder_chain;#define ATTR_LEN 16#define INITIAL_CHECK_INTERVAL 5 * 60/* 5 minutes */
arch/x86/kernel/cpu/mcheck/mce.c +3 -14
@@ -123,7 +123,7 @@ static void (*quirk_no_way_out)(int bank, struct mce *m, struct pt_regs *regs);* CPU/chipset specific EDAC code can register a notifier call here to print * MCE errors in a human-readable form. */ -ATOMIC_NOTIFIER_HEAD (x86_mce_decoder_chain); +BLOCKING_NOTIFIER_HEAD (x86_mce_decoder_chain);/* Do initial initialization of a struct mce */ void mce_setup (struct mce *m)
@@ -223,7 +223,7 @@ void mce_register_decode_chain(struct notifier_block *nb)if (nb != &mce_srao_nb && nb->priority ==INT_MAX ) nb->priority -=1 ; -atomic_notifier_chain_register (&x86_mce_decoder_chain, nb); +blocking_notifier_chain_register (&x86_mce_decoder_chain, nb); }EXPORT_SYMBOL_GPL (mce_register_decode_chain);
@@ -231,7 +231,7 @@ void mce_unregister_decode_chain(struct notifier_block *nb) {atomic_dec (&num_notifiers); -atomic_notifier_chain_unregister (&x86_mce_decoder_chain, nb); +blocking_notifier_chain_unregister (&x86_mce_decoder_chain, nb); }EXPORT_SYMBOL_GPL (mce_unregister_decode_chain);
@@ -324,18 +324,7 @@ static void __print_mce(struct mce *m)static void print_mce (struct mce *m) { -int ret =0 ; -__print_mce (m); - -/* -* Print out human-readable details about the MCE error, -* (if the CPU has an implementation for that) -*/ - ret =atomic_notifier_call_chain (&x86_mce_decoder_chain,0 , m); -if (ret ==NOTIFY_STOP ) -return ; -pr_emerg_ratelimited (HW_ERR "Run the above through 'mcelog --ascii'\n" ); }
arch/x86/kernel/cpu/mcheck/mce_amd.c +1 -1
@@ -60,7 +60,7 @@ static const char * const th_names[] = {"load_store" ,"insn_fetch" ,"combined_unit" , -"" , +"decode_unit" ,"northbridge" , "execution_unit", };
drivers/acpi/power.c +1 -0
@@ -200,6 +200,7 @@ static int acpi_power_get_list_state(struct list_head *list, int *state)return -EINVAL ;/* The state of the list is 'on' IFF all resources are 'on'. */ + cur_state =0 ;list_for_each_entry (entry, list, node) {struct acpi_power_resource *resource = entry->resource;acpi_handle handle = resource->device.handle;
drivers/dax/Kconfig +1 -0
@@ -2,6 +2,7 @@ menuconfig DEV_DAX tristate "DAX: direct access to differentiated memory" default m if NVDIMM_DAX depends on TRANSPARENT_HUGEPAGE + select SRCU help Support raw access to differentiated (persistence, bandwidth, latency...) memory via an mmap(2) capable character
drivers/dax/dax.c +7 -6
@@ -24,6 +24,7 @@#include "dax.h" static dev_t dax_devt; +DEFINE_STATIC_SRCU (dax_srcu);static struct class *dax_class;static DEFINE_IDA (dax_minor_ida);static int nr_dax =CONFIG_NR_DEV_DAX ;
@@ -59,7 +60,7 @@ struct dax_region {* @region - parent region * @dev - device backing the character device * @cdev - core chardev data -* @alive - !alive + rcu grace period == no new mappings can be established +* @alive - !alive + srcu grace period == no new mappings can be established * @id - child id in the region * @num_resources - number of physical address extents in this device * @res - array of physical address ranges
@@ -530,7 +531,7 @@ static int __dax_dev_pmd_fault(struct dax_dev *dax_dev,static int dax_dev_pmd_fault (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmd,unsigned int flags) { -int rc; +int rc, id;struct file *filp = vma->vm_file;struct dax_dev *dax_dev = filp->private_data;
@@ -538,9 +539,9 @@ static int dax_dev_pmd_fault(struct vm_area_struct *vma, unsigned long addr, current->comm, (flags &FAULT_FLAG_WRITE ) ? "write" : "read", vma->vm_start, vma->vm_end); -rcu_read_lock (); + id =srcu_read_lock (&dax_srcu); rc =__dax_dev_pmd_fault (dax_dev, vma, addr, pmd, flags); -rcu_read_unlock (); +srcu_read_unlock (&dax_srcu, id);return rc; }
@@ -656,11 +657,11 @@ static void unregister_dax_dev(void *dev)* Note, rcu is not protecting the liveness of dax_dev, rcu is * ensuring that any fault handlers that might have seen * dax_dev->alive == true, have completed. Any fault handlers -* that start after synchronize_rcu() has started will abort +* that start after synchronize_srcu() has started will abort * upon seeing dax_dev->alive == false. */ dax_dev->alive = false; -synchronize_rcu (); +synchronize_srcu (&dax_srcu);unmap_mapping_range (dax_dev->inode->i_mapping,0 ,0 ,1 );cdev_del (cdev);device_unregister (dev);
drivers/hid/wacom_wac.c +1 -1
@@ -1798,7 +1798,7 @@ static void wacom_wac_pen_event(struct hid_device *hdev, struct hid_field *fieldreturn ;case HID_DG_TOOLSERIALNUMBER : wacom_wac->serial[0 ] = (wacom_wac->serial[0 ] & ~0xFFFFFFFFULL ); - wacom_wac->serial[0 ] |= value; + wacom_wac->serial[0 ] |= (__u32 )value;return ;case WACOM_HID_WD_SENSE : wacom_wac->hid_data.sense_state = value;
drivers/input/mouse/elantech.c +8 -0
@@ -1118,6 +1118,7 @@ static int elantech_get_resolution_v4(struct psmouse *psmouse,* Asus UX32VD 0x361f02 00, 15, 0e clickpad * Avatar AVIU-145A2 0x361f00 ? clickpad * Fujitsu LIFEBOOK E544 0x470f00 d0, 12, 09 2 hw buttons +* Fujitsu LIFEBOOK E547 0x470f00 50, 12, 09 2 hw buttons * Fujitsu LIFEBOOK E554 0x570f01 40, 14, 0c 2 hw buttons * Fujitsu T725 0x470f01 05, 12, 09 2 hw buttons * Fujitsu H730 0x570f00 c0, 14, 0c 3 hw buttons (**)
@@ -1524,6 +1525,13 @@ static const struct dmi_system_id elantech_dmi_force_crc_enabled[] = { }, }, { +/* Fujitsu LIFEBOOK E547 does not work with crc_enabled == 0 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E547"), + }, + }, + {/* Fujitsu LIFEBOOK E554 does not work with crc_enabled == 0 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
drivers/mmc/host/dw_mmc.c +16 -7
@@ -22,6 +22,7 @@#include <linux/ioport.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include <linux/seq_file.h> #include <linux/slab.h> #include <linux/stat.h>
@@ -1179,11 +1180,13 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)if ((clock != slot->__clk_old && !test_bit (DW_MMC_CARD_NEEDS_POLL , &slot->flags)) || force_clkinit) { -dev_info (&slot->mmc->class_dev, -"Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n" , - slot->id, host->bus_hz, clock, - div ? ((host->bus_hz / div) >>1 ) : - host->bus_hz, div); +/* Silent the verbose log if calling from PM context */ +if (!force_clkinit) +dev_info (&slot->mmc->class_dev, +"Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n" , + slot->id, host->bus_hz, clock, + div ? ((host->bus_hz / div) >>1 ) : + host->bus_hz, div);/* * If card is polling, display the message only
@@ -1616,10 +1619,16 @@ static void dw_mci_init_card(struct mmc_host *mmc, struct mmc_card *card)if (card->type ==MMC_TYPE_SDIO || card->type ==MMC_TYPE_SD_COMBO ) { -set_bit (DW_MMC_CARD_NO_LOW_PWR , &slot->flags); +if (!test_bit (DW_MMC_CARD_NO_LOW_PWR , &slot->flags)) { +pm_runtime_get_noresume (mmc->parent); +set_bit (DW_MMC_CARD_NO_LOW_PWR , &slot->flags); + } clk_en_a = clk_en_a_old & ~clken_low_pwr; }else { -clear_bit (DW_MMC_CARD_NO_LOW_PWR , &slot->flags); +if (test_bit (DW_MMC_CARD_NO_LOW_PWR , &slot->flags)) { +pm_runtime_put_noidle (mmc->parent); +clear_bit (DW_MMC_CARD_NO_LOW_PWR , &slot->flags); + } clk_en_a = clk_en_a_old | clken_low_pwr; }
drivers/mmc/host/sdhci-esdhc-imx.c +1 -0
@@ -830,6 +830,7 @@ static int esdhc_change_pinstate(struct sdhci_host *host,switch (uhs) {case MMC_TIMING_UHS_SDR50 : +case MMC_TIMING_UHS_DDR50 : pinctrl = imx_data->pins_100mhz;break ;case MMC_TIMING_UHS_SDR104 :
drivers/mtd/ubi/upd.c +4 -4
@@ -148,11 +148,11 @@ int ubi_start_update(struct ubi_device *ubi, struct ubi_volume *vol,return err; } -if (bytes ==0 ) { - err =ubi_wl_flush (ubi,UBI_ALL ,UBI_ALL ); -if (err) -return err; + err =ubi_wl_flush (ubi,UBI_ALL ,UBI_ALL ); +if (err) +return err; +if (bytes ==0 ) { err =clear_update_marker (ubi, vol,0 );if (err)return err;
fs/cifs/cifsglob.h +0 -1
@@ -933,7 +933,6 @@ struct cifs_tcon { bool use_persistent:1; /* use persistent instead of durable handles */#ifdef CONFIG_CIFS_SMB2 bool print:1; /* set if connection to printer share */ - bool bad_network_name:1; /* set if ret status STATUS_BAD_NETWORK_NAME */__le32 capabilities;__u32 share_flags;__u32 maximal_access;
fs/cifs/smb1ops.c +10 -0
@@ -1015,6 +1015,15 @@ cifs_dir_needs_close(struct cifsFileInfo *cfile)return !cfile->srch_inf.endOfSearch && !cfile->invalidHandle; } +static bool +cifs_can_echo (struct TCP_Server_Info *server) +{ +if (server->tcpStatus == CifsGood) +return true; + +return false; +} +struct smb_version_operations smb1_operations = { .send_cancel = send_nt_cancel, .compare_fids = cifs_compare_fids,
@@ -1049,6 +1058,7 @@ struct smb_version_operations smb1_operations = { .get_dfs_refer = CIFSGetDFSRefer, .qfs_tcon = cifs_qfs_tcon, .is_path_accessible = cifs_is_path_accessible, + .can_echo = cifs_can_echo, .query_path_info = cifs_query_path_info, .query_file_info = cifs_query_file_info, .get_srv_inum = cifs_get_srv_inum,
fs/cifs/smb2pdu.c +0 -5
@@ -1084,9 +1084,6 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree,else return -EIO ; -if (tcon && tcon->bad_network_name) -return -ENOENT ; -if ((tcon && tcon->seal) && ((ses->server->capabilities &SMB2_GLOBAL_CAP_ENCRYPTION ) ==0 )) {cifs_dbg (VFS ,"encryption requested but no server support" );
@@ -1188,8 +1185,6 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree, tcon_error_exit:if (rsp->hdr.Status ==STATUS_BAD_NETWORK_NAME ) {cifs_dbg (VFS ,"BAD_NETWORK_NAME: %s\n" , tree); -if (tcon) - tcon->bad_network_name = true; } goto tcon_exit; }
fs/ubifs/dir.c +7 -3
@@ -748,6 +748,11 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir, goto out_fname;lock_2_inodes (dir, inode); + +/* Handle O_TMPFILE corner case, it is allowed to link a O_TMPFILE. */ +if (inode->i_nlink ==0 ) +ubifs_delete_orphan (c, inode->i_ino); +inc_nlink (inode);ihold (inode); inode->i_ctime =ubifs_current_time (inode);
@@ -768,6 +773,8 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir, dir->i_size -= sz_change; dir_ui->ui_size = dir->i_size;drop_nlink (inode); +if (inode->i_nlink ==0 ) +ubifs_add_orphan (c, inode->i_ino);unlock_2_inodes (dir, inode);ubifs_release_budget (c, &req);iput (inode);
@@ -1316,9 +1323,6 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry,unsigned int uninitialized_var (saved_nlink );struct fscrypt_name old_nm, new_nm; -if (flags & ~RENAME_NOREPLACE ) -return -EINVAL ; -/* * Budget request settings: deletion direntry, new direntry, removing * the old inode, and changing old and new parent directory inodes.
kernel/trace/ring_buffer.c +14 -2
@@ -3404,11 +3404,23 @@ EXPORT_SYMBOL_GPL(ring_buffer_iter_reset);int ring_buffer_iter_empty (struct ring_buffer_iter *iter) {struct ring_buffer_per_cpu *cpu_buffer; +struct buffer_page *reader; +struct buffer_page *head_page; +struct buffer_page *commit_page; +unsigned commit; cpu_buffer = iter->cpu_buffer; -return iter->head_page == cpu_buffer->commit_page && - iter->head ==rb_commit_index (cpu_buffer); +/* Remember, trace recording is off when iterator is in use */ + reader = cpu_buffer->reader_page; + head_page = cpu_buffer->head_page; + commit_page = cpu_buffer->commit_page; + commit =rb_page_commit (commit_page); + +return ((iter->head_page == commit_page && iter->head == commit) || + (iter->head_page == reader && commit_page == head_page && + head_page->read == commit && + iter->head ==rb_page_commit (cpu_buffer->reader_page))); }EXPORT_SYMBOL_GPL (ring_buffer_iter_empty);
kernel/trace/trace.c +5 -3
@@ -6740,11 +6740,13 @@ ftrace_trace_snapshot_callback(struct ftrace_hash *hash,return ret; out_reg: - ret =register_ftrace_function_probe (glob, ops, count); + ret =alloc_snapshot (&global_trace); +if (ret <0 ) + goto out; -if (ret >=0 ) -alloc_snapshot (&global_trace); + ret =register_ftrace_function_probe (glob, ops, count); + out:return ret <0 ? ret :0 ; }
mm/migrate.c +1 -1
@@ -183,9 +183,9 @@ void putback_movable_pages(struct list_head *l)unlock_page (page);put_page (page); }else { -putback_lru_page (page);dec_node_page_state (page,NR_ISOLATED_ANON +page_is_file_cache (page)); +putback_lru_page (page); } } }
net/mac80211/rx.c +68 -18
116 lines not on this page · raw message
security/keys/gc.c +1 -1
@@ -46,7 +46,7 @@ static unsigned long key_gc_flags;* immediately unlinked. */ struct key_type key_type_dead = { - .name ="dead" , + .name =".dead" , };/*
security/keys/keyctl.c +11 -9
@@ -271,7 +271,8 @@ long keyctl_get_keyring_ID(key_serial_t id, int create)* Create and join an anonymous session keyring or join a named session * keyring, creating it if necessary. A named session keyring must have Search * permission for it to be joined. Session keyrings without this permit will -* be skipped over. +* be skipped over. It is not permitted for userspace to create or join +* keyrings whose name begin with a dot. * * If successful, the ID of the joined session keyring will be returned. */
@@ -288,12 +289,16 @@ long keyctl_join_session_keyring(const char __user *_name) ret =PTR_ERR (name); goto error; } + + ret = -EPERM ; +if (name[0 ] =='.' ) + goto error_name; }/* join the session */ ret =join_session_keyring (name); +error_name:kfree (name); - error:return ret; }
@@ -1251,8 +1256,8 @@ long keyctl_reject_key(key_serial_t id, unsigned timeout, unsigned error,* Read or set the default keyring in which request_key() will cache keys and * return the old setting. * -* If a process keyring is specified then this will be created if it doesn't -* yet exist. The old setting will be returned if successful. +* If a thread or process keyring is specified then it will be created if it +* doesn't yet exist. The old setting will be returned if successful. */ long keyctl_set_reqkey_keyring (int reqkey_defl) {
@@ -1277,11 +1282,8 @@ long keyctl_set_reqkey_keyring(int reqkey_defl)case KEY_REQKEY_DEFL_PROCESS_KEYRING : ret =install_process_keyring_to_cred (new); -if (ret <0 ) { -if (ret != -EEXIST ) - goto error; - ret =0 ; - } +if (ret <0 ) + goto error; goto set;case KEY_REQKEY_DEFL_DEFAULT :
security/keys/process_keys.c +27 -17
105 lines not on this page · raw message