commits November 2009

commits@lists.open-mesh.org

1 participants
989 discussions

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 4c3da2209b1261af9a948b7509a38904c8eee554 Author: Eric W. Biederman <ebiederm(a)xmission.com> Date: Wed Nov 4 02:50:06 2009 -0800 sysfs: Don't leak secdata when a sysfs_dirent is freed. While refreshing my sysfs patches I noticed a leak in the secdata implementation. We don't free the secdata when we free the sysfs dirent. This is a bug in 2.6.32-rc5 that we really should close. Signed-off-by: Eric W. Biederman <ebiederm(a)aristanetworks.com> Acked-by: Serge Hallyn <serue(a)us.ibm.com> Signed-off-by: James Morris <jmorris(a)namei.org> diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index 5fad489..e020183 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c @@ -21,6 +21,7 @@ #include <linux/completion.h> #include <linux/mutex.h> #include <linux/slab.h> +#include <linux/security.h> #include "sysfs.h" DEFINE_MUTEX(sysfs_mutex); @@ -285,6 +286,9 @@ void release_sysfs_dirent(struct sysfs_dirent * sd) sysfs_put(sd->s_symlink.target_sd); if (sysfs_type(sd) & SYSFS_COPY_NAME) kfree(sd->s_name); + if (sd->s_iattr && sd->s_iattr->ia_secdata) + security_release_secctx(sd->s_iattr->ia_secdata, + sd->s_iattr->ia_secdata_len); kfree(sd->s_iattr); sysfs_free_ino(sd->s_ino); kmem_cache_free(sysfs_dir_cachep, sd); -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 91d3f9bacdb4950d2f79fe2ba296aa249f60d06c Merge: 51bb296b09a83ee1aae025778db38f9d2cc7bb1a 4204878179c99d419d392d78d817729992b4c442 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Wed Nov 4 07:05:43 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: drm/i915: Ironlake suspend/resume support drm/i915: kill warning in intel_find_pll_g4x_dp drm/i915: update watermarks before enabling PLLs drm/i915: add FIFO watermark support for G4x drm/i915: quiet DP i2c init drm/i915: fix panel fitting filter coefficient select for Ironlake drm/i915: fix to setup display reference clock control on Ironlake drm/i915: Install a fence register for fbc on g4x drm/i915: save/restore BLC histogram control reg across suspend/resume drm/i915: Fix FDI M/N setting according with correct color depth drm/i915: disable powersave feature for Ironlake currently drm/i915: Fix render reclock availability detection. drm/i915: Save and restore the GM45 FBC regs on suspend and resume. drm/i915: Set the LVDS_BORDER when using LVDS scaling mode drm/i915: disable FBC for Pineview, fixing a boot hang. diff --combined drivers/gpu/drm/i915/i915_drv.h index c5df223,9c67f06..57204e2 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@@ -274,7 -274,7 +274,7 @@@ typedef struct drm_i915_private struct drm_i915_display_funcs display; /* Register state */ - bool suspended; + bool modeset_on_lid; u8 saveLBB; u32 saveDSPACNTR; u32 saveDSPBCNTR; @@@ -296,6 -296,12 +296,12 @@@ u32 saveVBLANK_A; u32 saveVSYNC_A; u32 saveBCLRPAT_A; + u32 saveTRANS_HTOTAL_A; + u32 saveTRANS_HBLANK_A; + u32 saveTRANS_HSYNC_A; + u32 saveTRANS_VTOTAL_A; + u32 saveTRANS_VBLANK_A; + u32 saveTRANS_VSYNC_A; u32 savePIPEASTAT; u32 saveDSPASTRIDE; u32 saveDSPASIZE; @@@ -304,8 -310,11 +310,11 @@@ u32 saveDSPASURF; u32 saveDSPATILEOFF; u32 savePFIT_PGM_RATIOS; + u32 saveBLC_HIST_CTL; u32 saveBLC_PWM_CTL; u32 saveBLC_PWM_CTL2; + u32 saveBLC_CPU_PWM_CTL; + u32 saveBLC_CPU_PWM_CTL2; u32 saveFPB0; u32 saveFPB1; u32 saveDPLL_B; @@@ -317,6 -326,12 +326,12 @@@ u32 saveVBLANK_B; u32 saveVSYNC_B; u32 saveBCLRPAT_B; + u32 saveTRANS_HTOTAL_B; + u32 saveTRANS_HBLANK_B; + u32 saveTRANS_HSYNC_B; + u32 saveTRANS_VTOTAL_B; + u32 saveTRANS_VBLANK_B; + u32 saveTRANS_VSYNC_B; u32 savePIPEBSTAT; u32 saveDSPBSTRIDE; u32 saveDSPBSIZE; @@@ -342,6 -357,7 +357,7 @@@ u32 savePFIT_CONTROL; u32 save_palette_a[256]; u32 save_palette_b[256]; + u32 saveDPFC_CB_BASE; u32 saveFBC_CFB_BASE; u32 saveFBC_LL_BASE; u32 saveFBC_CONTROL; @@@ -349,6 -365,12 +365,12 @@@ u32 saveIER; u32 saveIIR; u32 saveIMR; + u32 saveDEIER; + u32 saveDEIMR; + u32 saveGTIER; + u32 saveGTIMR; + u32 saveFDI_RXA_IMR; + u32 saveFDI_RXB_IMR; u32 saveCACHE_MODE_0; u32 saveD_STATE; u32 saveDSPCLK_GATE_D; @@@ -382,6 -404,16 +404,16 @@@ u32 savePIPEB_DP_LINK_M; u32 savePIPEA_DP_LINK_N; u32 savePIPEB_DP_LINK_N; + u32 saveFDI_RXA_CTL; + u32 saveFDI_TXA_CTL; + u32 saveFDI_RXB_CTL; + u32 saveFDI_TXB_CTL; + u32 savePFA_CTL_1; + u32 savePFB_CTL_1; + u32 savePFA_WIN_SZ; + u32 savePFB_WIN_SZ; + u32 savePFA_WIN_POS; + u32 savePFB_WIN_POS; struct { struct drm_mm gtt_space; @@@ -492,6 -524,8 +524,8 @@@ struct drm_i915_gem_phys_object *phys_objs[I915_MAX_PHYS_OBJECT]; } mm; struct sdvo_device_mapping sdvo_mappings[2]; + /* indicate whether the LVDS_BORDER should be enabled or not */ + unsigned int lvds_border_bits; /* Reclocking support */ bool render_reclock_avail; @@@ -981,7 -1015,10 +1015,10 @@@ extern int i915_wait_ring(struct drm_de #define HAS_FW_BLC(dev) (IS_I9XX(dev) || IS_G4X(dev) || IS_IGDNG(dev)) #define HAS_PIPE_CXSR(dev) (IS_G4X(dev) || IS_IGDNG(dev)) - #define I915_HAS_FBC(dev) (IS_MOBILE(dev) && (IS_I9XX(dev) || IS_I965G(dev))) + #define I915_HAS_FBC(dev) (IS_MOBILE(dev) && \ + (IS_I9XX(dev) || IS_GM45(dev)) && \ + !IS_IGD(dev) && \ + !IS_IGDNG(dev)) #define PRIMARY_RINGBUFFER_SIZE (128*1024) diff --combined drivers/gpu/drm/i915/intel_lvds.c index 808bbe4,089f18c..05598ae --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@@ -380,7 -380,7 +380,7 @@@ static bool intel_lvds_mode_fixup(struc adjusted_mode->crtc_vblank_start + vsync_pos; /* keep the vsync width constant */ adjusted_mode->crtc_vsync_end = - adjusted_mode->crtc_vblank_start + vsync_width; + adjusted_mode->crtc_vsync_start + vsync_width; border = 1; break; case DRM_MODE_SCALE_ASPECT: @@@ -526,6 -526,14 +526,14 @@@ out lvds_priv->pfit_control = pfit_control; lvds_priv->pfit_pgm_ratios = pfit_pgm_ratios; /* + * When there exists the border, it means that the LVDS_BORDR + * should be enabled. + */ + if (border) + dev_priv->lvds_border_bits |= LVDS_BORDER_ENABLE; + else + dev_priv->lvds_border_bits &= ~(LVDS_BORDER_ENABLE); + /* * XXX: It would be nice to support lower refresh rates on the * panels to reduce power consumption, and perhaps match the * user's requested refresh rate. @@@ -656,15 -664,6 +664,15 @@@ static int intel_lvds_get_modes(struct return 0; } +/* + * Lid events. Note the use of 'modeset_on_lid': + * - we set it on lid close, and reset it on open + * - we use it as a "only once" bit (ie we ignore + * duplicate events where it was already properly + * set/reset) + * - the suspend/resume paths will also set it to + * zero, since they restore the mode ("lid open"). + */ static int intel_lid_notify(struct notifier_block *nb, unsigned long val, void *unused) { @@@ -672,19 -671,13 +680,19 @@@ container_of(nb, struct drm_i915_private, lid_notifier); struct drm_device *dev = dev_priv->dev; - if (acpi_lid_open() && !dev_priv->suspended) { - mutex_lock(&dev->mode_config.mutex); - drm_helper_resume_force_mode(dev); - mutex_unlock(&dev->mode_config.mutex); + if (!acpi_lid_open()) { + dev_priv->modeset_on_lid = 1; + return NOTIFY_OK; } - drm_sysfs_hotplug_event(dev_priv->dev); + if (!dev_priv->modeset_on_lid) + return NOTIFY_OK; + + dev_priv->modeset_on_lid = 0; + + mutex_lock(&dev->mode_config.mutex); + drm_helper_resume_force_mode(dev); + mutex_unlock(&dev->mode_config.mutex); return NOTIFY_OK; } -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit abb3911965c1bd8eea305f64d4840a314259d96d Author: Gleb Natapov <gleb(a)redhat.com> Date: Sun Oct 25 17:42:02 2009 +0200 KVM: get_tss_base_addr() should return a gpa_t If TSS we are switching to resides in high memory task switch will fail since address will be truncated. Windows2k3 does this sometimes when running with more then 4G Cc: stable(a)kernel.org Signed-off-by: Gleb Natapov <gleb(a)redhat.com> Signed-off-by: Avi Kivity <avi(a)redhat.com> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8a93fa8..ae07d26 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4051,7 +4051,7 @@ static int save_guest_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector, return kvm_write_guest_virt(dtable.base + index*8, seg_desc, sizeof(*seg_desc), vcpu); } -static u32 get_tss_base_addr(struct kvm_vcpu *vcpu, +static gpa_t get_tss_base_addr(struct kvm_vcpu *vcpu, struct desc_struct *seg_desc) { u32 base_addr = get_desc_base(seg_desc); -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 17adea01b9606e416ea5116a27d02d47fe7e6c8d Author: Borislav Petkov <borislav.petkov(a)amd.com> Date: Wed Nov 4 14:04:06 2009 +0100 amd64_edac: fix CECCs reporting Shift error type bits properly. Signed-off-by: Borislav Petkov <borislav.petkov(a)amd.com> diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 3ee539a..a38831c 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -2254,7 +2254,7 @@ static inline void __amd64_decode_bus_error(struct mem_ctl_info *mci, { u32 ec = ERROR_CODE(info->nbsl); u32 xec = EXT_ERROR_CODE(info->nbsl); - int ecc_type = info->nbsh & (0x3 << 13); + int ecc_type = (info->nbsh >> 13) & 0x3; /* Bail early out if this was an 'observed' error */ if (PP(ec) == K8_NBSL_PP_OBS) -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit a9e38c3e01ad242fe2a625354cf065c34b01e3aa Author: Jan Kiszka <jan.kiszka(a)siemens.com> Date: Fri Oct 23 09:37:00 2009 +0200 KVM: x86: Catch potential overrun in MCE setup We only allocate memory for 32 MCE banks (KVM_MAX_MCE_BANKS) but we allow user space to fill up to 255 on setup (mcg_cap & 0xff), corrupting kernel memory. Catch these overflows. Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti(a)redhat.com> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 9b96953..8a93fa8 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1692,7 +1692,7 @@ static int kvm_vcpu_ioctl_x86_setup_mce(struct kvm_vcpu *vcpu, unsigned bank_num = mcg_cap & 0xff, bank; r = -EINVAL; - if (!bank_num) + if (!bank_num || bank_num >= KVM_MAX_MCE_BANKS) goto out; if (mcg_cap & ~(KVM_MCE_CAP_SUPPORTED | 0xff | 0xff0000)) goto out; -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 5219f346b0ea2a2a8821f1e966b190788c285b0b Author: Miklos Szeredi <mszeredi(a)suse.cz> Date: Wed Nov 4 10:24:52 2009 +0100 fuse: invalidate target of rename Invalidate the target's attributes, which may have changed (such as nlink, change time) so that they are refreshed on the next getattr(). Signed-off-by: Miklos Szeredi <mszeredi(a)suse.cz> diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 992f6c9..8ada78a 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -712,8 +712,10 @@ static int fuse_rename(struct inode *olddir, struct dentry *oldent, fuse_invalidate_attr(newdir); /* newent will end up negative */ - if (newent->d_inode) + if (newent->d_inode) { + fuse_invalidate_attr(newent->d_inode); fuse_invalidate_entry_cache(newent); + } } else if (err == -EINTR) { /* If request was interrupted, DEITY only knows if the rename actually took place. If the invalidation -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 89240ba059ca468ae7a8346edf7f95082458c2fc Author: Stefani Seibold <stefani(a)seibold.net> Date: Tue Nov 3 10:22:40 2009 +0100 x86, fs: Fix x86 procfs stack information for threads on 64-bit This patch fixes two issues in the procfs stack information on x86-64 linux. The 32 bit loader compat_do_execve did not store stack start. (this was figured out by Alexey Dobriyan). The stack information on a x64_64 kernel always shows 0 kbyte stack usage, because of a missing implementation of the KSTK_ESP macro which always returned -1. The new implementation now returns the right value. Signed-off-by: Stefani Seibold <stefani(a)seibold.net> Cc: Americo Wang <xiyou.wangcong(a)gmail.com> Cc: Alexey Dobriyan <adobriyan(a)gmail.com> Cc: Al Viro <viro(a)zeniv.linux.org.uk> Cc: Andrew Morton <akpm(a)linux-foundation.org> LKML-Reference: <1257240160.4889.24.camel@wall-e> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index c3429e8..c978648 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -1000,7 +1000,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); #define thread_saved_pc(t) (*(unsigned long *)((t)->thread.sp - 8)) #define task_pt_regs(tsk) ((struct pt_regs *)(tsk)->thread.sp0 - 1) -#define KSTK_ESP(tsk) -1 /* sorry. doesn't work for syscall. */ +extern unsigned long KSTK_ESP(struct task_struct *task); #endif /* CONFIG_X86_64 */ extern void start_thread(struct pt_regs *regs, unsigned long new_ip, diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index ad535b6..eb62cbc 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -664,3 +664,8 @@ long sys_arch_prctl(int code, unsigned long addr) return do_arch_prctl(current, code, addr); } +unsigned long KSTK_ESP(struct task_struct *task) +{ + return (test_tsk_thread_flag(task, TIF_IA32)) ? + (task_pt_regs(task)->sp) : ((task)->thread.usersp); +} diff --git a/fs/compat.c b/fs/compat.c index d576b55..6c19040 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -1532,6 +1532,8 @@ int compat_do_execve(char * filename, if (retval < 0) goto out; + current->stack_start = current->mm->start_stack; + /* execve succeeded */ current->fs->in_exec = 0; current->in_execve = 0; -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit a3c4c58085b23d8e878a58dcdd0f8fcf8fad1ccd Author: Li Hong <lihong.hi(a)gmail.com> Date: Mon Oct 19 16:33:29 2009 +0800 amd64_edac: fix a wrong goto clause in amd64_edac.c In amd64_edac_init(void) in amd64_edac.c, cache_k8_northbridges() is called before pci_register_driver. If it fails, should exit with err directly. Signed-off-by: Li Hong <lihong.hi(a)gmail.com> Acked-by: Doug Thompson <dougthompson(a)xmission.com> Signed-off-by: Borislav Petkov <borislav.petkov(a)amd.com> diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index d4560d9..3ee539a 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -3163,7 +3163,7 @@ static int __init amd64_edac_init(void) opstate_init(); if (cache_k8_northbridges() < 0) - goto err_exit; + return err; err = pci_register_driver(&amd64_pci_driver); if (err) @@ -3189,8 +3189,6 @@ static int __init amd64_edac_init(void) err_2nd_stage: debugf0("2nd stage failed\n"); - -err_exit: pci_unregister_driver(&amd64_pci_driver); return err; -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 0bd87182d3ab18a32a8e9175d3f68754c58e3432 Author: Jens Axboe <jens.axboe(a)oracle.com> Date: Tue Nov 3 11:40:44 2009 +0100 fuse: fix kunmap in fuse_ioctl_copy_user Looks like another victim of the confusing kmap() vs kmap_atomic() API differences. Reported-by: Todor Gyumyushev <yodor1(a)gmail.com> Signed-off-by: Jens Axboe <jens.axboe(a)oracle.com> Signed-off-by: Miklos Szeredi <mszeredi(a)suse.cz> Cc: Tejun Heo <tj(a)kernel.org> Cc: stable(a)kernel.org diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 5887a63..c18913a 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1600,7 +1600,7 @@ static int fuse_ioctl_copy_user(struct page **pages, struct iovec *iov, kaddr += copy; } - kunmap(map); + kunmap(page); } return 0; -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit f60311d5f7670d9539b424e4ed8b5c0872fc9e83 Author: Anand V. Avati <avati(a)gluster.com> Date: Thu Oct 22 06:24:52 2009 -0700 fuse: prevent fuse_put_request on invalid pointer fuse_direct_io() has a loop where requests are allocated in each iteration. if allocation fails, the loop is broken out and follows into an unconditional fuse_put_request() on that invalid pointer. Signed-off-by: Anand V. Avati <avati(a)gluster.com> Signed-off-by: Miklos Szeredi <mszeredi(a)suse.cz> Cc: stable(a)kernel.org diff --git a/fs/fuse/file.c b/fs/fuse/file.c index a3492f7..5887a63 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1063,7 +1063,8 @@ ssize_t fuse_direct_io(struct file *file, const char __user *buf, break; } } - fuse_put_request(fc, req); + if (!IS_ERR(req)) + fuse_put_request(fc, req); if (res > 0) *ppos = pos; -- batman-adv

13 years, 4 months

← Newer
1
2
3
4
5
6
7
...
99
Older →

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2009