1. 15 9月, 2012 4 次提交
    • L
      Merge tag 'tty-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · fe59d297
      Linus Torvalds 提交于
      Pull TTY fixes from Greg Kroah-Hartman:
       "Here are 2 tiny patches for a serial driver to resolve issues that
        people have reported with the 3.6-rc tree.
      
        Both of these have been in the linux-next tree for a while now.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'tty-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: serial: imx: don't reinit clock in imx_setup_ufcr()
        tty: serial: imx: console write routing is unsafe on SMP
      fe59d297
    • L
      Merge tag 'staging-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · f2378e38
      Linus Torvalds 提交于
      Pull staging tree fixes from Greg Kroah-Hartman:
       "Here are a few staging tree fixes for problems that have been
        reported.
      
        Nothing major, just a number of tiny driver fixes.  All of these have
        been in the linux-next tree for a while.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'staging-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        drm/omap: add more new timings fields
        drm/omap: update for interlaced
        staging: r8712u: fix bug in r8712_recv_indicatepkt()
        staging: zcache: fix cleancache race condition with shrinker
        Staging: Android alarm: IOCTL command encoding fix
        staging: vt6656: [BUG] - Failed connection, incorrect endian.
        staging: ozwpan: fix memcmp() test in oz_set_active_pd()
        staging: wlan-ng: Fix problem with wrong arguments
        staging: comedi: das08: Correct AO output for das08jr-16-ao
        staging: comedi: das08: Correct AI encoding for das08jr-16-ao
        staging: comedi: das08: Fix PCI ref count
        staging: comedi: amplc_pci230: Fix PCI ref count
        staging: comedi: amplc_pc263: Fix PCI ref count
        staging: comedi: amplc_pc236: Fix PCI ref count
        staging: comedi: amplc_dio200: Fix PCI ref count
        staging: comedi: amplc_pci224: Fix PCI ref count
        drivers/iio/adc/at91_adc.c: adjust inconsistent IS_ERR and PTR_ERR
        staging iio: fix potential memory leak in lis3l02dq_ring.c
        staging:iio: prevent divide by zero bugs
      f2378e38
    • L
      Merge tag 'driver-core-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 0462bfc8
      Linus Torvalds 提交于
      Pull driver core fix from Greg Kroah-Hartman:
       "Here is one fix for 3.6-rc6 for the kobject.h file.
      
        It fixes a reported oops if CONFIG_HOTPLUG is disabled.  It's been in
        the linux-next tree for a while now.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'driver-core-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        kobject: fix oops with "input0: bad kobj_uevent_env content in show_uevent()"
      0462bfc8
    • L
      vfs: make O_PATH file descriptors usable for 'fstat()' · 55815f70
      Linus Torvalds 提交于
      We already use them for openat() and friends, but fstat() also wants to
      be able to use O_PATH file descriptors.  This should make it more
      directly comparable to the O_SEARCH of Solaris.
      
      Note that you could already do the same thing with "fstatat()" and an
      empty path, but just doing "fstat()" directly is simpler and faster, so
      there is no reason not to just allow it directly.
      
      See also commit 332a2e12, which did the same thing for fchdir, for
      the same reasons.
      Reported-by: Nольга крыжановская <olga.kryzhanovska@gmail.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: stable@kernel.org    # O_PATH introduced in 3.0+
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      55815f70
  2. 13 9月, 2012 10 次提交
  3. 12 9月, 2012 5 次提交
  4. 11 9月, 2012 18 次提交
  5. 10 9月, 2012 3 次提交
    • X
      KVM: fix error paths for failed gfn_to_page() calls · 4484141a
      Xiao Guangrong 提交于
      This bug was triggered:
      [ 4220.198458] BUG: unable to handle kernel paging request at fffffffffffffffe
      [ 4220.203907] IP: [<ffffffff81104d85>] put_page+0xf/0x34
      ......
      [ 4220.237326] Call Trace:
      [ 4220.237361]  [<ffffffffa03830d0>] kvm_arch_destroy_vm+0xf9/0x101 [kvm]
      [ 4220.237382]  [<ffffffffa036fe53>] kvm_put_kvm+0xcc/0x127 [kvm]
      [ 4220.237401]  [<ffffffffa03702bc>] kvm_vcpu_release+0x18/0x1c [kvm]
      [ 4220.237407]  [<ffffffff81145425>] __fput+0x111/0x1ed
      [ 4220.237411]  [<ffffffff8114550f>] ____fput+0xe/0x10
      [ 4220.237418]  [<ffffffff81063511>] task_work_run+0x5d/0x88
      [ 4220.237424]  [<ffffffff8104c3f7>] do_exit+0x2bf/0x7ca
      
      The test case:
      
      	printf(fmt, ##args);		\
      	exit(-1);} while (0)
      
      static int create_vm(void)
      {
      	int sys_fd, vm_fd;
      
      	sys_fd = open("/dev/kvm", O_RDWR);
      	if (sys_fd < 0)
      		die("open /dev/kvm fail.\n");
      
      	vm_fd = ioctl(sys_fd, KVM_CREATE_VM, 0);
      	if (vm_fd < 0)
      		die("KVM_CREATE_VM fail.\n");
      
      	return vm_fd;
      }
      
      static int create_vcpu(int vm_fd)
      {
      	int vcpu_fd;
      
      	vcpu_fd = ioctl(vm_fd, KVM_CREATE_VCPU, 0);
      	if (vcpu_fd < 0)
      		die("KVM_CREATE_VCPU ioctl.\n");
      	printf("Create vcpu.\n");
      	return vcpu_fd;
      }
      
      static void *vcpu_thread(void *arg)
      {
      	int vm_fd = (int)(long)arg;
      
      	create_vcpu(vm_fd);
      	return NULL;
      }
      
      int main(int argc, char *argv[])
      {
      	pthread_t thread;
      	int vm_fd;
      
      	(void)argc;
      	(void)argv;
      
      	vm_fd = create_vm();
      	pthread_create(&thread, NULL, vcpu_thread, (void *)(long)vm_fd);
      	printf("Exit.\n");
      	return 0;
      }
      
      It caused by release kvm->arch.ept_identity_map_addr which is the
      error page.
      
      The parent thread can send KILL signal to the vcpu thread when it was
      exiting which stops faulting pages and potentially allocating memory.
      So gfn_to_pfn/gfn_to_page may fail at this time
      
      Fixed by checking the page before it is used
      Signed-off-by: NXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
      Signed-off-by: NAvi Kivity <avi@redhat.com>
      4484141a
    • T
      ALSA: hda - Fix Oops at codec reset/reconfig · 07dc59f0
      Takashi Iwai 提交于
      snd_hda_codec_reset() calls restore_pincfgs() where the codec is
      powered up again, which eventually tries to resume and initialize via
      the callbacks of the codec.  However, it's the place just after codec
      free callback, thus no codec callbacks should be called after that.
      On a codec like CS4206, it results in Oops due to the access in init
      callback.
      
      This patch fixes the issue by clearing the codec callbacks properly
      after freeing codec.
      Reported-by: NDaniel J Blueman <daniel@quora.org>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      07dc59f0
    • J
      i2c-core: Fix for lockdep validator · 390946b1
      Jean Delvare 提交于
      If kernel is compiled with CONFIG_PROVE_LOCKING the
      validator raises an error when a multiplexer is removed
      via sysfs and sub-clients are connected to it. This is a
      false positive.
      Documentation/lockdep-design.txt recommends to handle this
      via calls to mutex_lock_nested().
      
      Based on an earlier fix from Michael Lawnick.
      
      Note that the extra code resolves to nothing unless
      CONFIG_DEBUG_LOCK_ALLOC=y.
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      Cc: Michael Lawnick <ml.lawnick@gmx.de>
      390946b1