Linux 2.6.32.27
Subsystems (63)
I'm announcing the release of the 2.6.32.27 kernel.
All users of the 2.6.32 kernel series must upgrade.
The updated 2.6.32.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.32.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.32.y.git;a=summaryNote, this will be the last .32 release in the stable/ directory. All future ones will be in the longterm/ directory on kernel.org. Please adjust your scripts as necessary.
thanks,
greg k-h
------------
MAINTAINERS | 6 Makefile | 2 arch/arm/include/asm/assembler.h | 2 arch/arm/lib/findbit.S | 6 arch/microblaze/Makefile | 8 - arch/s390/kernel/nmi.c | 10 - arch/s390/lib/delay.c | 14 + arch/sparc/kernel/signal32.c | 161 +++++++++++++--------- arch/sparc/kernel/signal_32.c | 55 ++++--- arch/sparc/kernel/signal_64.c | 45 +++--- arch/um/drivers/line.c | 5 arch/um/kernel/uml.lds.S | 2 arch/um/os-Linux/time.c | 2 arch/x86/include/asm/pgtable_32.h | 1 arch/x86/include/asm/trampoline.h | 5 arch/x86/kernel/apic/x2apic_uv_x.c | 9 - arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 1 arch/x86/kernel/head_32.S | 8 - arch/x86/kernel/quirks.c | 9 + arch/x86/kernel/setup.c | 3 arch/x86/kernel/smpboot.c | 32 +--- arch/x86/kernel/trampoline.c | 17 ++ arch/x86/kvm/vmx.c | 16 +- arch/x86/kvm/x86.c | 8 + arch/x86/xen/enlighten.c | 4 block/blk-map.c | 2 block/blk-settings.c | 2 block/scsi_ioctl.c | 34 +++- drivers/acpi/blacklist.c | 8 + drivers/ata/ahci.c | 10 + drivers/ata/ata_generic.c | 30 +++- drivers/ata/libata-scsi.c | 7 drivers/char/hpet.c | 17 ++ drivers/char/tty_buffer.c | 14 + drivers/char/tty_ldisc.c | 58 ++++++-- drivers/char/vt_ioctl.c | 11 - drivers/crypto/padlock-aes.c | 2 drivers/firewire/core-cdev.c | 18 +- drivers/firewire/core-device.c | 1 drivers/firewire/ohci.c | 60 ++++++-- drivers/gpu/drm/ttm/ttm_bo_util.c | 1 drivers/hid/hidraw.c | 18 +- drivers/hwmon/lm85.c | 1 drivers/i2c/busses/i2c-pca-platform.c | 2 drivers/input/serio/i8042-x86ia64io.h | 7 drivers/md/md.c | 4 drivers/md/raid1.c | 1 drivers/media/video/ivtv/ivtvfb.c | 2 drivers/media/video/uvc/uvc_driver.c | 14 + drivers/misc/sgi-xp/xpc_partition.c | 25 ++- drivers/misc/sgi-xp/xpc_uv.c | 19 +- drivers/net/gianfar.c | 6 drivers/net/jme.c | 22 ++- drivers/pci/pci-sysfs.c | 22 ++- drivers/pci/pci.h | 7 drivers/pci/proc.c | 2 drivers/power/olpc_battery.c | 8 - drivers/ssb/b43_pci_bridge.c | 1 drivers/staging/asus_oled/asus_oled.c | 8 - drivers/staging/frontier/tranzport.c | 2 drivers/staging/line6/control.c | 204 ++++++++++++++--------------- drivers/staging/line6/midi.c | 4 drivers/staging/line6/pod.c | 32 ++-- drivers/staging/line6/toneport.c | 4 drivers/staging/line6/variax.c | 12 - drivers/staging/rtl8187se/r8185b_init.c | 30 +++- drivers/usb/atm/ueagle-atm.c | 6 drivers/usb/core/devio.c | 7 drivers/usb/gadget/atmel_usba_udc.c | 2 drivers/usb/host/ehci-hcd.c | 10 - drivers/usb/misc/cypress_cy7c63.c | 6 drivers/usb/misc/iowarrior.c | 1 drivers/usb/misc/sisusbvga/sisusb.c | 1 drivers/usb/misc/trancevibrator.c | 2 drivers/usb/misc/usbled.c | 2 drivers/usb/misc/usbsevseg.c | 10 - drivers/usb/serial/ftdi_sio.c | 8 - drivers/usb/serial/ftdi_sio_ids.h | 11 + drivers/usb/serial/option.c | 2 drivers/usb/storage/sierra_ms.c | 2 drivers/video/backlight/backlight.c | 12 - drivers/video/efifb.c | 106 +++++++++++++-- drivers/video/via/accel.c | 7 drivers/xen/events.c | 2 fs/bio.c | 23 ++- fs/ecryptfs/inode.c | 4 fs/fuse/file.c | 10 + include/linux/blkdev.h | 4 include/linux/pci_ids.h | 2 include/linux/socket.h | 2 include/net/x25.h | 4 ipc/compat.c | 6 ipc/compat_mq.c | 5 ipc/sem.c | 2 ipc/shm.c | 1 kernel/exit.c | 9 + kernel/latencytop.c | 17 +- lib/percpu_counter.c | 1 mm/filemap.c | 3 mm/internal.h | 2 mm/memory_hotplug.c | 2 mm/mempolicy.c | 2 mm/mprotect.c | 2 mm/nommu.c | 1 net/can/bcm.c | 2 net/compat.c | 10 - net/core/dev.c | 6 net/core/ethtool.c | 2 net/core/iovec.c | 20 +- net/decnet/af_decnet.c | 2 net/econet/af_econet.c | 29 +--- net/ipv4/tcp.c | 4 net/ipv4/udp.c | 4 net/irda/iriap.c | 3 net/irda/parameters.c | 4 net/netfilter/nf_conntrack_core.c | 3 net/rds/rdma.c | 2 net/sched/act_gact.c | 21 +- net/sched/act_mirred.c | 15 +- net/sched/act_nat.c | 35 +--- net/sched/act_police.c | 21 +- net/sched/act_simple.c | 11 - net/sched/act_skbedit.c | 11 - net/sctp/protocol.c | 4 net/socket.c | 4 net/x25/af_x25.c | 47 ++++++ net/x25/x25_facilities.c | 32 +++- net/x25/x25_in.c | 17 +- sound/pci/hda/patch_realtek.c | 4 sound/pci/hda/patch_sigmatel.c | 2 sound/pci/intel8x0.c | 6 131 files changed, 1189 insertions(+), 594 deletions(-)
Alan Stern (1):
USB: EHCI: fix obscure race in ehci_endpoint_disable
Antonio Ospite (2):
HID: hidraw, fix a NULL pointer dereference in hidraw_ioctl
HID: hidraw, fix a NULL pointer dereference in hidraw_write
Ben Hutchings (2):
net: NETIF_F_HW_CSUM does not imply FCoE CRC offload
KVM: VMX: Fix host userspace gsbase corruption
Changli Gao (1):
act_nat: use stack variable
Clemens Ladisch (3):
hpet: fix unwanted interrupt due to stale irq status bit
firewire: ohci: fix buffer overflow in AR split packet handling
firewire: ohci: fix race in AR split packet handling
Dan Rosenberg (6):
ipc: initialize structure memory to zero for compat functions
sys_semctl: fix kernel stack leakage
DECnet: don't leak uninitialized stack byte V4L/DVB: ivtvfb: prevent reading uninitialized stack memory
x25: Prevent crashing when parsing bad X.25 facilities
rds: Integer overflow in RDS cmsg handling
Daniel Klaffenbach (1):
ssb: b43-pci-bridge: Add new vendor for BCM4318
Daniel T Chen (2):
ALSA: ac97: Apply quirk for Dell Latitude D610 binding Master and Headphone controls
ALSA: hda: Use "alienware" model quirk for another SSID
Darrick J. Wong (1):
PCI: fix offset check for sysfs mmapped files
Dave Hansen (1):
mm/vfs: revalidate page->mapping in do_generic_file_read()
David Henningsson (1):
ALSA: HDA: Add an extra DAC for Realtek ALC887-VD
David S. Miller (4):
sparc64: Fix race in signal instruction flushing.
sparc: Don't mask signal when we can't setup signal frame.
sparc: Prevent no-handler signal syscall restart recursion.
net: Limit socket I/O iovec total length to INT_MAX.
Dmitry Torokhov (1):
Input: i8042 - add Sony VAIO VPCZ122GX to nomux list
Douglas Gilbert (1):
libata-scsi passthru: fix bug which truncated LBA48 return values
Eric Dumazet (3):
numa: fix slab_node(MPOL_BIND)
netfilter: nf_conntrack: allow nf_ct_alloc_hashtable() to get highmem pages net sched: fix some kernel memory leaks
Florian Tobias Schandinat (1):
viafb: use proper register for colour when doing fill ops
Francisco Jerez (1):
drm/ttm: Clear the ghost cpu_writers flag on ttm_buffer_object_transfer.
Gleb Natapov (1):
KVM: VMX: fix vmx null pointer dereference on debug register access
Graham Gower (1):
drivers/char/vt_ioctl.c: fix VT_OPENQRY error value
Greg Kroah-Hartman (11):
Staging: asus_oled: fix up some sysfs attribute permissions
Staging: asus_oled: fix up my fixup for some sysfs attribute permissions
Staging: line6: fix up some sysfs attribute permissions
USB: storage: sierra_ms: fix sysfs file attribute
USB: atm: ueagle-atm: fix up some permissions on the sysfs files
USB: misc: cypress_cy7c63: fix up some sysfs attribute permissions
USB: misc: usbled: fix up some sysfs attribute permissions
USB: misc: trancevibrator: fix up a sysfs attribute permission
USB: misc: usbsevseg: fix up some sysfs attribute permissions
Staging: frontier: fix up some sysfs attribute permissions Linux 2.6.32.27
Guo-Fu Tseng (1):
jme: Fix PHY power-off error
H. Peter Anvin (1):
x86-32: Fix dummy trampoline-related inline stubs
Heiko Carstens (1):
nmi: fix clock comparator revalidation
Herbert Xu (1):
crypto: padlock - Fix AES-CBC handling on odd-block-sized input
Hugh Dickins (1):
x86, mm: Fix CONFIG_VMSPLIT_1G and 2G_OPT trampoline
Ian Campbell (1):
xen: ensure that all event channels start off bound to VCPU 0
Jack Steiner (2):
x86, UV: Delete unneeded boot messages
x86, UV: Fix initialization of max_pnode
Jacques Viviers (1):
USB: serial: ftdi_sio: Vardaan USB RS422/485 converter PID added
James Jones (1):
ARM: 6482/2: Fix find_next_zero_bit and related assembly
Jarek Poplawski (1):
gianfar: Fix crashes on RX path (Was Re: [Bugme-new] [Bug 19692] New: linux-2.6.36-rc5 crash with gianfar ethernet at full line rate traffic)
Jean Delvare (1):
hwmon: (lm85) Fix ADT7468 frequency table
Jeff Mahoney (1):
net sched: fix kernel leak in act_police
Jens Axboe (4):
block: limit vec count in bio_kmalloc() and bio_alloc_map_data()
block: take care not to overflow when calculating total iov length
block: check for proper length of iov entries in blk_rq_map_user_iov()
bio: take care not overflow page count when mapping/copying user data
Jeremy Fitzhardinge (1):
xen: don't bother to stop other cpus on shutdown/reboot
Jiri Olsa (1):
tty: prevent DOS in the flush_to_ldisc
Jiri Slaby (3):
hpet: unmap unused I/O space
TTY: restore tty_ldisc_wait_idle
TTY: ldisc, fix open flag handling
Joerg Roedel (1):
x86-32: Separate 1:1 pagetables from swapper_pg_dir
Johan Hovold (1):
USB: ftdi_sio: revert "USB: ftdi_sio: fix DTR/RTS line modes"
John Hughes (1):
x25: Patch to fix bug 15678 - x25 accesses fields beyond end of packet.
Josh Wu (1):
USB: gadget: AT91: fix typo in atmel_usba_udc driver
Justin Maggard (1):
md: fix return value of rdev_size_change()
KAMEZAWA Hiroyuki (2):
mm: fix return value of scan_lru_pages in memory unplug
mm: fix is_mem_section_removable() page_order BUG_ON check
Kees Cook (1):
net: clear heap allocation for ETHTOOL_GRXCLSRLALL
Ken Chen (1):
latencytop: fix per task accumulator
Ken Sumrall (1):
fuse: fix attributes after open(O_TRUNC)
Larry Finger (1):
staging: rtl8187se: Change panic to warn when RF switch turned off
Laurent Pinchart (1):
V4L/DVB (13154): uvcvideo: Handle garbage at the end of streaming interface descriptors
Len Brown (1):
ACPI: EC: add Vista incompatibility DMI entry for Toshiba Satellite L355
Linus Torvalds (1):
net: Truncate recvfrom and sendto length to INT_MAX.
Luke Macken (1):
efifb: support the EFI framebuffer on more Apple hardware
Martin K. Petersen (1):
block: Ensure physical block size is unsigned int
Martin Wilck (1):
PCI: fix size checks for mmap() on /proc/bus/pci files
Masanori ITOH (1):
percpu: fix list_head init bug in __percpu_counter_init()
Michael Stuermer (1):
USB: ftdi_sio: Add ID for RT Systems USB-29B radio cable
NeilBrown (1):
md/raid1: really fix recovery looping when single good device fails.
Nelson Elhage (1):
do_exit(): make sure that we run with get_fs() == USER_DS
Nobuhiro Iwamatsu (1):
i2c-pca-platform: Change device name of request_irq
Oliver Hartkopp (1):
can-bcm: fix minor heap overflow
Pekka Enberg (1):
perf_events: Fix perf_counter_mmap() hook in mprotect()
Peter Jones (1):
efifb: check that the base address is plausible on pci systems
Phil Blundell (2):
econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849
econet: fix CVE-2010-3850
Philippe Rétornaz (1):
tty_ldisc: Fix BUG() on hangup
Prarit Bhargava (1):
x86: AMD Northbridge: Verify NB's node is online
Richard A. Smith (1):
olpc_battery: Fix endian neutral breakage for s16 values
Richard Weinberger (2):
um: remove PAGE_SIZE alignment in linker script causing kernel segfault.
um: fix global timer issue when using CONFIG_NO_HZ
Robin Holt (5):
Limit sysctl_tcp_mem and sysctl_udp_mem initializers to prevent integer overflows. UV - XPC: pass nasid instead of nid to gru_create_message_queue
x86: uv: XPC receive message reuse triggers invalid BUG_ON()
X86: uv: xpc_make_first_contact hang due to not accepting ACTIVE state
x86: uv: xpc NULL deref when mesq becomes empty
[email protected] (1):
sgi-xpc: XPC fails to discover partitions with all nasids above 128
Samuel Ortiz (2):
irda: Fix parameter extraction stack overflow
irda: Fix heap memory corruption in iriap.c
Sebastien Bourdeauducq (1):
USB: ftdi_sio: add device IDs for Milkymist One JTAG/serial
Stefan Richter (2):
firewire: cdev: fix information leak
firewire: core: fix an information leak
Steven J. Magnani (1):
nommu: yield CPU while disposing VM
Tejun Heo (3):
ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
ata_generic: implement ATA_GEN_* flags and force enable DMA on MBP 7,1
libata: fix NULL sdev dereference race in atapi_qc_complete()
Thomas Backlund (1):
microblaze: Fix build with make 3.82
Thomas Gerlach (1):
drivers/video/efifb.c: support framebuffer for NVIDIA 9400M in MacBook Pro 5,1
Tyler Hicks (1):
eCryptfs: Clear LOOKUP_OPEN flag when creating lower file
Uwe Kleine-König (1):
backlight: grab ops_lock before testing bd->ops
Vasiliy Kulikov (5):
ipc: shm: fix information leak to userland
KVM: x86: fix information leak to userland
usb: misc: sisusbvga: fix information leak to userland
usb: misc: iowarrior: fix information leak to userland
usb: core: fix information leak to userland
Will Deacon (1):
ARM: 6489/1: thumb2: fix incorrect optimisation in usracc
Will Newton (1):
uml: disable winch irq before freeing handler data
Zhang Rui (1):
acpi-cpufreq: fix a memleak when unloading driver
andrew hendry (1):
memory corruption in X.25 facilities parsing
ma rui (1):
USB: option: fix when the driver is loaded incorrectly for some Huawei devices.
MAINTAINERS +6 -0
@@ -1974,6 +1974,12 @@ W: http://acpi4asus.sf.net S: Maintained F: drivers/platform/x86/eeepc-laptop.c +EFIFB FRAMEBUFFER DRIVER +L: [email protected] +M: Peter Jones <[email protected]> +S: Maintained +F: drivers/video/efifb.c + EFS FILESYSTEM W: http://aeschi.ch.eu.org/efs/ S: Orphan
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 32 -EXTRAVERSION = .26 +EXTRAVERSION = .27 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
arch/arm/include/asm/assembler.h +1 -1
@@ -215,7 +215,7 @@ @ Slightly optimised to avoid incrementing the pointer twice usraccoff \instr, \reg, \ptr, \inc, 0, \cond, \abort .if \rept == 2 - usraccoff \instr, \reg, \ptr, \inc, 4, \cond, \abort + usraccoff \instr, \reg, \ptr, \inc, \inc, \cond, \abort .endif add\cond \ptr, #\rept * \inc
arch/arm/lib/findbit.S +4 -2
@@ -174,8 +174,8 @@ ENDPROC(_find_next_bit_be) */ .L_found: #if __LINUX_ARM_ARCH__ >= 5 - rsb r1, r3, #0 - and r3, r3, r1 + rsb r0, r3, #0 + and r3, r3, r0 clz r3, r3 rsb r3, r3, #31 add r0, r2, r3
@@ -190,5 +190,7 @@ ENDPROC(_find_next_bit_be) addeq r2, r2, #1 mov r0, r2 #endif + cmp r1, r0 @ Clamp to maxbit + movlo r0, r1 mov pc, lr
arch/microblaze/Makefile +6 -2
@@ -69,12 +69,16 @@ export MMU DTB all: linux.bin -BOOT_TARGETS = linux.bin linux.bin.gz simpleImage.% +# With make 3.82 we cannot mix normal and wildcard targets +BOOT_TARGETS1 = linux.bin linux.bin.gz +BOOT_TARGETS2 = simpleImage.% archclean: $(Q)$(MAKE) $(clean)=$(boot) -$(BOOT_TARGETS): vmlinux +$(BOOT_TARGETS1): vmlinux + $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ +$(BOOT_TARGETS2): vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ define archhelp
arch/s390/kernel/nmi.c +4 -6
@@ -95,7 +95,6 @@ EXPORT_SYMBOL_GPL(s390_handle_mcck); static int notrace s390_revalidate_registers(struct mci *mci) {int kill_task; -u64 tmpclock;u64 zero;void *fpt_save_area, *fpt_creg_save_area;
@@ -214,11 +213,10 @@ static int notrace s390_revalidate_registers(struct mci *mci) : "0", "cc");#endif /* Revalidate clock comparator register */ - asmvolatile ( -" stck 0(%1)\n" -" sckc 0(%1)" - :"=m" (tmpclock) :"a" (&(tmpclock)) :"cc" ,"memory" ); - +if (S390_lowcore.clock_comparator ==-1 ) +set_clock_comparator (get_clock ()); +else +set_clock_comparator (S390_lowcore.clock_comparator);/* Check if old PSW is valid */ if (!mci->wp)/*
arch/s390/lib/delay.c +9 -5
@@ -29,17 +29,21 @@ static void __udelay_disabled(unsigned long long usecs) {unsigned long mask, cr0, cr0_saved;u64 clock_saved; +u64 end; + mask = psw_kernel_bits |PSW_MASK_WAIT |PSW_MASK_EXT ; + end =get_clock () + (usecs <<12 ); clock_saved =local_tick_disable (); -set_clock_comparator (get_clock () + (usecs <<12 ));__ctl_store (cr0_saved,0 ,0 ); cr0 = (cr0_saved &0xffff00e0 ) |0x00000800 ;__ctl_load (cr0 ,0 ,0 ); - mask = psw_kernel_bits |PSW_MASK_WAIT |PSW_MASK_EXT ;lockdep_off (); -trace_hardirqs_on (); -__load_psw_mask (mask); -local_irq_disable (); +do { +set_clock_comparator (end); +trace_hardirqs_on (); +__load_psw_mask (mask); +local_irq_disable (); + }while (get_clock () < end);lockdep_on ();__ctl_load (cr0_saved,0 ,0 );local_tick_enable (clock_saved);
arch/sparc/kernel/signal32.c +97 -64
236 lines not on this page · raw message
arch/sparc/kernel/signal_32.c +35 -20
116 lines not on this page · raw message
arch/sparc/kernel/signal_64.c +28 -17
89 lines not on this page · raw message
arch/um/drivers/line.c +3 -2
@@ -727,6 +727,9 @@ struct winch {static void free_winch (struct winch *winch,int free_irq_ok) { +if (free_irq_ok) +free_irq (WINCH_IRQ , winch); +list_del (&winch->list);if (winch->pid !=-1 )
@@ -735,8 +738,6 @@ static void free_winch(struct winch *winch, int free_irq_ok)os_close_file (winch->fd);if (winch->stack !=0 )free_stack (winch->stack,0 ); -if (free_irq_ok) -free_irq (WINCH_IRQ , winch);kfree (winch); }
arch/um/kernel/uml.lds.S +1 -1
@@ -22,7 +22,7 @@ SECTIONS _text = .; _stext = .; __init_begin = .; - INIT_TEXT_SECTION(PAGE_SIZE) + INIT_TEXT_SECTION(0) . = ALIGN(PAGE_SIZE); .text :
arch/um/os-Linux/time.c +1 -1
@@ -60,7 +60,7 @@ static inline long long timeval_to_ns(const struct timeval *tv)long long disable_timer (void ) {struct itimerval time = ((struct itimerval ) { {0 ,0 }, {0 ,0 } }); -int remain, max =UM_NSEC_PER_SEC /UM_HZ ; +long long remain, max =UM_NSEC_PER_SEC /UM_HZ ;if (setitimer (ITIMER_VIRTUAL , &time, &time) <0 ) printk(UM_KERN_ERR "disable_timer - setitimer failed, "
arch/x86/include/asm/pgtable_32.h +1 -0
@@ -27,6 +27,7 @@ struct mm_struct;struct vm_area_struct ;extern pgd_t swapper_pg_dir[1024 ]; +extern pgd_t trampoline_pg_dir[1024 ];static inline void pgtable_cache_init (void ) { }static inline void check_pgt_cache (void ) { }
arch/x86/include/asm/trampoline.h +4 -1
@@ -13,15 +13,18 @@ extern unsigned char *trampoline_base;extern unsigned long init_rsp;extern unsigned long initial_code; +extern unsigned long initial_page_table;extern unsigned long initial_gs;#define TRAMPOLINE_SIZE roundup(trampoline_end - trampoline_data, PAGE_SIZE)#define TRAMPOLINE_BASE 0x6000extern unsigned long setup_trampoline (void ); +extern void __init setup_trampoline_page_table (void );extern void __init reserve_trampoline_memory (void );#else -static inline void reserve_trampoline_memory (void ) {}; +static inline void setup_trampoline_page_table (void ) {} +static inline void reserve_trampoline_memory (void ) {}#endif /* CONFIG_X86_TRAMPOLINE */ #endif /* __ASSEMBLY__ */
arch/x86/kernel/apic/x2apic_uv_x.c +3 -6
@@ -595,9 +595,11 @@ void __init uv_system_init(void)for (j =0 ; j <64 ; j++) {if (!test_bit (j, &present))continue ; - uv_blade_info[blade].pnode = (i *64 + j); + pnode = (i *64 + j); + uv_blade_info[blade].pnode = pnode; uv_blade_info[blade].nr_possible_cpus =0 ; uv_blade_info[blade].nr_online_cpus =0 ; + max_pnode =max (pnode, max_pnode); blade++; } }
@@ -635,10 +637,6 @@ void __init uv_system_init(void)uv_cpu_hub_info (cpu)->scir.offset =uv_scir_offset (apicid); uv_node_to_blade[nid] = blade; uv_cpu_to_blade[cpu] = blade; - max_pnode =max (pnode, max_pnode); - -printk (KERN_DEBUG "UV: cpu %d, apicid 0x%x, pnode %d, nid %d, lcpu %d, blade %d\n" , - cpu, apicid, pnode, nid, lcpu, blade); }/* Add blade/pnode info for nodes without cpus */
@@ -650,7 +648,6 @@ void __init uv_system_init(void) pnode = (paddr >> m_val) & pnode_mask; blade =boot_pnode_to_blade (pnode); uv_node_to_blade[nid] = blade; - max_pnode =max (pnode, max_pnode); }map_gru_high (max_pnode);
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +1 -0
@@ -741,6 +741,7 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)per_cpu (drv_data, policy->cpu) =NULL ;acpi_processor_unregister_performance (data->acpi_data, policy->cpu); +kfree (data->freq_table);kfree (data); }
arch/x86/kernel/head_32.S +7 -1
@@ -324,7 +324,7 @@ ENTRY(startup_32_smp) /* * Enable paging */ - movl $pa(swapper_pg_dir),%eax + movl pa(initial_page_table), %eax movl %eax,%cr3 /* set the page table pointer.. */ movl %cr0,%eax orl $X86_CR0_PG,%eax
@@ -604,6 +604,8 @@ ignore_int: .align 4 ENTRY(initial_code) .long i386_start_kernel +ENTRY(initial_page_table) + .long pa(swapper_pg_dir) /* * BSS section
@@ -619,6 +621,10 @@ ENTRY(swapper_pg_dir) #endif swapper_pg_fixmap: .fill 1024,4,0 +#ifdef CONFIG_X86_TRAMPOLINE +ENTRY(trampoline_pg_dir) + .fill 1024,4,0 +#endif ENTRY(empty_zero_page) .fill 4096,1,0
arch/x86/kernel/quirks.c +8 -1
@@ -512,6 +512,7 @@ static void __init quirk_amd_nb_node(struct pci_dev *dev) {struct pci_dev *nb_ht;unsigned int devfn; +u32 node;u32 val; devfn =PCI_DEVFN (PCI_SLOT (dev->devfn),0 );
@@ -520,7 +521,13 @@ static void __init quirk_amd_nb_node(struct pci_dev *dev)return ;pci_read_config_dword (nb_ht,0x60 , &val); -set_dev_node (&dev->dev, val &7 ); + node = val &7 ; +/* +* Some hardware may return an invalid node ID, +* so check it first: +*/ +if (node_online (node)) +set_dev_node (&dev->dev, node);pci_dev_put (nb_ht); }
arch/x86/kernel/setup.c +3 -0
@@ -110,6 +110,7 @@#include <asm/numa_64.h> #endif #include <asm/mce.h> +#include <asm/trampoline.h> /* * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.
@@ -998,6 +999,8 @@ void __init setup_arch(char **cmdline_p)paging_init (); x86_init.paging.pagetable_setup_done (swapper_pg_dir); +setup_trampoline_page_table (); +tboot_probe ();#ifdef CONFIG_X86_64
arch/x86/kernel/smpboot.c +13 -19
@@ -70,7 +70,6 @@#ifdef CONFIG_X86_32 u8 apicid_2_node[MAX_APICID ]; -static int low_mappings;#endif /* State of each CPU */
@@ -292,6 +291,18 @@ notrace static void __cpuinit start_secondary(void *unused)* fragile that we want to limit the things done here to the * most necessary things. */ + +#ifdef CONFIG_X86_32 +/* +* Switch away from the trampoline page-table +* +* Do this before cpu_init() because it needs to access per-cpu +* data which may not be mapped in the trampoline page-table. +*/ +load_cr3 (swapper_pg_dir); +__flush_tlb_all (); +#endif +vmi_bringup ();cpu_init ();preempt_disable ();
@@ -310,12 +321,6 @@ notrace static void __cpuinit start_secondary(void *unused)enable_8259A_irq (0 ); } -#ifdef CONFIG_X86_32 -while (low_mappings) -cpu_relax (); -__flush_tlb_all (); -#endif -/* This must be done before setting cpu_online_mask */ set_cpu_sibling_map (raw_smp_processor_id ());wmb ();
@@ -741,6 +746,7 @@ do_rest:#ifdef CONFIG_X86_32 /* Stack for startup_32 can be just as for start_secondary onwards */ irq_ctx_init (cpu); + initial_page_table =__pa (&trampoline_pg_dir);#else clear_tsk_thread_flag (c_idle.idle,TIF_FORK ); initial_gs =per_cpu_offset (cpu);
@@ -885,20 +891,8 @@ int __cpuinit native_cpu_up(unsigned int cpu)per_cpu (cpu_state, cpu) =CPU_UP_PREPARE ; -#ifdef CONFIG_X86_32 -/* init low mem mapping */ -clone_pgd_range (swapper_pg_dir, swapper_pg_dir +KERNEL_PGD_BOUNDARY , - min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY)); -flush_tlb_all (); - low_mappings =1 ; - err =do_boot_cpu (apicid, cpu); -zap_low_mappings (false); - low_mappings =0 ; -#else - err =do_boot_cpu (apicid, cpu); -#endif if (err) {pr_debug ("do_boot_cpu failed %d\n" , err);return -EIO ;
arch/x86/kernel/trampoline.c +17 -0
@@ -1,6 +1,7 @@#include <linux/io.h> #include <asm/trampoline.h> +#include <asm/pgtable.h> #include <asm/e820.h> #if defined(CONFIG_X86_64 ) && defined(CONFIG_ACPI_SLEEP )
@@ -39,3 +40,19 @@ unsigned long __trampinit setup_trampoline(void)memcpy (trampoline_base, trampoline_data,TRAMPOLINE_SIZE );return virt_to_phys (trampoline_base); } + +void __init setup_trampoline_page_table (void ) +{ +#ifdef CONFIG_X86_32 +/* Copy kernel address range */ +clone_pgd_range (trampoline_pg_dir +KERNEL_PGD_BOUNDARY , + swapper_pg_dir +KERNEL_PGD_BOUNDARY , +KERNEL_PGD_PTRS ); + +/* Initialize low mappings */ +clone_pgd_range (trampoline_pg_dir, + swapper_pg_dir +KERNEL_PGD_BOUNDARY , + min_t(unsigned long, KERNEL_PGD_PTRS, +KERNEL_PGD_BOUNDARY )); +#endif +}
arch/x86/kvm/vmx.c +11 -5
@@ -654,10 +654,7 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu)#endif #ifdef CONFIG_X86_64 -if (is_long_mode (&vmx->vcpu)) -save_msrs (vmx->host_msrs + - vmx->msr_offset_kernel_gs_base,1 ); - +save_msrs (vmx->host_msrs + vmx->msr_offset_kernel_gs_base,1 );#endif load_msrs (vmx->guest_msrs, vmx->save_nmsrs);load_transition_efer (vmx);
@@ -672,17 +669,26 @@ static void __vmx_load_host_state(struct vcpu_vmx *vmx) vmx->host_state.loaded =0 ;if (vmx->host_state.fs_reload_needed)loadsegment (fs, vmx->host_state.fs_sel); +#ifdef CONFIG_X86_64 +if (is_long_mode (&vmx->vcpu)) +save_msrs (vmx->guest_msrs + vmx->msr_offset_kernel_gs_base,1 ); +#endif if (vmx->host_state.gs_ldt_reload_needed) {kvm_load_ldt (vmx->host_state.ldt_sel);#ifdef CONFIG_X86_64 load_gs_index (vmx->host_state.gs_sel); -wrmsrl (MSR_KERNEL_GS_BASE , current->thread.gs);#else loadsegment (gs, vmx->host_state.gs_sel);#endif }reload_tss (); +#ifdef CONFIG_X86_64 +save_msrs (vmx->guest_msrs, vmx->msr_offset_kernel_gs_base); +save_msrs (vmx->guest_msrs + vmx->msr_offset_kernel_gs_base +1 , + vmx->save_nmsrs - vmx->msr_offset_kernel_gs_base -1 ); +#else save_msrs (vmx->guest_msrs, vmx->save_nmsrs); +#endif load_msrs (vmx->host_msrs, vmx->save_nmsrs);reload_host_efer (vmx);load_gdt (&__get_cpu_var (host_gdt));
arch/x86/kvm/x86.c +8 -0
@@ -2102,6 +2102,7 @@ static int kvm_vm_ioctl_get_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps) sizeof(ps->channels)); ps->flags = kvm->arch.vpit->pit_state.flags;mutex_unlock (&kvm->arch.vpit->pit_state.lock); +memset (&ps->reserved,0 ,sizeof (ps->reserved));return r; }
@@ -2439,6 +2440,7 @@ long kvm_arch_vm_ioctl(struct file *filp, now_ns =timespec_to_ns (&now); user_ns.clock = kvm->arch.kvmclock_offset + now_ns; user_ns.flags =0 ; +memset (&user_ns.pad,0 ,sizeof (user_ns.pad)); r = -EFAULT ;if (copy_to_user (argp, &user_ns,sizeof (user_ns)))
@@ -2782,6 +2784,9 @@ int emulator_get_dr(struct x86_emulate_ctxt *ctxt, int dr, unsigned long *dest) {struct kvm_vcpu *vcpu = ctxt->vcpu; +if (!kvm_x86_ops->get_dr) +return X86EMUL_UNHANDLEABLE ; +switch (dr) { case 0 ... 3: *dest = kvm_x86_ops->get_dr (vcpu, dr);
@@ -2797,6 +2802,9 @@ int emulator_set_dr(struct x86_emulate_ctxt *ctxt, int dr, unsigned long value)unsigned long mask = (ctxt->mode ==X86EMUL_MODE_PROT64 ) ? ~0ULL : ~0U ;int exception; +if (!kvm_x86_ops->set_dr) +return X86EMUL_UNHANDLEABLE ; + kvm_x86_ops->set_dr (ctxt->vcpu, dr, value & mask, &exception);if (exception) {/* FIXME: better handling */
arch/x86/xen/enlighten.c +0 -4
@@ -997,10 +997,6 @@ static void xen_reboot(int reason) {struct sched_shutdown r = { .reason = reason }; -#ifdef CONFIG_SMP -stop_other_cpus (); -#endif -if (HYPERVISOR_sched_op (SCHEDOP_shutdown, &r))BUG (); }
block/blk-map.c +2 -0
@@ -205,6 +205,8 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq, unaligned =1 ;break ; } +if (!iov[i].iov_len) +return -EINVAL ; }if (unaligned || (q->dma_pad_mask & len) || map_data)
block/blk-settings.c +1 -1
@@ -352,7 +352,7 @@ EXPORT_SYMBOL(blk_queue_logical_block_size);* hardware can operate on without reverting to read-modify-write * operations. */ -void blk_queue_physical_block_size (struct request_queue *q,unsigned short size) +void blk_queue_physical_block_size (struct request_queue *q,unsigned int size) { q->limits.physical_block_size = size;
block/scsi_ioctl.c +24 -10
@@ -319,33 +319,47 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,if (hdr->iovec_count) {const int size =sizeof (struct sg_iovec ) * hdr->iovec_count;size_t iov_data_len; -struct sg_iovec *iov; +struct sg_iovec *sg_iov; +struct iovec *iov; +int i; - iov =kmalloc (size,GFP_KERNEL ); -if (!iov) { + sg_iov =kmalloc (size,GFP_KERNEL ); +if (!sg_iov) { ret = -ENOMEM ; goto out; } -if (copy_from_user (iov, hdr->dxferp, size)) { -kfree (iov); +if (copy_from_user (sg_iov, hdr->dxferp, size)) { +kfree (sg_iov); ret = -EFAULT ; goto out; } +/* +* Sum up the vecs, making sure they don't overflow +*/ + iov = (struct iovec *) sg_iov; + iov_data_len =0 ; +for (i =0 ; i < hdr->iovec_count; i++) { +if (iov_data_len + iov[i].iov_len < iov_data_len) { +kfree (sg_iov); + ret = -EINVAL ; + goto out; + } + iov_data_len += iov[i].iov_len; + } +/* SG_IO howto says that the shorter of the two wins */ - iov_data_len =iov_length ((struct iovec *)iov, - hdr->iovec_count);if (hdr->dxfer_len < iov_data_len) { - hdr->iovec_count =iov_shorten ((struct iovec *)iov, + hdr->iovec_count =iov_shorten (iov, hdr->iovec_count, hdr->dxfer_len); iov_data_len = hdr->dxfer_len; } - ret =blk_rq_map_user_iov (q, rq,NULL , iov, hdr->iovec_count, + ret =blk_rq_map_user_iov (q, rq,NULL , sg_iov, hdr->iovec_count, iov_data_len,GFP_KERNEL ); -kfree (iov); +kfree (sg_iov); }else if (hdr->dxfer_len) ret =blk_rq_map_user (q, rq,NULL , hdr->dxferp, hdr->dxfer_len,GFP_KERNEL );
drivers/acpi/blacklist.c +8 -0
@@ -226,6 +226,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { }, }, { + .callback = dmi_disable_osi_vista, + .ident = "Toshiba Satellite L355", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"TOSHIBA" ), + DMI_MATCH(DMI_PRODUCT_VERSION, "Satellite L355"), + }, + }, + { .callback = dmi_disable_osi_win7, .ident = "ASUS K50IJ", .matches = {
drivers/ata/ahci.c +10 -0
@@ -3037,6 +3037,16 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (pdev->vendor ==PCI_VENDOR_ID_MARVELL && !marvell_enable)return -ENODEV ; +/* +* For some reason, MCP89 on MacBook 7,1 doesn't work with +* ahci, use ata_generic instead. +*/ +if (pdev->vendor ==PCI_VENDOR_ID_NVIDIA && + pdev->device ==PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA && + pdev->subsystem_vendor ==PCI_VENDOR_ID_APPLE && + pdev->subsystem_device ==0xcb89 ) +return -ENODEV ; +/* acquire resources */ rc =pcim_enable_device (pdev);if (rc)
drivers/ata/ata_generic.c +24 -6
@@ -32,6 +32,11 @@* A generic parallel ATA driver using libata */ +enum { +ATA_GEN_CLASS_MATCH = (1 <<0 ), +ATA_GEN_FORCE_DMA = (1 <<1 ), +}; +/** * generic_set_mode - mode setting * @link: link to set up
@@ -46,13 +51,17 @@static int generic_set_mode (struct ata_link *link,struct ata_device **unused) {struct ata_port *ap = link->ap; +const struct pci_device_id *id = ap->host->private_data;int dma_enabled =0 ;struct ata_device *dev;struct pci_dev *pdev =to_pci_dev (ap->host->dev); -/* Bits 5 and 6 indicate if DMA is active on master/slave */ -if (ap->ioaddr.bmdma_addr) +if (id->driver_data &ATA_GEN_FORCE_DMA ) { + dma_enabled =0xff ; + }else if (ap->ioaddr.bmdma_addr) { +/* Bits 5 and 6 indicate if DMA is active on master/slave */ dma_enabled =ioread8 (ap->ioaddr.bmdma_addr +ATA_DMA_STATUS ); + }if (pdev->vendor ==PCI_VENDOR_ID_CENATEK ) dma_enabled =0xFF ;
@@ -126,7 +135,7 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_idconst struct ata_port_info *ppi[] = { &info,NULL };/* Don't use the generic entry unless instructed to do so */ -if (id->driver_data ==1 && all_generic_ide ==0 ) +if ((id->driver_data &ATA_GEN_CLASS_MATCH ) && all_generic_ide ==0 )return -ENODEV ;/* Devices that need care */
@@ -155,7 +164,7 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_idreturn rc;pcim_pin_device (dev); } -return ata_pci_sff_init_one (dev, ppi, &generic_sht,NULL ); +return ata_pci_sff_init_one (dev, ppi, &generic_sht, (void *)id); }static struct pci_device_id ata_generic[] = {
@@ -167,12 +176,21 @@ static struct pci_device_id ata_generic[] = { { PCI_DEVICE(PCI_VENDOR_ID_HINT, PCI_DEVICE_ID_HINT_VXPROII_IDE), }, { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C561), }, { PCI_DEVICE(PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C558), }, - { PCI_DEVICE(PCI_VENDOR_ID_CENATEK,PCI_DEVICE_ID_CENATEK_IDE), }, + { PCI_DEVICE(PCI_VENDOR_ID_CENATEK,PCI_DEVICE_ID_CENATEK_IDE), + .driver_data = ATA_GEN_FORCE_DMA }, +/* +* For some reason, MCP89 on MacBook 7,1 doesn't work with +* ahci, use ata_generic instead. +*/ + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA, +PCI_VENDOR_ID_APPLE ,0xcb89 , + .driver_data = ATA_GEN_FORCE_DMA }, { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO), }, { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), }, { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2), }, /* Must come last. If you add entries adjust this table appropriately */ - { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL, 1}, + { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL), + .driver_data = ATA_GEN_CLASS_MATCH }, { 0, }, };
drivers/ata/libata-scsi.c +5 -2
@@ -2497,8 +2497,11 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc)* * If door lock fails, always clear sdev->locked to * avoid this infinite loop. +* +* This may happen before SCSI scan is complete. Make +* sure qc->dev->sdev isn't NULL before dereferencing. */ -if (qc->cdb[0 ] ==ALLOW_MEDIUM_REMOVAL ) +if (qc->cdb[0 ] ==ALLOW_MEDIUM_REMOVAL && qc->dev->sdev) qc->dev->sdev->locked =0 ; qc->scsicmd->result =SAM_STAT_CHECK_CONDITION ;
@@ -2825,7 +2828,7 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)* write indication (used for PIO/DMA setup), result TF is * copied back and we don't whine too much about its failure. */ - tf->flags =ATA_TFLAG_ISADDR |ATA_TFLAG_DEVICE ; + tf->flags |=ATA_TFLAG_ISADDR |ATA_TFLAG_DEVICE ;if (scmd->sc_data_direction ==DMA_TO_DEVICE ) tf->flags |=ATA_TFLAG_WRITE ;
drivers/char/hpet.c +17 -0
@@ -476,6 +476,21 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)if (irq) {unsigned long irq_flags; +if (devp->hd_flags &HPET_SHARED_IRQ ) { +/* +* To prevent the interrupt handler from seeing an +* unwanted interrupt status bit, program the timer +* so that it will not fire in the near future ... +*/ +writel (readl (&timer->hpet_config) & ~Tn_TYPE_CNF_MASK, + &timer->hpet_config); +write_counter (read_counter (&hpet->hpet_mc), + &timer->hpet_compare); +/* ... and clear any left-over status. */ + isr =1 << (devp - devp->hd_hpets->hp_dev); +writel (isr, &hpet->hpet_isr); + } +sprintf (devp->hd_name,"hpet%d" , (int )(devp - hpetp->hp_dev)); irq_flags = devp->hd_flags &HPET_SHARED_IRQ ?IRQF_SHARED :IRQF_DISABLED ;
@@ -970,6 +985,8 @@ static int hpet_acpi_add(struct acpi_device *device)return -ENODEV ;if (!data.hd_address || !data.hd_nirqs) { +if (data.hd_address) +iounmap (data.hd_address);printk ("%s: no address or irqs in _CRS\n" , __func__);return -ENODEV ; }
drivers/char/tty_buffer.c +12 -2
@@ -412,7 +412,8 @@ static void flush_to_ldisc(struct work_struct *work)spin_lock_irqsave (&tty->buf.lock, flags);if (!test_and_set_bit (TTY_FLUSHING , &tty->flags)) { -struct tty_buffer *head; +struct tty_buffer *head, *tail = tty->buf.tail; +int seen_tail =0 ;while ((head = tty->buf.head) !=NULL ) {int count;char *char_buf;
@@ -422,6 +423,15 @@ static void flush_to_ldisc(struct work_struct *work)if (!count) {if (head->next ==NULL )break ; +/* +There's a possibility tty might get new buffer +added during the unlock window below. We could +end up spinning in here forever hogging the CPU +completely. To avoid this let's have a rest each +time we processed the tail buffer. +*/ +if (tail == head) + seen_tail =1 ; tty->buf.head = head->next;tty_buffer_free (tty, head);continue ;
@@ -431,7 +441,7 @@ static void flush_to_ldisc(struct work_struct *work)line discipline as we want to empty the queue */ if (test_bit (TTY_FLUSHPENDING , &tty->flags))break ; -if (!tty->receive_room) { +if (!tty->receive_room || seen_tail) {schedule_delayed_work (&tty->buf.work,1 );break ; }
drivers/char/tty_ldisc.c +49 -9
121 lines not on this page · raw message
drivers/char/vt_ioctl.c +6 -5
@@ -503,6 +503,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,struct kbd_struct * kbd;unsigned int console;unsigned char ucval; +unsigned int uival;void __user *up = (void __user *)arg;int i, perm;int ret =0 ;
@@ -657,7 +658,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,break ;case KDGETMODE : - ucval = vc->vc_mode; + uival = vc->vc_mode; goto setint;case KDMAPDISP :
@@ -695,7 +696,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,break ;case KDGKBMODE : - ucval = ((kbd->kbdmode ==VC_RAW ) ?K_RAW : + uival = ((kbd->kbdmode ==VC_RAW ) ?K_RAW : (kbd->kbdmode ==VC_MEDIUMRAW ) ?K_MEDIUMRAW : (kbd->kbdmode ==VC_UNICODE ) ?K_UNICODE :K_XLATE );
@@ -717,9 +718,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,break ;case KDGKBMETA : - ucval = (vc_kbd_mode (kbd,VC_META ) ?K_ESCPREFIX :K_METABIT ); + uival = (vc_kbd_mode (kbd,VC_META ) ?K_ESCPREFIX :K_METABIT ); setint: - ret =put_user (ucval, (int __user *)arg); + ret =put_user (uival, (int __user *)arg);break ;case KDGETKEYCODE :
@@ -949,7 +950,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,for (i =0 ; i <MAX_NR_CONSOLES ; ++i)if (!VT_IS_IN_USE (i))break ; - ucval = i <MAX_NR_CONSOLES ? (i+1 ) :-1 ; + uival = i <MAX_NR_CONSOLES ? (i+1 ) :-1 ; goto setint;/*
drivers/crypto/padlock-aes.c +1 -1
@@ -285,7 +285,7 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key,if (initial) asmvolatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ :"+S" (input),"+D" (output),"+a" (iv) - :"d" (control_word),"b" (key),"c" (count)); + :"d" (control_word),"b" (key),"c" (initial)); asmvolatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ : "+S" (input), "+D" (output), "+a" (iv)
drivers/firewire/core-cdev.c +9 -9
@@ -1299,24 +1299,24 @@ static int dispatch_ioctl(struct client *client,int ret;if (_IOC_TYPE (cmd) !='#' || -_IOC_NR (cmd) >=ARRAY_SIZE (ioctl_handlers)) +_IOC_NR (cmd) >=ARRAY_SIZE (ioctl_handlers) || +_IOC_SIZE (cmd) >sizeof (buffer))return -EINVAL ; -if (_IOC_DIR (cmd) & _IOC_WRITE) { -if (_IOC_SIZE (cmd) >sizeof (buffer) || -copy_from_user (buffer, arg,_IOC_SIZE (cmd))) +if (_IOC_DIR (cmd) == _IOC_READ) +memset (&buffer,0 ,_IOC_SIZE (cmd)); + +if (_IOC_DIR (cmd) & _IOC_WRITE) +if (copy_from_user (buffer, arg,_IOC_SIZE (cmd)))return -EFAULT ; - } ret = ioctl_handlers[_IOC_NR (cmd)](client, buffer);if (ret <0 )return ret; -if (_IOC_DIR (cmd) & _IOC_READ) { -if (_IOC_SIZE (cmd) >sizeof (buffer) || -copy_to_user (arg, buffer,_IOC_SIZE (cmd))) +if (_IOC_DIR (cmd) & _IOC_READ) +if (copy_to_user (arg, buffer,_IOC_SIZE (cmd)))return -EFAULT ; - }return ret; }
drivers/firewire/core-device.c +1 -0
@@ -463,6 +463,7 @@ static int read_bus_info_block(struct fw_device *device, int generation)return -ENOMEM ; stack = &rom[READ_BIB_ROM_SIZE ]; +memset (rom,0 ,sizeof (*rom) *READ_BIB_ROM_SIZE ); device->max_speed =SCODE_100 ;
drivers/firewire/ohci.c +48 -12
80 lines not on this page · raw message
drivers/gpu/drm/ttm/ttm_bo_util.c +1 -0
@@ -330,6 +330,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo,INIT_LIST_HEAD (&fbo->lru);INIT_LIST_HEAD (&fbo->swap); fbo->vm_node =NULL ; +atomic_set (&fbo->cpu_writers,0 ); fbo->sync_obj = driver->sync_obj_ref (bo->sync_obj);if (fbo->mem.mm_node)
drivers/hid/hidraw.c +14 -4
@@ -105,11 +105,15 @@ out:static ssize_t hidraw_write (struct file *file,const char __user *buffer,size_t count,loff_t *ppos) {unsigned int minor =iminor (file->f_path.dentry->d_inode); -/* FIXME: What stops hidraw_table going NULL */ -struct hid_device *dev = hidraw_table[minor]->hid; +struct hid_device *dev;__u8 *buf;int ret =0 ; +if (!hidraw_table[minor]) +return -ENODEV ; + + dev = hidraw_table[minor]->hid; +if (!dev->hid_output_raw_report)return -ENODEV ;
@@ -237,11 +241,16 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,struct inode *inode = file->f_path.dentry->d_inode;unsigned int minor =iminor (inode);long ret =0 ; -/* FIXME: What stops hidraw_table going NULL */ -struct hidraw *dev = hidraw_table[minor]; +struct hidraw *dev;void __user *user_arg = (void __user *) arg;lock_kernel (); + dev = hidraw_table[minor]; +if (!dev) { + ret = -ENODEV ; + goto out; + } +switch (cmd) {case HIDIOCGRDESCSIZE :if (put_user (dev->hid->rsize, (int __user *)arg))
@@ -314,6 +323,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, ret = -ENOTTY ; } +out:unlock_kernel ();return ret; }
drivers/hwmon/lm85.c +1 -0
@@ -1286,6 +1286,7 @@ static int lm85_probe(struct i2c_client *client,switch (data->type) {case adm1027:case adt7463: +case adt7468:case emc6d100:case emc6d102: data->freq_map = adm1027_freq_map;
drivers/i2c/busses/i2c-pca-platform.c +1 -1
@@ -224,7 +224,7 @@ static int __devinit i2c_pca_pf_probe(struct platform_device *pdev)if (irq) { ret =request_irq (irq, i2c_pca_pf_handler, -IRQF_TRIGGER_FALLING , i2c->adap.name, i2c); +IRQF_TRIGGER_FALLING , pdev->name, i2c);if (ret) goto e_reqirq; }
drivers/input/serio/i8042-x86ia64io.h +7 -0
@@ -329,6 +329,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { }, }, { +/* Sony Vaio VPCZ122GX */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ), + DMI_MATCH(DMI_PRODUCT_NAME, "VPCZ122GX"), + }, + }, + {/* Sony Vaio FS-115b */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
drivers/md/md.c +2 -2
@@ -1122,7 +1122,7 @@ super_90_rdev_size_change(mdk_rdev_t *rdev, sector_t num_sectors)md_super_write (rdev->mddev, rdev, rdev->sb_start, rdev->sb_size, rdev->sb_page);md_super_wait (rdev->mddev); -return num_sectors /2 ;/* kB for sysfs */ +return num_sectors; }
@@ -1485,7 +1485,7 @@ super_1_rdev_size_change(mdk_rdev_t *rdev, sector_t num_sectors)md_super_write (rdev->mddev, rdev, rdev->sb_start, rdev->sb_size, rdev->sb_page);md_super_wait (rdev->mddev); -return num_sectors /2 ;/* kB for sysfs */ +return num_sectors; }static struct super_type super_types[] = {
drivers/md/raid1.c +1 -0
@@ -1188,6 +1188,7 @@ static int raid1_remove_disk(mddev_t *mddev, int number)* is not possible. */ if (!test_bit (Faulty, &rdev->flags) && + !mddev->recovery_disabled && mddev->degraded < conf->raid_disks) { err = -EBUSY ; goto abort;
drivers/media/video/ivtv/ivtvfb.c +2 -0
@@ -457,6 +457,8 @@ static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arstruct fb_vblank vblank;u32 trace; +memset (&vblank,0 ,sizeof (struct fb_vblank )); + vblank.flags =FB_VBLANK_HAVE_COUNT |FB_VBLANK_HAVE_VCOUNT |FB_VBLANK_HAVE_VSYNC ; trace =read_reg (0x028c0 ) >>16 ;
drivers/media/video/uvc/uvc_driver.c +11 -3
@@ -436,7 +436,8 @@ static int uvc_parse_format(struct uvc_device *dev,/* Parse the frame descriptors. Only uncompressed, MJPEG and frame * based formats have frame descriptors. */ -while (buflen >2 && buffer[2 ] == ftype) { +while (buflen >2 && buffer[1 ] ==USB_DT_CS_INTERFACE && + buffer[2 ] == ftype) { frame = &format->frame[format->nframes];if (ftype !=UVC_VS_FRAME_FRAME_BASED ) n = buflen >25 ? buffer[25 ] :0 ;
@@ -513,12 +514,14 @@ static int uvc_parse_format(struct uvc_device *dev, buffer += buffer[0 ]; } -if (buflen >2 && buffer[2 ] ==UVC_VS_STILL_IMAGE_FRAME ) { +if (buflen >2 && buffer[1 ] ==USB_DT_CS_INTERFACE && + buffer[2 ] ==UVC_VS_STILL_IMAGE_FRAME ) { buflen -= buffer[0 ]; buffer += buffer[0 ]; } -if (buflen >2 && buffer[2 ] ==UVC_VS_COLORFORMAT ) { +if (buflen >2 && buffer[1 ] ==USB_DT_CS_INTERFACE && + buffer[2 ] ==UVC_VS_COLORFORMAT ) {if (buflen <6 ) { uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming " "interface %d COLORFORMAT error\n",
@@ -759,6 +762,11 @@ static int uvc_parse_streaming(struct uvc_device *dev, buffer += buffer[0 ]; } +if (buflen) +uvc_trace (UVC_TRACE_DESCR ,"device %d videostreaming interface " +"%d has %u bytes of trailing descriptor garbage.\n" , + dev->udev->devnum, alts->desc.bInterfaceNumber, buflen); +/* Parse the alternate settings to find the maximum bandwidth. */ for (i =0 ; i < intf->num_altsetting; ++i) {struct usb_host_endpoint *ep;
drivers/misc/sgi-xp/xpc_partition.c +15 -10
@@ -433,18 +433,23 @@ xpc_discovery(void)* nodes that can comprise an access protection grouping. The access * protection is in regards to memory, IOI and IPI. */ - max_regions =64 ; region_size = xp_region_size; -switch (region_size) { -case 128 : - max_regions *=2 ; -case 64 : - max_regions *=2 ; -case 32 : - max_regions *=2 ; - region_size =16 ; -DBUG_ON (!is_shub2 ()); +if (is_uv ()) + max_regions =256 ; +else { + max_regions =64 ; + +switch (region_size) { +case 128 : + max_regions *=2 ; +case 64 : + max_regions *=2 ; +case 32 : + max_regions *=2 ; + region_size =16 ; +DBUG_ON (!is_shub2 ()); + } }for (region =0 ; region < max_regions; region++) {
drivers/misc/sgi-xp/xpc_uv.c +11 -8
@@ -203,6 +203,7 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name,enum xp_retval xp_ret;int ret;int nid; +int nasid;int pg_order;struct page *page;struct xpc_gru_mq_uv *mq;
@@ -258,9 +259,11 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name, goto out_5; } + nasid =UV_PNODE_TO_NASID (uv_cpu_to_pnode (cpu)); + mmr_value = (struct uv_IO_APIC_route_entry *)&mq->mmr_value; ret =gru_create_message_queue (mq->gru_mq_desc, mq->address, mq_size, - nid, mmr_value->vector, mmr_value->dest); + nasid, mmr_value->vector, mmr_value->dest);if (ret !=0 ) {dev_err (xpc_part,"gru_create_message_queue() returned " "error=%d\n" , ret);
@@ -962,11 +965,13 @@ xpc_get_fifo_entry_uv(struct xpc_fifo_head_uv *head) head->first = first->next;if (head->first ==NULL ) head->last =NULL ; + + head->n_entries--; +BUG_ON (head->n_entries <0 ); + + first->next =NULL ; } - head->n_entries--; -BUG_ON (head->n_entries <0 );spin_unlock_irqrestore (&head->lock, irq_flags); - first->next =NULL ;return first; }
@@ -1035,7 +1040,8 @@ xpc_make_first_contact_uv(struct xpc_partition *part)xpc_send_activate_IRQ_part_uv (part, &msg,sizeof (msg),XPC_ACTIVATE_MQ_MSG_SYNC_ACT_STATE_UV ); -while (part->sn.uv.remote_act_state !=XPC_P_AS_ACTIVATING ) { +while (!((part->sn.uv.remote_act_state ==XPC_P_AS_ACTIVATING ) || + (part->sn.uv.remote_act_state ==XPC_P_AS_ACTIVE ))) {dev_dbg (xpc_part,"waiting to make first contact with " "partition %d\n" ,XPC_PARTID (part));
@@ -1438,7 +1444,6 @@ xpc_handle_notify_mq_msg_uv(struct xpc_partition *part, msg_slot = ch_uv->recv_msg_slots + (msg->hdr.msg_slot_number % ch->remote_nentries) * ch->entry_size; -BUG_ON (msg->hdr.msg_slot_number != msg_slot->hdr.msg_slot_number);BUG_ON (msg_slot->hdr.size !=0 );memcpy (msg_slot, msg, msg->hdr.size);
@@ -1662,8 +1667,6 @@ xpc_received_payload_uv(struct xpc_channel *ch, void *payload) sizeof(struct xpc_notify_mq_msghdr_uv));if (ret != xpSuccess)XPC_DEACTIVATE_PARTITION (&xpc_partitions[ch->partid], ret); - - msg->hdr.msg_slot_number += ch->remote_nentries; }static struct xpc_arch_operations xpc_arch_ops_uv = {
drivers/net/gianfar.c +3 -3
@@ -1621,7 +1621,7 @@ static int gfar_clean_tx_ring(struct net_device *dev)if (skb_queue_len (&priv->rx_recycle) < priv->rx_ring_size &&skb_recycle_check (skb, priv->rx_buffer_size +RXBUF_ALIGNMENT )) -__skb_queue_head (&priv->rx_recycle, skb); +skb_queue_head (&priv->rx_recycle, skb);else dev_kfree_skb_any (skb);
@@ -1703,7 +1703,7 @@ struct sk_buff * gfar_new_skb(struct net_device *dev)struct gfar_private *priv =netdev_priv (dev);struct sk_buff *skb =NULL ; - skb =__skb_dequeue (&priv->rx_recycle); + skb =skb_dequeue (&priv->rx_recycle);if (!skb) skb =netdev_alloc_skb (dev, priv->rx_buffer_size +RXBUF_ALIGNMENT );
@@ -1862,7 +1862,7 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)* recycle list. */ skb->data = skb->head +NET_SKB_PAD ; -__skb_queue_head (&priv->rx_recycle, skb); +skb_queue_head (&priv->rx_recycle, skb); } }else {/* Increment the number of packets */
drivers/net/jme.c +18 -4
@@ -1578,6 +1578,16 @@ jme_free_irq(struct jme_adapter *jme) } } +static inline void +jme_phy_on (struct jme_adapter *jme) +{ +u32 bmcr; + + bmcr =jme_mdio_read (jme->dev, jme->mii_if.phy_id,MII_BMCR ); + bmcr &= ~BMCR_PDOWN ; +jme_mdio_write (jme->dev, jme->mii_if.phy_id,MII_BMCR , bmcr); +} +static int jme_open (struct net_device *netdev) {
@@ -1598,10 +1608,12 @@ jme_open(struct net_device *netdev)jme_start_irq (jme); -if (test_bit (JME_FLAG_SSET , &jme->flags)) +if (test_bit (JME_FLAG_SSET , &jme->flags)) { +jme_phy_on (jme);jme_set_settings (netdev, &jme->old_ecmd); -else + }else {jme_reset_phy_processor (jme); + }jme_reset_link (jme);
@@ -3013,10 +3025,12 @@ jme_resume(struct pci_dev *pdev)jme_clear_pm (jme);pci_restore_state (pdev); -if (test_bit (JME_FLAG_SSET , &jme->flags)) +if (test_bit (JME_FLAG_SSET , &jme->flags)) { +jme_phy_on (jme);jme_set_settings (netdev, &jme->old_ecmd); -else + }else {jme_reset_phy_processor (jme); + }jme_start_irq (jme);netif_device_attach (netdev);
drivers/pci/pci-sysfs.c +16 -6
@@ -662,17 +662,21 @@ void pci_remove_legacy_files(struct pci_bus *b)#ifdef HAVE_PCI_MMAP -int pci_mmap_fits (struct pci_dev *pdev,int resno,struct vm_area_struct *vma) +int pci_mmap_fits (struct pci_dev *pdev,int resno,struct vm_area_struct *vma, +enum pci_mmap_api mmap_api) { -unsigned long nr, start, size; +unsigned long nr, start, size, pci_start; +if (pci_resource_len (pdev, resno) ==0 ) +return 0 ; nr = (vma->vm_end - vma->vm_start) >>PAGE_SHIFT ; start = vma->vm_pgoff; size = ((pci_resource_len (pdev, resno) -1 ) >>PAGE_SHIFT ) +1 ; -if (start < size && size - start >= nr) + pci_start = (mmap_api ==PCI_MMAP_PROCFS ) ? +pci_resource_start (pdev, resno) >>PAGE_SHIFT :0 ; +if (start >= pci_start && start < pci_start + size && + start + nr <= pci_start + size)return 1 ; -WARN (1 ,"process \"%s\" tried to map 0x%08lx-0x%08lx on %s BAR %d (size 0x%08lx)\n" , - current->comm, start, start+nr,pci_name (pdev), resno, size);return 0 ; }
@@ -702,8 +706,14 @@ pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,if (i >=PCI_ROM_RESOURCE )return -ENODEV ; -if (!pci_mmap_fits (pdev, i, vma)) +if (!pci_mmap_fits (pdev, i, vma,PCI_MMAP_SYSFS )) { +WARN (1 ,"process \"%s\" tried to map 0x%08lx bytes " +"at page 0x%08lx on %s BAR %d (start 0x%16Lx, size 0x%16Lx)\n" , + current->comm, vma->vm_end-vma->vm_start, vma->vm_pgoff, +pci_name (pdev), i, +pci_resource_start (pdev, i),pci_resource_len (pdev, i));return -EINVAL ; + }/* pci_mmap_page_range() expects the same kind of entry as coming * from /proc/bus/pci/ which is a "user visible" value. If this is
drivers/pci/pci.h +6 -1
@@ -13,8 +13,13 @@ extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);extern void pci_remove_sysfs_dev_files (struct pci_dev *pdev);extern void pci_cleanup_rom (struct pci_dev *dev);#ifdef HAVE_PCI_MMAP +enum pci_mmap_api { +PCI_MMAP_SYSFS ,/* mmap on /sys/bus/pci/devices/<BDF>/resource<N> */ +PCI_MMAP_PROCFS /* mmap on /proc/bus/pci/<BDF> */ +};extern int pci_mmap_fits (struct pci_dev *pdev,int resno, -struct vm_area_struct *vma); +struct vm_area_struct *vmai, +enum pci_mmap_api mmap_api);#endif int pci_probe_reset_function (struct pci_dev *dev);
drivers/pci/proc.c +1 -1
@@ -259,7 +259,7 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)/* Make sure the caller is mapping a real resource for this device */ for (i =0 ; i <PCI_ROM_RESOURCE ; i++) { -if (pci_mmap_fits (dev, i, vma)) +if (pci_mmap_fits (dev, i, vma,PCI_MMAP_PROCFS ))break ; }
drivers/power/olpc_battery.c +4 -4
@@ -271,14 +271,14 @@ static int olpc_bat_get_property(struct power_supply *psy,if (ret)return ret; - val->intval = (int )be16_to_cpu (ec_word) *9760L /32 ; + val->intval = (s16 )be16_to_cpu (ec_word) *9760L /32 ;break ;case POWER_SUPPLY_PROP_CURRENT_AVG : ret =olpc_ec_cmd (EC_BAT_CURRENT ,NULL ,0 , (void *)&ec_word,2 );if (ret)return ret; - val->intval = (int )be16_to_cpu (ec_word) *15625L /120 ; + val->intval = (s16 )be16_to_cpu (ec_word) *15625L /120 ;break ;case POWER_SUPPLY_PROP_CAPACITY : ret =olpc_ec_cmd (EC_BAT_SOC ,NULL ,0 , &ec_byte,1 );
@@ -299,7 +299,7 @@ static int olpc_bat_get_property(struct power_supply *psy,if (ret)return ret; - val->intval = (int )be16_to_cpu (ec_word) *100 /256 ; + val->intval = (s16 )be16_to_cpu (ec_word) *100 /256 ;break ;case POWER_SUPPLY_PROP_TEMP_AMBIENT : ret =olpc_ec_cmd (EC_AMB_TEMP ,NULL ,0 , (void *)&ec_word,2 );
@@ -313,7 +313,7 @@ static int olpc_bat_get_property(struct power_supply *psy,if (ret)return ret; - val->intval = (int )be16_to_cpu (ec_word) *6250 /15 ; + val->intval = (s16 )be16_to_cpu (ec_word) *6250 /15 ;break ;case POWER_SUPPLY_PROP_SERIAL_NUMBER : ret =olpc_ec_cmd (EC_BAT_SERIAL ,NULL ,0 , (void *)&ser_buf,8 );
drivers/ssb/b43_pci_bridge.c +1 -0
@@ -24,6 +24,7 @@ static const struct pci_device_id b43_pci_bridge_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4312) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4315) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4318) }, + { PCI_DEVICE(PCI_VENDOR_ID_BCM_GVC, 0x4318) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4319) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4320) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },
drivers/staging/asus_oled/asus_oled.c +4 -4
@@ -609,13 +609,13 @@ static ssize_t class_set_picture(struct device *device,#define ASUS_OLED_DEVICE_ATTR (_file) dev_attr_asus_oled_##_file -static DEVICE_ATTR(asus_oled_enabled, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(asus_oled_enabled, S_IWUSR | S_IRUGO, get_enabled, set_enabled); -static DEVICE_ATTR(asus_oled_picture, S_IWUGO , NULL, set_picture); +static DEVICE_ATTR(asus_oled_picture, S_IWUSR , NULL, set_picture); -static DEVICE_ATTR(enabled, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(enabled, S_IWUSR | S_IRUGO, class_get_enabled, class_set_enabled); -static DEVICE_ATTR(picture, S_IWUGO, NULL, class_set_picture); +static DEVICE_ATTR(picture, S_IWUSR, NULL, class_set_picture);static int asus_oled_probe (struct usb_interface *interface,const struct usb_device_id *id)
drivers/staging/frontier/tranzport.c +1 -1
@@ -202,7 +202,7 @@ static void usb_tranzport_abort_transfers(struct usb_tranzport *dev) t->value = temp; \return count; \ } \ - static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value); + static DEVICE_ATTR(value, S_IWUSR | S_IRUGO, show_##value, set_##value);show_int (enable);show_int (offline);
drivers/staging/line6/control.c +102 -102
210 lines not on this page · raw message
drivers/staging/line6/midi.c +2 -2
@@ -349,8 +349,8 @@ static ssize_t midi_set_midi_mask_receive(struct device *dev,return count; } -static DEVICE_ATTR(midi_mask_transmit, S_IWUGO | S_IRUGO, midi_get_midi_mask_transmit, midi_set_midi_mask_transmit); -static DEVICE_ATTR(midi_mask_receive, S_IWUGO | S_IRUGO, midi_get_midi_mask_receive, midi_set_midi_mask_receive); +static DEVICE_ATTR(midi_mask_transmit, S_IWUSR | S_IRUGO, midi_get_midi_mask_transmit, midi_set_midi_mask_transmit); +static DEVICE_ATTR(midi_mask_receive, S_IWUSR | S_IRUGO, midi_get_midi_mask_receive, midi_set_midi_mask_receive);/* MIDI device destructor */ static int snd_line6_midi_free (struct snd_device *device)
drivers/staging/line6/pod.c +16 -16
@@ -912,33 +912,33 @@ POD_GET_SYSTEM_PARAM(tuner_pitch, 1, 1);#undef GET_SYSTEM_PARAM/* POD special files: */ -static DEVICE_ATTR(channel, S_IWUGO | S_IRUGO, pod_get_channel, pod_set_channel); +static DEVICE_ATTR(channel, S_IWUSR | S_IRUGO, pod_get_channel, pod_set_channel); static DEVICE_ATTR(clip, S_IRUGO, pod_wait_for_clip, line6_nop_write); static DEVICE_ATTR(device_id, S_IRUGO, pod_get_device_id, line6_nop_write); static DEVICE_ATTR(dirty, S_IRUGO, pod_get_dirty, line6_nop_write); -static DEVICE_ATTR(dump, S_IWUGO | S_IRUGO, pod_get_dump, pod_set_dump); -static DEVICE_ATTR(dump_buf, S_IWUGO | S_IRUGO, pod_get_dump_buf, pod_set_dump_buf); -static DEVICE_ATTR(finish, S_IWUGO, line6_nop_read, pod_set_finish); +static DEVICE_ATTR(dump, S_IWUSR | S_IRUGO, pod_get_dump, pod_set_dump); +static DEVICE_ATTR(dump_buf, S_IWUSR | S_IRUGO, pod_get_dump_buf, pod_set_dump_buf); +static DEVICE_ATTR(finish, S_IWUSR, line6_nop_read, pod_set_finish); static DEVICE_ATTR(firmware_version, S_IRUGO, pod_get_firmware_version, line6_nop_write); -static DEVICE_ATTR(midi_postprocess, S_IWUGO | S_IRUGO, pod_get_midi_postprocess, pod_set_midi_postprocess); -static DEVICE_ATTR(monitor_level, S_IWUGO | S_IRUGO, pod_get_monitor_level, pod_set_monitor_level); +static DEVICE_ATTR(midi_postprocess, S_IWUSR | S_IRUGO, pod_get_midi_postprocess, pod_set_midi_postprocess); +static DEVICE_ATTR(monitor_level, S_IWUSR | S_IRUGO, pod_get_monitor_level, pod_set_monitor_level); static DEVICE_ATTR(name, S_IRUGO, pod_get_name, line6_nop_write); static DEVICE_ATTR(name_buf, S_IRUGO, pod_get_name_buf, line6_nop_write); -static DEVICE_ATTR(retrieve_amp_setup, S_IWUGO, line6_nop_read, pod_set_retrieve_amp_setup); -static DEVICE_ATTR(retrieve_channel, S_IWUGO, line6_nop_read, pod_set_retrieve_channel); -static DEVICE_ATTR(retrieve_effects_setup, S_IWUGO, line6_nop_read, pod_set_retrieve_effects_setup); -static DEVICE_ATTR(routing, S_IWUGO | S_IRUGO, pod_get_routing, pod_set_routing); +static DEVICE_ATTR(retrieve_amp_setup, S_IWUSR, line6_nop_read, pod_set_retrieve_amp_setup); +static DEVICE_ATTR(retrieve_channel, S_IWUSR, line6_nop_read, pod_set_retrieve_channel); +static DEVICE_ATTR(retrieve_effects_setup, S_IWUSR, line6_nop_read, pod_set_retrieve_effects_setup); +static DEVICE_ATTR(routing, S_IWUSR | S_IRUGO, pod_get_routing, pod_set_routing); static DEVICE_ATTR(serial_number, S_IRUGO, pod_get_serial_number, line6_nop_write); -static DEVICE_ATTR(store_amp_setup, S_IWUGO, line6_nop_read, pod_set_store_amp_setup); -static DEVICE_ATTR(store_channel, S_IWUGO, line6_nop_read, pod_set_store_channel); -static DEVICE_ATTR(store_effects_setup, S_IWUGO, line6_nop_read, pod_set_store_effects_setup); -static DEVICE_ATTR(tuner_freq, S_IWUGO | S_IRUGO, pod_get_tuner_freq, pod_set_tuner_freq); -static DEVICE_ATTR(tuner_mute, S_IWUGO | S_IRUGO, pod_get_tuner_mute, pod_set_tuner_mute); +static DEVICE_ATTR(store_amp_setup, S_IWUSR, line6_nop_read, pod_set_store_amp_setup); +static DEVICE_ATTR(store_channel, S_IWUSR, line6_nop_read, pod_set_store_channel); +static DEVICE_ATTR(store_effects_setup, S_IWUSR, line6_nop_read, pod_set_store_effects_setup); +static DEVICE_ATTR(tuner_freq, S_IWUSR | S_IRUGO, pod_get_tuner_freq, pod_set_tuner_freq); +static DEVICE_ATTR(tuner_mute, S_IWUSR | S_IRUGO, pod_get_tuner_mute, pod_set_tuner_mute); static DEVICE_ATTR(tuner_note, S_IRUGO, pod_get_tuner_note, line6_nop_write); static DEVICE_ATTR(tuner_pitch, S_IRUGO, pod_get_tuner_pitch, line6_nop_write);#if CREATE_RAW_FILE -static DEVICE_ATTR(raw, S_IWUGO, line6_nop_read, line6_set_raw); +static DEVICE_ATTR(raw, S_IWUSR, line6_nop_read, line6_set_raw);#endif /*
drivers/staging/line6/toneport.c +2 -2
@@ -117,8 +117,8 @@ static ssize_t toneport_set_led_green(struct device *dev,return count; } -static DEVICE_ATTR(led_red, S_IWUGO | S_IRUGO, line6_nop_read, toneport_set_led_red); -static DEVICE_ATTR(led_green, S_IWUGO | S_IRUGO, line6_nop_read, toneport_set_led_green); +static DEVICE_ATTR(led_red, S_IWUSR | S_IRUGO, line6_nop_read, toneport_set_led_red); +static DEVICE_ATTR(led_green, S_IWUSR | S_IRUGO, line6_nop_read, toneport_set_led_green);static int toneport_send_cmd (struct usb_device *usbdev,int cmd1,int cmd2)
drivers/staging/line6/variax.c +6 -6
@@ -366,17 +366,17 @@ static ssize_t variax_set_raw2(struct device *dev,#endif /* Variax workbench special files: */ -static DEVICE_ATTR(model, S_IWUGO | S_IRUGO, variax_get_model, variax_set_model); -static DEVICE_ATTR(volume, S_IWUGO | S_IRUGO, variax_get_volume, variax_set_volume); -static DEVICE_ATTR(tone, S_IWUGO | S_IRUGO, variax_get_tone, variax_set_tone); +static DEVICE_ATTR(model, S_IWUSR | S_IRUGO, variax_get_model, variax_set_model); +static DEVICE_ATTR(volume, S_IWUSR | S_IRUGO, variax_get_volume, variax_set_volume); +static DEVICE_ATTR(tone, S_IWUSR | S_IRUGO, variax_get_tone, variax_set_tone); static DEVICE_ATTR(name, S_IRUGO, variax_get_name, line6_nop_write); static DEVICE_ATTR(bank, S_IRUGO, variax_get_bank, line6_nop_write); static DEVICE_ATTR(dump, S_IRUGO, variax_get_dump, line6_nop_write); -static DEVICE_ATTR(active, S_IWUGO | S_IRUGO, variax_get_active, variax_set_active); +static DEVICE_ATTR(active, S_IWUSR | S_IRUGO, variax_get_active, variax_set_active);#if CREATE_RAW_FILE -static DEVICE_ATTR(raw, S_IWUGO, line6_nop_read, line6_set_raw); -static DEVICE_ATTR(raw2, S_IWUGO, line6_nop_read, variax_set_raw2); +static DEVICE_ATTR(raw, S_IWUSR, line6_nop_read, line6_set_raw); +static DEVICE_ATTR(raw2, S_IWUSR, line6_nop_read, variax_set_raw2);#endif
drivers/staging/rtl8187se/r8185b_init.c +22 -8
@@ -356,8 +356,12 @@ HwHSSIThreeWire( }udelay (10 ); } -if (TryCnt ==TC_3W_POLL_MAX_TRY_CNT ) -panic ("HwThreeWire(): CmdReg: %#X RE|WE bits are not clear!!\n" , u1bTmp); +if (TryCnt ==TC_3W_POLL_MAX_TRY_CNT ) { +printk (KERN_ERR "rtl8187se: HwThreeWire(): CmdReg:" +" %#X RE|WE bits are not clear!!\n" , u1bTmp); +dump_stack (); +return 0 ; + }// RTL8187S HSSI Read/Write Function u1bTmp =read_nic_byte (dev,RF_SW_CONFIG );
@@ -397,13 +401,23 @@ HwHSSIThreeWire(int idx;int ByteCnt = nDataBufBitCnt /8 ;//printk("%d\n",nDataBufBitCnt); -if ((nDataBufBitCnt %8 ) !=0 ) -panic ("HwThreeWire(): nDataBufBitCnt(%d) should be multiple of 8!!!\n" , - nDataBufBitCnt); +if ((nDataBufBitCnt %8 ) !=0 ) { +printk (KERN_ERR "rtl8187se: " +"HwThreeWire(): nDataBufBitCnt(%d)" +" should be multiple of 8!!!\n" , + nDataBufBitCnt); +dump_stack (); + nDataBufBitCnt +=8 ; + nDataBufBitCnt &= ~7 ; + } -if (nDataBufBitCnt >64 ) -panic ("HwThreeWire(): nDataBufBitCnt(%d) should <= 64!!!\n" , - nDataBufBitCnt); +if (nDataBufBitCnt >64 ) { +printk (KERN_ERR "rtl8187se: HwThreeWire():" +" nDataBufBitCnt(%d) should <= 64!!!\n" , + nDataBufBitCnt); +dump_stack (); + nDataBufBitCnt =64 ; + }for (idx =0 ; idx < ByteCnt; idx++) {
drivers/usb/atm/ueagle-atm.c +3 -3
@@ -2259,7 +2259,7 @@ out:return ret; } -static DEVICE_ATTR(stat_status, S_IWUGO | S_IRUGO, read_status, reboot); +static DEVICE_ATTR(stat_status, S_IWUSR | S_IRUGO, read_status, reboot);static ssize_t read_human_status (struct device *dev,struct device_attribute *attr,char *buf)
@@ -2322,7 +2322,7 @@ out:return ret; } -static DEVICE_ATTR(stat_human_status, S_IWUGO | S_IRUGO, read_human_status, NULL); +static DEVICE_ATTR(stat_human_status, S_IRUGO, read_human_status, NULL);static ssize_t read_delin (struct device *dev,struct device_attribute *attr,char *buf)
@@ -2354,7 +2354,7 @@ out:return ret; } -static DEVICE_ATTR(stat_delin, S_IWUGO | S_IRUGO, read_delin, NULL); +static DEVICE_ATTR(stat_delin, S_IRUGO, read_delin, NULL);#define UEA_ATTR (name, reset) \ \
drivers/usb/core/devio.c +4 -3
@@ -946,10 +946,11 @@ static int proc_getdriver(struct dev_state *ps, void __user *arg)static int proc_connectinfo (struct dev_state *ps,void __user *arg) { -struct usbdevfs_connectinfo ci; +struct usbdevfs_connectinfo ci = { + .devnum = ps->dev->devnum, + .slow = ps->dev->speed ==USB_SPEED_LOW + }; - ci.devnum = ps->dev->devnum; - ci.slow = ps->dev->speed ==USB_SPEED_LOW ;if (copy_to_user (arg, &ci,sizeof (ci)))return -EFAULT ;return 0 ;
drivers/usb/gadget/atmel_usba_udc.c +1 -1
@@ -2015,7 +2015,7 @@ static int __init usba_udc_probe(struct platform_device *pdev) } }else {/* gpio_request fail so use -EINVAL for gpio_is_valid */ - ubc->vbus_pin = -EINVAL ; + udc->vbus_pin = -EINVAL ; } }
drivers/usb/host/ehci-hcd.c +5 -5
@@ -1008,10 +1008,11 @@ rescan: tmp && tmp != qh; tmp = tmp->qh_next.qh)continue ; -/* periodic qh self-unlinks on empty */ -if (!tmp) - goto nogood; -unlink_async (ehci, qh); +/* periodic qh self-unlinks on empty, and a COMPLETING qh +* may already be unlinked. +*/ +if (tmp) +unlink_async (ehci, qh);/* FALL THROUGH */ case QH_STATE_UNLINK :/* wait for hw to finish? */ case QH_STATE_UNLINK_WAIT :
@@ -1028,7 +1029,6 @@ idle_timeout: }/* else FALL THROUGH */ default : -nogood:/* caller was supposed to have unlinked any requests; * that's not our job. just leak this memory. */
drivers/usb/misc/cypress_cy7c63.c +2 -4
@@ -195,11 +195,9 @@ static ssize_t get_port1_handler(struct device *dev,return read_port (dev, attr, buf,1 ,CYPRESS_READ_PORT_ID1 ); } -static DEVICE_ATTR(port0, S_IWUGO | S_IRUGO, - get_port0_handler, set_port0_handler); +static DEVICE_ATTR(port0, S_IRUGO | S_IWUSR, get_port0_handler, set_port0_handler); -static DEVICE_ATTR(port1, S_IWUGO | S_IRUGO, - get_port1_handler, set_port1_handler); +static DEVICE_ATTR(port1, S_IRUGO | S_IWUSR, get_port1_handler, set_port1_handler); static int cypress_probe(struct usb_interface *interface,
drivers/usb/misc/iowarrior.c +1 -0
@@ -552,6 +552,7 @@ static long iowarrior_ioctl(struct file *file, unsigned int cmd,/* needed for power consumption */ struct usb_config_descriptor *cfg_descriptor = &dev->udev->actconfig->desc; +memset (&info,0 ,sizeof (info));/* directly from the descriptor */ info.vendor =le16_to_cpu (dev->udev->descriptor.idVendor); info.product = dev->product_id;
drivers/usb/misc/sisusbvga/sisusb.c +1 -0
@@ -3008,6 +3008,7 @@ sisusb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)#else x.sisusb_conactive =0 ;#endif +memset (x.sisusb_reserved,0 ,sizeof (x.sisusb_reserved));if (copy_to_user ((void __user *)arg, &x,sizeof (x))) retval = -EFAULT ;
drivers/usb/misc/trancevibrator.c +1 -1
@@ -85,7 +85,7 @@ static ssize_t set_speed(struct device *dev, struct device_attribute *attr,return count; } -static DEVICE_ATTR(speed, S_IWUGO | S_IRUGO, show_speed, set_speed); +static DEVICE_ATTR(speed, S_IRUGO | S_IWUSR, show_speed, set_speed);static int tv_probe (struct usb_interface *interface,const struct usb_device_id *id)
drivers/usb/misc/usbled.c +1 -1
@@ -94,7 +94,7 @@ static ssize_t set_##value(struct device *dev, struct device_attribute *attr, cochange_color (led); \return count; \ } \ -static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value); +static DEVICE_ATTR(value, S_IRUGO | S_IWUSR, show_##value, set_##value);show_set (blue);show_set (red);show_set (green);
drivers/usb/misc/usbsevseg.c +4 -6
@@ -185,7 +185,7 @@ static ssize_t set_attr_##name(struct device *dev, \ \return count; \ } \ -static DEVICE_ATTR(name, S_IWUGO | S_IRUGO, show_attr_##name, set_attr_##name); +static DEVICE_ATTR(name, S_IRUGO | S_IWUSR, show_attr_##name, set_attr_##name);static ssize_t show_attr_text (struct device *dev,struct device_attribute *attr,char *buf)
@@ -216,7 +216,7 @@ static ssize_t set_attr_text(struct device *dev,return count; } -static DEVICE_ATTR(text, S_IWUGO | S_IRUGO, show_attr_text, set_attr_text); +static DEVICE_ATTR(text, S_IRUGO | S_IWUSR, show_attr_text, set_attr_text);static ssize_t show_attr_decimals (struct device *dev,struct device_attribute *attr,char *buf)
@@ -265,8 +265,7 @@ static ssize_t set_attr_decimals(struct device *dev,return count; } -static DEVICE_ATTR(decimals, S_IWUGO | S_IRUGO, - show_attr_decimals, set_attr_decimals); +static DEVICE_ATTR(decimals, S_IRUGO | S_IWUSR, show_attr_decimals, set_attr_decimals);static ssize_t show_attr_textmode (struct device *dev,struct device_attribute *attr,char *buf)
@@ -312,8 +311,7 @@ static ssize_t set_attr_textmode(struct device *dev,return -EINVAL ; } -static DEVICE_ATTR(textmode, S_IWUGO | S_IRUGO, - show_attr_textmode, set_attr_textmode); +static DEVICE_ATTR(textmode, S_IRUGO | S_IWUSR, show_attr_textmode, set_attr_textmode);MYDEV_ATTR_SIMPLE_UNSIGNED (powered, update_display_powered);
drivers/usb/serial/ftdi_sio.c +4 -4
@@ -206,6 +206,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_MTXORB_5_PID) }, { USB_DEVICE(FTDI_VID, FTDI_MTXORB_6_PID) }, { USB_DEVICE(FTDI_VID, FTDI_R2000KU_TRUE_RNG) }, + { USB_DEVICE(FTDI_VID, FTDI_VARDAAN_PID) }, { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0100_PID) }, { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0101_PID) }, { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0102_PID) },
@@ -702,6 +703,7 @@ static struct usb_device_id id_table_combined [] = { .driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk }, { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_SERIAL_VX7_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_CT29B_PID) }, { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) }, { USB_DEVICE(FTDI_VID, FTDI_PHI_FISCO_PID) }, { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
@@ -800,6 +802,8 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) }, + { USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { }, /* Optional parameter entry */ { } /* Terminating entry */ };
@@ -2363,8 +2367,6 @@ static void ftdi_set_termios(struct tty_struct *tty, "urb failed to set to rts/cts flow control\n"); } -/* raise DTR/RTS */ -set_mctrl (port,TIOCM_DTR |TIOCM_RTS ); }else {/* * Xon/Xoff code
@@ -2412,8 +2414,6 @@ static void ftdi_set_termios(struct tty_struct *tty, } } -/* lower DTR/RTS */ -clear_mctrl (port,TIOCM_DTR |TIOCM_RTS ); }return ; }
drivers/usb/serial/ftdi_sio_ids.h +11 -0
@@ -114,6 +114,9 @@/* Lenz LI-USB Computer Interface. */ #define FTDI_LENZ_LIUSB_PID 0xD780 +/* Vardaan Enterprises Serial Interface VEUSB422R3 */ +#define FTDI_VARDAAN_PID 0xF070 +/* * Xsens Technologies BV products (http://www.xsens.com). */
@@ -728,6 +731,7 @@*/ #define RTSYSTEMS_VID 0x2100/* Vendor ID */ #define RTSYSTEMS_SERIAL_VX7_PID 0x9e52/* Serial converter for VX-7 Radios using FT232RL */ +#define RTSYSTEMS_CT29B_PID 0x9e54/* CT29B Radio Cable */ /* * Bayer Ascensia Contour blood glucose meter USB-converter cable.
@@ -1107,3 +1111,10 @@#define FTDI_SCIENCESCOPE_LOGBOOKML_PID 0xFF18#define FTDI_SCIENCESCOPE_LS_LOGBOOK_PID 0xFF1C#define FTDI_SCIENCESCOPE_HS_LOGBOOK_PID 0xFF1D + +/* +* Milkymist One JTAG/Serial +*/ +#define QIHARDWARE_VID 0x20B7 +#define MILKYMISTONE_JTAGSERIAL_PID 0x0713 +
drivers/usb/serial/option.c +1 -1
@@ -479,7 +479,7 @@ static struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) }, - { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC, 0xff, 0xff, 0xff) }, { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) }, { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */
drivers/usb/storage/sierra_ms.c +1 -1
@@ -120,7 +120,7 @@ static ssize_t show_truinst(struct device *dev, struct device_attribute *attr, }return result; } -static DEVICE_ATTR(truinst, S_IWUGO | S_IRUGO, show_truinst, NULL); +static DEVICE_ATTR(truinst, S_IRUGO, show_truinst, NULL);int sierra_ms_init (struct us_data *us) {
drivers/video/backlight/backlight.c +6 -6
@@ -196,12 +196,12 @@ static int backlight_suspend(struct device *dev, pm_message_t state) {struct backlight_device *bd =to_backlight_device (dev); -if (bd->ops->options &BL_CORE_SUSPENDRESUME ) { -mutex_lock (&bd->ops_lock); +mutex_lock (&bd->ops_lock); +if (bd->ops && bd->ops->options &BL_CORE_SUSPENDRESUME ) { bd->props.state |=BL_CORE_SUSPENDED ;backlight_update_status (bd); -mutex_unlock (&bd->ops_lock); } +mutex_unlock (&bd->ops_lock);return 0 ; }
@@ -210,12 +210,12 @@ static int backlight_resume(struct device *dev) {struct backlight_device *bd =to_backlight_device (dev); -if (bd->ops->options &BL_CORE_SUSPENDRESUME ) { -mutex_lock (&bd->ops_lock); +mutex_lock (&bd->ops_lock); +if (bd->ops && bd->ops->options &BL_CORE_SUSPENDRESUME ) { bd->props.state &= ~BL_CORE_SUSPENDED ;backlight_update_status (bd); -mutex_unlock (&bd->ops_lock); } +mutex_unlock (&bd->ops_lock);return 0 ; }
drivers/video/efifb.c +94 -12
175 lines not on this page · raw message
drivers/video/via/accel.c +4 -3
@@ -277,11 +277,12 @@ static int hw_bitblt_2(void __iomem *engine, u8 op, u32 width, u32 height,writel (tmp, engine +0x1C ); } -if (op !=VIA_BITBLT_COLOR ) +if (op ==VIA_BITBLT_FILL ) { +writel (fg_color, engine +0x58 ); + }else if (op ==VIA_BITBLT_MONO ) {writel (fg_color, engine +0x4C ); - -if (op ==VIA_BITBLT_MONO )writel (bg_color, engine +0x50 ); + }if (op ==VIA_BITBLT_FILL ) ge_cmd |= fill_rop <<24 |0x00002000 |0x00000001 ;
drivers/xen/events.c +1 -1
@@ -255,7 +255,7 @@ static void init_evtchn_cpu_bindings(void) }#endif -memset (cpu_evtchn_mask (0 ), ~0 ,sizeof (cpu_evtchn_mask (0 ))); +memset (cpu_evtchn_mask (0 ), ~0 ,sizeof (struct cpu_evtchn_s )); }static inline void clear_evtchn (int port)
fs/bio.c +21 -2
@@ -371,6 +371,9 @@ struct bio *bio_kmalloc(gfp_t gfp_mask, int nr_iovecs) {struct bio *bio; +if (nr_iovecs >UIO_MAXIOV ) +return NULL ; + bio =kmalloc (sizeof (struct bio ) + nr_iovecs *sizeof (struct bio_vec ), gfp_mask);if (unlikely (!bio))
@@ -701,8 +704,12 @@ static void bio_free_map_data(struct bio_map_data *bmd)static struct bio_map_data *bio_alloc_map_data (int nr_segs,int iov_count,gfp_t gfp_mask) { -struct bio_map_data *bmd =kmalloc (sizeof (*bmd), gfp_mask); +struct bio_map_data *bmd; +if (iov_count >UIO_MAXIOV ) +return NULL ; + + bmd =kmalloc (sizeof (*bmd), gfp_mask);if (!bmd)return NULL ;
@@ -831,6 +838,12 @@ struct bio *bio_copy_user_iov(struct request_queue *q, end = (uaddr + iov[i].iov_len +PAGE_SIZE -1 ) >>PAGE_SHIFT ; start = uaddr >>PAGE_SHIFT ; +/* +* Overflow, abort +*/ +if (end < start) +return ERR_PTR (-EINVAL ); + nr_pages += end - start; len += iov[i].iov_len; }
@@ -958,6 +971,12 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,unsigned long end = (uaddr + len +PAGE_SIZE -1 ) >>PAGE_SHIFT ;unsigned long start = uaddr >>PAGE_SHIFT ; +/* +* Overflow, abort +*/ +if (end < start) +return ERR_PTR (-EINVAL ); + nr_pages += end - start;/* * buffer must be aligned to at least hardsector size for now
@@ -985,7 +1004,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,unsigned long start = uaddr >>PAGE_SHIFT ;const int local_nr_pages = end - start;const int page_limit = cur_page + local_nr_pages; - + ret =get_user_pages_fast (uaddr, local_nr_pages, write_to_vm, &pages[cur_page]);if (ret < local_nr_pages) {
fs/ecryptfs/inode.c +4 -0
@@ -69,15 +69,19 @@ ecryptfs_create_underlying_file(struct inode *lower_dir_inode,struct vfsmount *lower_mnt =ecryptfs_dentry_to_lower_mnt (dentry);struct dentry *dentry_save;struct vfsmount *vfsmount_save; +unsigned int flags_save;int rc; dentry_save = nd->path.dentry; vfsmount_save = nd->path.mnt; + flags_save = nd->flags; nd->path.dentry = lower_dentry; nd->path.mnt = lower_mnt; + nd->flags &= ~LOOKUP_OPEN ; rc =vfs_create (lower_dir_inode, lower_dentry, mode, nd); nd->path.dentry = dentry_save; nd->path.mnt = vfsmount_save; + nd->flags = flags_save;return rc; }
fs/fuse/file.c +10 -0
@@ -134,6 +134,7 @@ EXPORT_SYMBOL_GPL(fuse_do_open);void fuse_finish_open (struct inode *inode,struct file *file) {struct fuse_file *ff = file->private_data; +struct fuse_conn *fc =get_fuse_conn (inode);if (ff->open_flags &FOPEN_DIRECT_IO ) file->f_op = &fuse_direct_io_file_operations;
@@ -141,6 +142,15 @@ void fuse_finish_open(struct inode *inode, struct file *file)invalidate_inode_pages2 (inode->i_mapping);if (ff->open_flags &FOPEN_NONSEEKABLE )nonseekable_open (inode, file); +if (fc->atomic_o_trunc && (file->f_flags &O_TRUNC )) { +struct fuse_inode *fi =get_fuse_inode (inode); + +spin_lock (&fc->lock); + fi->attr_version = ++fc->attr_version; +i_size_write (inode,0 ); +spin_unlock (&fc->lock); +fuse_invalidate_attr (inode); + } }int fuse_open_common (struct inode *inode,struct file *file,bool isdir)
include/linux/blkdev.h +2 -2
@@ -932,7 +932,7 @@ extern void blk_queue_max_segment_size(struct request_queue *, unsigned int);extern void blk_queue_max_discard_sectors (struct request_queue *q,unsigned int max_discard_sectors);extern void blk_queue_logical_block_size (struct request_queue *,unsigned short ); -extern void blk_queue_physical_block_size (struct request_queue *,unsigned short ); +extern void blk_queue_physical_block_size (struct request_queue *,unsigned int );extern void blk_queue_alignment_offset (struct request_queue *q,unsigned int alignment);extern void blk_limits_io_min (struct queue_limits *limits,unsigned int min);
@@ -1083,7 +1083,7 @@ static inline unsigned int queue_physical_block_size(struct request_queue *q)return q->limits.physical_block_size; } -static inline int bdev_physical_block_size (struct block_device *bdev) +static inline unsigned int bdev_physical_block_size (struct block_device *bdev) {return queue_physical_block_size (bdev_get_queue (bdev)); }
include/linux/pci_ids.h +2 -0
@@ -1265,6 +1265,7 @@#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE 0x0759#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_SMBUS 0x07D8#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS 0x0AA2 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA 0x0D85#define PCI_VENDOR_ID_IMS 0x10e0#define PCI_DEVICE_ID_IMS_TT128 0x9128
@@ -2033,6 +2034,7 @@#define PCI_DEVICE_ID_AFAVLAB_P030 0x2182#define PCI_SUBDEVICE_ID_AFAVLAB_P061 0x2150 +#define PCI_VENDOR_ID_BCM_GVC 0x14a4#define PCI_VENDOR_ID_BROADCOM 0x14e4#define PCI_DEVICE_ID_TIGON3_5752 0x1600#define PCI_DEVICE_ID_TIGON3_5752M 0x1601
include/linux/socket.h +1 -1
@@ -304,7 +304,7 @@ extern int csum_partial_copy_fromiovecend(unsigned char *kdata,int offset, unsigned int len, __wsum *csump); -extern long verify_iovec (struct msghdr *m,struct iovec *iov,struct sockaddr *address,int mode); +extern int verify_iovec (struct msghdr *m,struct iovec *iov,struct sockaddr *address,int mode);extern int memcpy_toiovec (struct iovec *v,unsigned char *kdata,int len);extern int memcpy_toiovecend (const struct iovec *v,unsigned char *kdata,int offset,int len);
include/net/x25.h +4 -0
@@ -182,6 +182,10 @@ extern int sysctl_x25_clear_request_timeout;extern int sysctl_x25_ack_holdback_timeout;extern int sysctl_x25_forward; +extern int x25_parse_address_block (struct sk_buff *skb, +struct x25_address *called_addr, +struct x25_address *calling_addr); +extern int x25_addr_ntoa (unsigned char *,struct x25_address *,struct x25_address *); extern int x25_addr_aton(unsigned char *, struct x25_address *,
ipc/compat.c +6 -0
@@ -242,6 +242,8 @@ long compat_sys_semctl(int first, int second, int third, void __user *uptr)struct semid64_ds __user *up64;int version =compat_ipc_parse_version (&third); +memset (&s64,0 ,sizeof (s64)); +if (!uptr)return -EINVAL ;if (get_user (pad, (u32 __user *) uptr))
@@ -422,6 +424,8 @@ long compat_sys_msgctl(int first, int second, void __user *uptr)int version =compat_ipc_parse_version (&second);void __user *p; +memset (&m64,0 ,sizeof (m64)); +switch (second & (~IPC_64 )) {case IPC_INFO :case IPC_RMID :
@@ -595,6 +599,8 @@ long compat_sys_shmctl(int first, int second, void __user *uptr)int err, err2;int version =compat_ipc_parse_version (&second); +memset (&s64,0 ,sizeof (s64)); +switch (second & (~IPC_64 )) {case IPC_RMID :case SHM_LOCK :
ipc/compat_mq.c +5 -0
@@ -53,6 +53,9 @@ asmlinkage long compat_sys_mq_open(const char __user *u_name,void __user *p =NULL ;if (u_attr && oflag &O_CREAT ) {struct mq_attr attr; + +memset (&attr,0 ,sizeof (attr)); + p =compat_alloc_user_space (sizeof (attr));if (get_compat_mq_attr (&attr, u_attr) ||copy_to_user (p, &attr,sizeof (attr)))
@@ -127,6 +130,8 @@ asmlinkage long compat_sys_mq_getsetattr(mqd_t mqdes,struct mq_attr __user *p =compat_alloc_user_space (2 *sizeof (*p));long ret; +memset (&mqstat,0 ,sizeof (mqstat)); +if (u_mqstat) {if (get_compat_mq_attr (&mqstat, u_mqstat) ||copy_to_user (p, &mqstat,sizeof (mqstat)))
ipc/sem.c +2 -0
@@ -560,6 +560,8 @@ static unsigned long copy_semid_to_user(void __user *buf, struct semid64_ds *in, {struct semid_ds out; +memset (&out,0 ,sizeof (out)); +ipc64_perm_to_ipc_perm (&in->sem_perm, &out.sem_perm); out.sem_otime = in->sem_otime;
ipc/shm.c +1 -0
@@ -474,6 +474,7 @@ static inline unsigned long copy_shmid_to_user(void __user *buf, struct shmid64_ {struct shmid_ds out; +memset (&out,0 ,sizeof (out));ipc64_perm_to_ipc_perm (&in->shm_perm, &out.shm_perm); out.shm_segsz = in->shm_segsz; out.shm_atime = in->shm_atime;
kernel/exit.c +9 -0
@@ -899,6 +899,15 @@ NORET_TYPE void do_exit(long code)if (unlikely (!tsk->pid))panic ("Attempted to kill the idle task!" ); +/* +* If do_exit is called because this processes oopsed, it's possible +* that get_fs() was left as KERNEL_DS, so reset it to USER_DS before +* continuing. Amongst other possible reasons, this is to prevent +* mm_release()->clear_child_tid() from writing to a user-controlled +* kernel address. +*/ +set_fs (USER_DS ); +tracehook_report_exit (&code);validate_creds_for_do_exit (tsk);
kernel/latencytop.c +8 -9
@@ -195,14 +195,7 @@ __account_scheduler_latency(struct task_struct *tsk, int usecs, int inter)account_global_scheduler_latency (tsk, &lat); -/* -* short term hack; if we're > 32 we stop; future we recycle: -*/ - tsk->latency_record_count++; -if (tsk->latency_record_count >=LT_SAVECOUNT ) - goto out_unlock; - -for (i =0 ; i <LT_SAVECOUNT ; i++) { +for (i =0 ; i < tsk->latency_record_count; i++) {struct latency_record *mylat;int same =1 ;
@@ -228,8 +221,14 @@ __account_scheduler_latency(struct task_struct *tsk, int usecs, int inter) } } +/* +* short term hack; if we're > 32 we stop; future we recycle: +*/ +if (tsk->latency_record_count >=LT_SAVECOUNT ) + goto out_unlock; +/* Allocated a new one: */ - i = tsk->latency_record_count; + i = tsk->latency_record_count++;memcpy (&tsk->latency_record[i], &lat,sizeof (struct latency_record )); out_unlock:
lib/percpu_counter.c +1 -0
@@ -76,6 +76,7 @@ int __percpu_counter_init(struct percpu_counter *fbc, s64 amount,if (!fbc->counters)return -ENOMEM ;#ifdef CONFIG_HOTPLUG_CPU +INIT_LIST_HEAD (&fbc->list);mutex_lock (&percpu_counters_lock);list_add (&fbc->list, &percpu_counters);mutex_unlock (&percpu_counters_lock);
mm/filemap.c +3 -0
@@ -1030,6 +1030,9 @@ find_page: goto page_not_up_to_date;if (!trylock_page (page)) goto page_not_up_to_date; +/* Did it get truncated before we got the lock? */ +if (!page->mapping) + goto page_not_up_to_date_locked;if (!mapping->a_ops->is_partially_uptodate (page, desc, offset)) goto page_not_up_to_date_locked;
mm/internal.h +1 -1
@@ -59,7 +59,7 @@ extern void prep_compound_page(struct page *page, unsigned long order);*/ static inline unsigned long page_order (struct page *page) { -VM_BUG_ON (!PageBuddy (page)); +/* PageBuddy() must be checked by the caller */ return page_private (page); }
mm/memory_hotplug.c +1 -1
@@ -626,7 +626,7 @@ static int test_pages_in_a_zone(unsigned long start_pfn, unsigned long end_pfn)* Scanning pfn is much easier than scanning lru list. * Scan pfn from start to end and Find LRU page. */ -int scan_lru_pages (unsigned long start,unsigned long end) +unsigned long scan_lru_pages (unsigned long start,unsigned long end) {unsigned long pfn;struct page *page;
mm/mempolicy.c +1 -1
@@ -1482,7 +1482,7 @@ unsigned slab_node(struct mempolicy *policy) (void )first_zones_zonelist (zonelist, highest_zoneidx, &policy->v.nodes, &zone); -return zone->node; +return zone ? zone->node :numa_node_id (); }default :
mm/mprotect.c +1 -1
@@ -212,6 +212,7 @@ success:mmu_notifier_invalidate_range_end (mm, start, end);vm_stat_account (mm, oldflags, vma->vm_file, -nrpages);vm_stat_account (mm, newflags, vma->vm_file, nrpages); +perf_event_mmap (vma);return 0 ; fail:
@@ -300,7 +301,6 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, error =mprotect_fixup (vma, &prev, nstart, tmp, newflags);if (error) goto out; -perf_event_mmap (vma); nstart = tmp;if (nstart < prev->vm_end)
mm/nommu.c +1 -0
@@ -1615,6 +1615,7 @@ void exit_mmap(struct mm_struct *mm) mm->mmap = vma->vm_next;delete_vma_from_mm (vma);delete_vma (mm, vma); +cond_resched (); }kleave ("" );
net/can/bcm.c +1 -1
@@ -124,7 +124,7 @@ struct bcm_sock {struct list_head tx_ops;unsigned long dropped_usr_msgs;struct proc_dir_entry *bcm_proc_read; -char procname [9 ];/* pointer printed in ASCII with \0 */ +char procname [20 ];/* pointer printed in ASCII with \0 */ };static inline struct bcm_sock *bcm_sk (const struct sock *sk)
net/compat.c +6 -4
@@ -40,10 +40,12 @@ static inline int iov_from_user_compat_to_kern(struct iovec *kiov,compat_size_t len;if (get_user (len, &uiov32->iov_len) || -get_user (buf, &uiov32->iov_base)) { - tot_len = -EFAULT ; -break ; - } +get_user (buf, &uiov32->iov_base)) +return -EFAULT ; + +if (len >INT_MAX - tot_len) + len =INT_MAX - tot_len; + tot_len += len; kiov->iov_base =compat_ptr (buf); kiov->iov_len = (__kernel_size_t ) len;
net/core/dev.c +3 -3
@@ -1484,10 +1484,10 @@ EXPORT_SYMBOL(netif_device_attach);static bool can_checksum_protocol (unsigned long features,__be16 protocol) { -return ((features &NETIF_F_GEN_CSUM ) || - ((features &NETIF_F_IP_CSUM ) && +return ((features &NETIF_F_NO_CSUM ) || + ((features &NETIF_F_V4_CSUM ) && protocol ==htons (ETH_P_IP )) || - ((features &NETIF_F_IPV6_CSUM ) && + ((features &NETIF_F_V6_CSUM ) && protocol ==htons (ETH_P_IPV6 )) || ((features &NETIF_F_FCOE_CRC ) && protocol ==htons (ETH_P_FCOE )));
net/core/ethtool.c +1 -1
@@ -265,7 +265,7 @@ static int ethtool_get_rxnfc(struct net_device *dev,if (info.cmd ==ETHTOOL_GRXCLSRLALL ) {if (info.rule_cnt >0 ) {if (info.rule_cnt <=KMALLOC_MAX_SIZE /sizeof (u32)) - rule_buf =kmalloc (info.rule_cnt *sizeof (u32), + rule_buf =kzalloc (info.rule_cnt *sizeof (u32),GFP_USER );
Lines of this file are not shown. View the raw message.
net/x25/af_x25.c +46 -1
47 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.