3.10.99-stable review
Subsystems (3)
Greg Kroah-Hartman
maintainercover 3.10.99-stable review
This is the start of the stable review cycle for the 3.10.99 release. There are 80 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 3 23:43:32 UTC 2016. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.x/stable-review/patch-3.10.99-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 3.10.99-rc1
Konrad Rzeszutek Wilk <[email protected]>
xen/pcifront: Fix mysterious crashes when NUMA locality information was extracted.
Al Viro <[email protected]>
do_last(): don't let a bogus return value from ->open() et.al. to confuse us
Simon Guinot <[email protected]>
kernel/resource.c: fix muxed resource handling in __request_region()
Stefan Hajnoczi <[email protected]>
sunrpc/cache: fix off-by-one in qword_get()
Steven Rostedt (Red Hat) <[email protected]>
tracing: Fix showing function event in available_events
Christian Borntraeger <[email protected]>
KVM: async_pf: do not warn on page allocation failures
Christoph Hellwig <[email protected]>
nfs: fix nfs_size_to_loff_t
Sebastian Andrzej Siewior <[email protected]>
PCI/AER: Flush workqueue on device remove to avoid use-after-free
Tejun Heo <[email protected]>
libata: fix sff host state machine locking while polling
Tejun Heo <[email protected]>
Revert "workqueue: make sure delayed work run in local cpu"
Johannes Berg <[email protected]>
rfkill: fix rfkill_fop_read wait_event usage
Oliver Neukum <[email protected]>
cdc-acm:exclude Samsung phone 04e8:685d
Ilya Dryomov <[email protected]>
libceph: don't bail early from try_read() when skipping a message
Mike Marciniszyn <[email protected]>
IB/qib: fix mcast detach when qp not attached
Rasmus Villemoes <[email protected]>
drm/radeon: use post-decrement in error handling
Nicolai Hähnle <[email protected]>
drm/radeon: hold reference to fences in radeon_sa_bo_new
Alex Deucher <[email protected]>
drm/radeon: clean up fujitsu quirks
Rob Clark <[email protected]>
drm/vmwgfx: respect 'nomodeset'
Dmitry V. Levin <[email protected]>
sparc64: fix incorrect sign extension in sys_sparc64_personality
Linus Walleij <[email protected]>
mmc: mmci: fix an ages old detection error
Richard Cochran <[email protected]>
posix-clock: Fix return code on the poll method's error path
Mikulas Patocka <[email protected]>
dm snapshot: fix hung bios when copy error occurs
Mauro Carvalho Chehab <[email protected]>
tda1004x: only update the frontend properties if locked
Antonio Ospite <[email protected]>
gspca: ov534/topro: prevent a division by 0
Malcolm Priestley <[email protected]>
media: dvb-core: Don't force CAN_INVERSION_AUTO in oneshot mode
Vegard Nossum <[email protected]>
uml: fix hostfs mknod()
Vegard Nossum <[email protected]>
uml: flush stdout before forking
Stefan Haberland <[email protected]>
s390/dasd: fix refcount for PAV reassignment
Stefan Haberland <[email protected]>
s390/dasd: prevent incorrect length error under z/VM after PAV changes
Ard Biesheuvel <[email protected]>
s390: fix normalization bug in exception table sorting
Filipe Manana <[email protected]>
Btrfs: fix number of transaction units required to create symlink
Filipe Manana <[email protected]>
Btrfs: send, don't BUG_ON() when an empty symlink is found
Josef Bacik <[email protected]>
Btrfs: igrab inode in writepage
Anand Jain <[email protected]>
Btrfs: add missing brelse when superblock checksum fails
Russell King <[email protected]>
scripts: recordmcount: break hardlinks
James Bottomley <[email protected]>
ses: fix additional element traversal bug
James Bottomley <[email protected]>
ses: Fix problems with simple enclosures
Johannes Berg <[email protected]>
rfkill: copy the name into the rfkill struct
Kirill A. Shutemov <[email protected]>
vgaarb: fix signal handling in vga_get()
Joe Thornber <[email protected]>
dm btree: fix bufio buffer leaks in dm_btree_del() error path
Mikulas Patocka <[email protected]>
sata_sil: disable trim
Sasha Levin <[email protected]>
sched/core: Remove false-positive warning from wake_up_process()
Mirza Krak <[email protected]>
can: sja1000: clear interrupts on start
Quentin Casasnovas <[email protected]>
RDS: fix race condition when sending a message on unbound socket
Johannes Berg <[email protected]>
mac80211: mesh: fix call_rcu() usage
Suman Anna <[email protected]>
virtio: fix memory leak of virtio ida cache layers
Steven Rostedt (Red Hat) <[email protected]>
ring-buffer: Update read stamp with first real commit on page
Jan Kara <[email protected]>
vfs: Avoid softlockups with sendfile(2)
Vineet Gupta <[email protected]>
ARC: dw2 unwind: Remove falllback linear search thru FDE entries
Kees Cook <[email protected]>
mac: validate mac_partition is within sector
Luca Porzio <[email protected]>
mmc: remove bondage between REQ_META and reliable write
[email protected] <[email protected]>
megaraid_sas : SMAP restriction--do not access user memory from IOCTL code
[email protected] <[email protected]>
megaraid_sas: Do not use PAGE_SIZE for max_sectors
Valentin Rothberg <[email protected]>
wm831x_power: Use IRQF_ONESHOT to request threaded IRQs
Dan Carpenter <[email protected]>
devres: fix a for loop bounds check
Andrey Ryabinin <[email protected]>
lockd: create NSM handles per net namespace
Roman Volkov <[email protected]>
clocksource/drivers/vt8500: Increase the minimum delta
Roman Volkov <[email protected]>
dts: vt8500: Add SDHC node to DTS file for WM8650
Thomas Gleixner <[email protected]>
genirq: Prevent chip buslock deadlock
Hannes Frederic Sowa <[email protected]>
unix: correctly track in-flight fds in sending process user_struct
Olga Kornievskaia <[email protected]>
Failing to send a CLOSE if file is opened WRONLY and server reboots on a 4.x mount
Christophe Leroy <[email protected]>
splice: sendfile() at once fails for big files
James Hogan <[email protected]>
MIPS: KVM: Uninit VCPU in vcpu_create error path
James Hogan <[email protected]>
MIPS: KVM: Fix CACHE immediate offset sign extension
James Hogan <[email protected]>
MIPS: KVM: Fix ASID restoration logic
Hariprasad S <[email protected]>
iw_cxgb3: Fix incorrectly returning error on success
Corey Wright <[email protected]>
proc: Fix ptrace-based permission checks for accessing task maps
Bjørn Mork <[email protected]>
USB: option: add "4G LTE usb-modem U901"
Andrey Skvortsov <[email protected]>
USB: option: add support for SIM7100E
Ken Lin <[email protected]>
USB: cp210x: add IDs for GE B650V3 and B850V3 boards
Gerhard Uttenthaler <[email protected]>
can: ems_usb: Fix possible tx overflow
Nikolay Borisov <[email protected]>
dm thin: fix race condition when destroying thin pool workqueue
Joe Thornber <[email protected]>
dm thin metadata: fix bug when taking a metadata snapshot
Ingo Molnar <[email protected]>
efi: Disable interrupts around EFI calls, not in the epilog/prolog calls
Dave Airlie <[email protected]>
drm/radeon: fix hotplug race at startup
Kamal Mostafa <[email protected]>
tools: Add a "make all" rule
Zheng Liu <[email protected]>
bcache: unregister reboot notifier if bcache fails to unregister device
Andrey Vagin <[email protected]>
netfilter: nf_conntrack: fix RCU race in nf_conntrack_find_get
Egbert Eich <[email protected]>
drm/ast: Initialized data needed to map fbdev memory
Steven Rostedt (Red Hat) <[email protected]>
tracepoints: Do not trace when cpu is offline
-------------
Diffstat:
Makefile | 4 ++-- arch/arc/kernel/unwind.c | 37 ++++------------------------- arch/arm/boot/dts/wm8650.dtsi | 9 +++++++ arch/mips/kvm/kvm_locore.S | 16 ++++++++----- arch/mips/kvm/kvm_mips.c | 5 +++- arch/mips/kvm/kvm_mips_emul.c | 2 +- arch/s390/mm/extable.c | 8 +++++-- arch/sparc/kernel/sys_sparc_64.c | 2 +- arch/um/os-Linux/start_up.c | 2 ++ arch/x86/platform/efi/efi.c | 7 ++++++ arch/x86/platform/efi/efi_32.c | 11 +++------ arch/x86/platform/efi/efi_64.c | 3 --- block/partitions/mac.c | 10 +++++--- drivers/ata/libata-sff.c | 32 +++++++++---------------- drivers/ata/sata_sil.c | 3 +++ drivers/clocksource/vt8500_timer.c | 6 +++-- drivers/gpu/drm/ast/ast_drv.h | 1 + drivers/gpu/drm/ast/ast_fb.c | 7 ++++++ drivers/gpu/drm/ast/ast_main.c | 1 + drivers/gpu/drm/ast/ast_mode.c | 2 ++ drivers/gpu/drm/radeon/radeon_atombios.c | 12 +++------- drivers/gpu/drm/radeon/radeon_irq_kms.c | 5 ++++ drivers/gpu/drm/radeon/radeon_sa.c | 5 ++++ drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 ++++++ drivers/gpu/vga/vgaarb.c | 6 +++-- drivers/infiniband/hw/cxgb3/iwch_cm.c | 4 ++-- drivers/infiniband/hw/qib/qib_verbs_mcast.c | 35 ++++++++++++--------------- drivers/md/bcache/super.c | 4 +++- drivers/md/dm-exception-store.h | 2 +- drivers/md/dm-snap-persistent.c | 5 +++- drivers/md/dm-snap-transient.c | 4 ++-- drivers/md/dm-snap.c | 20 ++++------------ drivers/md/dm-thin-metadata.c | 6 +++++ drivers/md/dm-thin.c | 2 +- drivers/md/persistent-data/dm-btree.c | 16 ++++++++++++- drivers/media/dvb-core/dvb_frontend.c | 6 ++--- drivers/media/dvb-frontends/tda1004x.c | 9 +++++++ drivers/media/usb/gspca/ov534.c | 9 +++++-- drivers/media/usb/gspca/topro.c | 6 ++++- drivers/mmc/card/block.c | 11 +++------ drivers/mmc/host/mmci.c | 2 +- drivers/net/can/sja1000/sja1000.c | 3 +++ drivers/net/can/usb/ems_usb.c | 14 +++++++---- drivers/pci/pcie/aer/aerdrv.c | 4 +--- drivers/pci/pcie/aer/aerdrv.h | 1 - drivers/pci/pcie/aer/aerdrv_core.c | 2 -- drivers/pci/xen-pcifront.c | 10 ++++---- drivers/power/wm831x_power.c | 6 ++--- drivers/s390/block/dasd_alias.c | 23 +++++++++++++----- drivers/scsi/megaraid/megaraid_sas.h | 2 ++ drivers/scsi/megaraid/megaraid_sas_base.c | 15 +++++++++--- drivers/scsi/ses.c | 30 +++++++++++++++++++++-- drivers/usb/class/cdc-acm.c | 5 ++++ drivers/usb/serial/cp210x.c | 2 ++ drivers/usb/serial/option.c | 9 +++++++ drivers/virtio/virtio.c | 1 + fs/btrfs/disk-io.c | 1 + fs/btrfs/inode.c | 21 +++++++++++++--- fs/btrfs/send.c | 16 ++++++++++++- fs/hostfs/hostfs_kern.c | 4 +--- fs/lockd/host.c | 7 +++--- fs/lockd/mon.c | 36 +++++++++++++++++----------- fs/lockd/netns.h | 1 + fs/lockd/svc.c | 1 + fs/lockd/svc4proc.c | 2 +- fs/lockd/svcproc.c | 2 +- fs/namei.c | 4 ++++ fs/nfs/nfs4state.c | 2 +- fs/proc/task_mmu.c | 4 ++-- fs/proc/task_nommu.c | 2 +- fs/splice.c | 13 +++++++++- include/linux/enclosure.h | 4 ++++ include/linux/lockd/lockd.h | 9 ++++--- include/linux/nfs_fs.h | 4 +--- include/linux/tracepoint.h | 6 +++++ include/net/af_unix.h | 4 ++-- include/net/scm.h | 1 + kernel/irq/manage.c | 6 ++--- kernel/resource.c | 5 ++-- kernel/sched/core.c | 1 - kernel/time/posix-clock.c | 4 ++-- kernel/trace/ring_buffer.c | 12 ++++------ kernel/trace/trace_events.c | 3 ++- kernel/workqueue.c | 8 +++---- lib/devres.c | 2 +- net/ceph/messenger.c | 4 ++-- net/core/scm.c | 7 ++++++ net/mac80211/mesh_pathtbl.c | 8 +++---- net/netfilter/nf_conntrack_core.c | 21 ++++++++++++---- net/rds/connection.c | 6 ----- net/rds/send.c | 4 +++- net/rfkill/core.c | 22 ++++++----------- net/sunrpc/cache.c | 2 +- net/unix/af_unix.c | 4 ++-- net/unix/garbage.c | 8 +++---- scripts/recordmcount.c | 14 +++++++++++ tools/Makefile | 8 +++++++ virt/kvm/async_pf.c | 2 +- 99 files changed, 486 insertions(+), 282 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/80 tracepoints: Do not trace when cpu is offline
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Red Hat) <[email protected]>
commit f37755490fe9bf76f6ba1d8c6591745d3574a6a6 upstream.
The tracepoint infrastructure uses RCU sched protection to enable and disable tracepoints safely. There are some instances where tracepoints are used in infrastructure code (like kfree()) that get called after a CPU is going offline, and perhaps when it is coming back online but hasn't been registered yet.
This can probuce the following warning:
[ INFO: suspicious RCU usage. ]
4.4.0-00006-g0fe53e8-dirty #34 Tainted: G S
-------------------------------
include/trace/events/kmem.h:141 suspicious rcu_dereference_check() usage!
other info that might help us debug this:
RCU used illegally from offline CPU! rcu_scheduler_active = 1, debug_locks = 1 no locks held by swapper/8/0.
stack backtrace: CPU: 8 PID: 0 Comm: swapper/8 Tainted: G S 4.4.0-00006-g0fe53e8-dirty #34 Call Trace: [c0000005b76c78d0] [c0000000008b9540] .dump_stack+0x98/0xd4 (unreliable) [c0000005b76c7950] [c00000000010c898] .lockdep_rcu_suspicious+0x108/0x170 [c0000005b76c79e0] [c00000000029adc0] .kfree+0x390/0x440 [c0000005b76c7a80] [c000000000055f74] .destroy_context+0x44/0x100 [c0000005b76c7b00] [c0000000000934a0] .__mmdrop+0x60/0x150 [c0000005b76c7b90] [c0000000000e3ff0] .idle_task_exit+0x130/0x140 [c0000005b76c7c20] [c000000000075804] .pseries_mach_cpu_die+0x64/0x310 [c0000005b76c7cd0] [c000000000043e7c] .cpu_die+0x3c/0x60 [c0000005b76c7d40] [c0000000000188d8] .arch_cpu_idle_dead+0x28/0x40 [c0000005b76c7db0] [c000000000101e6c] .cpu_startup_entry+0x50c/0x560 [c0000005b76c7ed0] [c000000000043bd8] .start_secondary+0x328/0x360 [c0000005b76c7f90] [c000000000008a6c] start_secondary_prolog+0x10/0x14
This warning is not a false positive either. RCU is not protecting code that is being executed while the CPU is offline.
Instead of playing "whack-a-mole(TM)" and adding conditional statements to the tracepoints we find that are used in this instance, simply add a cpu_online() test to the tracepoint code where the tracepoint will be ignored if the CPU is offline.
Use of raw_smp_processor_id() is fine, as there should never be a case where the tracepoint code goes from running on a CPU that is online and suddenly gets migrated to a CPU that is offline.
--- include/linux/tracepoint.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/linux/tracepoint.h +6 -0
@@ -14,8 +14,11 @@* See the file COPYING for more details. */ +#include <linux/smp.h> #include <linux/errno.h> #include <linux/types.h> +#include <linux/percpu.h> +#include <linux/cpumask.h> #include <linux/rcupdate.h> #include <linux/static_key.h>
@@ -126,6 +129,9 @@ static inline void tracepoint_synchronizvoid *it_func; \void *__data; \ \ +if (!cpu_online (raw_smp_processor_id ())) \ +return ; \ + \if (!(cond)) \return ; \ prercu; \
Greg Kroah-Hartman
maintainerPATCH 2/80 drm/ast: Initialized data needed to map fbdev memory
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Egbert Eich <[email protected]>
commit 28fb4cb7fa6f63dc2fbdb5f2564dcbead8e3eee0 upstream.
Due to a missing initialization there was no way to map fbdev memory. Thus for example using the Xserver with the fbdev driver failed. This fix adds initialization for fix.smem_start and fix.smem_len in the fb_info structure, which fixes this problem.
--- drivers/gpu/drm/ast/ast_drv.h | 1 + drivers/gpu/drm/ast/ast_fb.c | 7 +++++++ drivers/gpu/drm/ast/ast_main.c | 1 + drivers/gpu/drm/ast/ast_mode.c | 2 ++ 4 files changed, 11 insertions(+)
drivers/gpu/drm/ast/ast_drv.h +1 -0
@@ -296,6 +296,7 @@ int ast_framebuffer_init(struct drm_deviint ast_fbdev_init (struct drm_device *dev);void ast_fbdev_fini (struct drm_device *dev);void ast_fbdev_set_suspend (struct drm_device *dev,int state); +void ast_fbdev_set_base (struct ast_private *ast,unsigned long gpu_addr);struct ast_bo {struct ttm_buffer_object bo;
drivers/gpu/drm/ast/ast_fb.c +7 -0
@@ -366,3 +366,10 @@ void ast_fbdev_set_suspend(struct drm_defb_set_suspend (ast->fbdev->helper.fbdev, state); } + +void ast_fbdev_set_base (struct ast_private *ast,unsigned long gpu_addr) +{ + ast->fbdev->helper.fbdev->fix.smem_start = + ast->fbdev->helper.fbdev->apertures->ranges[0 ].base + gpu_addr; + ast->fbdev->helper.fbdev->fix.smem_len = ast->vram_size - gpu_addr; +}
drivers/gpu/drm/ast/ast_main.c +1 -0
@@ -359,6 +359,7 @@ int ast_driver_load(struct drm_device *d dev->mode_config.min_height =0 ; dev->mode_config.preferred_depth =24 ; dev->mode_config.prefer_shadow =1 ; + dev->mode_config.fb_base =pci_resource_start (ast->dev->pdev,0 ); if (ast->chip == AST2100 || ast->chip == AST2200 ||
drivers/gpu/drm/ast/ast_mode.c +2 -0
@@ -509,6 +509,8 @@ static int ast_crtc_do_set_base(struct d ret =ttm_bo_kmap (&bo->bo,0 , bo->bo.num_pages, &bo->kmap);if (ret)DRM_ERROR ("failed to kmap fbcon\n" ); +else +ast_fbdev_set_base (ast, gpu_addr); }ast_bo_unreserve (bo);
Greg Kroah-Hartman
maintainerPATCH 3/80 netfilter: nf_conntrack: fix RCU race in nf_conntrack_find_get
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Vagin <[email protected]>
commit c6825c0976fa7893692e0e43b09740b419b23c09 upstream.
Lets look at destroy_conntrack:
hlist_nulls_del_rcu(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode);
...nf_conntrack_free(ct)
kmem_cache_free(net->ct.nf_conntrack_cachep, ct);
net->ct.nf_conntrack_cachep is created with SLAB_DESTROY_BY_RCU.
The hash is protected by rcu, so readers look up conntracks without locks.
A conntrack is removed from the hash, but in this moment a few readers still can use the conntrack. Then this conntrack is released and another thread creates conntrack with the same address and the equal tuple. After this a reader starts to validate the conntrack:
* It's not dying, because a new conntrack was created
* nf_ct_tuple_equal() returns true.
But this conntrack is not initialized yet, so it can not be used by two threads concurrently. In this case BUG_ON may be triggered from nf_nat_setup_info().
Florian Westphal suggested to check the confirm bit too. I think it's right.
task 1 task 2 task 3
nf_conntrack_find_get ____nf_conntrack_find
destroy_conntrack
hlist_nulls_del_rcu
nf_conntrack_free
kmem_cache_free
__nf_conntrack_alloc kmem_cache_alloc memset(&ct->tuplehash[IP_CT_DIR_MAX], if (nf_ct_is_dying(ct)) if (!nf_ct_tuple_equal()
I'm not sure, that I have ever seen this race condition in a real life. Currently we are investigating a bug, which is reproduced on a few nodes. In our case one conntrack is initialized from a few tasks concurrently, we don't have any other explanation for this.
<2>[46267.083061] kernel BUG at net/ipv4/netfilter/nf_nat_core.c:322! ... <4>[46267.083951] RIP: 0010:[<ffffffffa01e00a4>] [<ffffffffa01e00a4>] nf_nat_setup_info+0x564/0x590 [nf_nat] ... <4>[46267.085549] Call Trace: <4>[46267.085622] [<ffffffffa023421b>] alloc_null_binding+0x5b/0xa0 [iptable_nat] <4>[46267.085697] [<ffffffffa02342bc>] nf_nat_rule_find+0x5c/0x80 [iptable_nat] <4>[46267.085770] [<ffffffffa0234521>] nf_nat_fn+0x111/0x260 [iptable_nat] <4>[46267.085843] [<ffffffffa0234798>] nf_nat_out+0x48/0xd0 [iptable_nat] <4>[46267.085919] [<ffffffff814841b9>] nf_iterate+0x69/0xb0 <4>[46267.085991] [<ffffffff81494e70>] ? ip_finish_output+0x0/0x2f0 <4>[46267.086063] [<ffffffff81484374>] nf_hook_slow+0x74/0x110 <4>[46267.086133] [<ffffffff81494e70>] ? ip_finish_output+0x0/0x2f0 <4>[46267.086207] [<ffffffff814b5890>] ? dst_output+0x0/0x20 <4>[46267.086277] [<ffffffff81495204>] ip_output+0xa4/0xc0 <4>[46267.086346] [<ffffffff814b65a4>] raw_sendmsg+0x8b4/0x910 <4>[46267.086419] [<ffffffff814c10fa>] inet_sendmsg+0x4a/0xb0 <4>[46267.086491] [<ffffffff814459aa>] ? sock_update_classid+0x3a/0x50 <4>[46267.086562] [<ffffffff81444d67>] sock_sendmsg+0x117/0x140 <4>[46267.086638] [<ffffffff8151997b>] ? _spin_unlock_bh+0x1b/0x20 <4>[46267.086712] [<ffffffff8109d370>] ? autoremove_wake_function+0x0/0x40 <4>[46267.086785] [<ffffffff81495e80>] ? do_ip_setsockopt+0x90/0xd80 <4>[46267.086858] [<ffffffff8100be0e>] ? call_function_interrupt+0xe/0x20 <4>[46267.086936] [<ffffffff8118cb10>] ? ub_slab_ptr+0x20/0x90 <4>[46267.087006] [<ffffffff8118cb10>] ? ub_slab_ptr+0x20/0x90 <4>[46267.087081] [<ffffffff8118f2e8>] ? kmem_cache_alloc+0xd8/0x1e0 <4>[46267.087151] [<ffffffff81445599>] sys_sendto+0x139/0x190 <4>[46267.087229] [<ffffffff81448c0d>] ? sock_setsockopt+0x16d/0x6f0 <4>[46267.087303] [<ffffffff810efa47>] ? audit_syscall_entry+0x1d7/0x200 <4>[46267.087378] [<ffffffff810ef795>] ? __audit_syscall_exit+0x265/0x290 <4>[46267.087454] [<ffffffff81474885>] ? compat_sys_setsockopt+0x75/0x210 <4>[46267.087531] [<ffffffff81474b5f>] compat_sys_socketcall+0x13f/0x210 <4>[46267.087607] [<ffffffff8104dea3>] ia32_sysret+0x0/0x5 <4>[46267.087676] Code: 91 20 e2 01 75 29 48 89 de 4c 89 f7 e8 56 fa ff ff 85 c0 0f 84 68 fc ff ff 0f b6 4d c6 41 8b 45 00 e9 4d fb ff ff e8 7c 19 e9 e0 <0f> 0b eb fe f6 05 17 91 20 e2 80 74 ce 80 3d 5f 2e 00 00 00 74 <1>[46267.088023] RIP [<ffffffffa01e00a4>] nf_nat_setup_info+0x564/0x590
--- net/netfilter/nf_conntrack_core.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
net/netfilter/nf_conntrack_core.c +17 -4
@@ -311,6 +311,21 @@ static void death_by_timeout(unsigned lonf_ct_put (ct); } +static inline bool +nf_ct_key_equal (struct nf_conntrack_tuple_hash *h, +const struct nf_conntrack_tuple *tuple, +u16 zone) +{ +struct nf_conn *ct =nf_ct_tuplehash_to_ctrack (h); + +/* A conntrack can be recreated with the equal tuple, +* so we need to check that the conntrack is confirmed +*/ +return nf_ct_tuple_equal (tuple, &h->tuple) && +nf_ct_zone (ct) == zone && +nf_ct_is_confirmed (ct); +} +/* * Warning : * - Caller must take a reference on returned object
@@ -332,8 +347,7 @@ ____nf_conntrack_find(struct net *net, ulocal_bh_disable (); begin:hlist_nulls_for_each_entry_rcu (h, n, &net->ct.hash[bucket], hnnode) { -if (nf_ct_tuple_equal (tuple, &h->tuple) && -nf_ct_zone (nf_ct_tuplehash_to_ctrack (h)) == zone) { +if (nf_ct_key_equal (h, tuple, zone)) {NF_CT_STAT_INC (net, found);local_bh_enable ();return h;
@@ -380,8 +394,7 @@ begin: !atomic_inc_not_zero(&ct->ct_general.use))) h = NULL; else { -if (unlikely (!nf_ct_tuple_equal (tuple, &h->tuple) || -nf_ct_zone (ct) != zone)) { +if (unlikely (!nf_ct_key_equal (h, tuple, zone))) {nf_ct_put (ct); goto begin; }
Greg Kroah-Hartman
maintainerPATCH 4/80 bcache: unregister reboot notifier if bcache fails to unregister device
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Liu <[email protected]>
commit 2ecf0cdb2b437402110ab57546e02abfa68a716b upstream.
In bcache_init() function it forgot to unregister reboot notifier if bcache fails to unregister a block device. This commit fixes this.
--- drivers/md/bcache/super.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/md/bcache/super.c +3 -1
@@ -1959,8 +1959,10 @@ static int __init bcache_init(void)closure_debug_init (); bcache_major =register_blkdev (0 ,"bcache" ); -if (bcache_major <0 ) +if (bcache_major <0 ) { +unregister_reboot_notifier (&reboot);return bcache_major; + } if (!(bcache_wq = create_workqueue("bcache")) || !(bcache_kobj = kobject_create_and_add("bcache", fs_kobj)) ||
Greg Kroah-Hartman
maintainerPATCH 5/80 tools: Add a "make all" rule
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kamal Mostafa <[email protected]>
commit f6ba98c5dc78708cb7fd29950c4a50c4c7e88f95 upstream.
--- tools/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/Makefile +8 -0
@@ -22,6 +22,10 @@ help: @echo ' from the kernel command line to build and install one of' @echo ' the tools above' @echo '' + @echo ' $$ make tools/all' + @echo '' + @echo ' builds all tools.' + @echo '' @echo ' $$ make tools/install' @echo '' @echo ' installs all tools.'
@@ -50,6 +54,10 @@ selftests: FORCE turbostat x86_energy_perf_policy: FORCE $(call descend,power/x86/$@) +all: cgroup cpupower firewire lguest \ + perf selftests turbostat usb \ + virtio vm net x86_energy_perf_policy + cpupower_install: $(call descend,power/$(@:_install=),install)
Greg Kroah-Hartman
maintainerPATCH 6/80 drm/radeon: fix hotplug race at startup
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
commit 7f98ca454ad373fc1b76be804fa7138ff68c1d27 upstream.
We apparantly get a hotplug irq before we've initialised modesetting,
[drm] Loading R100 Microcode
BUG: unable to handle kernel NULL pointer dereference at (null) IP: [<c125f56f>] __mutex_lock_slowpath+0x23/0x91 *pde = 00000000 Oops: 0002 [#1] Modules linked in: radeon(+) drm_kms_helper ttm drm i2c_algo_bit backlight pcspkr psmouse evdev sr_mod input_leds led_class cdrom sg parport_pc parport floppy intel_agp intel_gtt lpc_ich acpi_cpufreq processor button mfd_core agpgart uhci_hcd ehci_hcd rng_core snd_intel8x0 snd_ac97_codec ac97_bus snd_pcm usbcore usb_common i2c_i801 i2c_core snd_timer snd soundcore thermal_sys CPU: 0 PID: 15 Comm: kworker/0:1 Not tainted 4.2.0-rc7-00015-gbf67402 #111 Hardware name: MicroLink /D850MV , BIOS MV85010A.86A.0067.P24.0304081124 04/08/2003 Workqueue: events radeon_hotplug_work_func [radeon] task: f6ca5900 ti: f6d3e000 task.ti: f6d3e000 EIP: 0060:[<c125f56f>] EFLAGS: 00010282 CPU: 0 EIP is at __mutex_lock_slowpath+0x23/0x91 EAX: 00000000 EBX: f5e900fc ECX: 00000000 EDX: fffffffe ESI: f6ca5900 EDI: f5e90100 EBP: f5e90000 ESP: f6d3ff0c DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068 CR0: 8005003b CR2: 00000000 CR3: 36f61000 CR4: 000006d0 Stack: f5e90100 00000000 c103c4c1 f6d2a5a0 f5e900fc f6df394c c125f162 f8b0faca f6d2a5a0 c138ca00 f6df394c f7395600 c1034741 00d40000 00000000 f6d2a5a0 c138ca00 f6d2a5b8 c138ca10 c1034b58 00000001 f6d40000 f6ca5900 f6d0c940 Call Trace: [<c103c4c1>] ? dequeue_task_fair+0xa4/0xb7 [<c125f162>] ? mutex_lock+0x9/0xa [<f8b0faca>] ? radeon_hotplug_work_func+0x17/0x57 [radeon] [<c1034741>] ? process_one_work+0xfc/0x194 [<c1034b58>] ? worker_thread+0x18d/0x218 [<c10349cb>] ? rescuer_thread+0x1d5/0x1d5 [<c103742a>] ? kthread+0x7b/0x80 [<c12601c0>] ? ret_from_kernel_thread+0x20/0x30 [<c10373af>] ? init_completion+0x18/0x18 Code: 42 08 e8 8e a6 dd ff c3 57 56 53 83 ec 0c 8b 35 48 f7 37 c1 8b 10 4a 74 1a 89 c3 8d 78 04 8b 40 08 89 63
--- drivers/gpu/drm/radeon/radeon_irq_kms.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/radeon/radeon_irq_kms.c +5 -0
@@ -73,6 +73,11 @@ static void radeon_hotplug_work_func(strstruct drm_mode_config *mode_config = &dev->mode_config;struct drm_connector *connector; +/* we can race here at startup, some boards seem to trigger +* hotplug irqs when they shouldn't. */ +if (!rdev->mode_info.mode_config_initialized) +return ; +mutex_lock (&mode_config->mutex);if (mode_config->num_connector) {list_for_each_entry (connector, &mode_config->connector_list, head)
Greg Kroah-Hartman
maintainerPATCH 7/80 efi: Disable interrupts around EFI calls, not in the epilog/prolog calls
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ingo Molnar <[email protected]>
commit 23a0d4e8fa6d3a1d7fb819f79bcc0a3739c30ba9 upstream.
Tapasweni Pathak reported that we do a kmalloc() in efi_call_phys_prolog() on x86-64 while having interrupts disabled, which is a big no-no, as kmalloc() can sleep.
Solve this by removing the irq disabling from the prolog/epilog calls around EFI calls: it's unnecessary, as in this stage we are single threaded in the boot thread, and we don't ever execute this from interrupt contexts.
--- arch/x86/platform/efi/efi.c | 7 +++++++ arch/x86/platform/efi/efi_32.c | 11 +++-------- arch/x86/platform/efi/efi_64.c | 3 --- 3 files changed, 10 insertions(+), 11 deletions(-)
arch/x86/platform/efi/efi.c +7 -0
@@ -250,12 +250,19 @@ static efi_status_t __init phys_efi_set_ efi_memory_desc_t *virtual_map) {efi_status_t status; +unsigned long flags;efi_call_phys_prelog (); + +/* Disable interrupts around EFI calls: */ +local_irq_save (flags); status =efi_call_phys4 (efi_phys.set_virtual_address_map, memory_map_size, descriptor_size, descriptor_version, virtual_map); +local_irq_restore (flags); +efi_call_phys_epilog (); +return status; }
arch/x86/platform/efi/efi_32.c +3 -8
@@ -33,19 +33,16 @@/* * To make EFI call EFI runtime service in physical addressing mode we need -* prelog/epilog before/after the invocation to disable interrupt, to -* claim EFI runtime service handler exclusively and to duplicate a memory in -* low memory space say 0 - 3G. +* prolog/epilog before/after the invocation to claim the EFI runtime service +* handler exclusively and to duplicate a memory mapping in low memory space, +* say 0 - 3G. */ -static unsigned long efi_rt_eflags;void efi_call_phys_prelog (void ) {struct desc_ptr gdt_descr; -local_irq_save (efi_rt_eflags); -load_cr3 (initial_page_table);__flush_tlb_all ();
@@ -64,6 +61,4 @@ void efi_call_phys_epilog(void)load_cr3 (swapper_pg_dir);__flush_tlb_all (); - -local_irq_restore (efi_rt_eflags); }
arch/x86/platform/efi/efi_64.c +0 -3
@@ -40,7 +40,6 @@#include <asm/fixmap.h> static pgd_t *save_pgd__initdata ; -static unsigned long efi_flags__initdata ;static void __init early_code_mapping_set_exec (int executable) {
@@ -66,7 +65,6 @@ void __init efi_call_phys_prelog(void)int n_pgds;early_code_mapping_set_exec (1 ); -local_irq_save (efi_flags); n_pgds =DIV_ROUND_UP ((max_pfn <<PAGE_SHIFT ),PGDIR_SIZE ); save_pgd =kmalloc (n_pgds *sizeof (pgd_t),GFP_KERNEL );
@@ -90,7 +88,6 @@ void __init efi_call_phys_epilog(void)set_pgd (pgd_offset_k (pgd *PGDIR_SIZE ), save_pgd[pgd]);kfree (save_pgd);__flush_tlb_all (); -local_irq_restore (efi_flags);early_code_mapping_set_exec (0 ); }
Greg Kroah-Hartman
maintainerPATCH 8/80 dm thin metadata: fix bug when taking a metadata snapshot
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joe Thornber <[email protected]>
commit 49e99fc717f624aa75ca755d6e7bc029efd3f0e9 upstream.
When you take a metadata snapshot the btree roots for the mapping and details tree need to have their reference counts incremented so they persist for the lifetime of the metadata snap.
The roots being incremented were those currently written in the superblock, which could possibly be out of date if concurrent IO is triggering new mappings, breaking of sharing, etc.
Fix this by performing a commit with the metadata lock held while taking a metadata snapshot.
--- drivers/md/dm-thin-metadata.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/md/dm-thin-metadata.c +6 -0
@@ -1191,6 +1191,12 @@ static int __reserve_metadata_snap(strucdm_block_t held_root;/* +* We commit to ensure the btree roots which we increment in a +* moment are up to date. +*/ +__commit_transaction (pmd); + +/* * Copy the superblock. */ dm_sm_inc_block (pmd->metadata_sm,THIN_SUPERBLOCK_LOCATION );
Greg Kroah-Hartman
maintainerPATCH 9/80 dm thin: fix race condition when destroying thin pool workqueue
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Borisov <[email protected]>
commit 18d03e8c25f173f4107a40d0b8c24defb6ed69f3 upstream.
When a thin pool is being destroyed delayed work items are cancelled using cancel_delayed_work(), which doesn't guarantee that on return the delayed item isn't running. This can cause the work item to requeue itself on an already destroyed workqueue. Fix this by using cancel_delayed_work_sync() which guarantees that on return the work item is not running anymore.
--- drivers/md/dm-thin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-thin.c +1 -1
@@ -2281,7 +2281,7 @@ static void pool_postsuspend(struct dm_tstruct pool_c *pt = ti->private;struct pool *pool = pt->pool; -cancel_delayed_work (&pool->waker); +cancel_delayed_work_sync (&pool->waker);flush_workqueue (pool->wq); (void )commit_or_fallback (pool); }
Greg Kroah-Hartman
maintainerPATCH 10/80 can: ems_usb: Fix possible tx overflow
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gerhard Uttenthaler <[email protected]>
commit 90cfde46586d2286488d8ed636929e936c0c9ab2 upstream.
This patch fixes the problem that more CAN messages could be sent to the interface as could be send on the CAN bus. This was more likely for slow baud rates. The sleeping _start_xmit was woken up in the _write_bulk_callback. Under heavy TX load this produced another bulk transfer without checking the free_slots variable and hence caused the overflow in the interface.
--- drivers/net/can/usb/ems_usb.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/net/can/usb/ems_usb.c +10 -4
@@ -118,6 +118,9 @@ MODULE_LICENSE("GPL v2");*/ #define EMS_USB_ARM7_CLOCK 8000000 +#define CPC_TX_QUEUE_TRIGGER_LOW 25 +#define CPC_TX_QUEUE_TRIGGER_HIGH 35 +/* * CAN-Message representation in a CPC_MSG. Message object type is * CPC_MSG_TYPE_CAN_FRAME or CPC_MSG_TYPE_RTR_FRAME or
@@ -279,6 +282,11 @@ static void ems_usb_read_interrupt_callbswitch (urb->status) {case 0 : dev->free_slots = dev->intr_in_buffer[1 ]; +if (dev->free_slots >CPC_TX_QUEUE_TRIGGER_HIGH ){ +if (netif_queue_stopped (netdev)){ +netif_wake_queue (netdev); + } + }break ;case -ECONNRESET :/* unlink */
@@ -530,8 +538,6 @@ static void ems_usb_write_bulk_callback(/* Release context */ context->echo_index =MAX_TX_URBS ; -if (netif_queue_stopped (netdev)) -netif_wake_queue (netdev); }/*
@@ -591,7 +597,7 @@ static int ems_usb_start(struct ems_usbint err, i; dev->intr_in_buffer[0 ] =0 ; - dev->free_slots =15 ;/* initial size */ + dev->free_slots =50 ;/* initial size */ for (i =0 ; i <MAX_RX_URBS ; i++) {struct urb *urb =NULL ;
@@ -841,7 +847,7 @@ static netdev_tx_t ems_usb_start_xmit(st/* Slow down tx path */ if (atomic_read (&dev->active_tx_urbs) >=MAX_TX_URBS || - dev->free_slots <5 ) { + dev->free_slots <CPC_TX_QUEUE_TRIGGER_LOW ) {netif_stop_queue (netdev); } }
Greg Kroah-Hartman
maintainerPATCH 11/80 USB: cp210x: add IDs for GE B650V3 and B850V3 boards
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ken Lin <[email protected]>
commit 6627ae19385283b89356a199d7f03c75ba35fb29 upstream.
Add USB ID for cp2104/5 devices on GE B650v3 and B850v3 boards.
--- drivers/usb/serial/cp210x.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/cp210x.c +2 -0
@@ -162,6 +162,8 @@ static const struct usb_device_id id_tab { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ { USB_DEVICE(0x18EF, 0xE025) }, /* ELV Marble Sound Board 1 */ + { USB_DEVICE(0x1901, 0x0190) }, /* GE B850 CP2105 Recorder interface */ + { USB_DEVICE(0x1901, 0x0193) }, /* GE B650 CP2104 PMC interface */ { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */ { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */ { USB_DEVICE(0x1BA4, 0x0002) }, /* Silicon Labs 358x factory default */
Greg Kroah-Hartman
maintainerPATCH 12/80 USB: option: add support for SIM7100E
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Skvortsov <[email protected]>
commit 3158a8d416f4e1b79dcc867d67cb50013140772c upstream.
$ lsusb: Bus 001 Device 101: ID 1e0e:9001 Qualcomm / Option
$ usb-devices: T: Bus=01 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#=101 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 2 P: Vendor=1e0e ProdID=9001 Rev= 2.32 S: Manufacturer=SimTech, Incorporated S: Product=SimTech, Incorporated S: SerialNumber=0123456789ABCDEF C:* #Ifs= 7 Cfg#= 1 Atr=80 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I:* If#= 5 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan I:* If#= 6 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
The last interface (6) is used for Android Composite ADB interface.
Serial port layout:
0: QCDM/DIAG
1: NMEA
2: AT
3: AT/PPP
4: audio
--- drivers/usb/serial/option.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/serial/option.c +7 -0
@@ -315,6 +315,7 @@ static void option_instat_callback(struc#define TOSHIBA_PRODUCT_G450 0x0d45#define ALINK_VENDOR_ID 0x1e0e +#define SIMCOM_PRODUCT_SIM7100E 0x9001/* Yes, ALINK_VENDOR_ID */ #define ALINK_PRODUCT_PH300 0x9100#define ALINK_PRODUCT_3GU 0x9200
@@ -615,6 +616,10 @@ static const struct option_blacklist_inf .reserved = BIT(3) | BIT(4), }; +static const struct option_blacklist_info simcom_sim7100e_blacklist = { + .reserved =BIT (5 ) |BIT (6 ), +}; +static const struct option_blacklist_info telit_le910_blacklist = { .sendsetup =BIT (0 ), .reserved =BIT (1 ) |BIT (2 ),
@@ -1645,6 +1650,8 @@ static const struct usb_device_id option { USB_DEVICE(ALINK_VENDOR_ID, 0x9000) }, { USB_DEVICE(ALINK_VENDOR_ID, ALINK_PRODUCT_PH300) }, { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) }, + { USB_DEVICE(ALINK_VENDOR_ID, SIMCOM_PRODUCT_SIM7100E), + .driver_info = (kernel_ulong_t)&simcom_sim7100e_blacklist }, { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200), .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist },
Greg Kroah-Hartman
maintainerPATCH 14/80 proc: Fix ptrace-based permission checks for accessing task maps
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Corey Wright <[email protected]>
Modify mm_access() calls in fs/proc/task_mmu.c and fs/proc/task_nommu.c to have the mode include PTRACE_MODE_FSCREDS so accessing /proc/pid/maps and /proc/pid/pagemap is not denied to all users.
In backporting upstream commit caaee623 to pre-3.18 kernel versions it was overlooked that mm_access() is used in fs/proc/task_*mmu.c as those calls were removed in 3.18 (by upstream commit 29a40ace) and did not exist at the time of the original commit.
--- fs/proc/task_mmu.c | 4 ++-- fs/proc/task_nommu.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
fs/proc/task_mmu.c +2 -2
@@ -170,7 +170,7 @@ static void *m_start(struct seq_file *m,if (!priv->task)return ERR_PTR (-ESRCH ); - mm =mm_access (priv->task,PTRACE_MODE_READ ); + mm =mm_access (priv->task,PTRACE_MODE_READ_FSCREDS );if (!mm ||IS_ERR (mm))return mm;down_read (&mm->mmap_sem);
@@ -1044,7 +1044,7 @@ static ssize_t pagemap_read(struct fileif (!pm.buffer) goto out_task; - mm =mm_access (task,PTRACE_MODE_READ ); + mm =mm_access (task,PTRACE_MODE_READ_FSCREDS ); ret =PTR_ERR (mm);if (!mm ||IS_ERR (mm)) goto out_free;
fs/proc/task_nommu.c +1 -1
@@ -223,7 +223,7 @@ static void *m_start(struct seq_file *m,if (!priv->task)return ERR_PTR (-ESRCH ); - mm =mm_access (priv->task,PTRACE_MODE_READ ); + mm =mm_access (priv->task,PTRACE_MODE_READ_FSCREDS );if (!mm ||IS_ERR (mm)) {put_task_struct (priv->task); priv->task =NULL ;
Greg Kroah-Hartman
maintainerPATCH 15/80 iw_cxgb3: Fix incorrectly returning error on success
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hariprasad S <[email protected]>
commit 67f1aee6f45059fd6b0f5b0ecb2c97ad0451f6b3 upstream.
The cxgb3_*_send() functions return NET_XMIT_ values, which are positive integers values. So don't treat positive return values as an error.
--- drivers/infiniband/hw/cxgb3/iwch_cm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/cxgb3/iwch_cm.c +2 -2
@@ -149,7 +149,7 @@ static int iwch_l2t_send(struct t3cdev * error =l2t_send (tdev, skb, l2e);if (error <0 )kfree_skb (skb); -return error; +return error <0 ? error :0 ; }int iwch_cxgb3_ofld_send (struct t3cdev *tdev,struct sk_buff *skb)
@@ -165,7 +165,7 @@ int iwch_cxgb3_ofld_send(struct t3cdev * error =cxgb3_ofld_send (tdev, skb);if (error <0 )kfree_skb (skb); -return error; +return error <0 ? error :0 ; }static void release_tid (struct t3cdev *tdev,u32 hwtid,struct sk_buff *skb)
Greg Kroah-Hartman
maintainerPATCH 16/80 MIPS: KVM: Fix ASID restoration logic
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Hogan <[email protected]>
commit 002374f371bd02df864cce1fe85d90dc5b292837 upstream.
ASID restoration on guest resume should determine the guest execution mode based on the guest Status register rather than bit 30 of the guest PC.
Fix the two places in locore.S that do this, loading the guest status from the cop0 area. Note, this assembly is specific to the trap & emulate implementation of KVM, so it doesn't need to check the supervisor bit as that mode is not implemented in the guest.
--- arch/mips/kvm/kvm_locore.S | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
arch/mips/kvm/kvm_locore.S +10 -6
@@ -156,9 +156,11 @@ FEXPORT(__kvm_mips_vcpu_run) FEXPORT(__kvm_mips_load_asid) /* Set the ASID for the Guest Kernel */ - sll t0, t0, 1 /* with kseg0 @ 0x40000000, kernel */ - /* addresses shift to 0x80000000 */ - bltz t0, 1f /* If kernel */ + PTR_L t0, VCPU_COP0(k1) + LONG_L t0, COP0_STATUS(t0) + andi t0, KSU_USER | ST0_ERL | ST0_EXL + xori t0, KSU_USER + bnez t0, 1f /* If kernel */ addiu t1, k1, VCPU_GUEST_KERNEL_ASID /* (BD) */ addiu t1, k1, VCPU_GUEST_USER_ASID /* else user */ 1:
@@ -442,9 +444,11 @@ __kvm_mips_return_to_guest: mtc0 t0, CP0_EPC /* Set the ASID for the Guest Kernel */ - sll t0, t0, 1 /* with kseg0 @ 0x40000000, kernel */ - /* addresses shift to 0x80000000 */ - bltz t0, 1f /* If kernel */ + PTR_L t0, VCPU_COP0(k1) + LONG_L t0, COP0_STATUS(t0) + andi t0, KSU_USER | ST0_ERL | ST0_EXL + xori t0, KSU_USER + bnez t0, 1f /* If kernel */ addiu t1, k1, VCPU_GUEST_KERNEL_ASID /* (BD) */ addiu t1, k1, VCPU_GUEST_USER_ASID /* else user */ 1:
Greg Kroah-Hartman
maintainerPATCH 17/80 MIPS: KVM: Fix CACHE immediate offset sign extension
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Hogan <[email protected]>
commit c5c2a3b998f1ff5a586f9d37e154070b8d550d17 upstream.
The immediate field of the CACHE instruction is signed, so ensure that it gets sign extended by casting it to an int16_t rather than just masking the low 16 bits.
--- arch/mips/kvm/kvm_mips_emul.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kvm/kvm_mips_emul.c +1 -1
@@ -935,7 +935,7 @@ kvm_mips_emulate_cache(uint32_t inst, ui base = (inst >>21 ) &0x1f ; op_inst = (inst >>16 ) &0x1f ; - offset = inst &0xffff ; + offset = (int16_t )inst; cache = (inst >>16 ) &0x3 ; op = (inst >>18 ) &0x7 ;
Greg Kroah-Hartman
maintainerPATCH 18/80 MIPS: KVM: Uninit VCPU in vcpu_create error path
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Hogan <[email protected]>
commit 585bb8f9a5e592f2ce7abbe5ed3112d5438d2754 upstream.
If either of the memory allocations in kvm_arch_vcpu_create() fail, the vcpu which has been allocated and kvm_vcpu_init'd doesn't get uninit'd in the error handling path. Add a call to kvm_vcpu_uninit() to fix this.
--- arch/mips/kvm/kvm_mips.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/mips/kvm/kvm_mips.c +4 -1
@@ -308,7 +308,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(stif (!gebase) { err = -ENOMEM ; - goto out_free_cpu; + goto out_uninit_cpu; }kvm_info ("Allocated %d bytes for KVM Exception Handlers @ %p\n" ,ALIGN (size,PAGE_SIZE ), gebase);
@@ -368,6 +368,9 @@ struct kvm_vcpu *kvm_arch_vcpu_create(st out_free_gebase:kfree (gebase); +out_uninit_cpu: +kvm_vcpu_uninit (vcpu); + out_free_cpu:kfree (vcpu);
Greg Kroah-Hartman
maintainerPATCH 19/80 splice: sendfile() at once fails for big files
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
commit 0ff28d9f4674d781e492bcff6f32f0fe48cf0fed upstream.
Using sendfile with below small program to get MD5 sums of some files, it appear that big files (over 64kbytes with 4k pages system) get a wrong MD5 sum while small files get the correct sum.
This program uses sendfile() to send a file to an AF_ALG socket for hashing.
/* md5sum2.c */
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <linux/if_alg.h>
int main(int argc, char **argv)
{
int sk = socket(AF_ALG, SOCK_SEQPACKET, 0);
struct stat st;
struct sockaddr_alg sa = {
.salg_family = AF_ALG,
.salg_type = "hash",
.salg_name = "md5",
};
int n;
bind(sk, (struct sockaddr*)&sa, sizeof(sa));
for (n = 1; n < argc; n++) {
int size;
int offset = 0;
char buf[4096];
int fd;
int sko;
int i;
fd = open(argv[n], O_RDONLY);
sko = accept(sk, NULL, 0);
fstat(fd, &st);
size = st.st_size;
sendfile(sko, fd, &offset, size);
size = read(sko, buf, sizeof(buf));
for (i = 0; i < size; i++)
printf("%2.2x", buf[i]);
printf(" %s\n", argv[n]);
close(fd);
close(sko);
}
exit(0);
}Test below is done using official linux patch files. First result is with a software based md5sum. Second result is with the program above.
root@vgoip:~# ls -l patch-3.6.* -rw-r--r-- 1 root root 64011 Aug 24 12:01 patch-3.6.2.gz -rw-r--r-- 1 root root 94131 Aug 24 12:01 patch-3.6.3.gz
root@vgoip:~# md5sum patch-3.6.* b3ffb9848196846f31b2ff133d2d6443 patch-3.6.2.gz c5e8f687878457db77cb7158c38a7e43 patch-3.6.3.gz
root@vgoip:~# ./md5sum2 patch-3.6.* b3ffb9848196846f31b2ff133d2d6443 patch-3.6.2.gz 5fd77b24e68bb24dcc72d6e57c64790e patch-3.6.3.gz
After investivation, it appears that sendfile() sends the files by blocks of 64kbytes (16 times PAGE_SIZE). The problem is that at the end of each block, the SPLICE_F_MORE flag is missing, therefore the hashing operation is reset as if it was the end of the file.
This patch adds SPLICE_F_MORE to the flags when more data is pending.
With the patch applied, we get the correct sums:
root@vgoip:~# md5sum patch-3.6.* b3ffb9848196846f31b2ff133d2d6443 patch-3.6.2.gz c5e8f687878457db77cb7158c38a7e43 patch-3.6.3.gz
root@vgoip:~# ./md5sum2 patch-3.6.* b3ffb9848196846f31b2ff133d2d6443 patch-3.6.2.gz c5e8f687878457db77cb7158c38a7e43 patch-3.6.3.gz
--- fs/splice.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
fs/splice.c +11 -1
@@ -1189,7 +1189,7 @@ ssize_t splice_direct_to_actor(struct filong ret, bytes;umode_t i_mode;size_t len; -int i, flags; +int i, flags, more;/* * We require the input being a regular file, as we don't want to
@@ -1232,6 +1232,7 @@ ssize_t splice_direct_to_actor(struct fi* Don't block on output, we have to drain the direct pipe. */ sd->flags &= ~SPLICE_F_NONBLOCK ; + more = sd->flags &SPLICE_F_MORE ;while (len) {size_t read_len;
@@ -1245,6 +1246,15 @@ ssize_t splice_direct_to_actor(struct fi sd->total_len = read_len;/* +* If more data is pending, set SPLICE_F_MORE +* If this is the last data and SPLICE_F_MORE was not set +* initially, clears it. +*/ +if (read_len < len) + sd->flags |=SPLICE_F_MORE ; +else if (!more) + sd->flags &= ~SPLICE_F_MORE ; +/* * NOTE: nonblocking mode only applies to the input. We * must not do the output in nonblocking mode as then we * could get stuck data in the internal pipe:
Greg Kroah-Hartman
maintainerPATCH 21/80 unix: correctly track in-flight fds in sending process user_struct
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
commit 415e3d3e90ce9e18727e8843ae343eda5a58fad6 upstream.
The commit referenced in the Fixes tag incorrectly accounted the number of in-flight fds over a unix domain socket to the original opener of the file-descriptor. This allows another process to arbitrary deplete the original file-openers resource limit for the maximum of open files. Instead the sending processes and its struct cred should be credited.
To do so, we add a reference counted struct user_struct pointer to the scm_fp_list and use it to account for the number of inflight unix fds.
--- include/net/af_unix.h | 4 ++-- include/net/scm.h | 1 + net/core/scm.c | 7 +++++++ net/unix/af_unix.c | 4 ++-- net/unix/garbage.c | 8 ++++---- 5 files changed, 16 insertions(+), 8 deletions(-)
include/net/af_unix.h +2 -2
@@ -6,8 +6,8 @@#include <linux/mutex.h> #include <net/sock.h> -extern void unix_inflight (struct file *fp); -extern void unix_notinflight (struct file *fp); +extern void unix_inflight (struct user_struct *user,struct file *fp); +extern void unix_notinflight (struct user_struct *user,struct file *fp);extern void unix_gc (void );extern void wait_for_unix_gc (void );extern struct sock *unix_get_socket (struct file *filp);
include/net/scm.h +1 -0
@@ -21,6 +21,7 @@ struct scm_creds {struct scm_fp_list {short count;short max; +struct user_struct *user;struct file *fp[SCM_MAX_FD ]; };
net/core/scm.c +7 -0
@@ -87,6 +87,7 @@ static int scm_fp_copy(struct cmsghdr *c *fplp = fpl; fpl->count =0 ; fpl->max =SCM_MAX_FD ; + fpl->user =NULL ; } fpp = &fpl->fp[fpl->count];
@@ -107,6 +108,10 @@ static int scm_fp_copy(struct cmsghdr *c *fpp++ = file; fpl->count++; } + +if (!fpl->user) + fpl->user =get_uid (current_user ()); +return num; }
@@ -119,6 +124,7 @@ void __scm_destroy(struct scm_cookie *sc scm->fp =NULL ;for (i=fpl->count-1 ; i>=0 ; i--)fput (fpl->fp[i]); +free_uid (fpl->user);kfree (fpl); } }
@@ -337,6 +343,7 @@ struct scm_fp_list *scm_fp_dup(struct scfor (i =0 ; i < fpl->count; i++)get_file (fpl->fp[i]); new_fpl->max = new_fpl->count; + new_fpl->user =get_uid (fpl->user); }return new_fpl; }
net/unix/af_unix.c +2 -2
@@ -1466,7 +1466,7 @@ static void unix_detach_fds(struct scm_cUNIXCB (skb).fp =NULL ;for (i = scm->fp->count-1 ; i >=0 ; i--) -unix_notinflight (scm->fp->fp[i]); +unix_notinflight (scm->fp->user, scm->fp->fp[i]); }static void unix_destruct_scm (struct sk_buff *skb)
@@ -1531,7 +1531,7 @@ static int unix_attach_fds(struct scm_coreturn -ENOMEM ;for (i = scm->fp->count -1 ; i >=0 ; i--) -unix_inflight (scm->fp->fp[i]); +unix_inflight (scm->fp->user, scm->fp->fp[i]);return max_level; }
net/unix/garbage.c +4 -4
@@ -122,7 +122,7 @@ struct sock *unix_get_socket(struct file* descriptor if it is for an AF_UNIX socket. */ -void unix_inflight (struct file *fp) +void unix_inflight (struct user_struct *user,struct file *fp) {struct sock *s =unix_get_socket (fp);
@@ -139,11 +139,11 @@ void unix_inflight(struct file *fp) } unix_tot_inflight++; } - fp->f_cred->user->unix_inflight++; + user->unix_inflight++;spin_unlock (&unix_gc_lock); } -void unix_notinflight (struct file *fp) +void unix_notinflight (struct user_struct *user,struct file *fp) {struct sock *s =unix_get_socket (fp);
@@ -157,7 +157,7 @@ void unix_notinflight(struct file *fp)list_del_init (&u->link); unix_tot_inflight--; } - fp->f_cred->user->unix_inflight--; + user->unix_inflight--;spin_unlock (&unix_gc_lock); }
Greg Kroah-Hartman
maintainerPATCH 23/80 dts: vt8500: Add SDHC node to DTS file for WM8650
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roman Volkov <[email protected]>
commit 0f090bf14e51e7eefb71d9d1c545807f8b627986 upstream.
Since WM8650 has the same 'WMT' SDHC controller as WM8505, and the driver is already in the kernel, this node enables the controller support for WM8650
--- arch/arm/boot/dts/wm8650.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm/boot/dts/wm8650.dtsi +9 -0
@@ -130,6 +130,15 @@ interrupts = <43>; }; + sdhc@d800a000 { + compatible = "wm,wm8505-sdhc"; + reg = <0xd800a000 0x400>; + interrupts = <20>, <21>; + clocks = <&clksdhc>; + bus-width = <4>; + sdon-inverted; + }; + fb: fb@d8050800 { compatible = "wm,wm8505-fb"; reg = <0xd8050800 0x200>;
Greg Kroah-Hartman
maintainerPATCH 24/80 clocksource/drivers/vt8500: Increase the minimum delta
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roman Volkov <[email protected]>
commit f9eccf24615672896dc13251410c3f2f33a14f95 upstream.
The vt8500 clocksource driver declares itself as capable to handle the minimum delay of 4 cycles by passing the value into clockevents_config_and_register(). The vt8500_timer_set_next_event() requires the passed cycles value to be at least 16. The impact is that userspace hangs in nanosleep() calls with small delay intervals.
This problem is reproducible in Linux 4.2 starting from:c6eb3f70d448 ('hrtimer: Get rid of hrtimer softirq')
Quoted 1 line
Quoted 1 line
From Russell King, more detailed explanation:
"It's a speciality of the StrongARM/PXA hardware. It takes a certain number of OSCR cycles for the value written to hit the compare registers. So, if a very small delta is written (eg, the compare register is written with a value of OSCR + 1), the OSCR will have incremented past this value before it hits the underlying hardware. The result is, that you end up waiting a very long time for the OSCR to wrap before the event fires.
So, we introduce a check in set_next_event() to detect this and return -ETIME if the calculated delta is too small, which causes the generic clockevents code to retry after adding the min_delta specified in clockevents_config_and_register() to the current time value.
min_delta must be sufficient that we don't re-trip the -ETIME check - if we do, we will return -ETIME, forward the next event time, try to set it, return -ETIME again, and basically lock the system up. So, min_delta must be larger than the check inside set_next_event(). A factor of two was chosen to ensure that this situation would never occur.
The PXA code worked on PXA systems for years, and I'd suggest no one changes this mechanism without access to a wide range of PXA systems, otherwise they're risking breakage."
--- drivers/clocksource/vt8500_timer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/clocksource/vt8500_timer.c +4 -2
@@ -50,6 +50,8 @@#define msecs_to_loops (t) (loops_per_jiffy / 1000 * HZ * t) +#define MIN_OSCR_DELTA 16 +static void __iomem *regbase;static cycle_t vt8500_timer_read (struct clocksource *cs)
@@ -80,7 +82,7 @@ static int vt8500_timer_set_next_event(ucpu_relax ();writel ((unsigned long )alarm, regbase +TIMER_MATCH_VAL ); -if ((signed )(alarm - clocksource.read (&clocksource)) <=16 ) +if ((signed )(alarm - clocksource.read (&clocksource)) <=MIN_OSCR_DELTA )return -ETIME ;writel (1 , regbase +TIMER_IER_VAL );
@@ -162,7 +164,7 @@ static void __init vt8500_timer_init(strpr_err ("%s: setup_irq failed for %s\n" , __func__, clockevent.name);clockevents_config_and_register (&clockevent,VT8500_TIMER_HZ , -4 ,0xf0000000 ); +MIN_OSCR_DELTA *2 ,0xf0000000 ); }CLOCKSOURCE_OF_DECLARE (vt8500,"via,vt8500-timer" , vt8500_timer_init);
Greg Kroah-Hartman
maintainerPATCH 25/80 lockd: create NSM handles per net namespace
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Ryabinin <[email protected]>
commit 0ad95472bf169a3501991f8f33f5147f792a8116 upstream.
Commit cb7323fffa85 ("lockd: create and use per-net NSM
RPC clients on MON/UNMON requests") introduced per-net
NSM RPC clients. Unfortunately this doesn't make any sense without per-net nsm_handle.
E.g. the following scenario could happen
Two hosts (X and Y) in different namespaces (A and B) share the same nsm struct.
1. nsm_monitor(host_X) called => NSM rpc client created,
nsm->sm_monitored bit set. 2. nsm_mointor(host-Y) called => nsm->sm_monitored already set, we just exit. Thus in namespace B ln->nsm_clnt == NULL. 3. host X destroyed => nsm->sm_count decremented to 1 4. host Y destroyed => nsm_unmonitor() => nsm_mon_unmon() => NULL-ptr dereference of *ln->nsm_clnt
So this could be fixed by making per-net nsm_handles list, instead of global. Thus different net namespaces will not be able share the same nsm_handle.
--- fs/lockd/host.c | 7 ++++--- fs/lockd/mon.c | 36 ++++++++++++++++++++++-------------- fs/lockd/netns.h | 1 + fs/lockd/svc.c | 1 + fs/lockd/svc4proc.c | 2 +- fs/lockd/svcproc.c | 2 +- include/linux/lockd/lockd.h | 9 ++++++--- 7 files changed, 36 insertions(+), 22 deletions(-)
fs/lockd/host.c +4 -3
@@ -116,7 +116,7 @@ static struct nlm_host *nlm_alloc_host(satomic_inc (&nsm->sm_count); else { host =NULL ; - nsm =nsm_get_handle (ni->sap, ni->salen, + nsm =nsm_get_handle (ni->net, ni->sap, ni->salen, ni->hostname, ni->hostname_len);if (unlikely (nsm ==NULL )) { dprintk("lockd: %s failed; no nsm handle\n",
@@ -534,17 +534,18 @@ static struct nlm_host *next_host_state(/** * nlm_host_rebooted - Release all resources held by rebooted host +* @net: network namespace * @info: pointer to decoded results of NLM_SM_NOTIFY call * * We were notified that the specified host has rebooted. Release * all resources held by that peer. */ -void nlm_host_rebooted (const struct nlm_reboot *info) +void nlm_host_rebooted (const struct net *net,const struct nlm_reboot *info) {struct nsm_handle *nsm;struct nlm_host *host; - nsm =nsm_reboot_lookup (info); + nsm =nsm_reboot_lookup (net, info);if (unlikely (nsm ==NULL ))return ;
fs/lockd/mon.c +22 -14
@@ -51,7 +51,6 @@ struct nsm_res { };static const struct rpc_program nsm_program; -static LIST_HEAD (nsm_handles);static DEFINE_SPINLOCK (nsm_lock);/*
@@ -259,33 +258,35 @@ void nsm_unmonitor(const struct nlm_host } } -static struct nsm_handle *nsm_lookup_hostname (const char *hostname, -const size_t len) +static struct nsm_handle *nsm_lookup_hostname (const struct list_head *nsm_handles, +const char *hostname,const size_t len) {struct nsm_handle *nsm; -list_for_each_entry (nsm, &nsm_handles, sm_link) +list_for_each_entry (nsm, nsm_handles, sm_link)if (strlen (nsm->sm_name) == len &&memcmp (nsm->sm_name, hostname, len) ==0 )return nsm;return NULL ; } -static struct nsm_handle *nsm_lookup_addr (const struct sockaddr *sap) +static struct nsm_handle *nsm_lookup_addr (const struct list_head *nsm_handles, +const struct sockaddr *sap) {struct nsm_handle *nsm; -list_for_each_entry (nsm, &nsm_handles, sm_link) +list_for_each_entry (nsm, nsm_handles, sm_link)if (rpc_cmp_addr (nsm_addr (nsm), sap))return nsm;return NULL ; } -static struct nsm_handle *nsm_lookup_priv (const struct nsm_private *priv) +static struct nsm_handle *nsm_lookup_priv (const struct list_head *nsm_handles, +const struct nsm_private *priv) {struct nsm_handle *nsm; -list_for_each_entry (nsm, &nsm_handles, sm_link) +list_for_each_entry (nsm, nsm_handles, sm_link)if (memcmp (nsm->sm_priv.data, priv->data,sizeof (priv->data)) ==0 )return nsm;
@@ -350,6 +351,7 @@ static struct nsm_handle *nsm_create_han/** * nsm_get_handle - Find or create a cached nsm_handle +* @net: network namespace * @sap: pointer to socket address of handle to find * @salen: length of socket address * @hostname: pointer to C string containing hostname to find
@@ -362,11 +364,13 @@ static struct nsm_handle *nsm_create_han* @hostname cannot be found in the handle cache. Returns NULL if * an error occurs. */ -struct nsm_handle *nsm_get_handle (const struct sockaddr *sap, +struct nsm_handle *nsm_get_handle (const struct net *net, +const struct sockaddr *sap,const size_t salen,const char *hostname,const size_t hostname_len) {struct nsm_handle *cached, *new =NULL ; +struct lockd_net *ln =net_generic (net, lockd_net_id);if (hostname &&memchr (hostname,'/' , hostname_len) !=NULL ) {if (printk_ratelimit ()) {
@@ -381,9 +385,10 @@ retry:spin_lock (&nsm_lock);if (nsm_use_hostnames && hostname !=NULL ) - cached =nsm_lookup_hostname (hostname, hostname_len); + cached =nsm_lookup_hostname (&ln->nsm_handles, + hostname, hostname_len);else - cached =nsm_lookup_addr (sap); + cached =nsm_lookup_addr (&ln->nsm_handles, sap);if (cached !=NULL ) {atomic_inc (&cached->sm_count);
@@ -397,7 +402,7 @@ retry: }if (new !=NULL ) { -list_add (&new->sm_link, &nsm_handles); +list_add (&new->sm_link, &ln->nsm_handles);spin_unlock (&nsm_lock);dprintk ("lockd: created nsm_handle for %s (%s)\n" , new->sm_name, new->sm_addrbuf);
@@ -414,19 +419,22 @@ retry:/** * nsm_reboot_lookup - match NLMPROC_SM_NOTIFY arguments to an nsm_handle +* @net: network namespace * @info: pointer to NLMPROC_SM_NOTIFY arguments * * Returns a matching nsm_handle if found in the nsm cache. The returned * nsm_handle's reference count is bumped. Otherwise returns NULL if some * error occurred. */ -struct nsm_handle *nsm_reboot_lookup (const struct nlm_reboot *info) +struct nsm_handle *nsm_reboot_lookup (const struct net *net, +const struct nlm_reboot *info) {struct nsm_handle *cached; +struct lockd_net *ln =net_generic (net, lockd_net_id);spin_lock (&nsm_lock); - cached =nsm_lookup_priv (&info->priv); + cached =nsm_lookup_priv (&ln->nsm_handles, &info->priv);if (unlikely (cached ==NULL )) {spin_unlock (&nsm_lock); dprintk("lockd: never saw rebooted peer '%.*s' before\n",
fs/lockd/netns.h +1 -0
@@ -16,6 +16,7 @@ struct lockd_net {spinlock_t nsm_clnt_lock;unsigned int nsm_users;struct rpc_clnt *nsm_clnt; +struct list_head nsm_handles; };extern int lockd_net_id;
fs/lockd/svc.c +1 -0
@@ -583,6 +583,7 @@ static int lockd_init_net(struct net *neINIT_DELAYED_WORK (&ln->grace_period_end, grace_ender);INIT_LIST_HEAD (&ln->grace_list);spin_lock_init (&ln->nsm_clnt_lock); +INIT_LIST_HEAD (&ln->nsm_handles);return 0 ; }
fs/lockd/svc4proc.c +1 -1
@@ -421,7 +421,7 @@ nlm4svc_proc_sm_notify(struct svc_rqst *return rpc_system_err; } -nlm_host_rebooted (argp); +nlm_host_rebooted (SVC_NET (rqstp), argp);return rpc_success; }
fs/lockd/svcproc.c +1 -1
@@ -464,7 +464,7 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rreturn rpc_system_err; } -nlm_host_rebooted (argp); +nlm_host_rebooted (SVC_NET (rqstp), argp);return rpc_success; }
include/linux/lockd/lockd.h +6 -3
@@ -236,7 +236,8 @@ void nlm_rebind_host(struct nlm_hoststruct nlm_host *nlm_get_host (struct nlm_host *);void nlm_shutdown_hosts (void );void nlm_shutdown_hosts_net (struct net *net); -void nlm_host_rebooted (const struct nlm_reboot *); +void nlm_host_rebooted (const struct net *net, +const struct nlm_reboot *);/* * Host monitoring
@@ -244,11 +245,13 @@ void nlm_host_rebooted(const struct nint nsm_monitor (const struct nlm_host *host);void nsm_unmonitor (const struct nlm_host *host); -struct nsm_handle *nsm_get_handle (const struct sockaddr *sap, +struct nsm_handle *nsm_get_handle (const struct net *net, +const struct sockaddr *sap,const size_t salen,const char *hostname,const size_t hostname_len); -struct nsm_handle *nsm_reboot_lookup (const struct nlm_reboot *info); +struct nsm_handle *nsm_reboot_lookup (const struct net *net, +const struct nlm_reboot *info);void nsm_release (struct nsm_handle *nsm);/*
Greg Kroah-Hartman
maintainerPATCH 26/80 devres: fix a for loop bounds check
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 1f35d04a02a652f14566f875aef3a6f2af4cb77b upstream.
The iomap[] array has PCIM_IOMAP_MAX (6) elements and not DEVICE_COUNT_RESOURCE (16). This bug was found using a static checker. It may be that the "if (!(mask & (1 << i)))" check means we never actually go past the end of the array in real life.
--- lib/devres.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/devres.c +1 -1
@@ -423,7 +423,7 @@ void pcim_iounmap_regions(struct pci_devif (!iomap)return ; -for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { +for (i =0 ; i <PCIM_IOMAP_MAX ; i++) {if (!(mask & (1 << i)))continue ;
Greg Kroah-Hartman
maintainerPATCH 27/80 wm831x_power: Use IRQF_ONESHOT to request threaded IRQs
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Valentin Rothberg <[email protected]>
commit 90adf98d9530054b8e665ba5a928de4307231d84 upstream.
Since commit 1c6c69525b40 ("genirq: Reject bogus threaded irq requests") threaded IRQs without a primary handler need to be requested with IRQF_ONESHOT, otherwise the request will fail.
scripts/coccinelle/misc/irqf_oneshot.cocci detected this issue.
--- drivers/power/wm831x_power.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/power/wm831x_power.c +3 -3
@@ -567,7 +567,7 @@ static int wm831x_power_probe(struct pla irq =wm831x_irq (wm831x,platform_get_irq_byname (pdev,"SYSLO" )); ret =request_threaded_irq (irq,NULL , wm831x_syslo_irq, -IRQF_TRIGGER_RISING ,"System power low" , +IRQF_TRIGGER_RISING |IRQF_ONESHOT ,"System power low" , power);if (ret !=0 ) { dev_err(&pdev->dev, "Failed to request SYSLO IRQ %d: %d\n",
@@ -577,7 +577,7 @@ static int wm831x_power_probe(struct pla irq =wm831x_irq (wm831x,platform_get_irq_byname (pdev,"PWR SRC" )); ret =request_threaded_irq (irq,NULL , wm831x_pwr_src_irq, -IRQF_TRIGGER_RISING ,"Power source" , +IRQF_TRIGGER_RISING |IRQF_ONESHOT ,"Power source" , power);if (ret !=0 ) { dev_err(&pdev->dev, "Failed to request PWR SRC IRQ %d: %d\n",
@@ -590,7 +590,7 @@ static int wm831x_power_probe(struct plaplatform_get_irq_byname (pdev, wm831x_bat_irqs[i])); ret =request_threaded_irq (irq,NULL , wm831x_bat_irq, -IRQF_TRIGGER_RISING , +IRQF_TRIGGER_RISING |IRQF_ONESHOT , wm831x_bat_irqs[i], power);if (ret !=0 ) {
Greg Kroah-Hartman
maintainerPATCH 28/80 megaraid_sas: Do not use PAGE_SIZE for max_sectors
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: [email protected] <[email protected]>
commit 357ae967ad66e357f78b5cfb5ab6ca07fb4a7758 upstream.
Do not use PAGE_SIZE marco to calculate max_sectors per I/O request. Driver code assumes PAGE_SIZE will be always 4096 which can lead to wrongly calculated value if PAGE_SIZE is not 4096. This issue was reported in Ubuntu Bugzilla Bug #1475166.
--- drivers/scsi/megaraid/megaraid_sas.h | 2 ++ drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/megaraid/megaraid_sas.h +2 -0
@@ -300,6 +300,8 @@ enum MR_EVT_ARGS { MR_EVT_ARGS_GENERIC, }; + +#define SGE_BUFFER_SIZE 4096/* * define constants for device list query options */
drivers/scsi/megaraid/megaraid_sas_base.c +1 -1
@@ -3602,7 +3602,7 @@ static int megasas_init_fw(struct megasa } instance->max_sectors_per_req = instance->max_num_sge * -PAGE_SIZE /512 ; +SGE_BUFFER_SIZE /512 ;if (tmp_sectors && (instance->max_sectors_per_req > tmp_sectors)) instance->max_sectors_per_req = tmp_sectors;
Greg Kroah-Hartman
maintainerPATCH 29/80 megaraid_sas : SMAP restriction--do not access user memory from IOCTL code
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: [email protected] <[email protected]>
commit 323c4a02c631d00851d8edc4213c4d184ef83647 upstream.
This is an issue on SMAP enabled CPUs and 32 bit apps running on 64 bit OS. Do not access user memory from kernel code. The SMAP bit restricts accessing user memory from kernel code.
--- drivers/scsi/megaraid/megaraid_sas_base.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/scsi/megaraid/megaraid_sas_base.c +11 -2
@@ -5051,6 +5051,9 @@ static int megasas_mgmt_compat_ioctl_fw(int i;int error =0 ;compat_uptr_t ptr; +unsigned long local_raw_ptr; +u32 local_sense_off; +u32 local_sense_len;if (clear_user (ioc,sizeof (*ioc)))return -EFAULT ;
@@ -5068,9 +5071,15 @@ static int megasas_mgmt_compat_ioctl_fw(* sense_len is not null, so prepare the 64bit value under * the same condition. */ -if (ioc->sense_len) { +if (get_user (local_raw_ptr, ioc->frame.raw) || +get_user (local_sense_off, &ioc->sense_off) || +get_user (local_sense_len, &ioc->sense_len)) +return -EFAULT ; + + +if (local_sense_len) {void __user **sense_ioc_ptr = - (void __user **)(ioc->frame.raw + ioc->sense_off); + (void __user **)((u8 *)local_raw_ptr + local_sense_off);compat_uptr_t *sense_cioc_ptr = (compat_uptr_t *)(cioc->frame.raw + cioc->sense_off); if (get_user(ptr, sense_cioc_ptr) ||
Greg Kroah-Hartman
maintainerPATCH 30/80 mmc: remove bondage between REQ_META and reliable write
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Porzio <[email protected]>
commit d3df0465db00cf4ed9f90d0bfc3b827d32b9c796 upstream.
Anytime a write operation is performed with Reliable Write flag enabled, the eMMC device is enforced to bypass the cache and do a write to the underling NVM device by Jedec specification; this causes a performance penalty since write operations can't be optimized by the device cache.
In our tests, we replayed a typical mobile daily trace pattern and found ~9% overall time reduction in trace replay by using this patch. Also the write ops within 4KB~64KB chunk size range get a 40~60% performance improvement by using the patch (as this range of write chunks are the ones affected by REQ_META).
This patch has been discussed in the Mobile & Embedded Linux Storage Forum and it's the results of feedbacks from many people. We also checked with fsdevl and f2fs mailing list developers that this change in the usage of REQ_META is not affecting FS behavior and we got positive feedbacks. Reporting here the feedbacks:
http://comments.gmane.org/gmane.linux.file-systems/97219
http://thread.gmane.org/gmane.linux.file-systems.f2fs/3178/focus=3183
--- drivers/mmc/card/block.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/mmc/card/block.c +3 -8
@@ -59,8 +59,7 @@ MODULE_ALIAS("mmc:block");#define INAND_CMD38_ARG_SECTRIM2 0x88#define MMC_BLK_TIMEOUT_MS (10 * 60 * 1000)/* 10 minute timeout */ -#define mmc_req_rel_wr (req) (((req->cmd_flags & REQ_FUA) || \ - (req->cmd_flags & REQ_META)) && \ +#define mmc_req_rel_wr (req) ((req->cmd_flags & REQ_FUA) && \ (rq_data_dir(req) == WRITE))#define PACKED_CMD_VER 0x01#define PACKED_CMD_WR 0x02
@@ -1300,13 +1299,9 @@ static void mmc_blk_rw_rq_prep(struct mm/* * Reliable writes are used to implement Forced Unit Access and -* REQ_META accesses, and are supported only on MMCs. -* -* XXX: this really needs a good explanation of why REQ_META -* is treated special. +* are supported only on MMCs. */ -bool do_rel_wr = ((req->cmd_flags &REQ_FUA ) || - (req->cmd_flags &REQ_META )) && +bool do_rel_wr = (req->cmd_flags &REQ_FUA ) && (rq_data_dir (req) ==WRITE ) && (md->flags &MMC_BLK_REL_WR );
Greg Kroah-Hartman
maintainerPATCH 31/80 mac: validate mac_partition is within sector
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 02e2a5bfebe99edcf9d694575a75032d53fe1b73 upstream.
If md->signature == MAC_DRIVER_MAGIC and md->block_size == 1023, a single 512 byte sector would be read (secsize / 512). However the partition structure would be located past the end of the buffer (secsize % 512).
--- block/partitions/mac.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
block/partitions/mac.c +7 -3
@@ -32,7 +32,7 @@ int mac_partition(struct parsed_partitioSector sect;unsigned char *data;int slot, blocks_in_map; -unsigned secsize; +unsigned secsize, datasize, partoffset;#ifdef CONFIG_PPC_PMAC int found_root =0 ;int found_root_goodness =0 ;
@@ -50,10 +50,14 @@ int mac_partition(struct parsed_partitio } secsize =be16_to_cpu (md->block_size);put_dev_sector (sect); - data =read_part_sector (state, secsize/512 , §); + datasize =round_down (secsize,512 ); + data =read_part_sector (state, datasize /512 , §);if (!data)return -1 ; - part = (struct mac_partition *) (data + secsize%512 ); + partoffset = secsize %512 ; +if (partoffset +sizeof (*part) > datasize) +return -1 ; + part = (struct mac_partition *) (data + partoffset);if (be16_to_cpu (part->signature) !=MAC_PARTITION_MAGIC ) {put_dev_sector (sect);return 0 ;/* not a MacOS disk */
Greg Kroah-Hartman
maintainerPATCH 32/80 ARC: dw2 unwind: Remove falllback linear search thru FDE entries
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vineet Gupta <[email protected]>
commit 2e22502c080f27afeab5e6f11e618fb7bc7aea53 upstream.
Fixes STAR 9000953410: "perf callgraph profiling causing RCU stalls"
| perf record -g -c 15000 -e cycles /sbin/hackbench | | INFO: rcu_preempt self-detected stall on CPU | 1: (1 GPs behind) idle=609/140000000000002/0 softirq=2914/2915 fqs=603 | Task dump for CPU 1:
in-kernel dwarf unwinder has a fast binary lookup and a fallback linear search (which iterates thru each of ~11K entries) thus takes 2 orders of magnitude longer (~3 million cycles vs. 2000). Routines written in hand assembler lack dwarf info (as we don't support assembler CFI pseudo-ops yet) fail the unwinder binary lookup, hit linear search, failing nevertheless in the end.
However the linear search is pointless as binary lookup tables are created from it in first place. It is impossible to have binary lookup fail while succeed the linear search. It is pure waste of cycles thus removed by this patch.
This manifested as RCU stalls / NMI watchdog splat when running hackbench under perf with callgraph profiling. The triggering condition was perf counter overflowing in routine lacking dwarf info (like memset) leading to patheic 3 million cycle unwinder slow path and by the time it returned new interrupts were already pending (Timer, IPI) and taken rightaway. The original memset didn't make forward progress, system kept accruing more interrupts and more unwinder delayes in a vicious feedback loop, ultimately triggering the NMI diagnostic.
--- arch/arc/kernel/unwind.c | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-)
arch/arc/kernel/unwind.c +4 -33
@@ -984,42 +984,13 @@ int arc_unwind(struct unwind_frame_info (const u8 *)(fde +1 ) + *fde, ptrType); -if (pc >= endLoc) +if (pc >= endLoc) { fde =NULL ; - }else - fde =NULL ; - } -if (fde ==NULL ) { -for (fde = table->address, tableSize = table->size; - cie =NULL , tableSize >sizeof (*fde) - && tableSize -sizeof (*fde) >= *fde; - tableSize -=sizeof (*fde) + *fde, - fde +=1 + *fde /sizeof (*fde)) { - cie =cie_for_fde (fde, table); -if (cie == &bad_cie) { cie =NULL ; -break ; } -if (cie ==NULL - || cie == ¬_fde - || (ptrType =fde_pointer_type (cie)) <0 ) -continue ; - ptr = (const u8 *)(fde +2 ); - startLoc =read_pointer (&ptr, - (const u8 *)(fde +1 ) + - *fde, ptrType); -if (!startLoc) -continue ; -if (!(ptrType & DW_EH_PE_indirect)) - ptrType &= -DW_EH_PE_FORM | DW_EH_PE_signed; - endLoc = - startLoc +read_pointer (&ptr, - (const u8 *)(fde + -1 ) + - *fde, ptrType); -if (pc >= startLoc && pc < endLoc) -break ; + }else { + fde =NULL ; + cie =NULL ; } } }
Greg Kroah-Hartman
maintainerPATCH 33/80 vfs: Avoid softlockups with sendfile(2)
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit c2489e07c0a71a56fb2c84bc0ee66cddfca7d068 upstream.
The following test program from Dmitry can cause softlockups or RCU stalls as it copies 1GB from tmpfs into eventfd and we don't have any scheduling point at that path in sendfile(2) implementation:
int r1 = eventfd(0, 0);
int r2 = memfd_create("", 0);
unsigned long n = 1<<30;
fallocate(r2, 0, 0, n);
sendfile(r1, r2, 0, n);Add cond_resched() into __splice_from_pipe() to fix the problem.
--- fs/splice.c | 1 + 1 file changed, 1 insertion(+)
fs/splice.c +1 -0
@@ -949,6 +949,7 @@ ssize_t __splice_from_pipe(struct pipe_isplice_from_pipe_begin (sd); do { + cond_resched(); ret = splice_from_pipe_next(pipe, sd); if (ret > 0) ret = splice_from_pipe_feed(pipe, sd, actor);
Greg Kroah-Hartman
maintainerPATCH 34/80 ring-buffer: Update read stamp with first real commit on page
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Red Hat) <[email protected]>
commit b81f472a208d3e2b4392faa6d17037a89442f4ce upstream.
Do not update the read stamp after swapping out the reader page from the write buffer. If the reader page is swapped out of the buffer before an event is written to it, then the read_stamp may get an out of date timestamp, as the page timestamp is updated on the first commit to that page.
rb_get_reader_page() only returns a page if it has an event on it, otherwise it will return NULL. At that point, check if the page being returned has events and has not been read yet. Then at that point update the read_stamp to match the time stamp of the reader page.
--- kernel/trace/ring_buffer.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
kernel/trace/ring_buffer.c +5 -7
@@ -1948,12 +1948,6 @@ rb_set_commit_to_write(struct ring_buffe goto again; } -static void rb_reset_reader_page (struct ring_buffer_per_cpu *cpu_buffer) -{ - cpu_buffer->read_stamp = cpu_buffer->reader_page->page->time_stamp; - cpu_buffer->reader_page->read =0 ; -} -static void rb_inc_iter (struct ring_buffer_iter *iter) {struct ring_buffer_per_cpu *cpu_buffer = iter->cpu_buffer;
@@ -3591,7 +3585,7 @@ rb_get_reader_page(struct ring_buffer_pe/* Finally update the reader page to the new head */ cpu_buffer->reader_page = reader; -rb_reset_reader_page (cpu_buffer); + cpu_buffer->reader_page->read =0 ;if (overwrite != cpu_buffer->last_overrun) { cpu_buffer->lost_events = overwrite - cpu_buffer->last_overrun;
@@ -3601,6 +3595,10 @@ rb_get_reader_page(struct ring_buffer_pe goto again; out: +/* Update the read_stamp on the first event */ +if (reader && reader->read ==0 ) + cpu_buffer->read_stamp = reader->page->time_stamp; +arch_spin_unlock (&cpu_buffer->lock);local_irq_restore (flags);
Greg Kroah-Hartman
maintainerPATCH 35/80 virtio: fix memory leak of virtio ida cache layers
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suman Anna <[email protected]>
commit c13f99b7e945dad5273a8b7ee230f4d1f22d3354 upstream.
The virtio core uses a static ida named virtio_index_ida for assigning index numbers to virtio devices during registration. The ida core may allocate some internal idr cache layers and an ida bitmap upon any ida allocation, and all these layers are truely freed only upon the ida destruction. The virtio_index_ida is not destroyed at present, leading to a memory leak when using the virtio core as a module and atleast one virtio device is registered and unregistered.
Fix this by invoking ida_destroy() in the virtio core module exit.
--- drivers/virtio/virtio.c | 1 + 1 file changed, 1 insertion(+)
drivers/virtio/virtio.c +1 -0
@@ -238,6 +238,7 @@ static int virtio_init(void) static void __exit virtio_exit(void) {bus_unregister (&virtio_bus); +ida_destroy (&virtio_index_ida); }core_initcall (virtio_init);module_exit (virtio_exit);
Greg Kroah-Hartman
maintainerPATCH 36/80 mac80211: mesh: fix call_rcu() usage
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit c2e703a55245bfff3db53b1f7cbe59f1ee8a4339 upstream.
When using call_rcu(), the called function may be delayed quite significantly, and without a matching rcu_barrier() there's no way to be sure it has finished.
Therefore, global state that could be gone/freed/reused should never be touched in the callback.
Fix this in mesh by moving the atomic_dec() into the caller; that's not really a problem since we already unlinked the path and it will be destroyed anyway.
This fixes a crash Jouni observed when running certain tests in a certain order, in which the mesh interface was torn down, the memory reused for a function pointer (work struct) and running that then crashed since the pointer had been decremented by 1, resulting in an invalid instruction byte stream.
--- net/mac80211/mesh_pathtbl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/mac80211/mesh_pathtbl.c +4 -4
@@ -747,10 +747,8 @@ void mesh_plink_broken(struct sta_info *static void mesh_path_node_reclaim (struct rcu_head *rp) { struct mpath_node *node = container_of(rp, struct mpath_node, rcu); -struct ieee80211_sub_if_data *sdata = node->mpath->sdata;del_timer_sync (&node->mpath->timer); -atomic_dec (&sdata->u.mesh.mpaths);kfree (node->mpath);kfree (node); }
@@ -758,8 +756,9 @@ static void mesh_path_node_reclaim(struc/* needs to be called with the corresponding hashwlock taken */ static void __mesh_path_del (struct mesh_table *tbl,struct mpath_node *node) { -struct mesh_path *mpath; - mpath = node->mpath; +struct mesh_path *mpath = node->mpath; +struct ieee80211_sub_if_data *sdata = node->mpath->sdata; +spin_lock (&mpath->state_lock); mpath->flags |=MESH_PATH_RESOLVING ;if (mpath->is_gate)
@@ -767,6 +766,7 @@ static void __mesh_path_del(struct mesh_hlist_del_rcu (&node->list);call_rcu (&node->rcu, mesh_path_node_reclaim);spin_unlock (&mpath->state_lock); +atomic_dec (&sdata->u.mesh.mpaths);atomic_dec (&tbl->entries); }
Greg Kroah-Hartman
maintainerPATCH 37/80 RDS: fix race condition when sending a message on unbound socket
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quentin Casasnovas <[email protected]>
commit 8c7188b23474cca017b3ef354c4a58456f68303a upstream.
Sasha's found a NULL pointer dereference in the RDS connection code when sending a message to an apparently unbound socket. The problem is caused by the code checking if the socket is bound in rds_sendmsg(), which checks the rs_bound_addr field without taking a lock on the socket. This opens a race where rs_bound_addr is temporarily set but where the transport is not in rds_bind(), leading to a NULL pointer dereference when trying to dereference 'trans' in __rds_conn_create().
Vegard wrote a reproducer for this issue, so kindly ask him to share if you're interested.
I cannot reproduce the NULL pointer dereference using Vegard's reproducer with this patch, whereas I could without.
Complete earlier incomplete fix to CVE-2015-6937:
74e98eb08588 ("RDS: verify the underlying transport exists before creating a connection")
--- net/rds/connection.c | 6 ------ net/rds/send.c | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-)
net/rds/connection.c +0 -6
@@ -177,12 +177,6 @@ static struct rds_connection *__rds_conn } } -if (trans ==NULL ) { -kmem_cache_free (rds_conn_slab, conn); - conn =ERR_PTR (-ENODEV ); - goto out; - } - conn->c_trans = trans; ret = trans->conn_alloc (conn, gfp);
net/rds/send.c +3 -1
@@ -955,11 +955,13 @@ int rds_sendmsg(struct kiocb *iocb, strurelease_sock (sk); } -/* racing with another thread binding seems ok here */ +lock_sock (sk);if (daddr ==0 || rs->rs_bound_addr ==0 ) { +release_sock (sk); ret = -ENOTCONN ;/* XXX not a great errno */ goto out; } +release_sock (sk);/* size of rm including all sgs */ ret =rds_rm_size (msg, payload_len);
Greg Kroah-Hartman
maintainerPATCH 38/80 can: sja1000: clear interrupts on start
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mirza Krak <[email protected]>
commit 7cecd9ab80f43972c056dc068338f7bcc407b71c upstream.
According to SJA1000 data sheet error-warning (EI) interrupt is not cleared by setting the controller in to reset-mode.
Then if we have the following case:
- system is suspended (echo mem > /sys/power/state) and SJA1000 is left in operating state
- A bus error condition occurs which activates EI interrupt, system is still suspended which means EI interrupt will be not be handled nor cleared.
If the above two events occur, on resume there is no way to return the SJA1000 to operating state, except to cycle power to it.
By simply reading the IR register on start we will clear any previous conditions that could be present.
--- drivers/net/can/sja1000/sja1000.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/can/sja1000/sja1000.c +3 -0
@@ -187,6 +187,9 @@ static void sja1000_start(struct net_dev/* clear interrupt flags */ priv->read_reg (priv,SJA1000_IR ); +/* clear interrupt flags */ + priv->read_reg (priv,SJA1000_IR ); +/* leave reset mode */ set_normal_mode (dev); }
Greg Kroah-Hartman
maintainerPATCH 39/80 sched/core: Remove false-positive warning from wake_up_process()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sasha Levin <[email protected]>
commit 119d6f6a3be8b424b200dcee56e74484d5445f7e upstream.
Because wakeups can (fundamentally) be late, a task might not be in the expected state. Therefore testing against a task's state is racy, and can yield false positives.
--- kernel/sched/core.c | 1 - 1 file changed, 1 deletion(-)
kernel/sched/core.c +0 -1
@@ -1587,7 +1587,6 @@ out:*/ int wake_up_process (struct task_struct *p) { -WARN_ON (task_is_stopped_or_traced (p));return try_to_wake_up (p,TASK_NORMAL ,0 ); }EXPORT_SYMBOL (wake_up_process);
Greg Kroah-Hartman
maintainerPATCH 40/80 sata_sil: disable trim
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit d98f1cd0a3b70ea91f1dfda3ac36c3b2e1a4d5e2 upstream.
When I connect an Intel SSD to SATA SIL controller (PCI ID 1095:3114), any TRIM command results in I/O errors being reported in the log. There is other similar error reported with TRIM and the SIL controller:
https://bugs.centos.org/view.php?id=5880
Apparently the controller doesn't support TRIM commands. This patch disables TRIM support on the SATA SIL controller.
ata7.00: exception Emask 0x0 SAct 0x0 SErr 0x0 action 0x0 ata7.00: BMDMA2 stat 0x50001
ata7.00: failed command: DATA SET MANAGEMENT
ata7.00: cmd 06/01:01:00:00:00/00:00:00:00:00/a0 tag 0 dma 512 out
res 51/04:01:00:00:00/00:00:00:00:00/a0 Emask 0x1 (device error)
ata7.00: status: { DRDY ERR }
ata7.00: error: { ABRT }
ata7.00: device reported invalid CHS sector 0
sd 8:0:0:0: [sdb] tag#0 FAILED Result: hostbyte=DID_OK driverbyte=DRIVER_SENSE sd 8:0:0:0: [sdb] tag#0 Sense Key : Illegal Request [current] [descriptor] sd 8:0:0:0: [sdb] tag#0 Add. Sense: Unaligned write command
sd 8:0:0:0: [sdb] tag#0 CDB: Write same(16) 93 08 00 00 00 00 00 21 95 88 00 20 00 00 00 00blk_update_request: I/O error, dev sdb, sector 2200968
--- drivers/ata/sata_sil.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/ata/sata_sil.c +3 -0
@@ -631,6 +631,9 @@ static void sil_dev_config(struct ata_deunsigned int n, quirks =0 ;unsigned char model_num[ATA_ID_PROD_LEN +1 ]; +/* This controller doesn't support trim */ + dev->horkage |=ATA_HORKAGE_NOTRIM ; +ata_id_c_string (dev->id, model_num,ATA_ID_PROD ,sizeof (model_num));for (n =0 ; sil_blacklist[n].product; n++)
Greg Kroah-Hartman
maintainerPATCH 41/80 dm btree: fix bufio buffer leaks in dm_btree_del() error path
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joe Thornber <[email protected]>
commit ed8b45a3679eb49069b094c0711b30833f27c734 upstream.
If dm_btree_del()'s call to push_frame() fails, e.g. due to btree_node_validator finding invalid metadata, the dm_btree_del() error path must unlock all frames (which have active dm-bufio buffers) that were pushed onto the del_stack.
Otherwise, dm_bufio_client_destroy() will BUG_ON() because dm-bufio buffers have leaked, e.g.:
device-mapper: bufio: leaked buffer 3, hold count 1, list 0
--- drivers/md/persistent-data/dm-btree.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/md/persistent-data/dm-btree.c +15 -1
@@ -235,6 +235,16 @@ static bool is_internal_level(struct dm_return f->level < (info->levels -1 ); } +static void unlock_all_frames (struct del_stack *s) +{ +struct frame *f; + +while (unprocessed_frames (s)) { + f = s->spine + s->top--; +dm_tm_unlock (s->tm, f->b); + } +} +int dm_btree_del (struct dm_btree_info *info,dm_block_t root) {int r;
@@ -290,9 +300,13 @@ int dm_btree_del(struct dm_btree_info *i f->current_child = f->nr_children; } } - out: +if (r) { +/* cleanup all frames of del_stack */ +unlock_all_frames (s); + }kfree (s); +return r; }EXPORT_SYMBOL_GPL (dm_btree_del);
Greg Kroah-Hartman
maintainerPATCH 42/80 vgaarb: fix signal handling in vga_get()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kirill A. Shutemov <[email protected]>
commit 9f5bd30818c42c6c36a51f93b4df75a2ea2bd85e upstream.
There are few defects in vga_get() related to signal hadning:
- we shouldn't check for pending signals for TASK_UNINTERRUPTIBLE
case;
- if we found pending signal we must remove ourself from wait queue
and change task state back to running;
- -ERESTARTSYS is more appropriate, I guess.
--- drivers/gpu/vga/vgaarb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/vga/vgaarb.c +4 -2
@@ -392,8 +392,10 @@ int vga_get(struct pci_dev *pdev, unsignset_current_state (interruptible ?TASK_INTERRUPTIBLE :TASK_UNINTERRUPTIBLE ); -if (signal_pending (current)) { - rc = -EINTR ; +if (interruptible &&signal_pending (current)) { +__set_current_state (TASK_RUNNING ); +remove_wait_queue (&vga_wait_queue, &wait); + rc = -ERESTARTSYS ;break ; }schedule ();
Greg Kroah-Hartman
maintainerPATCH 43/80 rfkill: copy the name into the rfkill struct
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit b7bb110008607a915298bf0f47d25886ecb94477 upstream.
Some users of rfkill, like NFC and cfg80211, use a dynamic name when allocating rfkill, in those cases dev_name(). Therefore, the pointer passed to rfkill_alloc() might not be valid forever, I specifically found the case that the rfkill name was quite obviously an invalid pointer (or at least garbage) when the wiphy had been renamed.
Fix this by making a copy of the rfkill name in rfkill_alloc().
--- net/rfkill/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/rfkill/core.c +3 -3
@@ -51,7 +51,6 @@struct rfkill {spinlock_t lock; -const char *name;enum rfkill_type type;unsigned long state;
@@ -75,6 +74,7 @@ struct rfkill {struct delayed_work poll_work;struct work_struct uevent_work;struct work_struct sync_work; +char name[]; };#define to_rfkill (d) container_of(d, struct rfkill, dev)
@@ -871,14 +871,14 @@ struct rfkill * __must_check rfkill_alloif (WARN_ON (type ==RFKILL_TYPE_ALL || type >=NUM_RFKILL_TYPES ))return NULL ; - rfkill =kzalloc (sizeof (*rfkill),GFP_KERNEL ); + rfkill =kzalloc (sizeof (*rfkill) +strlen (name) +1 ,GFP_KERNEL );if (!rfkill)return NULL ;spin_lock_init (&rfkill->lock);INIT_LIST_HEAD (&rfkill->node); rfkill->type = type; - rfkill->name = name; +strcpy (rfkill->name, name); rfkill->ops = ops; rfkill->data = ops_data;
Greg Kroah-Hartman
maintainerPATCH 44/80 ses: Fix problems with simple enclosures
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Bottomley <[email protected]>
commit 3417c1b5cb1fdc10261dbed42b05cc93166a78fd upstream.
Simple enclosure implementations (mostly USB) are allowed to return only page 8 to every diagnostic query. That really confuses our implementation because we assume the return is the page we asked for and end up doing incorrect offsets based on bogus information leading to accesses outside of allocated ranges. Fix that by checking the page code of the return and giving an error if it isn't the one we asked for. This should fix reported bugs with USB storage by simply refusing to attach to enclosures that behave like this. It's also good defensive practise now that we're starting to see more USB enclosures.
--- drivers/scsi/ses.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
drivers/scsi/ses.c +19 -1
@@ -70,6 +70,7 @@ static int ses_probe(struct device *dev)static int ses_recv_diag (struct scsi_device *sdev,int page_code,void *buf,int bufflen) { +int ret;unsigned char cmd[] = {RECEIVE_DIAGNOSTIC ,1 ,/* Set PCV bit */
@@ -78,9 +79,26 @@ static int ses_recv_diag(struct scsi_dev bufflen &0xff ,0 }; +unsigned char recv_page_code; -return scsi_execute_req (sdev, cmd,DMA_FROM_DEVICE , buf, bufflen, + ret =scsi_execute_req (sdev, cmd,DMA_FROM_DEVICE , buf, bufflen,NULL ,SES_TIMEOUT ,SES_RETRIES ,NULL ); +if (unlikely (!ret)) +return ret; + + recv_page_code = ((unsigned char *)buf)[0 ]; + +if (likely (recv_page_code == page_code)) +return ret; + +/* successful diagnostic but wrong page code. This happens to some +* USB devices, just print a message and pretend there was an error */ + +sdev_printk (KERN_ERR , sdev, +"Wrong diagnostic page; asked for %d got %u\n" , + page_code, recv_page_code); + +return -EINVAL ; } static int ses_send_diag(struct scsi_device *sdev, int page_code,
Greg Kroah-Hartman
maintainerPATCH 45/80 ses: fix additional element traversal bug
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Bottomley <[email protected]>
commit 5e1033561da1152c57b97ee84371dba2b3d64c25 upstream.
KASAN found that our additional element processing scripts drop off the end of the VPD page into unallocated space. The reason is that not every element has additional information but our traversal routines think they do, leading to them expecting far more additional information than is present. Fix this by adding a gate to the traversal routine so that it only processes elements that are expected to have additional information (list is in SES-2 section 6.1.13.1:
Additional Element Status diagnostic page overview)
--- drivers/scsi/ses.c | 10 +++++++++- include/linux/enclosure.h | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/scsi/ses.c +9 -1
@@ -454,7 +454,15 @@ static void ses_enclosure_data_process(sif (desc_ptr) desc_ptr += len; -if (addl_desc_ptr) +if (addl_desc_ptr && +/* only find additional descriptions for specific devices */ + (type_ptr[0 ] ==ENCLOSURE_COMPONENT_DEVICE || + type_ptr[0 ] ==ENCLOSURE_COMPONENT_ARRAY_DEVICE || + type_ptr[0 ] ==ENCLOSURE_COMPONENT_SAS_EXPANDER || +/* these elements are optional */ + type_ptr[0 ] ==ENCLOSURE_COMPONENT_SCSI_TARGET_PORT || + type_ptr[0 ] ==ENCLOSURE_COMPONENT_SCSI_INITIATOR_PORT || + type_ptr[0 ] ==ENCLOSURE_COMPONENT_CONTROLLER_ELECTRONICS )) addl_desc_ptr += addl_desc_ptr[1 ] +2 ; }
include/linux/enclosure.h +4 -0
@@ -29,7 +29,11 @@/* A few generic types ... taken from ses-2 */ enum enclosure_component_type {ENCLOSURE_COMPONENT_DEVICE =0x01 , +ENCLOSURE_COMPONENT_CONTROLLER_ELECTRONICS =0x07 , +ENCLOSURE_COMPONENT_SCSI_TARGET_PORT =0x14 , +ENCLOSURE_COMPONENT_SCSI_INITIATOR_PORT =0x15 ,ENCLOSURE_COMPONENT_ARRAY_DEVICE =0x17 , +ENCLOSURE_COMPONENT_SAS_EXPANDER =0x18 , };/* ses-2 common element status */
Greg Kroah-Hartman
maintainerPATCH 46/80 scripts: recordmcount: break hardlinks
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell King <[email protected]>
commit dd39a26538e37f6c6131e829a4a510787e43c783 upstream.
recordmcount edits the file in-place, which can cause problems when using ccache in hardlink mode. Arrange for recordmcount to break a hardlinked object.
--- scripts/recordmcount.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
scripts/recordmcount.c +14 -0
@@ -189,6 +189,20 @@ static void *mmap_file(char const *fname addr =umalloc (sb.st_size);uread (fd_map, addr, sb.st_size); } +if (sb.st_nlink !=1 ) { +/* file is hard-linked, break the hard link */ +close (fd_map); +if (unlink (fname) <0 ) { +perror (fname); +fail_file (); + } + fd_map =open (fname,O_RDWR |O_CREAT , sb.st_mode); +if (fd_map <0 ) { +perror (fname); +fail_file (); + } +uwrite (fd_map, addr, sb.st_size); + }return addr; }
Greg Kroah-Hartman
maintainerPATCH 47/80 Btrfs: add missing brelse when superblock checksum fails
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anand Jain <[email protected]>
commit b2acdddfad13c38a1e8b927d83c3cf321f63601a upstream.
Looks like oversight, call brelse() when checksum fails. Further down the code, in the non error path, we do call brelse() and so we don't see brelse() in the goto error paths.
--- fs/btrfs/disk-io.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/disk-io.c +1 -0
@@ -2437,6 +2437,7 @@ int open_ctree(struct super_block *sb,"unsupported option features (%Lx).\n" , (unsigned long long)features); err = -EINVAL ; +brelse (bh); goto fail_alloc; }
Greg Kroah-Hartman
maintainerPATCH 48/80 Btrfs: igrab inode in writepage
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josef Bacik <[email protected]>
commit be7bd730841e69fe8f70120098596f648cd1f3ff upstream.
We hit this panic on a few of our boxes this week where we have an ordered_extent with an NULL inode. We do an igrab() of the inode in writepages, but weren't doing it in writepage which can be called directly from the VM on dirty pages. If the inode has been unlinked then we could have I_FREEING set which means igrab() would return NULL and we get this panic. Fix this by trying to igrab in btrfs_writepage, and if it returns NULL then just redirty the page and return AOP_WRITEPAGE_ACTIVATE; so the VM knows it wasn't successful. Thanks,
--- fs/btrfs/inode.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +15 -2
@@ -7477,15 +7477,28 @@ int btrfs_readpage(struct file *file, ststatic int btrfs_writepage (struct page *page,struct writeback_control *wbc) {struct extent_io_tree *tree; - +struct inode *inode = page->mapping->host; +int ret;if (current->flags &PF_MEMALLOC ) {redirty_page_for_writepage (wbc, page);unlock_page (page);return 0 ; } + +/* +* If we are under memory pressure we will call this directly from the +* VM, we need to make sure we have the inode referenced for the ordered +* extent. If not just return like we didn't do anything. +*/ +if (!igrab (inode)) { +redirty_page_for_writepage (wbc, page); +return AOP_WRITEPAGE_ACTIVATE ; + } tree = &BTRFS_I (page->mapping->host)->io_tree; -return extent_write_full_page (tree, page, btrfs_get_extent, wbc); + ret =extent_write_full_page (tree, page, btrfs_get_extent, wbc); +btrfs_add_delayed_iput (inode); +return ret; } static int btrfs_writepages(struct address_space *mapping,
Greg Kroah-Hartman
maintainerPATCH 49/80 Btrfs: send, dont BUG_ON() when an empty symlink is found
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit a879719b8c90e15c9e7fa7266d5e3c0ca962f9df upstream.
When a symlink is successfully created it always has an inline extent containing the source path. However if an error happens when creating the symlink, we can leave in the subvolume's tree a symlink inode without any such inline extent item - this happens if after btrfs_symlink() calls btrfs_end_transaction() and before it calls the inode eviction handler (through the final iput() call), the transaction gets committed and a crash happens before the eviction handler gets called, or if a snapshot of the subvolume is made before the eviction handler gets called. Sadly we can't just avoid this by making btrfs_symlink() call btrfs_end_transaction() after it calls the eviction handler, because the later can commit the current transaction before it removes any items from the subvolume tree (if it encounters ENOSPC errors while reserving space for removing all the items).
So make send fail more gracefully, with an -EIO error, and print a message to dmesg/syslog informing that there's an empty symlink inode, so that the user can delete the empty symlink or do something else about it.
--- fs/btrfs/send.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
fs/btrfs/send.c +15 -1
@@ -1338,7 +1338,21 @@ static int read_symlink(struct send_ctx ret =btrfs_search_slot (NULL , root, &key, path,0 ,0 );if (ret <0 ) goto out; -BUG_ON (ret); +if (ret) { +/* +* An empty symlink inode. Can happen in rare error paths when +* creating a symlink (transaction committed before the inode +* eviction handler removed the symlink inode items and a crash +* happened in between or the subvol was snapshoted in between). +* Print an informative message to dmesg/syslog so that the user +* can delete the symlink. +*/ +btrfs_err (root->fs_info, +"Found empty symlink inode %llu at root %llu" , + ino, root->root_key.objectid); + ret = -EIO ; + goto out; + } ei =btrfs_item_ptr (path->nodes[0 ], path->slots[0 ], struct btrfs_file_extent_item);
Greg Kroah-Hartman
maintainerPATCH 50/80 Btrfs: fix number of transaction units required to create symlink
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit 9269d12b2d57d9e3d13036bb750762d1110d425c upstream.
We weren't accounting for the insertion of an inline extent item for the symlink inode nor that we need to update the parent inode item (through the call to btrfs_add_nondir()). So fix this by including two more transaction units.
--- fs/btrfs/inode.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/inode.c +3 -1
@@ -8487,9 +8487,11 @@ static int btrfs_symlink(struct inode *d/* * 2 items for inode item and ref * 2 items for dir items +* 1 item for updating parent inode item +* 1 item for the inline extent item * 1 item for xattr if selinux is on */ - trans =btrfs_start_transaction (root,5 ); + trans =btrfs_start_transaction (root,7 );if (IS_ERR (trans))return PTR_ERR (trans);
Greg Kroah-Hartman
maintainerPATCH 51/80 s390: fix normalization bug in exception table sorting
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
commit bcb7825a77f41c7dd91da6f7ac10b928156a322e upstream.
The normalization pass in the sorting routine of the relative exception table serves two purposes:
- it ensures that the address fields of the exception table entries are fully ordered, so that no ambiguities arise between entries with identical instruction offsets (i.e., when two instructions that are exactly 8 bytes apart each have an exception table entry associated with them)
- it ensures that the offsets of both the instruction and the fixup fields of each entry are relative to their final location after sorting.
Commit eb608fb366de ("s390/exceptions: switch to relative exception table entries") ported the relative exception table format from x86, but modified the sorting routine to only normalize the instruction offset field and not the fixup offset field. The result is that the fixup offset of each entry will be relative to the original location of the entry before sorting, likely leading to crashes when those entries are dereferenced.
--- arch/s390/mm/extable.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/s390/mm/extable.c +6 -2
@@ -52,12 +52,16 @@ void sort_extable(struct exception_tableint i;/* Normalize entries to being relative to the start of the section */ -for (p = start, i =0 ; p < finish; p++, i +=8 ) +for (p = start, i =0 ; p < finish; p++, i +=8 ) { p->insn += i; + p->fixup += i +4 ; + }sort (start, finish - start,sizeof (*start), cmp_ex,NULL );/* Denormalize all entries */ -for (p = start, i =0 ; p < finish; p++, i +=8 ) +for (p = start, i =0 ; p < finish; p++, i +=8 ) { p->insn -= i; + p->fixup -= i +4 ; + } }#ifdef CONFIG_MODULES
Greg Kroah-Hartman
maintainerPATCH 52/80 s390/dasd: prevent incorrect length error under z/VM after PAV changes
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Haberland <[email protected]>
commit 020bf042e5b397479c1174081b935d0ff15d1a64 upstream.
The channel checks the specified length and the provided amount of data for CCWs and provides an incorrect length error if the size does not match. Under z/VM with simulation activated the length may get changed. Having the suppress length indication bit set is stated as good CCW coding practice and avoids errors under z/VM.
--- drivers/s390/block/dasd_alias.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/block/dasd_alias.c +1 -1
@@ -722,7 +722,7 @@ static int reset_summary_unit_check(struASCEBC ((char *) &cqr->magic,4 ); ccw = cqr->cpaddr; ccw->cmd_code =DASD_ECKD_CCW_RSCK ; - ccw->flags =0 ; + ccw->flags =CCW_FLAG_SLI ; ccw->count =16 ; ccw->cda = (__u32 )(addr_t ) cqr->data; ((char *)cqr->data)[0 ] = reason;
Greg Kroah-Hartman
maintainerPATCH 53/80 s390/dasd: fix refcount for PAV reassignment
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Haberland <[email protected]>
commit 9d862ababb609439c5d6987f6d3ddd09e703aa0b upstream.
Add refcount to the DASD device when a summary unit check worker is scheduled. This prevents that the device is set offline with worker in place.
--- drivers/s390/block/dasd_alias.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/s390/block/dasd_alias.c +16 -5
@@ -264,8 +264,10 @@ void dasd_alias_disconnect_device_from_lspin_unlock_irqrestore (&lcu->lock, flags);cancel_work_sync (&lcu->suc_data.worker);spin_lock_irqsave (&lcu->lock, flags); -if (device == lcu->suc_data.device) +if (device == lcu->suc_data.device) { +dasd_put_device (device); lcu->suc_data.device =NULL ; + } } was_pending =0 ;if (device == lcu->ruac_data.device) {
@@ -273,8 +275,10 @@ void dasd_alias_disconnect_device_from_l was_pending =1 ;cancel_delayed_work_sync (&lcu->ruac_data.dwork);spin_lock_irqsave (&lcu->lock, flags); -if (device == lcu->ruac_data.device) +if (device == lcu->ruac_data.device) { +dasd_put_device (device); lcu->ruac_data.device =NULL ; + } } private->lcu =NULL ;spin_unlock_irqrestore (&lcu->lock, flags);
@@ -549,8 +553,10 @@ static void lcu_update_work(struct work_if ((rc && (rc != -EOPNOTSUPP )) || (lcu->flags &NEED_UAC_UPDATE )) {DBF_DEV_EVENT (DBF_WARNING , device,"could not update" " alias data in lcu (rc = %d), retry later" , rc); -schedule_delayed_work (&lcu->ruac_data.dwork,30 *HZ ); +if (!schedule_delayed_work (&lcu->ruac_data.dwork,30 *HZ )) +dasd_put_device (device); }else { +dasd_put_device (device); lcu->ruac_data.device =NULL ; lcu->flags &= ~UPDATE_PENDING ; }
@@ -593,8 +599,10 @@ static int _schedule_lcu_update(struct a*/ if (!usedev)return -EINVAL ; +dasd_get_device (usedev); lcu->ruac_data.device = usedev; -schedule_delayed_work (&lcu->ruac_data.dwork,0 ); +if (!schedule_delayed_work (&lcu->ruac_data.dwork,0 )) +dasd_put_device (usedev);return 0 ; }
@@ -926,6 +934,7 @@ static void summary_unit_check_handling_/* 3. read new alias configuration */ _schedule_lcu_update (lcu, device); lcu->suc_data.device =NULL ; +dasd_put_device (device);spin_unlock_irqrestore (&lcu->lock, flags); }
@@ -985,6 +994,8 @@ void dasd_alias_handle_summary_unit_chec } lcu->suc_data.reason = reason; lcu->suc_data.device = device; +dasd_get_device (device);spin_unlock (&lcu->lock); -schedule_work (&lcu->suc_data.worker); +if (!schedule_work (&lcu->suc_data.worker)) +dasd_put_device (device); };
Greg Kroah-Hartman
maintainerPATCH 54/80 uml: flush stdout before forking
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vegard Nossum <[email protected]>
commit 0754fb298f2f2719f0393491d010d46cfb25d043 upstream.
I was seeing some really weird behaviour where piping UML's output somewhere would cause output to get duplicated:
$ ./vmlinux | head -n 40
Checking that ptrace can change system call numbers...Core dump limits :
soft - 0
hard - NONE
OK
Checking syscall emulation patch for ptrace...Core dump limits :
soft - 0
hard - NONE
OK
Checking advanced syscall emulation patch for ptrace...Core dump limits :
soft - 0
hard - NONE
OK
Core dump limits :
soft - 0
hard - NONEThis is because these tests do a fork() which duplicates the non-empty stdout buffer, then glibc flushes the duplicated buffer as each child exits.
A simple workaround is to flush before forking.
--- arch/um/os-Linux/start_up.c | 2 ++ 1 file changed, 2 insertions(+)
arch/um/os-Linux/start_up.c +2 -0
@@ -95,6 +95,8 @@ static int start_ptraced_child(void) {int pid, n, status; +fflush (stdout); + pid =fork ();if (pid ==0 )ptrace_child ();
Greg Kroah-Hartman
maintainerPATCH 55/80 uml: fix hostfs mknod()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vegard Nossum <[email protected]>
commit 9f2dfda2f2f1c6181c3732c16b85c59ab2d195e0 upstream.
An inverted return value check in hostfs_mknod() caused the function to return success after handling it as an error (and cleaning up).
It resulted in the following segfault when trying to bind() a named unix socket:
Pid: 198, comm: a.out Not tainted 4.4.0-rc4
RIP: 0033:[<0000000061077df6>] RSP: 00000000daae5d60 EFLAGS: 00010202 RAX: 0000000000000000 RBX: 000000006092a460 RCX: 00000000dfc54208 RDX: 0000000061073ef1 RSI: 0000000000000070 RDI: 00000000e027d600 RBP: 00000000daae5de0 R08: 00000000da980ac0 R09: 0000000000000000 R10: 0000000000000003 R11: 00007fb1ae08f72a R12: 0000000000000000 R13: 000000006092a460 R14: 00000000daaa97c0 R15: 00000000daaa9a88 Kernel panic - not syncing: Kernel mode fault at addr 0x40, ip 0x61077df6 CPU: 0 PID: 198 Comm: a.out Not tainted 4.4.0-rc4 #1 Stack: e027d620 dfc54208 0000006f da981398 61bee000 0000c1ed daae5de0 0000006e e027d620 dfcd4208 00000005 6092a460 Call Trace: [<60dedc67>] SyS_bind+0xf7/0x110 [<600587be>] handle_syscall+0x7e/0x80 [<60066ad7>] userspace+0x3e7/0x4e0 [<6006321f>] ? save_registers+0x1f/0x40 [<6006c88e>] ? arch_prctl+0x1be/0x1f0 [<60054985>] fork_handler+0x85/0x90
Let's also get rid of the "cosmic ray protection" while we're at it.
--- fs/hostfs/hostfs_kern.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/hostfs/hostfs_kern.c +1 -3
@@ -720,15 +720,13 @@ static int hostfs_mknod(struct inode *diinit_special_inode (inode, mode, dev); err =do_mknod (name, mode,MAJOR (dev),MINOR (dev)); -if (!err) +if (err) goto out_free; err =read_name (inode, name);__putname (name);if (err) goto out_put; -if (err) - goto out_put;d_instantiate (dentry, inode);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 56/80 media: dvb-core: Dont force CAN_INVERSION_AUTO in oneshot mode
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Malcolm Priestley <[email protected]>
commit c9d57de6103e343f2d4e04ea8d9e417e10a24da7 upstream.
When in FE_TUNE_MODE_ONESHOT the frontend must report the actual capabilities so user can take appropriate action.
With frontends that can't do auto inversion this is done by dvb-core automatically so CAN_INVERSION_AUTO is valid.
However, when in FE_TUNE_MODE_ONESHOT this is not true.
So only set FE_CAN_INVERSION_AUTO in modes other than FE_TUNE_MODE_ONESHOT
--- drivers/media/dvb-core/dvb_frontend.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/dvb-core/dvb_frontend.c +3 -3
@@ -2195,9 +2195,9 @@ static int dvb_frontend_ioctl_legacy(strdev_dbg (fe->dvb->device,"%s: current delivery system on cache: %d, V3 type: %d\n" , __func__, c->delivery_system, fe->ops.info.type); -/* Force the CAN_INVERSION_AUTO bit on. If the frontend doesn't -* do it, it is done for it. */ - info->caps |=FE_CAN_INVERSION_AUTO ; +/* Set CAN_INVERSION_AUTO bit on in other than oneshot mode */ +if (!(fepriv->tune_mode_flags &FE_TUNE_MODE_ONESHOT )) + info->caps |=FE_CAN_INVERSION_AUTO ; err =0 ;break ; }
Greg Kroah-Hartman
maintainerPATCH 57/80 gspca: ov534/topro: prevent a division by 0
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antonio Ospite <[email protected]>
commit dcc7fdbec53a960588f2c40232db2c6466c09917 upstream.
v4l2-compliance sends a zeroed struct v4l2_streamparm in v4l2-test-formats.cpp::testParmType(), and this results in a division by 0 in some gspca subdrivers:
divide error: 0000 [#1] SMP
Modules linked in: gspca_ov534 gspca_main ...
CPU: 0 PID: 17201 Comm: v4l2-compliance Not tainted 4.3.0-rc2-ao2 #1
Hardware name: System manufacturer System Product Name/M2N-E SLI, BIOS
ASUS M2N-E SLI ACPI BIOS Revision 1301 09/16/2010
task: ffff8800818306c0 ti: ffff880095c4c000 task.ti: ffff880095c4c000
RIP: 0010:[<ffffffffa079bd62>] [<ffffffffa079bd62>] sd_set_streamparm+0x12/0x60 [gspca_ov534]
RSP: 0018:ffff880095c4fce8 EFLAGS: 00010296
RAX: 0000000000000000 RBX: ffff8800c9522000 RCX: ffffffffa077a140
RDX: 0000000000000000 RSI: ffff880095e0c100 RDI: ffff8800c9522000
RBP: ffff880095e0c100 R08: ffffffffa077a100 R09: 00000000000000cc
R10: ffff880067ec7740 R11: 0000000000000016 R12: ffffffffa07bb400
R13: 0000000000000000 R14: ffff880081b6a800 R15: 0000000000000000
FS: 00007fda0de78740(0000) GS:ffff88012fc00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00000000014630f8 CR3: 00000000cf349000 CR4: 00000000000006f0
Stack:
ffffffffa07a6431 ffff8800c9522000 ffffffffa077656e 00000000c0cc5616
ffff8800c9522000 ffffffffa07a5e20 ffff880095e0c100 0000000000000000
ffff880067ec7740 ffffffffa077a140 ffff880067ec7740 0000000000000016
Call Trace:
[<ffffffffa07a6431>] ? v4l_s_parm+0x21/0x50 [videodev]
[<ffffffffa077656e>] ? vidioc_s_parm+0x4e/0x60 [gspca_main]
[<ffffffffa07a5e20>] ? __video_do_ioctl+0x280/0x2f0 [videodev]
[<ffffffffa07a5ba0>] ? video_ioctl2+0x20/0x20 [videodev]
[<ffffffffa07a59b9>] ? video_usercopy+0x319/0x4e0 [videodev]
[<ffffffff81182dc1>] ? page_add_new_anon_rmap+0x71/0xa0
[<ffffffff811afb92>] ? mem_cgroup_commit_charge+0x52/0x90
[<ffffffff81179b18>] ? handle_mm_fault+0xc18/0x1680
[<ffffffffa07a15cc>] ? v4l2_ioctl+0xac/0xd0 [videodev]
[<ffffffff811c846f>] ? do_vfs_ioctl+0x28f/0x480
[<ffffffff811c86d4>] ? SyS_ioctl+0x74/0x80
[<ffffffff8154a8b6>] ? entry_SYSCALL_64_fastpath+0x16/0x75
Code: c7 93 d9 79 a0 5b 5d e9 f1 f3 9a e0 0f 1f 00 66 2e 0f 1f 84 00
00 00 00 00 66 66 66 66 90 53 31 d2 48 89 fb 48 83 ec 08 8b 46 10 <f7>
76 0c 80 bf ac 0c 00 00 00 88 87 4e 0e 00 00 74 09 80 bf 4f
RIP [<ffffffffa079bd62>] sd_set_streamparm+0x12/0x60 [gspca_ov534]
RSP <ffff880095c4fce8>
---[ end trace 279710c2c6c72080 ]---Following what the doc says about a zeroed timeperframe (see
http://www.linuxtv.org/downloads/v4l-dvb-apis/vidioc-g-parm.html):
...
To reset manually applications can just set this field to zero.
fix the issue by resetting the frame rate to a default value in case of an unusable timeperframe.
The fix is done in the subdrivers instead of gspca.c because only the subdrivers have notion of a default frame rate to reset the camera to.
--- drivers/media/usb/gspca/ov534.c | 9 +++++++-- drivers/media/usb/gspca/topro.c | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-)
drivers/media/usb/gspca/ov534.c +7 -2
@@ -1490,8 +1490,13 @@ static void sd_set_streamparm(struct gspstruct v4l2_fract *tpf = &cp->timeperframe;struct sd *sd = (struct sd *) gspca_dev; -/* Set requested framerate */ - sd->frame_rate = tpf->denominator / tpf->numerator; +if (tpf->numerator ==0 || tpf->denominator ==0 ) +/* Set default framerate */ + sd->frame_rate =30 ; +else +/* Set requested framerate */ + sd->frame_rate = tpf->denominator / tpf->numerator; +if (gspca_dev->streaming)set_frame_rate (gspca_dev);
drivers/media/usb/gspca/topro.c +5 -1
@@ -4791,7 +4791,11 @@ static void sd_set_streamparm(struct gspstruct v4l2_fract *tpf = &cp->timeperframe;int fr, i; - sd->framerate = tpf->denominator / tpf->numerator; +if (tpf->numerator ==0 || tpf->denominator ==0 ) + sd->framerate =30 ; +else + sd->framerate = tpf->denominator / tpf->numerator; +if (gspca_dev->streaming)setframerate (gspca_dev,v4l2_ctrl_g_ctrl (gspca_dev->exposure));
Greg Kroah-Hartman
maintainerPATCH 58/80 tda1004x: only update the frontend properties if locked
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit e8beb02343e7582980c6705816cd957cf4f74c7a upstream.
The tda1004x was updating the properties cache before locking. If the device is not locked, the data at the registers are just random values with no real meaning.
This caused the driver to fail with libdvbv5, as such library calls GET_PROPERTY from time to time, in order to return the DVB stats.
Tested with a saa7134 card 78:
ASUSTeK P7131 Dual, vendor PCI ID: 1043:4862
--- drivers/media/dvb-frontends/tda1004x.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/media/dvb-frontends/tda1004x.c +9 -0
@@ -903,9 +903,18 @@ static int tda1004x_get_fe(struct dvb_fr {struct dtv_frontend_properties *fe_params = &fe->dtv_property_cache;struct tda1004x_state * state = fe->demodulator_priv; +int status;dprintk ("%s\n" , __func__); + status =tda1004x_read_byte (state,TDA1004X_STATUS_CD ); +if (status ==-1 ) +return -EIO ; + +/* Only update the properties cache if device is locked */ +if (!(status &8 )) +return 0 ; +// inversion status fe_params->inversion =INVERSION_OFF ;if (tda1004x_read_byte (state,TDA1004X_CONFC1 ) &0x20 )
Greg Kroah-Hartman
maintainerPATCH 59/80 dm snapshot: fix hung bios when copy error occurs
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit 385277bfb57faac44e92497104ba542cdd82d5fe upstream.
When there is an error copying a chunk dm-snapshot can incorrectly hold associated bios indefinitely, resulting in hung IO.
The function copy_callback sets pe->error if there was error copying the chunk, and then calls complete_exception. complete_exception calls pending_complete on error, otherwise it calls commit_exception with commit_callback (and commit_callback calls complete_exception).
The persistent exception store (dm-snap-persistent.c) assumes that calls to prepare_exception and commit_exception are paired. persistent_prepare_exception increases ps->pending_count and persistent_commit_exception decreases it.
If there is a copy error, persistent_prepare_exception is called but persistent_commit_exception is not. This results in the variable ps->pending_count never returning to zero and that causes some pending exceptions (and their associated bios) to be held forever.
Fix this by unconditionally calling commit_exception regardless of whether the copy was successful. A new "valid" parameter is added to commit_exception -- when the copy fails this parameter is set to zero so that the chunk that failed to copy (and all following chunks) is not recorded in the snapshot store. Also, remove commit_callback now that it is merely a wrapper around pending_complete.
--- drivers/md/dm-exception-store.h | 2 +- drivers/md/dm-snap-persistent.c | 5 ++++- drivers/md/dm-snap-transient.c | 4 ++-- drivers/md/dm-snap.c | 20 +++++--------------- 4 files changed, 12 insertions(+), 19 deletions(-)
drivers/md/dm-exception-store.h +1 -1
@@ -70,7 +70,7 @@ struct dm_exception_store_type {* Update the metadata with this exception. */ void (*commit_exception) (struct dm_exception_store *store, -struct dm_exception *e, +struct dm_exception *e,int valid,void (*callback) (void *,int success),void *callback_context);
drivers/md/dm-snap-persistent.c +4 -1
@@ -646,7 +646,7 @@ static int persistent_prepare_exception( }static void persistent_commit_exception (struct dm_exception_store *store, -struct dm_exception *e, +struct dm_exception *e,int valid,void (*callback) (void *,int success),void *callback_context) {
@@ -655,6 +655,9 @@ static void persistent_commit_exception(struct core_exception ce;struct commit_callback *cb; +if (!valid) + ps->valid =0 ; + ce.old_chunk = e->old_chunk; ce.new_chunk = e->new_chunk;write_exception (ps, ps->current_committed++, &ce);
drivers/md/dm-snap-transient.c +2 -2
@@ -52,12 +52,12 @@ static int transient_prepare_exception(s }static void transient_commit_exception (struct dm_exception_store *store, -struct dm_exception *e, +struct dm_exception *e,int valid,void (*callback) (void *,int success),void *callback_context) {/* Just succeed */ -callback (callback_context,1 ); +callback (callback_context, valid); } static void transient_usage(struct dm_exception_store *store,
drivers/md/dm-snap.c +5 -15
@@ -1388,8 +1388,9 @@ static void __invalidate_snapshot(structdm_table_event (s->ti->table); } -static void pending_complete (struct dm_snap_pending_exception *pe,int success) +static void pending_complete (void *context,int success) { +struct dm_snap_pending_exception *pe = context;struct dm_exception *e;struct dm_snapshot *s = pe->snap;struct bio *origin_bios =NULL ;
@@ -1459,24 +1460,13 @@ out:free_pending_exception (pe); } -static void commit_callback (void *context,int success) -{ -struct dm_snap_pending_exception *pe = context; - -pending_complete (pe, success); -} -static void complete_exception (struct dm_snap_pending_exception *pe) {struct dm_snapshot *s = pe->snap; -if (unlikely (pe->copy_error)) -pending_complete (pe,0 ); - -else -/* Update the metadata if we are persistent */ - s->store->type->commit_exception (s->store, &pe->e, - commit_callback, pe); +/* Update the metadata if we are persistent */ + s->store->type->commit_exception (s->store, &pe->e, !pe->copy_error, + pending_complete, pe); }/*
Greg Kroah-Hartman
maintainerPATCH 60/80 posix-clock: Fix return code on the poll methods error path
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Cochran <[email protected]>
commit 1b9f23727abb92c5e58f139e7d180befcaa06fe0 upstream.
The posix_clock_poll function is supposed to return a bit mask of POLLxxx values. However, in case the hardware has disappeared (due to hot plugging for example) this code returns -ENODEV in a futile attempt to throw an error at the file descriptor level. The kernel's file_operations interface does not accept such error codes from the poll method. Instead, this function aught to return POLLERR.
The value -ENODEV does, in fact, contain the POLLERR bit (and almost all the other POLLxxx bits as well), but only by chance. This patch fixes code to return a proper bit mask.
Credit goes to Markus Elfring for pointing out the suspicious signed/unsigned mismatch.
--- kernel/time/posix-clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/time/posix-clock.c +2 -2
@@ -69,10 +69,10 @@ static ssize_t posix_clock_read(struct fstatic unsigned int posix_clock_poll (struct file *fp,poll_table *wait) {struct posix_clock *clk =get_posix_clock (fp); -int result =0 ; +unsigned int result =0 ;if (!clk) -return -ENODEV ; +return POLLERR ;if (clk->ops.poll) result = clk->ops.poll (clk, fp, wait);
Greg Kroah-Hartman
maintainerPATCH 61/80 mmc: mmci: fix an ages old detection error
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Walleij <[email protected]>
commit 0bcb7efdff63564e80fe84dd36a9fbdfbf6697a4 upstream.
commit 4956e10903fd ("ARM: 6244/1: mmci: add variant data and default MCICLOCK support") added variant data for ARM, U300 and Ux500 variants. The Nomadik NHK8815/8820 variant was erroneously labeled as a U300 variant, and when the proper Nomadik variant was later introduced in commit 34fd421349ff ("ARM: 7378/1: mmci: add support for the Nomadik MMCI variant") this was not fixes. Let's say this fixes the latter commit as there was no proper Nomadik support until then.
--- drivers/mmc/host/mmci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/mmci.c +1 -1
@@ -1740,7 +1740,7 @@ static struct amba_id mmci_ids[] = { { .id = 0x00280180, .mask = 0x00ffffff, - .data = &variant_u300, + .data = &variant_nomadik, }, { .id = 0x00480180,
Greg Kroah-Hartman
maintainerPATCH 62/80 sparc64: fix incorrect sign extension in sys_sparc64_personality
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry V. Levin <[email protected]>
commit 525fd5a94e1be0776fa652df5c687697db508c91 upstream.
The value returned by sys_personality has type "long int". It is saved to a variable of type "int", which is not a problem yet because the type of task_struct->pesonality is "unsigned int". The problem is the sign extension from "int" to "long int" that happens on return from sys_sparc64_personality.
For example, a userspace call personality((unsigned) -EINVAL) will result to any subsequent personality call, including absolutely harmless read-only personality(0xffffffff) call, failing with errno set to EINVAL.
--- arch/sparc/kernel/sys_sparc_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sparc/kernel/sys_sparc_64.c +1 -1
@@ -416,7 +416,7 @@ out: SYSCALL_DEFINE1(sparc64_personality, unsigned long, personality) { -int ret; +long ret;if (personality (current->personality) ==PER_LINUX32 &&personality (personality) ==PER_LINUX )
Greg Kroah-Hartman
maintainerPATCH 63/80 drm/vmwgfx: respect nomodeset
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Clark <[email protected]>
commit 96c5d076f0a5e2023ecdb44d8261f87641ee71e0 upstream.
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +7 -0
@@ -25,6 +25,7 @@* **************************************************************************/ #include <linux/module.h> +#include <linux/console.h> #include <drm/drmP.h> #include "vmwgfx_drv.h"
@@ -1192,6 +1193,12 @@ static int vmw_probe(struct pci_dev *pdestatic int __init vmwgfx_init (void ) {int ret; + +#ifdef CONFIG_VGA_CONSOLE +if (vgacon_text_force ()) +return -EINVAL ; +#endif + ret =drm_pci_init (&driver, &vmw_pci_driver);if (ret)DRM_ERROR ("Failed initializing DRM.\n" );
Greg Kroah-Hartman
maintainerPATCH 64/80 drm/radeon: clean up fujitsu quirks
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 0eb1c3d4084eeb6fb3a703f88d6ce1521f8fcdd1 upstream.
Combine the two quirks.
bug:
https://bugzilla.kernel.org/show_bug.cgi?id=109481
--- drivers/gpu/drm/radeon/radeon_atombios.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/radeon/radeon_atombios.c +3 -9
@@ -452,7 +452,9 @@ static bool radeon_atom_apply_quirks(str }/* Fujitsu D3003-S2 board lists DVI-I as DVI-D and VGA */ -if (((dev->pdev->device ==0x9802 ) || (dev->pdev->device ==0x9806 )) && +if (((dev->pdev->device ==0x9802 ) || + (dev->pdev->device ==0x9805 ) || + (dev->pdev->device ==0x9806 )) && (dev->pdev->subsystem_vendor ==0x1734 ) && (dev->pdev->subsystem_device ==0x11bd )) {if (*connector_type ==DRM_MODE_CONNECTOR_VGA ) {
@@ -463,14 +465,6 @@ static bool radeon_atom_apply_quirks(str } } -/* Fujitsu D3003-S2 board lists DVI-I as DVI-I and VGA */ -if ((dev->pdev->device ==0x9805 ) && - (dev->pdev->subsystem_vendor ==0x1734 ) && - (dev->pdev->subsystem_device ==0x11bd )) { -if (*connector_type ==DRM_MODE_CONNECTOR_VGA ) -return false; - } -return true; }
Greg Kroah-Hartman
maintainerPATCH 67/80 IB/qib: fix mcast detach when qp not attached
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Marciniszyn <[email protected]>
commit 09dc9cd6528f5b52bcbd3292a6312e762c85260f upstream.
The code produces the following trace:
[1750924.419007] general protection fault: 0000 [#3] SMP [1750924.420364] Modules linked in: nfnetlink autofs4 rpcsec_gss_krb5 nfsv4
dcdbas rfcomm bnep bluetooth nfsd auth_rpcgss nfs_acl dm_multipath nfs lockd scsi_dh sunrpc fscache radeon ttm drm_kms_helper drm serio_raw parport_pc ppdev i2c_algo_bit lpc_ich ipmi_si ib_mthca ib_qib dca lp parport ib_ipoib mac_hid ib_cm i3000_edac ib_sa ib_uverbs edac_core ib_umad ib_mad ib_core ib_addr tg3 ptp dm_mirror dm_region_hash dm_log psmouse pps_core
[1750924.420364] CPU: 1 PID: 8401 Comm: python Tainted: G D 3.13.0-39-generic #66-Ubuntu [1750924.420364] Hardware name: Dell Computer Corporation PowerEdge 860/0XM089, BIOS A04 07/24/2007 [1750924.420364] task: ffff8800366a9800 ti: ffff88007af1c000 task.ti: ffff88007af1c000 [1750924.420364] RIP: 0010:[<ffffffffa0131d51>] [<ffffffffa0131d51>] qib_mcast_qp_free+0x11/0x50 [ib_qib] [1750924.420364] RSP: 0018:ffff88007af1dd70 EFLAGS: 00010246 [1750924.420364] RAX: 0000000000000001 RBX: ffff88007b822688 RCX: 000000000000000f [1750924.420364] RDX: ffff88007b822688 RSI: ffff8800366c15a0 RDI: 6764697200000000 [1750924.420364] RBP: ffff88007af1dd78 R08: 0000000000000001 R09: 0000000000000000 [1750924.420364] R10: 0000000000000011 R11: 0000000000000246 R12: ffff88007baa1d98 [1750924.420364] R13: ffff88003ecab000 R14: ffff88007b822660 R15: 0000000000000000 [1750924.420364] FS: 00007ffff7fd8740(0000) GS:ffff88007fc80000(0000) knlGS:0000000000000000 [1750924.420364] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [1750924.420364] CR2: 00007ffff597c750 CR3: 000000006860b000 CR4: 00000000000007e0 [1750924.420364] Stack: [1750924.420364] ffff88007b822688 ffff88007af1ddf0 ffffffffa0132429 000000007af1de20 [1750924.420364] ffff88007baa1dc8 ffff88007baa0000 ffff88007af1de70 ffffffffa00cb313 [1750924.420364] 00007fffffffde88 0000000000000000 0000000000000008 ffff88003ecab000 [1750924.420364] Call Trace: [1750924.420364] [<ffffffffa0132429>] qib_multicast_detach+0x1e9/0x350 [ib_qib] [1750924.568035] [<ffffffffa00cb313>] ? ib_uverbs_modify_qp+0x323/0x3d0 [ib_uverbs] [1750924.568035] [<ffffffffa0092d61>] ib_detach_mcast+0x31/0x50 [ib_core] [1750924.568035] [<ffffffffa00cc213>] ib_uverbs_detach_mcast+0x93/0x170 [ib_uverbs] [1750924.568035] [<ffffffffa00c61f6>] ib_uverbs_write+0xc6/0x2c0 [ib_uverbs] [1750924.568035] [<ffffffff81312e68>] ? apparmor_file_permission+0x18/0x20 [1750924.568035] [<ffffffff812d4cd3>] ? security_file_permission+0x23/0xa0 [1750924.568035] [<ffffffff811bd214>] vfs_write+0xb4/0x1f0 [1750924.568035] [<ffffffff811bdc49>] SyS_write+0x49/0xa0 [1750924.568035] [<ffffffff8172f7ed>] system_call_fastpath+0x1a/0x1f [1750924.568035] Code: 66 2e 0f 1f 84 00 00 00 00 00 31 c0 5d c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 0f 1f 44 00 00 55 48 89 e5 53 48 89 fb 48 8b 7f 10 <f0> ff 8f 40 01 00 00 74 0e 48 89 df e8 8e f8 06 e1 5b 5d c3 0f [1750924.568035] RIP [<ffffffffa0131d51>] qib_mcast_qp_free+0x11/0x50 [ib_qib] [1750924.568035] RSP <ffff88007af1dd70> [1750924.650439] ---[ end trace 73d5d4b3f8ad4851 ]
The fix is to note the qib_mcast_qp that was found. If none is found, then
return EINVAL indicating the error.
--- drivers/infiniband/hw/qib/qib_verbs_mcast.c | 35 ++++++++++++---------------- 1 file changed, 15 insertions(+), 20 deletions(-)
drivers/infiniband/hw/qib/qib_verbs_mcast.c +15 -20
@@ -286,15 +286,13 @@ int qib_multicast_detach(struct ib_qp *istruct qib_ibdev *dev =to_idev (ibqp->device);struct qib_ibport *ibp =to_iport (ibqp->device, qp->port_num);struct qib_mcast *mcast =NULL ; -struct qib_mcast_qp *p, *tmp; +struct qib_mcast_qp *p, *tmp, *delp =NULL ;struct rb_node *n;int last =0 ;int ret; -if (ibqp->qp_num <=1 || qp->state ==IB_QPS_RESET ) { - ret = -EINVAL ; - goto bail; - } +if (ibqp->qp_num <=1 || qp->state ==IB_QPS_RESET ) +return -EINVAL ;spin_lock_irq (&ibp->lock);
@@ -303,8 +301,7 @@ int qib_multicast_detach(struct ib_qp *iwhile (1 ) {if (n ==NULL ) {spin_unlock_irq (&ibp->lock); - ret = -EINVAL ; - goto bail; +return -EINVAL ; } mcast = rb_entry(n, struct qib_mcast, rb_node);
@@ -328,6 +325,7 @@ int qib_multicast_detach(struct ib_qp *i*/ list_del_rcu (&p->list); mcast->n_attached--; + delp = p;/* If this was the last attached QP, remove the GID too. */ if (list_empty (&mcast->qp_list)) {
@@ -338,15 +336,16 @@ int qib_multicast_detach(struct ib_qp *i }spin_unlock_irq (&ibp->lock); +/* QP not attached */ +if (!delp) +return -EINVAL ; +/* +* Wait for any list walkers to finish before freeing the +* list element. +*/ +wait_event (mcast->wait,atomic_read (&mcast->refcount) <=1 ); +qib_mcast_qp_free (delp); -if (p) { -/* -* Wait for any list walkers to finish before freeing the -* list element. -*/ -wait_event (mcast->wait,atomic_read (&mcast->refcount) <=1 ); -qib_mcast_qp_free (p); - }if (last) {atomic_dec (&mcast->refcount);wait_event (mcast->wait, !atomic_read (&mcast->refcount));
@@ -355,11 +354,7 @@ int qib_multicast_detach(struct ib_qp *i dev->n_mcast_grps_allocated--;spin_unlock_irq (&dev->n_mcast_grps_lock); } - - ret =0 ; - -bail: -return ret; +return 0 ; }int qib_mcast_tree_empty (struct qib_ibport *ibp)
Greg Kroah-Hartman
maintainerPATCH 68/80 libceph: dont bail early from try_read() when skipping a message
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Dryomov <[email protected]>
commit e7a88e82fe380459b864e05b372638aeacb0f52d upstream.
The contract between try_read() and try_write() is that when called each processes as much data as possible. When instructed by osd_client to skip a message, try_read() is violating this contract by returning after receiving and discarding a single message instead of checking for more. try_write() then gets a chance to write out more requests, generating more replies/skips for try_read() to handle, forcing the messenger into a starvation loop.
--- net/ceph/messenger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ceph/messenger.c +2 -2
@@ -2277,7 +2277,7 @@ static int read_partial_message(struct c con->in_base_pos = -front_len - middle_len - data_len -sizeof (m->footer); con->in_tag =CEPH_MSGR_TAG_READY ; -return 0 ; +return 1 ; }else if ((s64 )seq - (s64 )con->in_seq >1 ) {pr_err ("read_partial_message bad seq %lld expected %lld\n" , seq, con->in_seq +1 );
@@ -2310,7 +2310,7 @@ static int read_partial_message(struct csizeof (m->footer); con->in_tag =CEPH_MSGR_TAG_READY ; con->in_seq++; -return 0 ; +return 1 ; }BUG_ON (!con->in_msg);
Greg Kroah-Hartman
maintainerPATCH 69/80 cdc-acm:exclude Samsung phone 04e8:685d
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit e912e685f372ab62a2405a1acd923597f524e94a upstream.
This phone needs to be handled by a specialised firmware tool and is reported to crash irrevocably if cdc-acm takes it.
--- drivers/usb/class/cdc-acm.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/class/cdc-acm.c +5 -0
@@ -1726,6 +1726,11 @@ static const struct usb_device_id acm_id },#endif +/*Samsung phone in firmware update mode */ + { USB_DEVICE(0x04e8, 0x685d), + .driver_info =IGNORE_DEVICE , + }, + /* Exclude Infineon Flash Loader utility */ { USB_DEVICE(0x058b, 0x0041), .driver_info = IGNORE_DEVICE,
Greg Kroah-Hartman
maintainerPATCH 70/80 rfkill: fix rfkill_fop_read wait_event usage
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit 6736fde9672ff6717ac576e9bba2fd5f3dfec822 upstream.
The code within wait_event_interruptible() is called with !TASK_RUNNING, so mustn't call any functions that can sleep, like mutex_lock().
Since we re-check the list_empty() in a loop after the wait, it's safe to simply use list_empty() without locking.
This bug has existed forever, but was only discovered now because all userspace implementations, including the default 'rfkill' tool, use poll() or select() to get a readable fd before attempting to read.
--- net/rfkill/core.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
net/rfkill/core.c +4 -12
@@ -1088,17 +1088,6 @@ static unsigned int rfkill_fop_poll(strureturn res; } -static bool rfkill_readable (struct rfkill_data *data) -{ -bool r; - -mutex_lock (&data->mtx); - r = !list_empty (&data->events); -mutex_unlock (&data->mtx); - -return r; -} -static ssize_t rfkill_fop_read (struct file *file,char __user *buf,size_t count,loff_t *pos) {
@@ -1115,8 +1104,11 @@ static ssize_t rfkill_fop_read(struct fi goto out; }mutex_unlock (&data->mtx); +/* since we re-check and it just compares pointers, +* using !list_empty() without locking isn't a problem +*/ ret =wait_event_interruptible (data->read_wait, -rfkill_readable (data)); + !list_empty (&data->events));mutex_lock (&data->mtx);if (ret)
Greg Kroah-Hartman
maintainerPATCH 71/80 Revert "workqueue: make sure delayed work run in local cpu"
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit 041bd12e272c53a35c54c13875839bcb98c999ce upstream.
This reverts commit 874bbfe600a660cba9c776b3957b1ce393151b76.
Workqueue used to implicity guarantee that work items queued without explicit CPU specified are put on the local CPU. Recent changes in timer broke the guarantee and led to vmstat breakage which was fixed by 176bed1de5bf ("vmstat: explicitly schedule per-cpu work on the CPU we need it to run on").
vmstat is the most likely to expose the issue and it's quite possible that there are other similar problems which are a lot more difficult to trigger. As a preventive measure, 874bbfe600a6 ("workqueue: make sure delayed work run in local cpu") was applied to restore the local CPU guarnatee. Unfortunately, the change exposed a bug in timer code which got fixed by 22b886dd1018 ("timers: Use proper base migration in add_timer_on()"). Due to code restructuring, the commit couldn't be backported beyond certain point and stable kernels which only had 874bbfe600a6 started crashing.
The local CPU guarantee was accidental more than anything else and we want to get rid of it anyway. As, with the vmstat case fixed, 874bbfe600a6 is causing more problems than it's fixing, it has been decided to take the chance and officially break the guarantee by reverting the commit. A debug feature will be added to force foreign CPU assignment to expose cases relying on the guarantee and fixes for the individual cases will be backported to stable as necessary.
--- kernel/workqueue.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/workqueue.c +4 -4
@@ -1450,13 +1450,13 @@ static void __queue_delayed_work(int cputimer_stats_timer_set_start_info (&dwork->timer); dwork->wq = wq; -/* timer isn't guaranteed to run in this cpu, record earlier */ -if (cpu ==WORK_CPU_UNBOUND ) - cpu =raw_smp_processor_id (); dwork->cpu = cpu; timer->expires = jiffies + delay; -add_timer_on (timer, cpu); +if (unlikely (cpu !=WORK_CPU_UNBOUND )) +add_timer_on (timer, cpu); +else +add_timer (timer); }/**
Greg Kroah-Hartman
maintainerPATCH 72/80 libata: fix sff host state machine locking while polling
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit 8eee1d3ed5b6fc8e14389567c9a6f53f82bb7224 upstream.
The bulk of ATA host state machine is implemented by ata_sff_hsm_move(). The function is called from either the interrupt handler or, if polling, a work item. Unlike from the interrupt path, the polling path calls the function without holding the host lock and ata_sff_hsm_move() selectively grabs the lock.
This is completely broken. If an IRQ triggers while polling is in progress, the two can easily race and end up accessing the hardware and updating state machine state at the same time. This can put the state machine in an illegal state and lead to a crash like the following.
kernel BUG at drivers/ata/libata-sff.c:1302! invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN
Modules linked in: CPU: 1 PID: 10679 Comm: syz-executor Not tainted 4.5.0-rc1+ #300 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 task: ffff88002bd00000 ti: ffff88002e048000 task.ti: ffff88002e048000 RIP: 0010:[<ffffffff83a83409>] [<ffffffff83a83409>] ata_sff_hsm_move+0x619/0x1c60 ... Call Trace: <IRQ> [<ffffffff83a84c31>] __ata_sff_port_intr+0x1e1/0x3a0 drivers/ata/libata-sff.c:1584 [<ffffffff83a85611>] ata_bmdma_port_intr+0x71/0x400 drivers/ata/libata-sff.c:2877 [< inline >] __ata_sff_interrupt drivers/ata/libata-sff.c:1629 [<ffffffff83a85bf3>] ata_bmdma_interrupt+0x253/0x580 drivers/ata/libata-sff.c:2902 [<ffffffff81479f98>] handle_irq_event_percpu+0x108/0x7e0 kernel/irq/handle.c:157 [<ffffffff8147a717>] handle_irq_event+0xa7/0x140 kernel/irq/handle.c:205 [<ffffffff81484573>] handle_edge_irq+0x1e3/0x8d0 kernel/irq/chip.c:623 [< inline >] generic_handle_irq_desc include/linux/irqdesc.h:146 [<ffffffff811a92bc>] handle_irq+0x10c/0x2a0 arch/x86/kernel/irq_64.c:78 [<ffffffff811a7e4d>] do_IRQ+0x7d/0x1a0 arch/x86/kernel/irq.c:240 [<ffffffff86653d4c>] common_interrupt+0x8c/0x8c arch/x86/entry/entry_64.S:520 <EOI> [< inline >] rcu_lock_acquire include/linux/rcupdate.h:490 [< inline >] rcu_read_lock include/linux/rcupdate.h:874 [<ffffffff8164b4a1>] filemap_map_pages+0x131/0xba0 mm/filemap.c:2145 [< inline >] do_fault_around mm/memory.c:2943 [< inline >] do_read_fault mm/memory.c:2962 [< inline >] do_fault mm/memory.c:3133 [< inline >] handle_pte_fault mm/memory.c:3308 [< inline >] __handle_mm_fault mm/memory.c:3418 [<ffffffff816efb16>] handle_mm_fault+0x2516/0x49a0 mm/memory.c:3447 [<ffffffff8127dc16>] __do_page_fault+0x376/0x960 arch/x86/mm/fault.c:1238 [<ffffffff8127e358>] trace_do_page_fault+0xe8/0x420 arch/x86/mm/fault.c:1331 [<ffffffff8126f514>] do_async_page_fault+0x14/0xd0 arch/x86/kernel/kvm.c:264 [<ffffffff86655578>] async_page_fault+0x28/0x30 arch/x86/entry/entry_64.S:986
Fix it by ensuring that the polling path is holding the host lock before entering ata_sff_hsm_move() so that all hardware accesses and state updates are performed under the host lock.
--- drivers/ata/libata-sff.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-)
drivers/ata/libata-sff.c +11 -21
@@ -997,12 +997,9 @@ static inline int ata_hsm_ok_in_wq(strucstatic void ata_hsm_qc_complete (struct ata_queued_cmd *qc,int in_wq) {struct ata_port *ap = qc->ap; -unsigned long flags;if (ap->ops->error_handler) {if (in_wq) { -spin_lock_irqsave (ap->lock, flags); -/* EH might have kicked in while host lock is * released. */
@@ -1014,8 +1011,6 @@ static void ata_hsm_qc_complete(struct a }else ata_port_freeze (ap); } - -spin_unlock_irqrestore (ap->lock, flags); }else {if (likely (!(qc->err_mask &AC_ERR_HSM )))ata_qc_complete (qc);
@@ -1024,10 +1019,8 @@ static void ata_hsm_qc_complete(struct a } }else {if (in_wq) { -spin_lock_irqsave (ap->lock, flags);ata_sff_irq_on (ap);ata_qc_complete (qc); -spin_unlock_irqrestore (ap->lock, flags); }else ata_qc_complete (qc); }
@@ -1048,9 +1041,10 @@ int ata_sff_hsm_move(struct ata_port *ap {struct ata_link *link = qc->dev->link;struct ata_eh_info *ehi = &link->eh_info; -unsigned long flags =0 ;int poll_next; +lockdep_assert_held (ap->lock); +WARN_ON_ONCE ((qc->flags &ATA_QCFLAG_ACTIVE ) ==0 );/* Make sure ata_sff_qc_issue() does not throw things
@@ -1112,14 +1106,6 @@ fsm_start: } } -/* Send the CDB (atapi) or the first data block (ata pio out). -* During the state transition, interrupt handler shouldn't -* be invoked before the data transfer is complete and -* hsm_task_state is changed. Hence, the following locking. -*/ -if (in_wq) -spin_lock_irqsave (ap->lock, flags); -if (qc->tf.protocol ==ATA_PROT_PIO ) {/* PIO data out protocol. * send first data block.
@@ -1135,9 +1121,6 @@ fsm_start:/* send CDB */ atapi_send_cdb (ap, qc); -if (in_wq) -spin_unlock_irqrestore (ap->lock, flags); -/* if polling, ata_sff_pio_task() handles the rest. * otherwise, interrupt handler takes over from here. */
@@ -1361,12 +1344,14 @@ static void ata_sff_pio_task(struct worku8 status;int poll_next; +spin_lock_irq (ap->lock); +BUG_ON (ap->sff_pio_task_link ==NULL );/* qc can be NULL if timeout occurred */ qc =ata_qc_from_tag (ap, link->active_tag);if (!qc) { ap->sff_pio_task_link =NULL ; -return ; + goto out_unlock; } fsm_start:
@@ -1381,11 +1366,14 @@ fsm_start:*/ status =ata_sff_busy_wait (ap,ATA_BUSY ,5 );if (status &ATA_BUSY ) { +spin_unlock_irq (ap->lock);ata_msleep (ap,2 ); +spin_lock_irq (ap->lock); + status =ata_sff_busy_wait (ap,ATA_BUSY ,10 );if (status &ATA_BUSY ) {ata_sff_queue_pio_task (link,ATA_SHORT_PAUSE ); -return ; + goto out_unlock; } }
@@ -1402,6 +1390,8 @@ fsm_start:*/ if (poll_next) goto fsm_start; +out_unlock: +spin_unlock_irq (ap->lock); }/**
Greg Kroah-Hartman
maintainerPATCH 73/80 PCI/AER: Flush workqueue on device remove to avoid use-after-free
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
commit 4ae2182b1e3407de369f8c5d799543b7db74221b upstream.
A Root Port's AER structure (rpc) contains a queue of events. aer_irq() enqueues AER status information and schedules aer_isr() to dequeue and process it. When we remove a device, aer_remove() waits for the queue to be empty, then frees the rpc struct.
But aer_isr() references the rpc struct after dequeueing and possibly emptying the queue, which can cause a use-after-free error as in the following scenario with two threads, aer_isr() on the left and a concurrent aer_remove() on the right:
Thread A Thread B
-------- --------
aer_irq():
rpc->prod_idx++
aer_remove():
wait_event(rpc->prod_idx == rpc->cons_idx)
# now blocked until queue becomes empty
aer_isr(): # ...
rpc->cons_idx++ # unblocked because queue is now empty
... kfree(rpc)
mutex_unlock(&rpc->rpc_mutex)To prevent this problem, use flush_work() to wait until the last scheduled instance of aer_isr() has completed before freeing the rpc struct in aer_remove().
I reproduced this use-after-free by flashing a device FPGA and re-enumerating the bus to find the new device. With SLUB debug, this crashes with 0x6b bytes (POISON_FREE, the use-after-free magic number) in GPR25:
pcieport 0000:00:00.0: AER: Multiple Corrected error received: id=0000
Unable to handle kernel paging request for data at address 0x27ef9e3e Workqueue: events aer_isr GPR24: dd6aa000 6b6b6b6b 605f8378 605f8360 d99b12c0 604fc674 606b1704 d99b12c0 NIP [602f5328] pci_walk_bus+0xd4/0x104
--- drivers/pci/pcie/aer/aerdrv.c | 4 +--- drivers/pci/pcie/aer/aerdrv.h | 1 - drivers/pci/pcie/aer/aerdrv_core.c | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/pci/pcie/aer/aerdrv.c +1 -3
@@ -262,7 +262,6 @@ static struct aer_rpc *aer_alloc_rpc(str rpc->rpd = dev;INIT_WORK (&rpc->dpc_handler, aer_isr);mutex_init (&rpc->rpc_mutex); -init_waitqueue_head (&rpc->wait_release);/* Use PCIe bus function to store rpc into PCIe device */ set_service_data (dev, rpc);
@@ -285,8 +284,7 @@ static void aer_remove(struct pcie_devicif (rpc->isr)free_irq (dev->irq, dev); -wait_event (rpc->wait_release, rpc->prod_idx == rpc->cons_idx); - +flush_work (&rpc->dpc_handler);aer_disable_rootport (rpc);kfree (rpc);set_service_data (dev,NULL );
drivers/pci/pcie/aer/aerdrv.h +0 -1
@@ -76,7 +76,6 @@ struct aer_rpc {* recovery on the same * root port hierarchy */ -wait_queue_head_t wait_release; };struct aer_broadcast_data {
drivers/pci/pcie/aer/aerdrv_core.c +0 -2
@@ -817,8 +817,6 @@ void aer_isr(struct work_struct *work)while (get_e_source (rpc, &e_src))aer_isr_one_error (p_device, &e_src);mutex_unlock (&rpc->rpc_mutex); - -wake_up (&rpc->wait_release); }/**
Greg Kroah-Hartman
maintainerPATCH 74/80 nfs: fix nfs_size_to_loff_t
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
commit 50ab8ec74a153eb30db26529088bc57dd700b24c upstream.
See http: //www.infradead.org/rpr.html
X-Evolution-Source: [email protected]
Content-Transfer-Encoding: 8bit
Mime-Version: 1.0
We support OFFSET_MAX just fine, so don't round down below it. Also switch to using min_t to make the helper more readable.
--- include/linux/nfs_fs.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
include/linux/nfs_fs.h +1 -3
@@ -578,9 +578,7 @@ static inline void nfs3_forget_cached_acstatic inline loff_t nfs_size_to_loff_t (__u64 size) { -if (size > (__u64 )OFFSET_MAX -1 ) -return OFFSET_MAX -1 ; -return (loff_t ) size; +return min_t (u64, size,OFFSET_MAX ); } static inline ino_t
Greg Kroah-Hartman
maintainerPATCH 75/80 KVM: async_pf: do not warn on page allocation failures
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Borntraeger <[email protected]>
commit d7444794a02ff655eda87e3cc54e86b940e7736f upstream.
In async_pf we try to allocate with NOWAIT to get an element quickly or fail. This code also handle failures gracefully. Lets silence potential page allocation failures under load.
qemu-system-s39: page allocation failure: order:0,mode:0x2200000 [...]
Call Trace: ([<00000000001146b8>] show_trace+0xf8/0x148) [<000000000011476a>] show_stack+0x62/0xe8 [<00000000004a36b8>] dump_stack+0x70/0x98 [<0000000000272c3a>] warn_alloc_failed+0xd2/0x148 [<000000000027709e>] __alloc_pages_nodemask+0x94e/0xb38 [<00000000002cd36a>] new_slab+0x382/0x400 [<00000000002cf7ac>] ___slab_alloc.constprop.30+0x2dc/0x378 [<00000000002d03d0>] kmem_cache_alloc+0x160/0x1d0 [<0000000000133db4>] kvm_setup_async_pf+0x6c/0x198 [<000000000013dee8>] kvm_arch_vcpu_ioctl_run+0xd48/0xd58 [<000000000012fcaa>] kvm_vcpu_ioctl+0x372/0x690 [<00000000002f66f6>] do_vfs_ioctl+0x3be/0x510 [<00000000002f68ec>] SyS_ioctl+0xa4/0xb8 [<0000000000781c5e>] system_call+0xd6/0x264
[<000003ffa24fa06a>] 0x3ffa24fa06a
--- virt/kvm/async_pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
virt/kvm/async_pf.c +1 -1
@@ -158,7 +158,7 @@ int kvm_setup_async_pf(struct kvm_vcpu ** do alloc nowait since if we are going to sleep anyway we * may as well sleep faulting in page */ - work =kmem_cache_zalloc (async_pf_cache,GFP_NOWAIT ); + work =kmem_cache_zalloc (async_pf_cache,GFP_NOWAIT | __GFP_NOWARN);if (!work)return 0 ;
Greg Kroah-Hartman
maintainerPATCH 76/80 tracing: Fix showing function event in available_events
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Red Hat) <[email protected]>
commit d045437a169f899dfb0f6f7ede24cc042543ced9 upstream.
The ftrace:function event is only displayed for parsing the function tracer data. It is not used to enable function tracing, and does not include an "enable" file in its event directory.
Originally, this event was kept separate from other events because it did not have a ->reg parameter. But perf added a "reg" parameter for its use which caused issues, because it made the event available to functions where it was not compatible for.
Commit 9b63776fa3ca9 "tracing: Do not enable function event with enable" added a TRACE_EVENT_FL_IGNORE_ENABLE flag that prevented the function event from being enabled by normal trace events. But this commit missed keeping the function event from being displayed by the "available_events" directory, which is used to show what events can be enabled by set_event.
One documented way to enable all events is to:
cat available_events > set_event
But because the function event is displayed in the available_events, this now causes an INVALID error:
cat: write error: Invalid argument
--- kernel/trace/trace_events.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/trace_events.c +2 -1
@@ -602,7 +602,8 @@ t_next(struct seq_file *m, void *v, loff* The ftrace subsystem is for showing formats only. * They can not be enabled or disabled via the event files. */ -if (call->class && call->class->reg) +if (call->class && call->class->reg && + !(call->flags &TRACE_EVENT_FL_IGNORE_ENABLE ))return file; }
Greg Kroah-Hartman
maintainerPATCH 77/80 sunrpc/cache: fix off-by-one in qword_get()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Hajnoczi <[email protected]>
commit b7052cd7bcf3c1478796e93e3dff2b44c9e82943 upstream.
The qword_get() function NUL-terminates its output buffer. If the input string is in hex format \xXXXX... and the same length as the output buffer, there is an off-by-one:
int qword_get(char **bpp, char *dest, int bufsize)
{
...
while (len < bufsize) {
...
*dest++ = (h << 4) | l;
len++;
}
...
*dest = '\0';
return len;
}This patch ensures the NUL terminator doesn't fall outside the output buffer.
--- net/sunrpc/cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sunrpc/cache.c +1 -1
@@ -1221,7 +1221,7 @@ int qword_get(char **bpp, char *dest, inif (bp[0 ] =='\\' && bp[1 ] =='x' ) {/* HEX STRING */ bp +=2 ; -while (len < bufsize) { +while (len < bufsize -1 ) {int h, l; h =hex_to_bin (bp[0 ]);
Greg Kroah-Hartman
maintainerPATCH 78/80 kernel/resource.c: fix muxed resource handling in __request_region()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Guinot <[email protected]>
commit 59ceeaaf355fa0fb16558ef7c24413c804932ada upstream.
In __request_region, if a conflict with a BUSY and MUXED resource is detected, then the caller goes to sleep and waits for the resource to be released. A pointer on the conflicting resource is kept. At wake-up this pointer is used as a parent to retry to request the region.
A first problem is that this pointer might well be invalid (if for example the conflicting resource have already been freed). Another problem is that the next call to __request_region() fails to detect a remaining conflict. The previously conflicting resource is passed as a parameter and __request_region() will look for a conflict among the children of this resource and not at the resource itself. It is likely to succeed anyway, even if there is still a conflict.
Instead, the parent of the conflicting resource should be passed to __request_region().
As a fix, this patch doesn't update the parent resource pointer in the case we have to wait for a muxed region right after.
--- kernel/resource.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/resource.c +3 -2
@@ -961,9 +961,10 @@ struct resource * __request_region(strucif (!conflict)break ;if (conflict != parent) { - parent = conflict; -if (!(conflict->flags &IORESOURCE_BUSY )) +if (!(conflict->flags &IORESOURCE_BUSY )) { + parent = conflict;continue ; + } }if (conflict->flags & flags &IORESOURCE_MUXED ) {add_wait_queue (&muxed_resource_wait, &wait);
Greg Kroah-Hartman
maintainerPATCH 79/80 do_last(): dont let a bogus return value from ->open() et.al. to confuse us
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
commit c80567c82ae4814a41287618e315a60ecf513be6 upstream.
... into returning a positive to path_openat(), which would interpret that as "symlink had been encountered" and proceed to corrupt memory, etc. It can only happen due to a bug in some ->open() instance or in some LSM hook, etc., so we report any such event *and* make sure it doesn't trick us into further unpleasantness.
--- fs/namei.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/namei.c +4 -0
@@ -2917,6 +2917,10 @@ opened: goto exit_fput; } out: +if (unlikely (error >0 )) { +WARN_ON (1 ); + error = -EINVAL ; + }if (got_write)mnt_drop_write (nd->path.mnt);path_put (&save_parent);
Greg Kroah-Hartman
maintainerPATCH 80/80 xen/pcifront: Fix mysterious crashes when NUMA locality information was extracted.
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Rzeszutek Wilk <[email protected]>
commit 4d8c8bd6f2062c9988817183a91fe2e623c8aa5e upstream.
Occasionaly PV guests would crash with:
pciback 0000:00:00.1: Xen PCI mapped GSI0 to IRQ16
BUG: unable to handle kernel paging request at 0000000d1a8c0be0 .. snip.. <ffffffff8139ce1b>] find_next_bit+0xb/0x10 [<ffffffff81387f22>] cpumask_next_and+0x22/0x40 [<ffffffff813c1ef8>] pci_device_probe+0xb8/0x120 [<ffffffff81529097>] ? driver_sysfs_add+0x77/0xa0 [<ffffffff815293e4>] driver_probe_device+0x1a4/0x2d0 [<ffffffff813c1ddd>] ? pci_match_device+0xdd/0x110 [<ffffffff81529657>] __device_attach_driver+0xa7/0xb0 [<ffffffff815295b0>] ? __driver_attach+0xa0/0xa0 [<ffffffff81527622>] bus_for_each_drv+0x62/0x90 [<ffffffff8152978d>] __device_attach+0xbd/0x110 [<ffffffff815297fb>] device_attach+0xb/0x10 [<ffffffff813b75ac>] pci_bus_add_device+0x3c/0x70 [<ffffffff813b7618>] pci_bus_add_devices+0x38/0x80 [<ffffffff813dc34e>] pcifront_scan_root+0x13e/0x1a0 [<ffffffff817a0692>] pcifront_backend_changed+0x262/0x60b [<ffffffff814644c6>] ? xenbus_gather+0xd6/0x160 [<ffffffff8120900f>] ? put_object+0x2f/0x50 [<ffffffff81465c1d>] xenbus_otherend_changed+0x9d/0xa0 [<ffffffff814678ee>] backend_changed+0xe/0x10 [<ffffffff81463a28>] xenwatch_thread+0xc8/0x190 [<ffffffff810f22f0>] ? woken_wake_function+0x10/0x10
which was the result of two things:
When we call pci_scan_root_bus we would pass in 'sd' (sysdata) pointer which was an 'pcifront_sd' structure. However in the pci_device_add it expects that the 'sd' is 'struct sysdata' and sets the dev->node to what is in sd->node (offset 4):
set_dev_node(&dev->dev, pcibus_to_node(bus));
__pcibus_to_node(const struct pci_bus *bus)
{
const struct pci_sysdata *sd = bus->sysdata;
return sd->node;
}However our structure was pcifront_sd which had nothing at that offset:
struct pcifront_sd {
int domain; /* 0 4 */
/* XXX 4 bytes hole, try to pack */
struct pcifront_device * pdev; /* 8 8 */
}
That is an hole - filled with garbage as we used kmalloc instead of kzalloc (the second problem).
This patch fixes the issue by:
1) Use kzalloc to initialize to a well known state.
2) Put 'struct pci_sysdata' at the start of 'pcifront_sd'. That way access to the 'node' will access the right offset.
--- drivers/pci/xen-pcifront.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/pci/xen-pcifront.c +6 -4
@@ -51,7 +51,7 @@ struct pcifront_device { };struct pcifront_sd { -int domain; +struct pci_sysdata sd;struct pcifront_device *pdev; };
@@ -65,7 +65,9 @@ static inline void pcifront_init_sd(stru unsigned int domain, unsigned int bus, struct pcifront_device *pdev) { - sd->domain = domain; +/* Because we do not expose that information via XenBus. */ + sd->sd.node = first_online_node; + sd->sd.domain = domain; sd->pdev = pdev; }
@@ -463,8 +465,8 @@ static int pcifront_scan_root(struct pcidev_info (&pdev->xdev->dev,"Creating PCI Frontend Bus %04x:%02x\n" , domain, bus); - bus_entry =kmalloc (sizeof (*bus_entry),GFP_KERNEL ); - sd =kmalloc (sizeof (*sd),GFP_KERNEL ); + bus_entry =kzalloc (sizeof (*bus_entry),GFP_KERNEL ); + sd =kzalloc (sizeof (*sd),GFP_KERNEL );if (!bus_entry || !sd) { err = -ENOMEM ; goto err_out;
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.10.99 release. There are 80 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 7 lines
Responses should be made by Thu Mar 3 23:43:32 UTC 2016. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.x/stable-review/patch-3.10.99-rc1.gzand the diffstat can be found below.
Compiled and booted on my test system.
No dmesg regressions.
thanks,
-- Shuah
Signature · 5 lines
Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) [email protected] | (970) 217-8978
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.10.99 release. There are 80 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 3 23:43:32 UTC 2016. Anything received after that time might be too late.
Build results:
total: 122 pass: 119 fail: 3 Failed builds: arm:allmodconfig mn10300:asb2303_defconfig mn10300:asb2364_defconfig
Qemu test results:
total: 72 pass: 72 fail: 0
arm:allmodconfig fails with:
ERROR (phandle_references): Reference to non-existent node or label "clksdhc"
ERROR: Input tree has errors, aborting (use -f to force output) make[1]: *** [arch/arm/boot/dts/wm8650-mid.dtb] Error 2
which is due to 'dts: vt8500: Add SDHC node to DTS file for WM8650'.
Details are available at http://kerneltests.org/builders.
Guenter
Quoted 25 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.10.99 release. There are 80 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 3 23:43:32 UTC 2016. Anything received after that time might be too late.
Build results:
total: 122 pass: 119 fail: 3 Failed builds: arm:allmodconfig mn10300:asb2303_defconfig mn10300:asb2364_defconfigQemu test results:
total: 72 pass: 72 fail: 0arm:allmodconfig fails with:
ERROR (
phandle_references): Reference to non-existent node or label "clksdhc"
Quoted 6 lines
ERROR: Input tree has errors, aborting (use -f to force output) make[1]: *** [
arch/arm/boot/dts/wm8650-mid.dtb] Error 2which is due to 'dts: vt8500: Add SDHC node to DTS file for WM8650'.
Details are available at http://kerneltests.org/builders.
Indeed, clksdhc was added in 3.11 by the following patch :
9e7b6d3 ("dts: vt8500: Add ARM, AHB, APB and DDR clock nodes to SoC files")
3 other patches are missing in this DTSI file compared to 3.14, so I guess this patch should simply be dropped from 3.10.
Willy
Greg Kroah-Hartman
maintainerQuoted 31 lines · Willy Tarreau
Quoted 30 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.10.99 release. There are 80 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 3 23:43:32 UTC 2016. Anything received after that time might be too late.
Build results:
total: 122 pass: 119 fail: 3 Failed builds: arm:allmodconfig mn10300:asb2303_defconfig mn10300:asb2364_defconfigQemu test results:
total: 72 pass: 72 fail: 0arm:allmodconfig fails with:
ERROR (
phandle_references): Reference to non-existent node or label "clksdhc"ERROR: Input tree has errors, aborting (use -f to force output) make[1]: *** [
arch/arm/boot/dts/wm8650-mid.dtb] Error 2which is due to 'dts: vt8500: Add SDHC node to DTS file for WM8650'.
Quoted 8 lines
Quoted 1 line
Details are available at http://kerneltests.org/builders.
Indeed, clksdhc was added in 3.11 by the following patch :
9e7b6d3 ("dts: vt8500: Add ARM, AHB, APB and DDR clock nodes to SoC files")
3 other patches are missing in this DTSI file compared to 3.14, so I guess this patch should simply be dropped from 3.10.
Thanks for this, both of you, I've now dropped this from the 3.10-stable queue.
greg k-h