Linux 3.10.35
Greg KH
maintainerI'm announcing the release of the 3.10.35 kernel.
All users of the 3.10 kernel series must upgrade.
The updated 3.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.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/arm/include/asm/outercache.h | 4 +- arch/arm/mach-highbank/highbank.c | 13 +++---- arch/x86/kvm/mmu.c | 12 +++++++ arch/x86/kvm/paging_tmpl.h | 8 ++++ arch/x86/kvm/vmx.c | 2 - arch/x86/net/bpf_jit.S | 2 - drivers/input/mouse/elantech.c | 45 +++++++++++++++++++++++++-- drivers/input/tablet/wacom_sys.c | 7 +++- drivers/media/pci/cx18/cx18-driver.c | 5 ++- drivers/media/usb/dvb-usb/cxusb.c | 21 +++++++++--- drivers/media/usb/dvb-usb/dw2102.c | 52 ++++++++++++++++++++++--------- drivers/net/ethernet/intel/e100.c | 2 - drivers/net/wireless/p54/txrx.c | 2 - drivers/regulator/core.c | 34 +++++++------------- drivers/usb/host/xhci-pci.c | 5 +++ include/linux/ceph/osd_client.h | 1 include/linux/ftrace_event.h | 4 -- include/trace/ftrace.h | 7 +--- kernel/sched/auto_group.c | 3 - kernel/trace/trace_events.c | 6 --- kernel/trace/trace_export.c | 7 +--- net/ceph/osd_client.c | 57 ++++++++++++++++++++++++++++++----- scripts/package/builddeb | 9 ++--- sound/core/compress_offload.c | 2 - sound/soc/codecs/max98090.c | 1 26 files changed, 215 insertions(+), 98 deletions(-)
Alexei Starovoitov (1):
x86: bpf_jit: support negative offsets
Ben Hutchings (1):
deb-pkg: Fix cross-building linux-headers package
Charles Keepax (1):
ALSA: compress: Pass through return value of open ops callback
Dan Carpenter (4):
media: cxusb: unlock on error in cxusb_i2c_xfer()
media: dw2102: some missing unlocks on error
media: cx18: check for allocation failure in cx18_read_eeprom()
p54: clamp properly instead of just truncating
Gerald Schaefer (1):
sched/autogroup: Fix race with task_groups list
Greg Kroah-Hartman (1):
Linux 3.10.35
Hans de Goede (1):
Input: elantech - improve clickpad detection
Josh Durgin (2):
libceph: block I/O when PAUSE or FULL osd map flags are set
libceph: resend all writes after the osdmap loses the full flag
Marcelo Tosatti (3):
KVM: MMU: handle invalid root_hpa at __direct_map
KVM: x86: handle invalid root_hpa everywhere
KVM: VMX: fix use after free of vmx->loaded_vmcs
Markus Pargmann (1):
regulator: core: Replace direct ops->disable usage
Michele Baldessari (1):
e100: Fix "disabling already-disabled device" warning
Ping Cheng (1):
Input: wacom - make sure touch_max is set for touch devices
Rob Herring (2):
ARM: move outer_cache declaration out of ifdef
ARM: highbank: avoid L2 cache smc calls when PL310 is not present
Sarah Sharp (1):
xhci: Fix resume issues on Renesas chips in Samsung laptops
Stephen Warren (1):
ASoC: max98090: make REVISION_ID readable
Vaibhav Nagarnaik (1):
tracing: Fix array size mismatch in format string
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 10 -SUBLEVEL = 34 +SUBLEVEL = 35 EXTRAVERSION = NAME = TOSSUG Baby Fish
arch/arm/include/asm/outercache.h +2 -2
@@ -37,10 +37,10 @@ struct outer_cache_fns {void (*resume)(void ); }; -#ifdef CONFIG_OUTER_CACHE -extern struct outer_cache_fns outer_cache; +#ifdef CONFIG_OUTER_CACHE +static inline void outer_inv_range (phys_addr_t start,phys_addr_t end) {if (outer_cache.inv_range)
arch/arm/mach-highbank/highbank.c +6 -7
@@ -65,14 +65,12 @@ void highbank_set_cpu_jump(int cpu, void *jump_addr) HB_JUMP_TABLE_PHYS(cpu) + 15); } -#ifdef CONFIG_CACHE_L2X0 static void highbank_l2x0_disable (void ) {outer_flush_all ();/* Disable PL310 L2 Cache controller */ highbank_smc1 (0x102 ,0x0 ); } -#endif static void __init highbank_init_irq (void ) {
@@ -81,12 +79,13 @@ static void __init highbank_init_irq(void)if (of_find_compatible_node (NULL ,NULL ,"arm,cortex-a9" ))highbank_scu_map_io (); -#ifdef CONFIG_CACHE_L2X0 /* Enable PL310 L2 Cache controller */ -highbank_smc1 (0x102 ,0x1 ); -l2x0_of_init (0 , ~0UL ); - outer_cache.disable = highbank_l2x0_disable; -#endif +if (IS_ENABLED (CONFIG_CACHE_L2X0 ) && +of_find_compatible_node (NULL ,NULL ,"arm,pl310-cache" )) { +highbank_smc1 (0x102 ,0x1 ); +l2x0_of_init (0 , ~0UL ); + outer_cache.disable = highbank_l2x0_disable; + } }static void __init highbank_timer_init (void )
arch/x86/kvm/mmu.c +12 -0
@@ -2585,6 +2585,9 @@ static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write,int emulate =0 ;gfn_t pseudo_gfn; +if (!VALID_PAGE (vcpu->arch.mmu.root_hpa)) +return 0 ; +for_each_shadow_entry (vcpu, (u64 )gfn <<PAGE_SHIFT , iterator) {if (iterator.level == level) { mmu_set_spte(vcpu, iterator.sptep, ACC_ALL,
@@ -2748,6 +2751,9 @@ static bool fast_page_fault(struct kvm_vcpu *vcpu, gva_t gva, int level,bool ret = false;u64 spte =0ull ; +if (!VALID_PAGE (vcpu->arch.mmu.root_hpa)) +return false; +if (!page_fault_can_be_fast (vcpu, error_code))return false;
@@ -3139,6 +3145,9 @@ static u64 walk_shadow_page_get_mmio_spte(struct kvm_vcpu *vcpu, u64 addr)struct kvm_shadow_walk_iterator iterator;u64 spte =0ull ; +if (!VALID_PAGE (vcpu->arch.mmu.root_hpa)) +return spte; +walk_shadow_page_lockless_begin (vcpu);for_each_shadow_entry_lockless (vcpu, addr, iterator, spte)if (!is_shadow_present_pte (spte))
@@ -4329,6 +4338,9 @@ int kvm_mmu_get_spte_hierarchy(struct kvm_vcpu *vcpu, u64 addr, u64 sptes[4])u64 spte;int nr_sptes =0 ; +if (!VALID_PAGE (vcpu->arch.mmu.root_hpa)) +return nr_sptes; +walk_shadow_page_lockless_begin (vcpu);for_each_shadow_entry_lockless (vcpu, addr, iterator, spte) { sptes[iterator.level-1 ] = spte;
arch/x86/kvm/paging_tmpl.h +8 -0
@@ -423,6 +423,9 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,if (FNAME (gpte_changed)(vcpu, gw, top_level)) goto out_gpte_changed; +if (!VALID_PAGE (vcpu->arch.mmu.root_hpa)) + goto out_gpte_changed; +for (shadow_walk_init (&it, vcpu, addr);shadow_walk_okay (&it) && it.level > gw->level;shadow_walk_next (&it)) {
@@ -671,6 +674,11 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva)*/ mmu_topup_memory_caches (vcpu); +if (!VALID_PAGE (vcpu->arch.mmu.root_hpa)) { +WARN_ON (1 ); +return ; + } +spin_lock (&vcpu->kvm->mmu_lock);for_each_shadow_entry (vcpu, gva, iterator) { level = iterator.level;
arch/x86/kvm/vmx.c +1 -1
@@ -7133,8 +7133,8 @@ static void vmx_free_vcpu(struct kvm_vcpu *vcpu)struct vcpu_vmx *vmx =to_vmx (vcpu);free_vpid (vmx); -free_nested (vmx);free_loaded_vmcs (vmx->loaded_vmcs); +free_nested (vmx);kfree (vmx->guest_msrs);kvm_vcpu_uninit (vcpu);kmem_cache_free (kvm_vcpu_cache, vmx);
arch/x86/net/bpf_jit.S +1 -1
@@ -140,7 +140,7 @@ bpf_slow_path_byte_msh: push %r9; \ push SKBDATA; \ /* rsi already has offset */ \ - mov $SIZE,%ecx; /* size */ \ + mov $SIZE,%edx; /* size */ \ call bpf_internal_load_pointer_neg_helper; \ test %rax,%rax; \ pop SKBDATA; \
drivers/input/mouse/elantech.c +42 -3
69 lines not on this page · raw message
drivers/input/tablet/wacom_sys.c +5 -2
@@ -339,7 +339,7 @@ static int wacom_parse_hid(struct usb_interface *intf,struct usb_device *dev =interface_to_usbdev (intf);char limit =0 ;/* result has to be defined as int for some devices */ -int result =0 ; +int result =0 , touch_max =0 ;int i =0 , usage =WCM_UNDEFINED , finger =0 , pen =0 ;unsigned char *report;
@@ -386,7 +386,8 @@ static int wacom_parse_hid(struct usb_interface *intf,if (usage ==WCM_DESKTOP ) {if (finger) { features->device_type =BTN_TOOL_FINGER ; - +/* touch device at least supports one touch point */ + touch_max =1 ;switch (features->type) {case TABLETPC2FG : features->pktlen =WACOM_PKGLEN_TPC2FG ;
@@ -539,6 +540,8 @@ static int wacom_parse_hid(struct usb_interface *intf, } out: +if (!features->touch_max && touch_max) + features->touch_max = touch_max; result =0 ;kfree (report);return result;
drivers/media/pci/cx18/cx18-driver.c +4 -1
@@ -327,13 +327,16 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)struct i2c_client *c;u8 eedata[256 ]; +memset (tv,0 ,sizeof (*tv)); + c =kzalloc (sizeof (*c),GFP_KERNEL ); +if (!c) +return ;strlcpy (c->name,"cx18 tveeprom tmp" ,sizeof (c->name)); c->adapter = &cx->i2c_adap[0 ]; c->addr =0xa0 >>1 ; -memset (tv,0 ,sizeof (*tv));if (tveeprom_read (c, eedata,sizeof (eedata))) goto ret;
drivers/media/usb/dvb-usb/cxusb.c +16 -5
@@ -149,6 +149,7 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num) {struct dvb_usb_device *d =i2c_get_adapdata (adap); +int ret;int i;if (mutex_lock_interruptible (&d->i2c_mutex) <0 )
@@ -173,7 +174,8 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],if (1 + msg[i].len >sizeof (ibuf)) {warn ("i2c rd: len=%d is too big!\n" , msg[i].len); -return -EOPNOTSUPP ; + ret = -EOPNOTSUPP ; + goto unlock; } obuf[0 ] =0 ; obuf[1 ] = msg[i].len;
@@ -193,12 +195,14 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],if (3 + msg[i].len >sizeof (obuf)) {warn ("i2c wr: len=%d is too big!\n" , msg[i].len); -return -EOPNOTSUPP ; + ret = -EOPNOTSUPP ; + goto unlock; }if (1 + msg[i +1 ].len >sizeof (ibuf)) {warn ("i2c rd: len=%d is too big!\n" , msg[i +1 ].len); -return -EOPNOTSUPP ; + ret = -EOPNOTSUPP ; + goto unlock; } obuf[0 ] = msg[i].len; obuf[1 ] = msg[i+1 ].len;
@@ -223,7 +227,8 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],if (2 + msg[i].len >sizeof (obuf)) {warn ("i2c wr: len=%d is too big!\n" , msg[i].len); -return -EOPNOTSUPP ; + ret = -EOPNOTSUPP ; + goto unlock; } obuf[0 ] = msg[i].addr; obuf[1 ] = msg[i].len;
@@ -237,8 +242,14 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], } } +if (i == num) + ret = num; +else + ret = -EREMOTEIO ; + +unlock:mutex_unlock (&d->i2c_mutex); -return i == num ? num : -EREMOTEIO ; +return ret; }static u32 cxusb_i2c_func (struct i2c_adapter *adapter)
drivers/media/usb/dvb-usb/dw2102.c +36 -16
167 lines not on this page · raw message
drivers/net/ethernet/intel/e100.c +1 -1
@@ -3039,7 +3039,7 @@ static void __e100_shutdown(struct pci_dev *pdev, bool *enable_wake) *enable_wake = false; } -pci_disable_device (pdev); +pci_clear_master (pdev); }static int __e100_power_off (struct pci_dev *pdev,bool wake)
drivers/net/wireless/p54/txrx.c +1 -1
@@ -587,7 +587,7 @@ static void p54_rx_stats(struct p54_common *priv, struct sk_buff *skb) chan = priv->curchan;if (chan) {struct survey_info *survey = &priv->survey[chan->hw_value]; - survey->noise =clamp_t (s8, priv->noise,-128 ,127 ); + survey->noise =clamp (priv->noise,-128 ,127 ); survey->channel_time = priv->survey_raw.active; survey->channel_time_tx = priv->survey_raw.tx; survey->channel_time_busy = priv->survey_raw.tx +
drivers/regulator/core.c +13 -21
@@ -1712,8 +1712,6 @@ static int _regulator_do_disable(struct regulator_dev *rdev)trace_regulator_disable_complete (rdev_get_name (rdev)); -_notifier_call_chain (rdev,REGULATOR_EVENT_DISABLE , -NULL );return 0 ; }
@@ -1737,6 +1735,8 @@ static int _regulator_disable(struct regulator_dev *rdev)rdev_err (rdev,"failed to disable\n" );return ret; } +_notifier_call_chain (rdev,REGULATOR_EVENT_DISABLE , +NULL ); } rdev->use_count =0 ;
@@ -1789,20 +1789,16 @@ static int _regulator_force_disable(struct regulator_dev *rdev) {int ret =0 ; -/* force disable */ -if (rdev->desc->ops->disable) { -/* ah well, who wants to live forever... */ - ret = rdev->desc->ops->disable (rdev); -if (ret <0 ) { -rdev_err (rdev,"failed to force disable\n" ); -return ret; - } -/* notify other consumers that power has been forced off */ -_notifier_call_chain (rdev,REGULATOR_EVENT_FORCE_DISABLE | -REGULATOR_EVENT_DISABLE ,NULL ); + ret =_regulator_do_disable (rdev); +if (ret <0 ) { +rdev_err (rdev,"failed to force disable\n" ); +return ret; } -return ret; +_notifier_call_chain (rdev,REGULATOR_EVENT_FORCE_DISABLE | +REGULATOR_EVENT_DISABLE ,NULL ); + +return 0 ; }/**
@@ -3788,8 +3784,6 @@ int regulator_suspend_finish(void)mutex_lock (®ulator_list_mutex);list_for_each_entry (rdev, ®ulator_list, list) { -struct regulator_ops *ops = rdev->desc->ops; -mutex_lock (&rdev->mutex);if (rdev->use_count >0 || rdev->constraints->always_on) { error =_regulator_do_enable (rdev);
@@ -3798,12 +3792,10 @@ int regulator_suspend_finish(void) }else {if (!has_full_constraints) goto unlock; -if (!ops->disable) - goto unlock;if (!_regulator_is_enabled (rdev)) goto unlock; - error = ops->disable (rdev); + error =_regulator_do_disable (rdev);if (error) ret = error; }
@@ -3993,7 +3985,7 @@ static int __init regulator_init_complete(void) ops = rdev->desc->ops; c = rdev->constraints; -if (!ops->disable || (c && c->always_on)) +if (c && c->always_on)continue ;mutex_lock (&rdev->mutex);
@@ -4014,7 +4006,7 @@ static int __init regulator_init_complete(void)/* We log since this may kill the system if it * goes wrong. */ rdev_info (rdev,"disabling\n" ); - ret = ops->disable (rdev); + ret =_regulator_do_disable (rdev);if (ret !=0 ) {rdev_err (rdev,"couldn't disable: %d\n" , ret); }
drivers/usb/host/xhci-pci.c +5 -0
@@ -113,6 +113,11 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)xhci_dbg (xhci,"QUIRK: Resetting on resume\n" ); xhci->quirks |=XHCI_TRUST_TX_LENGTH ; } +if (pdev->vendor ==PCI_VENDOR_ID_RENESAS && + pdev->device ==0x0015 && + pdev->subsystem_vendor ==PCI_VENDOR_ID_SAMSUNG && + pdev->subsystem_device ==0xc0cd ) + xhci->quirks |=XHCI_RESET_ON_RESUME ;if (pdev->vendor ==PCI_VENDOR_ID_VIA ) xhci->quirks |=XHCI_RESET_ON_RESUME ; }
include/linux/ceph/osd_client.h +1 -0
@@ -138,6 +138,7 @@ struct ceph_osd_request {__le64 *r_request_pool;void *r_request_pgid;__le32 *r_request_attempts; +bool r_paused;struct ceph_eversion *r_request_reassert_version;int r_result;
include/linux/ftrace_event.h +0 -4
@@ -325,10 +325,6 @@ enum { FILTER_TRACE_FN, }; -#define EVENT_STORAGE_SIZE 128 -extern struct mutex event_storage_mutex; -extern char event_storage[EVENT_STORAGE_SIZE ]; -extern int trace_event_raw_init (struct ftrace_event_call *call); extern int trace_define_field(struct ftrace_event_call *call, const char *type, const char *name, int offset, int size,
include/trace/ftrace.h +2 -5
@@ -299,15 +299,12 @@ static struct trace_event_functions ftrace_event_type_funcs_##call = { \#undef __array#define __array (type, item, len) \ do { \ - mutex_lock(&event_storage_mutex); \ + char *type_str = #type"["__stringify(len)"]"; \ BUILD_BUG_ON(len > MAX_FILTER_STR_VAL); \ - snprintf(event_storage, sizeof(event_storage), \ - "%s[%d]", #type, len); \ - ret = trace_define_field(event_call, event_storage, #item, \ + ret = trace_define_field(event_call, type_str, #item, \ offsetof(typeof(field), item), \ sizeof(field.item), \ is_signed_type(type), FILTER_OTHER); \ - mutex_unlock(&event_storage_mutex); \ if (ret) \ return ret; \ } while (0);
kernel/sched/auto_group.c +1 -2
@@ -77,8 +77,6 @@ static inline struct autogroup *autogroup_create(void)if (IS_ERR (tg)) goto out_free; -sched_online_group (tg, &root_task_group); -kref_init (&ag->kref);init_rwsem (&ag->lock); ag->id =atomic_inc_return (&autogroup_seq_nr);
@@ -98,6 +96,7 @@ static inline struct autogroup *autogroup_create(void)#endif tg->autogroup = ag; +sched_online_group (tg, &root_task_group);return ag; out_free:
kernel/trace/trace_events.c +0 -6
@@ -27,12 +27,6 @@DEFINE_MUTEX (event_mutex); -DEFINE_MUTEX (event_storage_mutex); -EXPORT_SYMBOL_GPL (event_storage_mutex); - -char event_storage[EVENT_STORAGE_SIZE ]; -EXPORT_SYMBOL_GPL (event_storage); -LIST_HEAD (ftrace_events);static LIST_HEAD (ftrace_common_fields);
kernel/trace/trace_export.c +2 -5
@@ -95,15 +95,12 @@ static void __always_unused ____ftrace_check_##name(void) \#undef __array#define __array (type, item, len) \ do { \ + char *type_str = #type"["__stringify(len)"]"; \ BUILD_BUG_ON(len > MAX_FILTER_STR_VAL); \ - mutex_lock(&event_storage_mutex); \ - snprintf(event_storage, sizeof(event_storage), \ - "%s[%d]", #type, len); \ - ret = trace_define_field(event_call, event_storage, #item, \ + ret = trace_define_field(event_call, type_str, #item, \ offsetof(typeof(field), item), \ sizeof(field.item), \ is_signed_type(type), filter_type); \ - mutex_unlock(&event_storage_mutex); \ if (ret) \ return ret; \ } while (0);
net/ceph/osd_client.c +49 -8
134 lines not on this page · raw message
scripts/package/builddeb +4 -5
@@ -62,7 +62,7 @@ create_package() { fi # Create the package - dpkg-gencontrol -isp $forcearch -p$pname -P"$pdir" + dpkg-gencontrol -isp $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir" dpkg --build "$pdir" .. }
@@ -252,15 +252,14 @@ mkdir -p "$destdir" (cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -) ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build" rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles" -arch=$(dpkg --print-architecture) cat <<EOF >> debian/control Package: $kernel_headers_packagename Provides: linux-headers, linux-headers-2.6 -Architecture: $arch -Description: Linux kernel headers for $KERNELRELEASE on $arch - This package provides kernel header files for $KERNELRELEASE on $arch +Architecture: any +Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch} + This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch} . This is useful for people who need to build external modules EOF
sound/core/compress_offload.c +1 -1
@@ -133,7 +133,7 @@ static int snd_compr_open(struct inode *inode, struct file *f)kfree (data); }snd_card_unref (compr->card); -return 0 ; +return ret; }static int snd_compr_free (struct inode *inode,struct file *f)
sound/soc/codecs/max98090.c +1 -0
@@ -336,6 +336,7 @@ static bool max98090_readable_register(struct device *dev, unsigned int reg)case M98090_REG_RECORD_TDM_SLOT :case M98090_REG_SAMPLE_RATE : case M98090_REG_DMIC34_BIQUAD_BASE ... M98090_REG_DMIC34_BIQUAD_BASE + 0x0E: +case M98090_REG_REVISION_ID :return true;default :return false;