Linux 2.6.27.46
Subsystems (31)
I'm announcing the release of the 2.6.27.46 kernel. All users of the 2.6.27 kernel series are very strongly encouraged to upgrade.
The updated 2.6.27.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.27.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.27.y.git;a=summarythanks,
greg k-h
------------
Documentation/filesystems/tmpfs.txt | 6 ++- Makefile | 2 - arch/x86/ia32/ia32_aout.c | 1 arch/x86/kvm/vmx.c | 3 + arch/x86/kvm/x86.c | 21 ++++++++++- arch/x86/kvm/x86_emulate.c | 5 ++ drivers/char/mem.c | 3 + drivers/char/tty_io.c | 4 +- drivers/gpu/drm/r128/r128_cce.c | 18 +++++++-- drivers/gpu/drm/r128/r128_drv.h | 8 ++++ drivers/gpu/drm/r128/r128_state.c | 36 +++++++++--------- drivers/hwmon/coretemp.c | 2 - drivers/hwmon/lm78.c | 23 ++++++++---- drivers/i2c/i2c-core.c | 5 +- drivers/media/video/em28xx/em28xx-dvb.c | 1 drivers/mtd/ubi/cdev.c | 1 drivers/net/b44.c | 3 - drivers/net/bonding/bond_main.c | 8 ++++ drivers/net/r8169.c | 4 +- drivers/net/sky2.c | 4 +- drivers/parisc/eisa_eeprom.c | 2 - drivers/serial/8250.c | 7 ++- drivers/usb/core/devio.c | 61 ++++++++++++++++++++++---------- drivers/usb/host/ehci-hub.c | 7 ++- drivers/usb/host/ehci-q.c | 11 ++--- drivers/usb/host/ehci-sched.c | 1 fs/exec.c | 3 + fs/ext4/super.c | 3 + fs/fcntl.c | 6 +-- fs/namei.c | 14 ++++++- include/asm-x86/checksum_32.h | 3 + include/asm-x86/kvm_host.h | 1 include/asm-x86/kvm_x86_emulate.h | 2 - include/linux/sched.h | 24 ++++++++++++ include/linux/topology.h | 4 +- kernel/futex.c | 28 +++++++++++++- kernel/printk.c | 2 - kernel/sched.c | 12 +++--- kernel/sched_fair.c | 13 +++++- kernel/sched_features.h | 1 kernel/sched_idletask.c | 6 +-- kernel/sched_rt.c | 2 - mm/mempolicy.c | 34 +++++++++++------ mm/migrate.c | 3 + net/ax25/af_ax25.c | 2 - net/ipv4/tcp_minisocks.c | 2 - net/ipv6/sit.c | 2 - net/sched/sch_api.c | 2 + net/unix/af_unix.c | 5 ++ 49 files changed, 301 insertions(+), 120 deletions(-)
Al Viro (1):
fix LOOKUP_FOLLOW on automount "symlinks"
Alan Stern (3):
EHCI: fix bug in keeping track of resuming ports
USB: EHCI: fix counting of transaction error retries
USB: fix usbfs regression
Avi Kivity (2):
KVM: x86 emulator: limit instructions to 15 bytes
KVM: VMX: Check cpl before emulating debug register access
Ben Hutchings (1):
drm/r128: Add test for initialisation to all ioctls that require it
Dean Nelson (1):
hwmon: (coretemp) Add missing newline to dev_warn() message
Dick Hollenbeck (1):
serial: 8250: add serial transmitter fully empty test
Eric Dumazet (1):
tc: Fix unitialized kernel memory leak
Francesco Lavra (1):
V4L/DVB (13961): em28xx-dvb: fix memleak in dvb_fini()
Greg Kroah-Hartman (2):
USB: usbfs: only copy the actual data received Linux 2.6.27.46
Ingo Molnar (1):
sched: fine-tune SD_SIBLING_INIT
Jarek Poplawski (1):
ax25: Fix possible oops in ax25_make_new
Jean Delvare (1):
hwmon: (lm78) Fix I/O resource conflict with PNP
Jiri Pirko (1):
bonding: ignore updelay param when there is no active slave
Jiri Slaby (2):
resource: add helpers for fetching rlimits x86, ia32_aout: do not kill argument mapping
KOSAKI Motohiro (4):
tmpfs: mpol=bind:0 don't cause mount error.
tmpfs: handle MPOL_LOCAL mount option properly
doc: add the documentation for mpol=local
tmpfs: cleanup mpol_parse_str()
Linus Torvalds (3):
Fix potential crash with sys_move_pages
Fix race in tty_fasync() properly
USB: usbfs: properly clean up the as structure on error paths
Marcelo Tosatti (1):
KVM: x86: check for cr3 validity in ioctl_set_sregs
Michael Buesch (1):
parisc: isa-eeprom - Fix loff_t usage
Mika Westerberg (1):
UBI: fix volume creation input checking
Mike Galbraith (1):
sched: fine-tune SD_MC_INIT
Mike McCormack (1):
sky2: Set SKY2_HW_RAM_BUFFER in sky2_init
Miklos Szeredi (1):
net: unix: fix sending fds in multiple buffers
Neil Horman (1):
coredump: suppress uid comparison test if core output files are pipes
Peter Zijlstra (2):
printk: robustify printk, fix #2
sched: wakeup preempt when small overlap
Raimonds Cicans (1):
r8169: Fix receive buffer length when MTU is between 1515 and 1536
Ravikiran G Thirumalai (1):
tmpfs: fix oops on mounts with mpol=default
Robert Varga (1):
tcp: fix CONFIG_TCP_MD5SIG + CONFIG_PREEMPT timer BUG()
Salman Qazi (1):
drivers/char/mem.c: avoid OOM lockup during large reads from /dev/zero
Samuel Thibault (1):
x86: fix csum_ipv6_magic asm memory clobber
Sascha Hlusiak (1):
sit: fix off-by-one in ipip6_tunnel_get_prl
Stanislav Brabec (1):
b44 WOL setup: one-bit-off stack corruption kernel panic fix
Thadeu Lima de Souza Cascardo (1):
i2c: Do not use device name after device_unregister
Theodore Ts'o (1):
ext4: Avoid null pointer dereference when decoding EROFS w/o a journal
Thomas Gleixner (2):
futex: Handle futex value corruption gracefully
futex: Handle user space corruption gracefully
Documentation/filesystems/tmpfs.txt +5 -1
@@ -82,11 +82,13 @@ tmpfs has a mount option to set the NUMA memory allocation policy for all files in that instance (if CONFIG_NUMA is enabled) - which can be adjusted on the fly via 'mount -o remount ...' -mpol=default prefers to allocate memory from the local node +mpol=default use the process allocation policy + (see set_mempolicy(2)) mpol=prefer:Node prefers to allocate memory from the given Node mpol=bind:NodeList allocates memory only from nodes in NodeList mpol=interleave prefers to allocate from each node in turn mpol=interleave:NodeList allocates from each node of NodeList in turn +mpol=local prefers to allocate memory from the local node NodeList format is a comma-separated list of decimal numbers and ranges, a range being two hyphen-separated decimal numbers, the smallest and
@@ -134,3 +136,5 @@ Author: Christoph Rohland <[email protected]>, 1.12.01 Updated: Hugh Dickins <[email protected]>, 4 June 2007 +Updated: + KOSAKI Motohiro, 16 Mar 2010
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 27 -EXTRAVERSION = .45 +EXTRAVERSION = .46 NAME = Trembling Tortoise # *DOCUMENTATION*
arch/x86/ia32/ia32_aout.c +0 -1
@@ -324,7 +324,6 @@ static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs) current->mm->free_area_cache =TASK_UNMAPPED_BASE ; current->mm->cached_hole_size =0 ; - current->mm->mmap =NULL ;compute_creds (bprm); current->flags &= ~PF_FORKNOEXEC ;
arch/x86/kvm/vmx.c +3 -0
@@ -2464,6 +2464,9 @@ static int handle_dr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)unsigned long val;int dr, reg; +if (!kvm_require_cpl (vcpu,0 )) +return 1 ; +/* * FIXME: this code assumes the host is debugging the guest. * need to deal with guest debugging itself too.
arch/x86/kvm/x86.c +20 -1
@@ -198,6 +198,19 @@ static void __queue_exception(struct kvm_vcpu *vcpu) }/* +* Checks if cpl <= required_cpl; if true, return true. Otherwise queue +* a #GP and return false. +*/ +bool kvm_require_cpl (struct kvm_vcpu *vcpu,int required_cpl) +{ +if (kvm_x86_ops->get_cpl (vcpu) <= required_cpl) +return true; +kvm_queue_exception_e (vcpu,GP_VECTOR ,0 ); +return false; +} +EXPORT_SYMBOL_GPL (kvm_require_cpl); + +/* * Load the pae pdptrs. Return true is they are all valid. */ int load_pdptrs (struct kvm_vcpu *vcpu,unsigned long cr3)
@@ -3645,7 +3658,13 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, vcpu->arch.cr2 = sregs->cr2; mmu_reset_needed |= vcpu->arch.cr3 != sregs->cr3; - vcpu->arch.cr3 = sregs->cr3; + +down_read (&vcpu->kvm->slots_lock); +if (gfn_to_memslot (vcpu->kvm, sregs->cr3 >>PAGE_SHIFT )) + vcpu->arch.cr3 = sregs->cr3; +else +set_bit (KVM_REQ_TRIPLE_FAULT , &vcpu->requests); +up_read (&vcpu->kvm->slots_lock);kvm_set_cr8 (vcpu, sregs->cr8);
arch/x86/kvm/x86_emulate.c +4 -1
@@ -581,6 +581,9 @@ static int do_insn_fetch(struct x86_emulate_ctxt *ctxt, {int rc =0 ; +/* x86 instructions are limited to 15 bytes. */ +if (eip + size - ctxt->decode.eip_orig >15 ) +return X86EMUL_UNHANDLEABLE ; eip += ctxt->cs_base;while (size--) { rc =do_fetch_insn_byte (ctxt, ops, eip++, dest++);
@@ -839,7 +842,7 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)/* Shadow copy of register state. Committed on successful emulation. */ memset (c,0 ,sizeof (struct decode_cache )); - c->eip = ctxt->vcpu->arch.rip; + c->eip = c->eip_orig = ctxt->vcpu->arch.rip; ctxt->cs_base =seg_base (ctxt,VCPU_SREG_CS );memcpy (c->regs, ctxt->vcpu->arch.regs,sizeof c->regs);
drivers/char/mem.c +3 -0
@@ -724,6 +724,9 @@ static ssize_t read_zero(struct file * file, char __user * buf, written += chunk - unwritten;if (unwritten)break ; +/* Consider changing this to just 'signal_pending()' with lots of testing */ +if (fatal_signal_pending (current)) +return written ? written : -EINTR ; buf += chunk; count -= chunk;cond_resched ();
drivers/char/tty_io.c +3 -1
@@ -2437,8 +2437,10 @@ static int tty_fasync(int fd, struct file *filp, int on) pid =task_pid (current); type =PIDTYPE_PID ; } - retval =__f_setown (filp, pid, type,0 ); +get_pid (pid);spin_unlock_irqrestore (&tty->ctrl_lock, flags); + retval =__f_setown (filp, pid, type,0 ); +put_pid (pid);if (retval) goto out; }else {
drivers/gpu/drm/r128/r128_cce.c +14 -4
@@ -353,6 +353,11 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)DRM_DEBUG ("\n" ); +if (dev->dev_private) { +DRM_DEBUG ("called when already initialized\n" ); +return -EINVAL ; + } + dev_priv =drm_alloc (sizeof (drm_r128_private_t),DRM_MEM_DRIVER );if (dev_priv ==NULL )return -ENOMEM ;
@@ -651,6 +656,8 @@ int r128_cce_start(struct drm_device *dev, void *data, struct drm_file *file_priLOCK_TEST_WITH_RETURN (dev, file_priv); +DEV_INIT_TEST_WITH_RETURN (dev_priv); +if (dev_priv->cce_running || dev_priv->cce_mode ==R128_PM4_NONPM4 ) {DRM_DEBUG ("while CCE running\n" );return 0 ;
@@ -673,6 +680,8 @@ int r128_cce_stop(struct drm_device *dev, void *data, struct drm_file *file_privLOCK_TEST_WITH_RETURN (dev, file_priv); +DEV_INIT_TEST_WITH_RETURN (dev_priv); +/* Flush any pending CCE commands. This ensures any outstanding * commands are exectuted by the engine before we turn it off. */
@@ -710,10 +719,7 @@ int r128_cce_reset(struct drm_device *dev, void *data, struct drm_file *file_priLOCK_TEST_WITH_RETURN (dev, file_priv); -if (!dev_priv) { -DRM_DEBUG ("called before init done\n" ); -return -EINVAL ; - } +DEV_INIT_TEST_WITH_RETURN (dev_priv);r128_do_cce_reset (dev_priv);
@@ -730,6 +736,8 @@ int r128_cce_idle(struct drm_device *dev, void *data, struct drm_file *file_privLOCK_TEST_WITH_RETURN (dev, file_priv); +DEV_INIT_TEST_WITH_RETURN (dev_priv); +if (dev_priv->cce_running) {r128_do_cce_flush (dev_priv); }
@@ -743,6 +751,8 @@ int r128_engine_reset(struct drm_device *dev, void *data, struct drm_file *file_LOCK_TEST_WITH_RETURN (dev, file_priv); +DEV_INIT_TEST_WITH_RETURN (dev->dev_private); +return r128_do_engine_reset (dev); }
drivers/gpu/drm/r128/r128_drv.h +8 -0
@@ -418,6 +418,14 @@ static __inline__ void r128_update_ring_snapshot(drm_r128_private_t * dev_priv)* Misc helper macros */ +#define DEV_INIT_TEST_WITH_RETURN (_dev_priv) \ +do { \ + if (!_dev_priv) { \ + DRM_ERROR("called with no initialization\n"); \ + return -EINVAL; \ + } \ +} while (0) +#define RING_SPACE_TEST_WITH_RETURN ( dev_priv ) \ do { \ drm_r128_ring_buffer_t *ring = &dev_priv->ring; int i; \
drivers/gpu/drm/r128/r128_state.c +19 -17
@@ -1244,14 +1244,18 @@ static void r128_cce_dispatch_stipple(struct drm_device * dev, u32 * stipple)static int r128_cce_clear (struct drm_device *dev,void *data,struct drm_file *file_priv) {drm_r128_private_t *dev_priv = dev->dev_private; -drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; +drm_r128_sarea_t *sarea_priv;drm_r128_clear_t *clear = data;DRM_DEBUG ("\n" );LOCK_TEST_WITH_RETURN (dev, file_priv); +DEV_INIT_TEST_WITH_RETURN (dev_priv); +RING_SPACE_TEST_WITH_RETURN (dev_priv); + sarea_priv = dev_priv->sarea_priv; +if (sarea_priv->nbox >R128_NR_SAREA_CLIPRECTS ) sarea_priv->nbox =R128_NR_SAREA_CLIPRECTS ;
@@ -1312,6 +1316,8 @@ static int r128_cce_flip(struct drm_device *dev, void *data, struct drm_file *fiLOCK_TEST_WITH_RETURN (dev, file_priv); +DEV_INIT_TEST_WITH_RETURN (dev_priv); +RING_SPACE_TEST_WITH_RETURN (dev_priv);if (!dev_priv->page_flipping)
@@ -1331,6 +1337,8 @@ static int r128_cce_swap(struct drm_device *dev, void *data, struct drm_file *fiLOCK_TEST_WITH_RETURN (dev, file_priv); +DEV_INIT_TEST_WITH_RETURN (dev_priv); +RING_SPACE_TEST_WITH_RETURN (dev_priv);if (sarea_priv->nbox >R128_NR_SAREA_CLIPRECTS )
@@ -1354,10 +1362,7 @@ static int r128_cce_vertex(struct drm_device *dev, void *data, struct drm_file *LOCK_TEST_WITH_RETURN (dev, file_priv); -if (!dev_priv) { -DRM_ERROR ("called with no initialization\n" ); -return -EINVAL ; - } +DEV_INIT_TEST_WITH_RETURN (dev_priv);DRM_DEBUG ("pid=%d index=%d count=%d discard=%d\n" ,DRM_CURRENTPID , vertex->idx, vertex->count, vertex->discard);
@@ -1410,10 +1415,7 @@ static int r128_cce_indices(struct drm_device *dev, void *data, struct drm_fileLOCK_TEST_WITH_RETURN (dev, file_priv); -if (!dev_priv) { -DRM_ERROR ("called with no initialization\n" ); -return -EINVAL ; - } +DEV_INIT_TEST_WITH_RETURN (dev_priv);DRM_DEBUG ("pid=%d buf=%d s=%d e=%d d=%d\n" ,DRM_CURRENTPID , elts->idx, elts->start, elts->end, elts->discard);
@@ -1476,6 +1478,8 @@ static int r128_cce_blit(struct drm_device *dev, void *data, struct drm_file *fiLOCK_TEST_WITH_RETURN (dev, file_priv); +DEV_INIT_TEST_WITH_RETURN (dev_priv); +DRM_DEBUG ("pid=%d index=%d\n" ,DRM_CURRENTPID , blit->idx);if (blit->idx <0 || blit->idx >= dma->buf_count) {
@@ -1501,6 +1505,8 @@ static int r128_cce_depth(struct drm_device *dev, void *data, struct drm_file *fLOCK_TEST_WITH_RETURN (dev, file_priv); +DEV_INIT_TEST_WITH_RETURN (dev_priv); +RING_SPACE_TEST_WITH_RETURN (dev_priv); ret = -EINVAL ;
@@ -1531,6 +1537,8 @@ static int r128_cce_stipple(struct drm_device *dev, void *data, struct drm_fileLOCK_TEST_WITH_RETURN (dev, file_priv); +DEV_INIT_TEST_WITH_RETURN (dev_priv); +if (DRM_COPY_FROM_USER (&mask, stipple->mask,32 *sizeof (u32)))return -EFAULT ;
@@ -1555,10 +1563,7 @@ static int r128_cce_indirect(struct drm_device *dev, void *data, struct drm_fileLOCK_TEST_WITH_RETURN (dev, file_priv); -if (!dev_priv) { -DRM_ERROR ("called with no initialization\n" ); -return -EINVAL ; - } +DEV_INIT_TEST_WITH_RETURN (dev_priv); DRM_DEBUG("idx=%d s=%d e=%d d=%d\n", indirect->idx, indirect->start, indirect->end,
@@ -1620,10 +1625,7 @@ static int r128_getparam(struct drm_device *dev, void *data, struct drm_file *fidrm_r128_getparam_t *param = data;int value; -if (!dev_priv) { -DRM_ERROR ("called with no initialization\n" ); -return -EINVAL ; - } +DEV_INIT_TEST_WITH_RETURN (dev_priv);DRM_DEBUG ("pid=%d\n" ,DRM_CURRENTPID );
drivers/hwmon/coretemp.c +1 -1
@@ -191,7 +191,7 @@ static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *if (err) {dev_warn (dev,"Unable to access MSR 0xEE, for Tjmax, left" -" at default" ); +" at default\n" ); }else if (eax &0x40000000 ) { tjmax =85000 ; }
drivers/hwmon/lm78.c +16 -7
@@ -655,7 +655,7 @@ static int __devinit lm78_isa_probe(struct platform_device *pdev)/* Reserve the ISA region */ res =platform_get_resource (pdev,IORESOURCE_IO ,0 ); -if (!request_region (res->start,LM78_EXTENT ,"lm78" )) { +if (!request_region (res->start +LM78_ADDR_REG_OFFSET ,2 ,"lm78" )) { err = -EBUSY ; goto exit; }
@@ -699,7 +699,7 @@ static int __devinit lm78_isa_probe(struct platform_device *pdev)device_remove_file (&pdev->dev, &dev_attr_name);kfree (data); exit_release_region: -release_region (res->start,LM78_EXTENT ); +release_region (res->start +LM78_ADDR_REG_OFFSET ,2 ); exit:return err; }
@@ -711,7 +711,7 @@ static int __devexit lm78_isa_remove(struct platform_device *pdev)hwmon_device_unregister (data->hwmon_dev);sysfs_remove_group (&pdev->dev.kobj, &lm78_group);device_remove_file (&pdev->dev, &dev_attr_name); -release_region (data->client.addr,LM78_EXTENT ); +release_region (data->client.addr +LM78_ADDR_REG_OFFSET ,2 );kfree (data);return 0 ;
@@ -836,9 +836,17 @@ static struct lm78_data *lm78_update_device(struct device *dev)static int __init lm78_isa_found (unsigned short address) {int val, save, found =0 ; - -if (!request_region (address,LM78_EXTENT ,"lm78" )) -return 0 ; +int port; + +/* Some boards declare base+0 to base+7 as a PNP device, some base+4 +* to base+7 and some base+5 to base+6. So we better request each port +* individually for the probing phase. */ +for (port = address; port < address +LM78_EXTENT ; port++) { +if (!request_region (port,1 ,"lm78" )) { +pr_debug ("lm78: Failed to request port 0x%x\n" , port); + goto release; + } + }#define REALLY_SLOW_IO /* We need the timeouts for at least some LM78-like
@@ -901,7 +909,8 @@ static int __init lm78_isa_found(unsigned short address) val & 0x80 ? "LM79" : "LM78", (int)address); release: -release_region (address,LM78_EXTENT ); +for (port--; port >= address; port--) +release_region (port,1 );return found; }
drivers/i2c/i2c-core.c +3 -2
@@ -644,6 +644,9 @@ int i2c_del_adapter(struct i2c_adapter *adap) } } +/* device name is gone after device_unregister */ +dev_dbg (&adap->dev,"adapter [%s] unregistered\n" , adap->name); +/* clean up the sysfs representation */ init_completion (&adap->dev_released);device_unregister (&adap->dev);
@@ -654,8 +657,6 @@ int i2c_del_adapter(struct i2c_adapter *adap)/* free bus id */ idr_remove (&i2c_adapter_idr, adap->nr); -dev_dbg (&adap->dev,"adapter [%s] unregistered\n" , adap->name); -/* Clear the device structure in case this adapter is ever going to be added again */ memset (&adap->dev,0 ,sizeof (adap->dev));
drivers/media/video/em28xx/em28xx-dvb.c +1 -0
@@ -501,6 +501,7 @@ static int dvb_fini(struct em28xx *dev)if (dev->dvb) {unregister_dvb (dev->dvb); +kfree (dev->dvb); dev->dvb =NULL ; }
drivers/mtd/ubi/cdev.c +0 -1
@@ -793,7 +793,6 @@ static int ubi_cdev_ioctl(struct inode *inode, struct file *file,break ; } - req.name[req.name_len] ='\0' ; err =verify_mkvol_req (ubi, &req);if (err)break ;
drivers/net/b44.c +1 -2
@@ -1502,8 +1502,7 @@ static int b44_magic_pattern(u8 *macaddr, u8 *ppattern, u8 *pmask, int offset)for (k =0 ; k< ethaddr_bytes; k++) { ppattern[offset + magicsync + (j *ETH_ALEN ) + k] = macaddr[k]; - len++; -set_bit (len, (unsigned long *) pmask); +set_bit (len++, (unsigned long *) pmask); } }return len -1 ;
drivers/net/bonding/bond_main.c +8 -0
@@ -2228,6 +2228,9 @@ static int bond_miimon_inspect(struct bonding *bond) {struct slave *slave;int i, link_state, commit =0 ; +bool ignore_updelay; + + ignore_updelay = !bond->curr_active_slave ? true : false;bond_for_each_slave (bond, slave, i) { slave->new_link =BOND_LINK_NOCHANGE ;
@@ -2292,6 +2295,7 @@ static int bond_miimon_inspect(struct bonding *bond)": %s: link status up for " "interface %s, enabling it in %d ms.\n" , bond->dev->name, slave->dev->name, + ignore_updelay ?0 : bond->params.updelay * bond->params.miimon); }
@@ -2310,9 +2314,13 @@ static int bond_miimon_inspect(struct bonding *bond)continue ; } +if (ignore_updelay) + slave->delay =0 ; +if (slave->delay <=0 ) { slave->new_link =BOND_LINK_UP ; commit++; + ignore_updelay = false;continue ; }
drivers/net/r8169.c +2 -2
@@ -1842,9 +1842,9 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev)static void rtl8169_set_rxbufsize (struct rtl8169_private *tp,struct net_device *dev) { -unsigned int mtu = dev->mtu; +unsigned int max_frame = dev->mtu +VLAN_ETH_HLEN +ETH_FCS_LEN ; - tp->rx_buf_sz = (mtu >RX_BUF_SIZE ) ? mtu +ETH_HLEN +8 :RX_BUF_SIZE ; + tp->rx_buf_sz = (max_frame >RX_BUF_SIZE ) ? max_frame :RX_BUF_SIZE ; }static int rtl8169_open (struct net_device *dev)
drivers/net/sky2.c +3 -1
@@ -1438,7 +1438,6 @@ static int sky2_up(struct net_device *dev)if (ramsize >0 ) {u32 rxspace; - hw->flags |=SKY2_HW_RAM_BUFFER ;pr_debug (PFX "%s: ram buffer %dK\n" , dev->name, ramsize);if (ramsize <16 ) rxspace = ramsize /2 ;
@@ -2846,6 +2845,9 @@ static int __devinit sky2_init(struct sky2_hw *hw) ++hw->ports; } +if (sky2_read8 (hw,B2_E_0 )) + hw->flags |=SKY2_HW_RAM_BUFFER ; +return 0 ; }
drivers/parisc/eisa_eeprom.c +1 -1
@@ -55,7 +55,7 @@ static ssize_t eisa_eeprom_read(struct file * file,ssize_t ret;int i; -if (*ppos >=HPEE_MAX_LENGTH ) +if (*ppos <0 || *ppos >=HPEE_MAX_LENGTH )return 0 ; count = *ppos + count <HPEE_MAX_LENGTH ? count :HPEE_MAX_LENGTH - *ppos;
drivers/serial/8250.c +4 -3
@@ -70,6 +70,9 @@ static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS;#define PASS_LIMIT 256 +#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) + +/* * We default to IRQ0 for the "no irq" hack. Some * machine types want others as well - they're free
@@ -1656,7 +1659,7 @@ static unsigned int serial8250_tx_empty(struct uart_port *port) up->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ;spin_unlock_irqrestore (&up->port.lock, flags); -return lsr &UART_LSR_TEMT ?TIOCSER_TEMT :0 ; +return (lsr &BOTH_EMPTY ) ==BOTH_EMPTY ?TIOCSER_TEMT :0 ; }static unsigned int serial8250_get_mctrl (struct uart_port *port)
@@ -1714,8 +1717,6 @@ static void serial8250_break_ctl(struct uart_port *port, int break_state)spin_unlock_irqrestore (&up->port.lock, flags); } -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -/* * Wait for transmitter & holding register to empty */
drivers/usb/core/devio.c +42 -19
126 lines not on this page · raw message
drivers/usb/host/ehci-hub.c +4 -3
@@ -254,10 +254,8 @@ static int ehci_bus_resume (struct usb_hcd *hcd) temp =ehci_readl (ehci, &ehci->regs->port_status [i]); temp &= ~(PORT_RWC_BITS |PORT_WAKE_BITS );if (test_bit (i, &ehci->bus_suspended) && - (temp &PORT_SUSPEND )) { - ehci->reset_done [i] = jiffies +msecs_to_jiffies (20 ); + (temp &PORT_SUSPEND )) temp |=PORT_RESUME ; - }ehci_writel (ehci, temp, &ehci->regs->port_status [i]); } i =HCS_N_PORTS (ehci->hcs_params);
@@ -752,6 +750,9 @@ static int ehci_hub_control ( ehci_readl(ehci, status_reg)); } +if (!(temp & (PORT_RESUME |PORT_RESET ))) + ehci->reset_done[wIndex] =0 ; +/* transfer dedicated ports to the companion hc */ if ((temp &PORT_CONNECT ) &&test_bit (wIndex, &ehci->companion_ports)) {
drivers/usb/host/ehci-q.c +5 -6
@@ -346,12 +346,11 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)*/ if ((token &QTD_STS_XACT ) &&QTD_CERR (token) ==0 && - --qh->xacterrs >0 && + ++qh->xacterrs <QH_XACTERR_MAX && !urb->unlinked) {ehci_dbg (ehci, -"detected XactErr len %d/%d retry %d\n" , - qtd->length -QTD_LENGTH (token), qtd->length, -QH_XACTERR_MAX - qh->xacterrs); +"detected XactErr len %zu/%zu retry %d\n" , + qtd->length -QTD_LENGTH (token), qtd->length, qh->xacterrs);/* reset the token in the qtd and the * qh overlay (which still contains
@@ -451,7 +450,7 @@ halt: last = qtd;/* reinit the xacterr counter for the next qtd */ - qh->xacterrs =QH_XACTERR_MAX ; + qh->xacterrs =0 ; }/* last urb's completion might still need calling */
@@ -898,7 +897,7 @@ static void qh_link_async (struct ehci_hcd *ehci, struct ehci_qh *qh) head->qh_next.qh = qh; head->hw_next = dma; - qh->xacterrs =QH_XACTERR_MAX ; + qh->xacterrs =0 ; qh->qh_state =QH_STATE_LINKED ;/* qtd completions reported later by interrupt */ }
drivers/usb/host/ehci-sched.c +1 -0
@@ -542,6 +542,7 @@ static int qh_link_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh) } } qh->qh_state =QH_STATE_LINKED ; + qh->xacterrs =0 ;qh_get (qh);/* update per-qh bandwidth for usbfs */
fs/exec.c +2 -1
@@ -1826,8 +1826,9 @@ int do_coredump(long signr, int exit_code, struct pt_regs * regs)/* * Dont allow local users get cute and trick others to coredump * into their pre-created files: +* Note, this is not relevant for pipes */ -if (inode->i_uid != current->fsuid) +if (!ispipe && (inode->i_uid != current->fsuid)) goto close_fail;if (!file->f_op) goto close_fail;
fs/ext4/super.c +2 -1
@@ -254,7 +254,8 @@ static const char *ext4_decode_error(struct super_block *sb, int errno, errstr ="Out of memory" ;break ;case -EROFS : -if (!sb ||EXT4_SB (sb)->s_journal->j_flags &JBD2_ABORT ) +if (!sb || (EXT4_SB (sb)->s_journal && +EXT4_SB (sb)->s_journal->j_flags &JBD2_ABORT )) errstr ="Journal has aborted" ;else errstr ="Readonly filesystem" ;
fs/fcntl.c +2 -4
@@ -200,9 +200,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg)static void f_modown (struct file *filp,struct pid *pid,enum pid_type type,uid_t uid,uid_t euid,int force) { -unsigned long flags; - -write_lock_irqsave (&filp->f_owner.lock, flags); +write_lock_irq (&filp->f_owner.lock);if (force || !filp->f_owner.pid) {put_pid (filp->f_owner.pid); filp->f_owner.pid =get_pid (pid);
@@ -210,7 +208,7 @@ static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, filp->f_owner.uid = uid; filp->f_owner.euid = euid; } -write_unlock_irqrestore (&filp->f_owner.lock, flags); +write_unlock_irq (&filp->f_owner.lock); } int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
fs/namei.c +12 -2
@@ -841,6 +841,17 @@ fail: }/* +* This is a temporary kludge to deal with "automount" symlinks; proper +* solution is to trigger them on follow_mount(), so that do_lookup() +* would DTRT. To be killed before 2.6.34-final. +*/ +static inline int follow_on_final (struct inode *inode,unsigned lookup_flags) +{ +return inode &&unlikely (inode->i_op->follow_link) && + ((lookup_flags &LOOKUP_FOLLOW ) ||S_ISDIR (inode->i_mode)); +} + +/* * Name resolution. * This is the basic name resolution function, turning a pathname into * the final dentry. We expect 'base' to be positive and a directory.
@@ -984,8 +995,7 @@ last_component:if (err)break ; inode = next.dentry->d_inode; -if ((lookup_flags &LOOKUP_FOLLOW ) - && inode && inode->i_op && inode->i_op->follow_link) { +if (follow_on_final (inode, lookup_flags)) { err =do_follow_link (&next, nd);if (err) goto return_err;
include/asm-x86/checksum_32.h +2 -1
@@ -161,7 +161,8 @@ static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr, "adcl $0, %0 ;\n" : "=&r" (sum) : "r" (saddr), "r" (daddr), - "r" (htonl(len)), "r" (htonl(proto)), "0" (sum)); + "r" (htonl(len)), "r" (htonl(proto)), "0" (sum) + : "memory");return csum_fold (sum); }
include/asm-x86/kvm_host.h +1 -0
@@ -537,6 +537,7 @@ void kvm_queue_exception(struct kvm_vcpu *vcpu, unsigned nr);void kvm_queue_exception_e (struct kvm_vcpu *vcpu,unsigned nr,u32 error_code);void kvm_inject_page_fault (struct kvm_vcpu *vcpu,unsigned long cr2,u32 error_code); +bool kvm_require_cpl (struct kvm_vcpu *vcpu,int required_cpl);void kvm_inject_nmi (struct kvm_vcpu *vcpu);
include/asm-x86/kvm_x86_emulate.h +1 -1
@@ -128,7 +128,7 @@ struct decode_cache {u8 seg_override;unsigned int d;unsigned long regs[NR_VCPU_REGS ]; -unsigned long eip; +unsigned long eip, eip_orig;/* modrm */ u8 modrm;u8 modrm_mod;
include/linux/sched.h +23 -1
@@ -901,7 +901,7 @@ struct sched_class {void (*yield_task) (struct rq *rq);int (*select_task_rq)(struct task_struct *p,int sync); -void (*check_preempt_curr) (struct rq *rq,struct task_struct *p); +void (*check_preempt_curr) (struct rq *rq,struct task_struct *p,int sync);struct task_struct * (*pick_next_task) (struct rq *rq);void (*put_prev_task) (struct rq *rq,struct task_struct *p);
@@ -2232,6 +2232,28 @@ static inline void mm_init_owner(struct mm_struct *mm, struct task_struct *p)#define TASK_STATE_TO_CHAR_STR "RSDTtZX" +static inline unsigned long task_rlimit (const struct task_struct *tsk, +unsigned int limit) +{ +return ACCESS_ONCE (tsk->signal->rlim[limit].rlim_cur); +} + +static inline unsigned long task_rlimit_max (const struct task_struct *tsk, +unsigned int limit) +{ +return ACCESS_ONCE (tsk->signal->rlim[limit].rlim_max); +} + +static inline unsigned long rlimit (unsigned int limit) +{ +return task_rlimit (current, limit); +} + +static inline unsigned long rlimit_max (unsigned int limit) +{ +return task_rlimit_max (current, limit); +} +#endif /* __KERNEL__ */ #endif
include/linux/topology.h +2 -2
@@ -99,7 +99,7 @@ void arch_update_cpu_topology(void); | SD_BALANCE_FORK \ |SD_BALANCE_EXEC \ |SD_WAKE_AFFINE \ - |SD_WAKE_IDLE \ + |SD_WAKE_BALANCE \ | SD_SHARE_CPUPOWER, \ .last_balance = jiffies, \ .balance_interval = 1, \
@@ -120,10 +120,10 @@ void arch_update_cpu_topology(void); .wake_idx = 1, \ .forkexec_idx = 1, \ .flags =SD_LOAD_BALANCE \ - |SD_BALANCE_NEWIDLE \ |SD_BALANCE_FORK \ |SD_BALANCE_EXEC \ |SD_WAKE_AFFINE \ + |SD_WAKE_BALANCE \ |SD_SHARE_PKG_RESOURCES \ | BALANCE_FOR_MC_POWER, \ .last_balance = jiffies, \
kernel/futex.c +26 -2
@@ -533,8 +533,25 @@ lookup_pi_state(u32 uval, struct futex_hash_bucket *hb,return -EINVAL ;WARN_ON (!atomic_read (&pi_state->refcount)); -WARN_ON (pid && pi_state->owner && - pi_state->owner->pid != pid); + +/* +* When pi_state->owner is NULL then the owner died +* and another waiter is on the fly. pi_state->owner +* is fixed up by the task which acquires +* pi_state->rt_mutex. +* +* We do not check for pid == 0 which can happen when +* the owner died and robust_list_exit() cleared the +* TID. +*/ +if (pid && pi_state->owner) { +/* +* Bail out if user space manipulated the +* futex value. +*/ +if (pid !=task_pid_vnr (pi_state->owner)) +return -EINVAL ; + }atomic_inc (&pi_state->refcount); *ps = pi_state;
@@ -630,6 +647,13 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this)if (!pi_state)return -EINVAL ; +/* +* If current does not own the pi_state then the futex is +* inconsistent and user space fiddled with the futex value. +*/ +if (pi_state->owner != current) +return -EINVAL ; +spin_lock (&pi_state->pi_mutex.wait_lock); new_owner =rt_mutex_next_owner (&pi_state->pi_mutex);
kernel/printk.c +1 -1
@@ -995,7 +995,7 @@ int printk_needs_cpu(int cpu)void wake_up_klogd (void ) {if (waitqueue_active (&log_wait)) -__get_cpu_var (printk_pending) =1 ; +__raw_get_cpu_var (printk_pending) =1 ; }/**
kernel/sched.c +6 -6
@@ -604,9 +604,9 @@ struct rq { static DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); -static inline void check_preempt_curr (struct rq *rq,struct task_struct *p) +static inline void check_preempt_curr (struct rq *rq,struct task_struct *p,int sync) { - rq->curr->sched_class->check_preempt_curr (rq, p); + rq->curr->sched_class->check_preempt_curr (rq, p, sync); }static inline int cpu_of (struct rq *rq)
@@ -2285,7 +2285,7 @@ out_running:trace_mark (kernel_sched_wakeup,"pid %d state %ld ## rq %p task %p rq->curr %p" , p->pid, p->state, rq, p, rq->curr); -check_preempt_curr (rq, p); +check_preempt_curr (rq, p, sync); p->state =TASK_RUNNING ;#ifdef CONFIG_SMP
@@ -2420,7 +2420,7 @@ void wake_up_new_task(struct task_struct *p, unsigned long clone_flags)trace_mark (kernel_sched_wakeup_new,"pid %d state %ld ## rq %p task %p rq->curr %p" , p->pid, p->state, rq, p, rq->curr); -check_preempt_curr (rq, p); +check_preempt_curr (rq, p,0 );#ifdef CONFIG_SMP if (p->sched_class->task_wake_up) p->sched_class->task_wake_up (rq, p);
@@ -2880,7 +2880,7 @@ static void pull_task(struct rq *src_rq, struct task_struct *p,* Note that idle threads have a prio of MAX_PRIO, for this test * to be always true for them. */ -check_preempt_curr (this_rq, p); +check_preempt_curr (this_rq, p,0 ); }/*
@@ -5957,7 +5957,7 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu)set_task_cpu (p, dest_cpu);if (on_rq) {activate_task (rq_dest, p,0 ); -check_preempt_curr (rq_dest, p); +check_preempt_curr (rq_dest, p,0 ); } done: ret =1 ;
kernel/sched_fair.c +10 -3
@@ -1331,7 +1331,7 @@ static inline int depth_se(struct sched_entity *se)/* * Preempt the current task with a newly woken task if needed: */ -static void check_preempt_wakeup (struct rq *rq,struct task_struct *p) +static void check_preempt_wakeup (struct rq *rq,struct task_struct *p,int sync) {struct task_struct *curr = rq->curr;struct cfs_rq *cfs_rq =task_cfs_rq (curr);
@@ -1360,6 +1360,13 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p)if (!sched_feat (WAKEUP_PREEMPT ))return ; +if (sched_feat (WAKEUP_OVERLAP ) && sync && + se->avg_overlap < sysctl_sched_migration_cost && + pse->avg_overlap < sysctl_sched_migration_cost) { +resched_task (curr); +return ; + } +/* * preemption test can be made between sibling entities who are in the * same cfs_rq i.e who have a common parent. Walk up the hierarchy of
@@ -1642,7 +1649,7 @@ static void prio_changed_fair(struct rq *rq, struct task_struct *p,if (p->prio > oldprio)resched_task (rq->curr); }else -check_preempt_curr (rq, p); +check_preempt_curr (rq, p,0 ); }/*
@@ -1659,7 +1666,7 @@ static void switched_to_fair(struct rq *rq, struct task_struct *p,if (running)resched_task (rq->curr);else -check_preempt_curr (rq, p); +check_preempt_curr (rq, p,0 ); }/* Account for a task changing its policy or group.
kernel/sched_features.h +1 -0
@@ -11,3 +11,4 @@ SCHED_FEAT(ASYM_GRAN, 1) SCHED_FEAT(LB_BIAS, 1) SCHED_FEAT(LB_WAKEUP_UPDATE, 1) SCHED_FEAT(ASYM_EFF_LOAD, 1) +SCHED_FEAT (WAKEUP_OVERLAP ,1 )
kernel/sched_idletask.c +3 -3
@@ -14,7 +14,7 @@ static int select_task_rq_idle(struct task_struct *p, int sync)/* * Idle tasks are unconditionally rescheduled: */ -static void check_preempt_curr_idle (struct rq *rq,struct task_struct *p) +static void check_preempt_curr_idle (struct rq *rq,struct task_struct *p,int sync) {resched_task (rq->idle); }
@@ -76,7 +76,7 @@ static void switched_to_idle(struct rq *rq, struct task_struct *p,if (running)resched_task (rq->curr);else -check_preempt_curr (rq, p); +check_preempt_curr (rq, p,0 ); } static void prio_changed_idle(struct rq *rq, struct task_struct *p,
@@ -93,7 +93,7 @@ static void prio_changed_idle(struct rq *rq, struct task_struct *p,if (p->prio > oldprio)resched_task (rq->curr); }else -check_preempt_curr (rq, p); +check_preempt_curr (rq, p,0 ); }/*
kernel/sched_rt.c +1 -1
@@ -784,7 +784,7 @@ static void check_preempt_equal_prio(struct rq *rq, struct task_struct *p)/* * Preempt the current task with a newly woken task if needed: */ -static void check_preempt_curr_rt (struct rq *rq,struct task_struct *p) +static void check_preempt_curr_rt (struct rq *rq,struct task_struct *p,int sync) {if (p->prio < rq->curr->prio) {resched_task (rq->curr);
mm/mempolicy.c +22 -12
@@ -2029,8 +2029,8 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)char *rest = nodelist;while (isdigit (*rest)) rest++; -if (!*rest) - err =0 ; +if (*rest) + goto out; }break ;case MPOL_INTERLEAVE :
@@ -2039,7 +2039,6 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)*/ if (!nodelist) nodes = node_states[N_HIGH_MEMORY ]; - err =0 ;break ;case MPOL_LOCAL :/*
@@ -2049,11 +2048,19 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context) goto out; mode =MPOL_PREFERRED ;break ; - -/* -* case MPOL_BIND: mpol_new() enforces non-empty nodemask. -* case MPOL_DEFAULT: mpol_new() enforces empty nodemask, ignores flags. -*/ +case MPOL_DEFAULT : +/* +* Insist on a empty nodelist +*/ +if (!nodelist) + err =0 ; + goto out; +case MPOL_BIND : +/* +* Insist on a nodelist +*/ +if (!nodelist) + goto out; } mode_flags =0 ;
@@ -2067,14 +2074,17 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)else if (!strcmp (flags,"relative" )) mode_flags |=MPOL_F_RELATIVE_NODES ;else - err =1 ; + goto out; } new =mpol_new (mode, mode_flags, &nodes);if (IS_ERR (new)) - err =1 ; -else if (no_context) - new->w.user_nodemask = nodes;/* save for contextualization */ + goto out; + err =0 ; +if (no_context) { +/* save for contextualization */ + new->w.user_nodemask = nodes; + } out:/* Restore string for error message */
mm/migrate.c +3 -0
@@ -1062,6 +1062,9 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages, goto out; err = -ENODEV ; +if (node <0 || node >=MAX_NUMNODES ) + goto out; +if (!node_state (node,N_HIGH_MEMORY )) goto out;
net/ax25/af_ax25.c +1 -1
@@ -894,7 +894,6 @@ struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev)sock_init_data (NULL , sk); - sk->sk_destruct = ax25_free_sock; sk->sk_type = osk->sk_type; sk->sk_priority = osk->sk_priority; sk->sk_protocol = osk->sk_protocol;
@@ -932,6 +931,7 @@ struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev) } sk->sk_protinfo = ax25; + sk->sk_destruct = ax25_free_sock; ax25->sk = sk;return sk;
net/ipv4/tcp_minisocks.c +1 -1
@@ -362,7 +362,7 @@ void tcp_twsk_destructor(struct sock *sk)#ifdef CONFIG_TCP_MD5SIG struct tcp_timewait_sock *twsk =tcp_twsk (sk);if (twsk->tw_md5_keylen) -tcp_put_md5sig_pool (); +tcp_free_md5sig_pool ();#endif }
net/ipv6/sit.c +1 -1
@@ -260,7 +260,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t, c =0 ;for (prl = t->prl; prl; prl = prl->next) { -if (c > cmax) +if (c >= cmax)break ;if (kprl.addr !=htonl (INADDR_ANY ) && prl->addr != kprl.addr)continue ;
net/sched/sch_api.c +2 -0
@@ -1453,6 +1453,8 @@ static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q, nlh =NLMSG_NEW (skb, pid, seq, event,sizeof (*tcm), flags); tcm =NLMSG_DATA (nlh); tcm->tcm_family =AF_UNSPEC ; + tcm->tcm__pad1 =0 ; + tcm->tcm__pad2 =0 ; tcm->tcm_ifindex =qdisc_dev (q)->ifindex; tcm->tcm_parent = q->handle; tcm->tcm_handle = q->handle;
net/unix/af_unix.c +4 -1
@@ -1491,6 +1491,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,struct sk_buff *skb;int sent=0 ;struct scm_cookie tmp_scm; +bool fds_sent = false;if (NULL == siocb->scm) siocb->scm = &tmp_scm;
@@ -1552,12 +1553,14 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock, size =min_t (int, size,skb_tailroom (skb));memcpy (UNIXCREDS (skb), &siocb->scm->creds,sizeof (struct ucred )); -if (siocb->scm->fp) { +/* Only send the fds in the first buffer */ +if (siocb->scm->fp && !fds_sent) { err =unix_attach_fds (siocb->scm, skb);if (err) {kfree_skb (skb); goto out_err; } + fds_sent = true; }if ((err =memcpy_fromiovec (skb_put (skb,size), msg->msg_iov, size)) !=0 ) {