Linux 3.4.75
Greg KH
maintainerI'm announcing the release of the 3.4.75 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 arch/arm/kernel/process.c | 7 + arch/arm/kernel/stacktrace.c | 2 arch/arm/mach-omap2/omap_hwmod.c | 43 +++++++++++- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 13 --- arch/arm/mach-pxa/tosa.c | 102 ++++++++++++++--------------- arch/mips/mm/dma-default.c | 16 ++-- arch/x86/platform/efi/efi.c | 7 - crypto/algif_hash.c | 3 crypto/algif_skcipher.c | 3 drivers/gpu/drm/radeon/si.c | 11 ++- drivers/hwmon/w83l786ng.c | 4 - drivers/input/touchscreen/usbtouchscreen.c | 22 +++++- drivers/md/dm-bufio.c | 5 + drivers/md/dm-delay.c | 23 +++--- drivers/md/dm-table.c | 5 + drivers/rtc/rtc-at91rm9200.c | 2 drivers/staging/comedi/drivers/pcmuio.c | 12 +-- drivers/staging/comedi/drivers/ssv_dnp.c | 6 - drivers/usb/core/hub.c | 5 - drivers/usb/dwc3/ep0.c | 2 drivers/usb/dwc3/gadget.c | 5 - drivers/usb/gadget/composite.c | 1 drivers/usb/serial/option.c | 27 +++++++ drivers/watchdog/sc1200wdt.c | 3 fs/hpfs/file.c | 5 + fs/nfs/blocklayout/extents.c | 2 fs/xfs/xfs_ioctl.c | 3 fs/xfs/xfs_ioctl32.c | 3 include/sound/memalloc.h | 2 kernel/futex.c | 2 net/ipv4/udp.c | 3 net/mac80211/rx.c | 3 security/selinux/hooks.c | 93 +++++++++++++++++++++----- virt/kvm/kvm_main.c | 3 35 files changed, 302 insertions(+), 148 deletions(-)
Alan (1):
sc1200_wdt: Fix oops
Alan Stern (1):
usb: dwc3: fix implementation of endpoint wedge
Alex Deucher (1):
drm/radeon: fixup bad vram size on SI
Andy Honig (1):
KVM: Improve create VCPU parameter (CVE-2013-4587)
Brian Carnes (1):
hwmon: (w83l786ng) Fix fan speed control mode setting and reporting
Christian Engelmayer (1):
Input: usbtouchscreen - separate report and transmit buffer size handling
Dan Carpenter (1):
xfs: underflow bug in xfs_attrlist_by_handle()
Dmitry Eremin-Solenikov (1):
ARM: pxa: tosa: fix keys mapping
Fangxiaozhi (Franko) (1):
USB: option: support new huawei devices
Greg Kroah-Hartman (2):
Revert "net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST" Linux 3.4.75
Gustavo Zacarias (1):
USB: serial: option: blacklist interface 1 for Huawei E173s-6
H Hartley Sweeten (1):
staging: comedi: ssv_dnp: use comedi_dio_update_state()
Helge Deller (1):
nfs: fix do_div() warning by instead using sector_div()
Ian Abbott (1):
staging: comedi: pcmuio: fix possible NULL deref on detach
Jim Quinlan (1):
MIPS: DMA: For BMIPS5000 cores flush region just like non-coherent R10000
Johannes Berg (1):
mac80211: don't attempt to reorder multicast frames
Julius Werner (1):
usb: hub: Use correct reset for wedged USB3 devices that are NOTATTACHED
Konstantin Khlebnikov (2):
ARM: 7912/1: check stack pointer in get_wchan
ARM: 7913/1: fix framepointer check in unwind_frame
Linus Pizunski (1):
drivers/rtc/rtc-at91rm9200.c: correct alarm over day/month wrap
Linus Torvalds (1):
futex: fix handling of read-only-mapped hugepages
Matthew Garrett (1):
x86, efi: Don't use (U)EFI time services on 32 bit
Michael Grzeschik (1):
usb: gadget: composite: reset delayed_status on reset_config
Mikulas Patocka (4):
dm bufio: initialize read-only module parameters dm delay: fix a possible deadlock due to shared workqueue dm table: fail dm_table_create on dm_round_up overflow
hpfs: fix warnings when the filesystem fills up
Paul Moore (2):
selinux: handle TCP SYN-ACK packets correctly in selinux_ip_output()
selinux: handle TCP SYN-ACK packets correctly in selinux_ip_postroute()
Roger Quadros (2):
ARM: OMAP3: hwmod data: Don't prevent RESET of USB Host module
ARM: OMAP2+: hwmod: Fix SOFTRESET logic
Stefano Panella (1):
ALSA: memalloc.h - fix wrong truncation of dma_addr_t
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 74 +SUBLEVEL = 75 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/arm/kernel/process.c +5 -2
@@ -503,6 +503,7 @@ EXPORT_SYMBOL(kernel_thread);unsigned long get_wchan (struct task_struct *p) {struct stackframe frame; +unsigned long stack_page;int count =0 ;if (!p || p == current || p->state ==TASK_RUNNING )return 0 ;
@@ -511,9 +512,11 @@ unsigned long get_wchan(struct task_struct *p) frame.sp =thread_saved_sp (p); frame.lr =0 ;/* recovered from the stack */ frame.pc =thread_saved_pc (p); + stack_page = (unsigned long )task_stack_page (p); do { - int ret = unwind_frame(&frame); - if (ret < 0) + if (frame.sp < stack_page || + frame.sp >= stack_page + THREAD_SIZE || + unwind_frame(&frame) < 0) return 0; if (!in_sched_functions(frame.pc)) return frame.pc;
arch/arm/kernel/stacktrace.c +1 -1
@@ -31,7 +31,7 @@ int notrace unwind_frame(struct stackframe *frame) high =ALIGN (low,THREAD_SIZE );/* check current frame pointer is within bounds */ -if (fp < (low +12 ) || fp +4 >= high) +if (fp < low +12 || fp > high -4 )return -EINVAL ;/* restore the registers from the stack frame */
arch/arm/mach-omap2/omap_hwmod.c +42 -1
67 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +3 -10
@@ -3347,7 +3347,8 @@ static struct omap_hwmod_class_sysconfig omap3xxx_usb_host_hs_sysc = { .syss_offs = 0x0014, .sysc_flags = (SYSC_HAS_MIDLEMODE |SYSC_HAS_CLOCKACTIVITY |SYSC_HAS_SIDLEMODE |SYSC_HAS_ENAWAKEUP | - SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE), +SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE | + SYSS_HAS_RESET_STATUS), .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART), .sysc_fields = &omap_hwmod_sysc_type1,
@@ -3465,15 +3466,7 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = {* hence HWMOD_SWSUP_MSTANDBY */ -/* -* During system boot; If the hwmod framework resets the module -* the module will have smart idle settings; which can lead to deadlock -* (above Errata Id:i660); so, dont reset the module during boot; -* Use HWMOD_INIT_NO_RESET. -*/ - - .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY | - HWMOD_INIT_NO_RESET, + .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, };/*
arch/arm/mach-pxa/tosa.c +51 -51
108 lines not on this page · raw message
arch/mips/mm/dma-default.c +10 -6
@@ -30,16 +30,20 @@ static inline struct page *dma_addr_to_page(struct device *dev, }/* +* The affected CPUs below in 'cpu_needs_post_dma_flush()' can +* speculatively fill random cachelines with stale data at any time, +* requiring an extra flush post-DMA. +* * Warning on the terminology - Linux calls an uncached area coherent; * MIPS terminology calls memory areas with hardware maintained coherency * coherent. */ - -static inline int cpu_is_noncoherent_r10000 (struct device *dev) +static inline int cpu_needs_post_dma_flush (struct device *dev) {return !plat_device_is_coherent (dev) && (current_cpu_type () ==CPU_R10000 || -current_cpu_type () ==CPU_R12000 ); +current_cpu_type () ==CPU_R12000 || +current_cpu_type () ==CPU_BMIPS5000 ); }static gfp_t massage_gfp_flags (const struct device *dev,gfp_t gfp)
@@ -209,7 +213,7 @@ static inline void __dma_sync(struct page *page,static void mips_dma_unmap_page (struct device *dev,dma_addr_t dma_addr,size_t size,enum dma_data_direction direction,struct dma_attrs *attrs) { -if (cpu_is_noncoherent_r10000 (dev)) +if (cpu_needs_post_dma_flush (dev))__dma_sync (dma_addr_to_page (dev, dma_addr), dma_addr & ~PAGE_MASK , size, direction);
@@ -260,7 +264,7 @@ static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sg,static void mips_dma_sync_single_for_cpu (struct device *dev,dma_addr_t dma_handle,size_t size,enum dma_data_direction direction) { -if (cpu_is_noncoherent_r10000 (dev)) +if (cpu_needs_post_dma_flush (dev))__dma_sync (dma_addr_to_page (dev, dma_handle), dma_handle & ~PAGE_MASK , size, direction); }
@@ -281,7 +285,7 @@ static void mips_dma_sync_sg_for_cpu(struct device *dev,/* Make sure that gcc doesn't leave the empty loop body. */ for (i =0 ; i < nelems; i++, sg++) { -if (cpu_is_noncoherent_r10000 (dev)) +if (cpu_needs_post_dma_flush (dev))__dma_sync (sg_page (sg), sg->offset, sg->length, direction); }
arch/x86/platform/efi/efi.c +0 -7
@@ -744,13 +744,6 @@ void __init efi_init(void)set_bit (EFI_MEMMAP , &x86_efi_facility); -#ifdef CONFIG_X86_32 -if (efi_is_native ()) { - x86_platform.get_wallclock = efi_get_time; - x86_platform.set_wallclock = efi_set_rtc_mmss; - } -#endif -#if EFI_DEBUG print_efi_memmap ();#endif
crypto/algif_hash.c +0 -3
@@ -117,9 +117,6 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page,if (flags &MSG_SENDPAGE_NOTLAST ) flags |=MSG_MORE ; -if (flags &MSG_SENDPAGE_NOTLAST ) - flags |=MSG_MORE ; -lock_sock (sk);sg_init_table (ctx->sgl.sg,1 );sg_set_page (ctx->sgl.sg, page, size, offset);
crypto/algif_skcipher.c +0 -3
@@ -381,9 +381,6 @@ static ssize_t skcipher_sendpage(struct socket *sock, struct page *page,if (flags &MSG_SENDPAGE_NOTLAST ) flags |=MSG_MORE ; -if (flags &MSG_SENDPAGE_NOTLAST ) - flags |=MSG_MORE ; -lock_sock (sk);if (!ctx->more && ctx->used) goto unlock;
drivers/gpu/drm/radeon/si.c +9 -2
@@ -2479,8 +2479,15 @@ static int si_mc_init(struct radeon_device *rdev) rdev->mc.aper_base =pci_resource_start (rdev->pdev,0 ); rdev->mc.aper_size =pci_resource_len (rdev->pdev,0 );/* size in MB on si */ - rdev->mc.mc_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; - rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; + tmp =RREG32 (CONFIG_MEMSIZE ); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + rdev->mc.mc_vram_size = tmp *1024ULL *1024ULL ; + rdev->mc.real_vram_size = rdev->mc.mc_vram_size; rdev->mc.visible_vram_size = rdev->mc.aper_size;si_vram_gtt_location (rdev, &rdev->mc);radeon_update_bandwidth_info (rdev);
drivers/hwmon/w83l786ng.c +2 -2
@@ -510,7 +510,7 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,mutex_lock (&data->update_lock); reg =w83l786ng_read_value (client,W83L786NG_REG_FAN_CFG ); data->pwm_enable[nr] = val; - reg &= ~(0x02 <<W83L786NG_PWM_ENABLE_SHIFT [nr]); + reg &= ~(0x03 <<W83L786NG_PWM_ENABLE_SHIFT [nr]); reg |= (val -1 ) <<W83L786NG_PWM_ENABLE_SHIFT [nr];w83l786ng_write_value (client,W83L786NG_REG_FAN_CFG , reg);mutex_unlock (&data->update_lock);
@@ -781,7 +781,7 @@ static struct w83l786ng_data *w83l786ng_update_device(struct device *dev) ((pwmcfg >>W83L786NG_PWM_MODE_SHIFT [i]) &1 ) ?0 :1 ; data->pwm_enable[i] = - ((pwmcfg >>W83L786NG_PWM_ENABLE_SHIFT [i]) &2 ) +1 ; + ((pwmcfg >>W83L786NG_PWM_ENABLE_SHIFT [i]) &3 ) +1 ; data->pwm[i] =w83l786ng_read_value (client,W83L786NG_REG_PWM [i]); }
drivers/input/touchscreen/usbtouchscreen.c +18 -4
@@ -106,6 +106,7 @@ struct usbtouch_device_info {struct usbtouch_usb {unsigned char *data;dma_addr_t data_dma; +int data_size;unsigned char *buffer;int buf_len;struct urb *irq;
@@ -1474,7 +1475,7 @@ static int usbtouch_reset_resume(struct usb_interface *intf)static void usbtouch_free_buffers (struct usb_device *udev,struct usbtouch_usb *usbtouch) { -usb_free_coherent (udev, usbtouch->type->rept_size, +usb_free_coherent (udev, usbtouch->data_size, usbtouch->data, usbtouch->data_dma);kfree (usbtouch->buffer); }
@@ -1519,7 +1520,20 @@ static int usbtouch_probe(struct usb_interface *intf,if (!type->process_pkt) type->process_pkt = usbtouch_process_pkt; - usbtouch->data =usb_alloc_coherent (udev, type->rept_size, + usbtouch->data_size = type->rept_size; +if (type->get_pkt_len) { +/* +* When dealing with variable-length packets we should +* not request more than wMaxPacketSize bytes at once +* as we do not know if there is more data coming or +* we filled exactly wMaxPacketSize bytes and there is +* nothing else. +*/ + usbtouch->data_size =min (usbtouch->data_size, +usb_endpoint_maxp (endpoint)); + } + + usbtouch->data =usb_alloc_coherent (udev, usbtouch->data_size,GFP_KERNEL , &usbtouch->data_dma);if (!usbtouch->data) goto out_free;
@@ -1578,12 +1592,12 @@ static int usbtouch_probe(struct usb_interface *intf,if (usb_endpoint_type (endpoint) ==USB_ENDPOINT_XFER_INT )usb_fill_int_urb (usbtouch->irq, udev,usb_rcvintpipe (udev, endpoint->bEndpointAddress), - usbtouch->data, type->rept_size, + usbtouch->data, usbtouch->data_size, usbtouch_irq, usbtouch, endpoint->bInterval);else usb_fill_bulk_urb (usbtouch->irq, udev,usb_rcvbulkpipe (udev, endpoint->bEndpointAddress), - usbtouch->data, type->rept_size, + usbtouch->data, usbtouch->data_size, usbtouch_irq, usbtouch); usbtouch->irq->dev = udev;
drivers/md/dm-bufio.c +5 -0
@@ -1642,6 +1642,11 @@ static int __init dm_bufio_init(void) {__u64 mem; + dm_bufio_allocated_kmem_cache =0 ; + dm_bufio_allocated_get_free_pages =0 ; + dm_bufio_allocated_vmalloc =0 ; + dm_bufio_current_allocated =0 ; +memset (&dm_bufio_caches,0 ,sizeof dm_bufio_caches);memset (&dm_bufio_cache_names,0 ,sizeof dm_bufio_cache_names);
drivers/md/dm-delay.c +11 -12
@@ -20,6 +20,7 @@struct delay_c {struct timer_list delay_timer;struct mutex timer_lock; +struct workqueue_struct *kdelayd_wq;struct work_struct flush_expired_bios;struct list_head delayed_bios;atomic_t may_delay;
@@ -45,14 +46,13 @@ struct dm_delay_info {static DEFINE_MUTEX (delayed_bios_lock); -static struct workqueue_struct *kdelayd_wq;static struct kmem_cache *delayed_cache;static void handle_delayed_timer (unsigned long data) {struct delay_c *dc = (struct delay_c *)data; -queue_work (kdelayd_wq, &dc->flush_expired_bios); +queue_work (dc->kdelayd_wq, &dc->flush_expired_bios); }static void queue_timeout (struct delay_c *dc,unsigned long expires)
@@ -191,6 +191,12 @@ out: goto bad_dev_write; } + dc->kdelayd_wq =alloc_workqueue ("kdelayd" ,WQ_MEM_RECLAIM ,0 ); +if (!dc->kdelayd_wq) { +DMERR ("Couldn't start kdelayd" ); + goto bad_queue; + } +setup_timer (&dc->delay_timer, handle_delayed_timer, (unsigned long )dc);INIT_WORK (&dc->flush_expired_bios, flush_expired_bios);
@@ -203,6 +209,8 @@ out: ti->private = dc;return 0 ; +bad_queue: +mempool_destroy (dc->delayed_pool); bad_dev_write:if (dc->dev_write)dm_put_device (ti, dc->dev_write);
@@ -217,7 +225,7 @@ static void delay_dtr(struct dm_target *ti) {struct delay_c *dc = ti->private; -flush_workqueue (kdelayd_wq); +destroy_workqueue (dc->kdelayd_wq);dm_put_device (ti, dc->dev_read);
@@ -351,12 +359,6 @@ static int __init dm_delay_init(void) {int r = -ENOMEM ; - kdelayd_wq =alloc_workqueue ("kdelayd" ,WQ_MEM_RECLAIM ,0 ); -if (!kdelayd_wq) { -DMERR ("Couldn't start kdelayd" ); - goto bad_queue; - } - delayed_cache =KMEM_CACHE (dm_delay_info,0 );if (!delayed_cache) {DMERR ("Couldn't create delayed bio cache." );
@@ -374,8 +376,6 @@ static int __init dm_delay_init(void) bad_register:kmem_cache_destroy (delayed_cache); bad_memcache: -destroy_workqueue (kdelayd_wq); -bad_queue:return r; }
@@ -383,7 +383,6 @@ static void __exit dm_delay_exit(void) {dm_unregister_target (&delay_target);kmem_cache_destroy (delayed_cache); -destroy_workqueue (kdelayd_wq); }/* Module hooks */
drivers/md/dm-table.c +5 -0
@@ -215,6 +215,11 @@ int dm_table_create(struct dm_table **result, fmode_t mode, num_targets =dm_round_up (num_targets,KEYS_PER_NODE ); +if (!num_targets) { +kfree (t); +return -ENOMEM ; + } +if (alloc_targets (t, num_targets)) {kfree (t); t =NULL ;
drivers/rtc/rtc-at91rm9200.c +2 -0
@@ -162,6 +162,8 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) at91_alarm_year = tm.tm_year; + tm.tm_mon = alrm->time.tm_mon; + tm.tm_mday = alrm->time.tm_mday; tm.tm_hour = alrm->time.tm_hour; tm.tm_min = alrm->time.tm_min; tm.tm_sec = alrm->time.tm_sec;
drivers/staging/comedi/drivers/pcmuio.c +6 -6
@@ -464,13 +464,13 @@ static int pcmuio_detach(struct comedi_device *dev)if (dev->iobase)release_region (dev->iobase,ASIC_IOSIZE * thisboard->num_asics); -for (i =0 ; i <MAX_ASICS ; ++i) { -if (devpriv->asics[i].irq) -free_irq (devpriv->asics[i].irq, dev); - } - -if (devpriv && devpriv->sprivs) +if (devpriv) { +for (i =0 ; i <MAX_ASICS ; ++i) { +if (devpriv->asics[i].irq) +free_irq (devpriv->asics[i].irq, dev); + }kfree (devpriv->sprivs); + }return 0 ; }
drivers/staging/comedi/drivers/ssv_dnp.c +3 -3
@@ -251,11 +251,11 @@ static int dnp_dio_insn_bits(struct comedi_device *dev,/* on return, data[1] contains the value of the digital input lines. */ outb (PADR ,CSCIR ); - data[0 ] =inb (CSCDR ); + data[1 ] =inb (CSCDR );outb (PBDR ,CSCIR ); - data[0 ] +=inb (CSCDR ) <<8 ; + data[1 ] +=inb (CSCDR ) <<8 ;outb (PCDR ,CSCIR ); - data[0 ] += ((inb (CSCDR ) &0xF0 ) <<12 ); + data[1 ] += ((inb (CSCDR ) &0xF0 ) <<12 );return 2 ;
drivers/usb/core/hub.c +3 -2
@@ -3891,8 +3891,9 @@ static void hub_events(void) hub->hdev->children[i -1 ];dev_dbg (hub_dev,"warm reset port %d\n" , i); -if (!udev || !(portstatus & -USB_PORT_STAT_CONNECTION )) { +if (!udev || + !(portstatus &USB_PORT_STAT_CONNECTION ) || + udev->state ==USB_STATE_NOTATTACHED ) { status =hub_port_reset (hub, i,NULL ,HUB_BH_RESET_TIME , true);
drivers/usb/dwc3/ep0.c +2 -0
@@ -380,6 +380,8 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc, dep =dwc3_wIndex_to_dep (dwc, wIndex);if (!dep)return -EINVAL ; +if (set ==0 && (dep->flags &DWC3_EP_WEDGE )) +break ; ret =__dwc3_gadget_ep_set_halt (dep, set);if (ret)return -EINVAL ;
drivers/usb/dwc3/gadget.c +1 -4
@@ -1101,9 +1101,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value)else dep->flags |=DWC3_EP_STALL ; }else { -if (dep->flags &DWC3_EP_WEDGE ) -return 0 ; - ret =dwc3_send_gadget_ep_cmd (dwc, dep->number,DWC3_DEPCMD_CLEARSTALL , ¶ms);if (ret)
@@ -1111,7 +1108,7 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value) value ?"set" :"clear" , dep->name); else - dep->flags &= ~DWC3_EP_STALL; + dep->flags &= ~(DWC3_EP_STALL | DWC3_EP_WEDGE); }return ret;
drivers/usb/gadget/composite.c +1 -0
@@ -584,6 +584,7 @@ static void reset_config(struct usb_composite_dev *cdev)bitmap_zero (f->endpoints,32 ); } cdev->config =NULL ; + cdev->delayed_status =0 ; } static int set_config(struct usb_composite_dev *cdev,
drivers/usb/serial/option.c +27 -0
@@ -85,6 +85,7 @@ static void option_instat_callback(struct urb *urb);#define HUAWEI_PRODUCT_K4505 0x1464#define HUAWEI_PRODUCT_K3765 0x1465#define HUAWEI_PRODUCT_K4605 0x14C6 +#define HUAWEI_PRODUCT_E173S6 0x1C07#define QUANTA_VENDOR_ID 0x0408#define QUANTA_PRODUCT_Q101 0xEA02
@@ -586,6 +587,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S6, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1750, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf2_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) },
@@ -648,6 +651,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x7A) },
@@ -702,6 +709,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7A) },
@@ -756,6 +767,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7A) },
@@ -810,6 +825,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7A) },
@@ -864,6 +883,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7A) },
@@ -918,6 +941,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7A) },
drivers/watchdog/sc1200wdt.c +2 -1
@@ -409,8 +409,9 @@ static int __init sc1200wdt_init(void)#if definedCONFIG_PNP /* now that the user has specified an IO port and we haven't detected * any devices, disable pnp support */ +if (isapnp) +pnp_unregister_driver (&scl200wdt_pnp_driver); isapnp =0 ; -pnp_unregister_driver (&scl200wdt_pnp_driver);#endif if (!request_region (io, io_len,SC1200_MODULE_NAME )) {
fs/hpfs/file.c +4 -1
@@ -116,9 +116,12 @@ static int hpfs_write_begin(struct file *file, struct address_space *mapping, hpfs_get_block, &hpfs_i(mapping->host)->mmu_private);if (unlikely (ret)) { -loff_t isize = mapping->host->i_size; +loff_t isize; +hpfs_lock (mapping->host->i_sb); + isize = mapping->host->i_size;if (pos + len > isize)vmtruncate (mapping->host, isize); +hpfs_unlock (mapping->host->i_sb); }return ret;
fs/nfs/blocklayout/extents.c +1 -1
@@ -44,7 +44,7 @@static inline sector_t normalize (sector_t s,int base) {sector_t tmp = s;/* Since do_div modifies its argument */ -return s -do_div (tmp, base); +return s -sector_div (tmp, base); }static inline sector_t normalize_up (sector_t s,int base)
fs/xfs/xfs_ioctl.c +2 -1
@@ -400,7 +400,8 @@ xfs_attrlist_by_handle(return -XFS_ERROR (EPERM );if (copy_from_user (&al_hreq, arg,sizeof (xfs_fsop_attrlist_handlereq_t)))return -XFS_ERROR (EFAULT ); -if (al_hreq.buflen >XATTR_LIST_MAX ) +if (al_hreq.buflen <sizeof (struct attrlist ) || + al_hreq.buflen >XATTR_LIST_MAX )return -XFS_ERROR (EINVAL );/*
fs/xfs/xfs_ioctl32.c +2 -1
@@ -361,7 +361,8 @@ xfs_compat_attrlist_by_handle(if (copy_from_user (&al_hreq, arg,sizeof (compat_xfs_fsop_attrlist_handlereq_t)))return -XFS_ERROR (EFAULT ); -if (al_hreq.buflen >XATTR_LIST_MAX ) +if (al_hreq.buflen <sizeof (struct attrlist ) || + al_hreq.buflen >XATTR_LIST_MAX )return -XFS_ERROR (EINVAL );/*
include/sound/memalloc.h +1 -1
@@ -101,7 +101,7 @@ static inline unsigned int snd_sgbuf_aligned_pages(size_t size)static inline dma_addr_t snd_sgbuf_get_addr (struct snd_sg_buf *sgbuf,size_t offset) {dma_addr_t addr = sgbuf->table[offset >>PAGE_SHIFT ].addr; - addr &=PAGE_MASK ; + addr &= ~((dma_addr_t )PAGE_SIZE -1 );return addr + offset %PAGE_SIZE ; }
kernel/futex.c +1 -1
@@ -285,7 +285,7 @@ again:put_page (page);/* serialize against __split_huge_page_splitting() */ local_irq_disable (); -if (likely (__get_user_pages_fast (address,1 ,1 , &page) ==1 )) { +if (likely (__get_user_pages_fast (address,1 , !ro, &page) ==1 )) { page_head =compound_head (page);/* * page_head is valid pointer but we must pin
net/ipv4/udp.c +0 -3
@@ -1042,9 +1042,6 @@ int udp_sendpage(struct sock *sk, struct page *page, int offset,if (flags &MSG_SENDPAGE_NOTLAST ) flags |=MSG_MORE ; -if (flags &MSG_SENDPAGE_NOTLAST ) - flags |=MSG_MORE ; -if (!up->pending) {struct msghdr msg = { .msg_flags = flags|MSG_MORE };
net/mac80211/rx.c +2 -1
@@ -763,7 +763,8 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx)u16 sc;u8 tid, ack_policy; -if (!ieee80211_is_data_qos (hdr->frame_control)) +if (!ieee80211_is_data_qos (hdr->frame_control) || +is_multicast_ether_addr (hdr->addr1)) goto dont_reorder;/*
security/selinux/hooks.c +76 -17
144 lines not on this page · raw message
virt/kvm/kvm_main.c +3 -0
@@ -1668,6 +1668,9 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)int r;struct kvm_vcpu *vcpu, *v; +if (id >=KVM_MAX_VCPUS ) +return -EINVAL ; + vcpu =kvm_arch_vcpu_create (kvm, id);if (IS_ERR (vcpu))return PTR_ERR (vcpu);