Linux 3.9.4
Greg KH
maintainerI'm announcing the release of the 3.9.4 kernel.
All users of the 3.9 kernel series must upgrade.
The updated 3.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.9.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/arm64/kernel/debug-monitors.c | 2 arch/arm64/mm/cache.S | 2 arch/arm64/mm/proc.S | 3 arch/x86/include/asm/syscalls.h | 4 arch/x86/kernel/head64.c | 2 arch/x86/kernel/vm86_32.c | 11 - drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 4 drivers/gpu/drm/radeon/evergreen.c | 4 drivers/gpu/drm/radeon/radeon_ttm.c | 2 drivers/gpu/drm/radeon/si.c | 4 drivers/hwmon/abituguru.c | 16 +- drivers/i2c/busses/i2c-designware-core.c | 14 + drivers/i2c/busses/i2c-designware-core.h | 2 drivers/net/ntb_netdev.c | 2 drivers/ntb/ntb_hw.c | 10 - drivers/ntb/ntb_transport.c | 175 +++++++++++++++--------- fs/btrfs/ioctl.c | 10 - include/uapi/linux/virtio_console.h | 2 19 files changed, 170 insertions(+), 101 deletions(-)
Alexander van Heukelum (1):
x86, vm86: fix VM86 syscalls: use SYSCALL_DEFINEx(...)
Ben Skeggs (1):
drm/nouveau/bios: fix thinko in ZM_MASK_ADD opcode
Dan Carpenter (2):
ntb: off by one sanity checks
NTB: fix pointer math issues
Gabriel de Perthuis (1):
btrfs: don't stop searching after encountering the wrong item
Greg Kroah-Hartman (1):
Linux 3.9.4
Jon Mason (8):
NTB: variable dereferenced before check
NTB: Handle 64bit BAR sizes
NTB: Link toggle memory leak
NTB: reset tx_index on link toggle
NTB: Correctly handle receive buffers of the minimal size
NTB: memcpy lockup workaround
ntb_netdev: remove from list on exit
NTB: Multiple NTB client fix
Josef Ahmad (1):
i2c: designware: fix RX FIFO overrun
Linus Torvalds (1):
x86: Fix bit corruption at CPU resume time
Michael S. Tsirkin (1):
virtio_console: fix uapi header
Mika Westerberg (1):
i2c: designware: always clear interrupts before enabling them
Niels Ole Salscheider (1):
drm/radeon: Fix VRAM size calculation for VRAM >= 4GB
Sukanto Ghosh (1):
arm64: mm: Fix operands of clz in __flush_dcache_all
Wei Yongjun (1):
hwmon: fix error return code in abituguru_probe()
Will Deacon (1):
arm64: debug: clear mdscr_el1 instead of taking the OS lock
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 9 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = NAME = Unicycling Gorilla
arch/arm64/kernel/debug-monitors.c +0 -2
@@ -136,8 +136,6 @@ void disable_debug_monitors(enum debug_el el)*/ static void clear_os_lock (void *unused) { - asmvolatile ("msr mdscr_el1, %0" : :"r" (0 )); -isb (); asmvolatile ("msr oslar_el1, %0" : :"r" (0 ));isb (); }
arch/arm64/mm/cache.S +1 -1
@@ -52,7 +52,7 @@ loop1: add x2, x2, #4 // add 4 (line length offset) mov x4, #0x3ff and x4, x4, x1, lsr #3 // find maximum number on the way size - clz x5, x4 // find bit position of way size increment + clz w5, w4 // find bit position of way size increment mov x7, #0x7fff and x7, x7, x1, lsr #13 // extract max number of the index size loop2:
arch/arm64/mm/proc.S +1 -2
@@ -119,8 +119,7 @@ ENTRY(__cpu_setup) mov x0, #3 << 20 msr cpacr_el1, x0 // Enable FP/ASIMD - mov x0, #1 - msr oslar_el1, x0 // Set the debug OS lock + msr mdscr_el1, xzr // Reset mdscr_el1 tlbi vmalle1is // invalidate I + D TLBs /* * Memory region attributes for LPAE:
arch/x86/include/asm/syscalls.h +2 -2
@@ -37,8 +37,8 @@ asmlinkage int sys_get_thread_area(struct user_desc __user *);unsigned long sys_sigreturn (void );/* kernel/vm86_32.c */ -int sys_vm86old (struct vm86_struct __user *); -int sys_vm86 (unsigned long ,unsigned long ); +asmlinkage long sys_vm86old (struct vm86_struct __user *); +asmlinkage long sys_vm86 (unsigned long ,unsigned long );#else /* CONFIG_X86_32 */
arch/x86/kernel/head64.c +1 -1
@@ -34,7 +34,7 @@extern pgd_t early_level4_pgt[PTRS_PER_PGD ];extern pmd_t early_dynamic_pgts[EARLY_DYNAMIC_PAGE_TABLES ][PTRS_PER_PMD ];static unsigned int __initdata next_early_pgt =2 ; -pmdval_t __initdata early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX); +pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX);/* Wipe all early page tables except for the kernel symbol map */ static void __init reset_early_page_tables (void )
arch/x86/kernel/vm86_32.c +6 -5
@@ -33,6 +33,7 @@#include <linux/capability.h> #include <linux/errno.h> #include <linux/interrupt.h> +#include <linux/syscalls.h> #include <linux/sched.h> #include <linux/kernel.h> #include <linux/signal.h>
@@ -48,7 +49,6 @@#include <asm/io.h> #include <asm/tlbflush.h> #include <asm/irq.h> -#include <asm/syscalls.h> /* * Known problems:
@@ -202,17 +202,16 @@ out:static int do_vm86_irq_handling (int subfunction,int irqnumber);static void do_sys_vm86 (struct kernel_vm86_struct *info,struct task_struct *tsk); -int sys_vm86old (struct vm86_struct __user *v86) +SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86) {struct kernel_vm86_struct info;/* declare this _on top_, * this avoids wasting of stack space. * This remains on the stack until we * return to 32 bit user space. */ -struct task_struct *tsk; +struct task_struct *tsk = current;int tmp, ret = -EPERM ; - tsk = current;if (tsk->thread.saved_sp0) goto out; tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
@@ -227,11 +226,12 @@ int sys_vm86old(struct vm86_struct __user *v86)do_sys_vm86 (&info, tsk); ret =0 ;/* we never return here */ out: +asmlinkage_protect (1 , ret, v86);return ret; } -int sys_vm86 (unsigned long cmd,unsigned long arg) +SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg) {struct kernel_vm86_struct info;/* declare this _on top_, * this avoids wasting of stack space.
@@ -278,6 +278,7 @@ int sys_vm86(unsigned long cmd, unsigned long arg)do_sys_vm86 (&info, tsk); ret =0 ;/* we never return here */ out: +asmlinkage_protect (2 , ret, cmd, arg);return ret; }
drivers/gpu/drm/nouveau/core/subdev/bios/init.c +2 -2
@@ -1926,8 +1926,8 @@ init_zm_mask_add(struct nvbios_init *init)trace ("ZM_MASK_ADD\tR[0x%06x] &= 0x%08x += 0x%08x\n" , addr, mask, add); init->offset +=13 ; - data =init_rd32 (init, addr) & mask; - data |= ((data + add) & ~mask); + data =init_rd32 (init, addr); + data = (data & mask) | ((data + add) & ~mask);init_wr32 (init, addr, data); }
drivers/gpu/drm/radeon/evergreen.c +2 -2
@@ -2400,8 +2400,8 @@ int evergreen_mc_init(struct radeon_device *rdev) rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ); }else {/* size in MB on evergreen/cayman/tn */ - rdev->mc.mc_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024 *1024 ; - rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024 *1024 ; + rdev->mc.mc_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; + rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; } rdev->mc.visible_vram_size = rdev->mc.aper_size;r700_vram_gtt_location (rdev, &rdev->mc);
drivers/gpu/drm/radeon/radeon_ttm.c +1 -1
@@ -726,7 +726,7 @@ int radeon_ttm_init(struct radeon_device *rdev)return r; }DRM_INFO ("radeon: %uM of VRAM memory ready\n" , - (unsigned )rdev->mc.real_vram_size / (1024 *1024 )); + (unsigned ) (rdev->mc.real_vram_size / (1024 *1024 ))); r =ttm_bo_init_mm (&rdev->mman.bdev,TTM_PL_TT , rdev->mc.gtt_size >>PAGE_SHIFT );if (r) {
drivers/gpu/drm/radeon/si.c +2 -2
@@ -2644,8 +2644,8 @@ 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 ) *1024 *1024 ; - rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024 *1024 ; + rdev->mc.mc_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; + rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; rdev->mc.visible_vram_size = rdev->mc.aper_size;si_vram_gtt_location (rdev, &rdev->mc);radeon_update_bandwidth_info (rdev);
drivers/hwmon/abituguru.c +10 -6
@@ -1411,14 +1411,18 @@ static int abituguru_probe(struct platform_device *pdev)pr_info ("found Abit uGuru\n" );/* Register sysfs hooks */ -for (i =0 ; i < sysfs_attr_i; i++) -if (device_create_file (&pdev->dev, - &data->sysfs_attr[i].dev_attr)) +for (i =0 ; i < sysfs_attr_i; i++) { + res =device_create_file (&pdev->dev, + &data->sysfs_attr[i].dev_attr); +if (res) goto abituguru_probe_error; -for (i =0 ; i <ARRAY_SIZE (abituguru_sysfs_attr); i++) -if (device_create_file (&pdev->dev, - &abituguru_sysfs_attr[i].dev_attr)) + } +for (i =0 ; i <ARRAY_SIZE (abituguru_sysfs_attr); i++) { + res =device_create_file (&pdev->dev, + &abituguru_sysfs_attr[i].dev_attr); +if (res) goto abituguru_probe_error; + } data->hwmon_dev =hwmon_device_register (&pdev->dev);if (!IS_ERR (data->hwmon_dev))
drivers/i2c/busses/i2c-designware-core.c +12 -2
@@ -361,7 +361,8 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)/* Enable the adapter */ dw_writel (dev,1 ,DW_IC_ENABLE ); -/* Enable interrupts */ +/* Clear and enable interrupts */ +i2c_dw_clear_int (dev);dw_writel (dev,DW_IC_INTR_DEFAULT_MASK ,DW_IC_INTR_MASK ); }
@@ -426,8 +427,14 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) cmd |=BIT (9 );if (msgs[dev->msg_write_idx].flags &I2C_M_RD ) { + +/* avoid rx buffer overrun */ +if (rx_limit - dev->rx_outstanding <=0 ) +break ; +dw_writel (dev, cmd |0x100 ,DW_IC_DATA_CMD ); rx_limit--; + dev->rx_outstanding++; }else dw_writel (dev, cmd | *buf++,DW_IC_DATA_CMD ); tx_limit--; buf_len--;
@@ -480,8 +487,10 @@ i2c_dw_read(struct dw_i2c_dev *dev) rx_valid =dw_readl (dev,DW_IC_RXFLR ); -for (; len >0 && rx_valid >0 ; len--, rx_valid--) +for (; len >0 && rx_valid >0 ; len--, rx_valid--) { *buf++ =dw_readl (dev,DW_IC_DATA_CMD ); + dev->rx_outstanding--; + }if (len >0 ) { dev->status |=STATUS_READ_IN_PROGRESS ;
@@ -539,6 +548,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) dev->msg_err =0 ; dev->status =STATUS_IDLE ; dev->abort_source =0 ; + dev->rx_outstanding =0 ; ret =i2c_dw_wait_bus_not_busy (dev);if (ret <0 )
drivers/i2c/busses/i2c-designware-core.h +2 -0
@@ -60,6 +60,7 @@* @adapter: i2c subsystem adapter node * @tx_fifo_depth: depth of the hardware tx fifo * @rx_fifo_depth: depth of the hardware rx fifo +* @rx_outstanding: current master-rx elements in tx fifo */ struct dw_i2c_dev {struct device *dev;
@@ -88,6 +89,7 @@ struct dw_i2c_dev {u32 master_cfg;unsigned int tx_fifo_depth;unsigned int rx_fifo_depth; +int rx_outstanding; };#define ACCESS_SWAP 0x00000001
drivers/net/ntb_netdev.c +2 -0
@@ -375,6 +375,8 @@ static void ntb_netdev_remove(struct pci_dev *pdev)if (dev ==NULL )return ; +list_del (&dev->list); + ndev = dev->ndev;unregister_netdev (ndev);
drivers/ntb/ntb_hw.c +5 -5
@@ -345,7 +345,7 @@ int ntb_read_remote_spad(struct ntb_device *ndev, unsigned int idx, u32 *val)*/ void __iomem *ntb_get_mw_vbase (struct ntb_device *ndev,unsigned int mw) { -if (mw >NTB_NUM_MW ) +if (mw >=NTB_NUM_MW )return NULL ;return ndev->mw[mw].vbase;
@@ -362,7 +362,7 @@ void __iomem *ntb_get_mw_vbase(struct ntb_device *ndev, unsigned int mw)*/ resource_size_t ntb_get_mw_size (struct ntb_device *ndev,unsigned int mw) { -if (mw >NTB_NUM_MW ) +if (mw >=NTB_NUM_MW )return 0 ;return ndev->mw[mw].bar_sz;
@@ -380,7 +380,7 @@ resource_size_t ntb_get_mw_size(struct ntb_device *ndev, unsigned int mw)*/ void ntb_set_mw_addr (struct ntb_device *ndev,unsigned int mw,u64 addr) { -if (mw >NTB_NUM_MW ) +if (mw >=NTB_NUM_MW )return ; dev_dbg(&ndev->pdev->dev, "Writing addr %Lx to BAR %d\n", addr,
@@ -1027,8 +1027,8 @@ static int ntb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) ndev->mw[i].vbase =ioremap_wc (pci_resource_start (pdev,MW_TO_BAR (i)), ndev->mw[i].bar_sz); -dev_info (&pdev->dev,"MW %d size %d\n" , i, - (u32 )pci_resource_len (pdev,MW_TO_BAR (i))); +dev_info (&pdev->dev,"MW %d size %llu\n" , i, +pci_resource_len (pdev,MW_TO_BAR (i)));if (!ndev->mw[i].vbase) {dev_warn (&pdev->dev,"Cannot remap BAR %d\n" ,MW_TO_BAR (i));
drivers/ntb/ntb_transport.c +114 -61
334 lines not on this page · raw message
fs/btrfs/ioctl.c +5 -5
@@ -1796,7 +1796,11 @@ static noinline int copy_to_sk(struct btrfs_root *root, item_off =btrfs_item_ptr_offset (leaf, i); item_len =btrfs_item_size_nr (leaf, i); -if (item_len >BTRFS_SEARCH_ARGS_BUFSIZE ) +btrfs_item_key_to_cpu (leaf, key, i); +if (!key_in_sk (key, sk)) +continue ; + +if (sizeof (sh) + item_len >BTRFS_SEARCH_ARGS_BUFSIZE ) item_len =0 ; if (sizeof(sh) + item_len + *sk_offset >
@@ -1805,10 +1809,6 @@ static noinline int copy_to_sk(struct btrfs_root *root, goto overflow; } -btrfs_item_key_to_cpu (leaf, key, i); -if (!key_in_sk (key, sk)) -continue ; - sh.objectid = key->objectid; sh.offset = key->offset; sh.type = key->type;
include/uapi/linux/virtio_console.h +1 -1
@@ -39,7 +39,7 @@#define VIRTIO_CONSOLE_F_SIZE 0/* Does host provide console size? */ #define VIRTIO_CONSOLE_F_MULTIPORT 1/* Does host provide multiple ports? */ -#define VIRTIO_CONSOLE_BAD_ID (~(u32)0) +#define VIRTIO_CONSOLE_BAD_ID (~(__u32)0)struct virtio_console_config {/* colums of the screens */