3.0.72-stable review
Subsystems (44)
Greg Kroah-Hartman
maintainercover 3.0.72-stable review
This is the start of the stable review cycle for the 3.0.72 release. There are 56 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 Apr 4 22:46:30 UTC 2013. 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.0/stable-review/patch-3.0.72-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 3.0.72-rc1
Joerg Roedel <[email protected]>
iommu/amd: Make sure dma_ops are set for hotplug devices
Steve Glendinning <[email protected]>
smsc75xx: fix jumbo frame support
Veaceslav Falico <[email protected]>
pch_gbe: fix ip_summed checksum reporting on rx
Eric Dumazet <[email protected]>
net: add a synchronize_net() in netdev_rx_handler_unregister()
[email protected] <[email protected]>
ks8851: Fix interpretation of rxlen field.
Hong Zhiguo <[email protected]>
ipv6: fix bad free of addrconf_init_net
Mugunthan V N <[email protected]>
atl1e: drop pci-msi support because of packet corruption
Mugunthan V N <[email protected]>
drivers: net: ethernet: davinci_emac: use netif_wake_queue() while restarting tx queue
Eric Dumazet <[email protected]>
aoe: reserve enough headroom on skbs
Paul Moore <[email protected]>
unix: fix a race condition in unix_release()
Masatake YAMATO <[email protected]>
thermal: shorten too long mcast group name
Cong Wang <[email protected]>
8021q: fix a potential use-after-free
Yuchung Cheng <[email protected]>
tcp: undo spurious timeout after SACK reneging
Eric Dumazet <[email protected]>
tcp: preserve ACK clocking in TSO
Mirko Lindner <[email protected]>
sky2: Threshold for Pause Packet is set wrong
Mirko Lindner <[email protected]>
sky2: Receive Overflows not counted
Steven Rostedt (Red Hat) <[email protected]>
tracing: Prevent buffer overwrite disabled for latency tracers
Steven Rostedt (Red Hat) <[email protected]>
tracing: Protect tracer flags with trace_types_lock
Theodore Ts'o <[email protected]>
ext4: use atomic64_t for the per-flexbg free_clusters count
Matt Fleming <[email protected]>
efivars: Handle duplicate names from get_next_variable()
Matt Fleming <[email protected]>
efivars: explicitly calculate length of VariableName
Ville Syrjälä <[email protected]>
drm/i915: Don't clobber crtc->fb when queue_flip fails
Jesse Barnes <[email protected]>
drm/i915: don't set unpin_work if vblank_get fails
J. Bruce Fields <[email protected]>
nfsd4: reject "negative" acl lengths
Anatol Pomozov <[email protected]>
loop: prevent bdev freeing while device in use
Petr Matousek <[email protected]>
KVM: x86: invalid opcode oops on SET_SREGS with OSXSAVE bit set (CVE-2012-4461)
Jiang Liu <[email protected]>
mm/hotplug: correctly add new zone to all other nodes' zone lists
Avi Kivity <[email protected]>
KVM: Fix buffer overflow in kvm_set_irq()
Jason Wang <[email protected]>
macvtap: zerocopy: validate vectors before building skb
Avi Kivity <[email protected]>
KVM: Ensure all vcpus are consistent with in-kernel irqchip settings
Chuck Lever <[email protected]>
NFS: nfs_getaclargs.acl_len is a size_t
Trond Myklebust <[email protected]>
NFSv4: Fix an Oops in the NFSv4 getacl code
Andy Adamson <[email protected]>
NFSv4: include bitmap in nfsv4 get acl data
Jan Kiszka <[email protected]>
KVM: x86: Prevent starting PIT timers in the absence of irqchip support
Sven Eckelmann <[email protected]>
batman-adv: Only write requested number of byte to user buffer
Paul Kot <[email protected]>
batman-adv: bat_socket_read missing checks
Matthew Daley <[email protected]>
x25: Handle undersized/fragmented skbs
Matthew Daley <[email protected]>
x25: Validate incoming call user data lengths
Jan Kiszka <[email protected]>
KVM: Clean up error handling during VCPU creation
Josef Bacik <[email protected]>
Btrfs: limit the global reserve to 512mb
Vivek Gautam <[email protected]>
usb: xhci: Fix TRB transfer length macro used for Event TRB.
Kees Cook <[email protected]>
net/irda: add missing error path release_sock call
Bing Zhao <[email protected]>
mwifiex: cancel cmd timer and free curr_cmd in shutdown process
Al Viro <[email protected]>
vt: synchronize_rcu() under spinlock is not nice...
Konstantin Holoborodko <[email protected]>
usb: ftdi_sio: Add support for Mitsubishi FX-USB-AW/-BD
Jan Beulich <[email protected]>
xen-blkback: fix dispatch_rw_block_io() error path
Iestyn C. Elfick <[email protected]>
b43: A fix for DMA transmission sequence errors
Ming Lei <[email protected]>
sysfs: handle failure path correctly for readdir()
Ming Lei <[email protected]>
sysfs: fix race between readdir and lseek
Ian Abbott <[email protected]>
staging: comedi: s626: fix continuous acquisition
Ming Lei <[email protected]>
Bluetooth: Add support for Dell[QCA 0cf3:817a]
Ming Lei <[email protected]>
Bluetooth: Add support for Dell[QCA 0cf3:0036]
Vinicius Costa Gomes <[email protected]>
Bluetooth: Fix not closing SCO sockets in the BT_CONNECT2 state
Trond Myklebust <[email protected]>
SUNRPC: Add barriers to ensure read ordering in rpc_wake_up_task_queue_locked
Andrew Morton <[email protected]>
kernel/signal.c: use __ARCH_HAS_SA_RESTORER instead of SA_RESTORER
Ben Hutchings <[email protected]>
signal: Define __ARCH_HAS_SA_RESTORER so we know whether to clear sa_restorer
-------------
Diffstat:
Makefile | 4 +- arch/arm/include/asm/signal.h | 1 + arch/avr32/include/asm/signal.h | 1 + arch/cris/include/asm/signal.h | 1 + arch/h8300/include/asm/signal.h | 1 + arch/ia64/kvm/kvm-ia64.c | 5 ++ arch/m32r/include/asm/signal.h | 1 + arch/m68k/include/asm/signal.h | 1 + arch/mn10300/include/asm/signal.h | 1 + arch/powerpc/include/asm/signal.h | 1 + arch/s390/include/asm/signal.h | 1 + arch/sparc/include/asm/signal.h | 1 + arch/x86/include/asm/signal.h | 2 + arch/x86/kernel/amd_iommu.c | 24 +++++---- arch/x86/kvm/i8254.c | 10 ++-- arch/x86/kvm/x86.c | 19 +++++-- arch/xtensa/include/asm/signal.h | 1 + drivers/block/aoe/aoecmd.c | 3 +- drivers/block/loop.c | 9 +++- drivers/block/xen-blkback/blkback.c | 7 +-- drivers/bluetooth/ath3k.c | 4 ++ drivers/bluetooth/btusb.c | 2 + drivers/firmware/efivars.c | 92 ++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_display.c | 23 ++++---- drivers/net/atl1e/atl1e.h | 1 - drivers/net/atl1e/atl1e_main.c | 22 +------- drivers/net/davinci_emac.c | 2 +- drivers/net/ks8851.c | 2 +- drivers/net/macvtap.c | 4 ++ drivers/net/pch_gbe/pch_gbe_main.c | 4 +- drivers/net/sky2.c | 2 +- drivers/net/sky2.h | 2 +- drivers/net/usb/smsc75xx.c | 12 +++-- drivers/net/wireless/b43/dma.c | 65 ++++++++++++++++++----- drivers/net/wireless/mwifiex/init.c | 8 +++ drivers/staging/comedi/drivers/s626.c | 2 +- drivers/tty/vt/vc_screen.c | 6 ++- drivers/usb/host/xhci-ring.c | 24 ++++----- drivers/usb/host/xhci.h | 4 ++ drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 7 +++ fs/block_dev.c | 1 + fs/btrfs/extent-tree.c | 2 +- fs/ext4/ext4.h | 6 +-- fs/ext4/ialloc.c | 18 +++---- fs/ext4/mballoc.c | 10 ++-- fs/ext4/resize.c | 4 +- fs/ext4/super.c | 4 +- fs/nfs/nfs4proc.c | 99 +++++++++++++++++++++-------------- fs/nfs/nfs4xdr.c | 34 +++++++++--- fs/nfsd/nfs4xdr.c | 2 +- fs/sysfs/dir.c | 17 +++++- include/asm-generic/signal.h | 4 ++ include/linux/kvm_host.h | 7 +++ include/linux/nfs_xdr.h | 5 ++ include/linux/sunrpc/xdr.h | 2 + include/linux/thermal.h | 2 +- kernel/signal.c | 2 +- kernel/trace/trace.c | 50 ++++++++++++++---- kernel/trace/trace.h | 7 +++ kernel/trace/trace_irqsoff.c | 19 +++++-- kernel/trace/trace_sched_wakeup.c | 18 +++++-- mm/memory_hotplug.c | 15 +++--- net/8021q/vlan.c | 14 ++--- net/batman-adv/icmp_socket.c | 5 +- net/bluetooth/sco.c | 1 + net/core/dev.c | 6 +++ net/ipv4/tcp_input.c | 7 +-- net/ipv4/tcp_output.c | 7 ++- net/ipv6/addrconf.c | 26 ++++----- net/irda/af_irda.c | 6 ++- net/netlink/genetlink.c | 1 + net/sunrpc/sched.c | 9 +++- net/sunrpc/xdr.c | 3 +- net/unix/af_unix.c | 7 ++- net/x25/af_x25.c | 37 ++++++++++--- net/x25/x25_dev.c | 6 +++ net/x25/x25_facilities.c | 10 ++-- net/x25/x25_in.c | 43 +++++++++++++-- net/x25/x25_link.c | 3 ++ net/x25/x25_subr.c | 14 ++++- virt/kvm/irq_comm.c | 1 + virt/kvm/kvm_main.c | 15 ++++-- 83 files changed, 665 insertions(+), 267 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/56 signal: Define __ARCH_HAS_SA_RESTORER so we know whether to clear sa_restorer
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
Vaguely based on upstream commit 574c4866e33d 'consolidate kernel-side struct sigaction declarations'.
flush_signal_handlers() needs to know whether sigaction::sa_restorer is defined, not whether SA_RESTORER is defined. Define the __ARCH_HAS_SA_RESTORER macro to indicate this.
--- arch/arm/include/asm/signal.h | 1 + arch/avr32/include/asm/signal.h | 1 + arch/cris/include/asm/signal.h | 1 + arch/h8300/include/asm/signal.h | 1 + arch/m32r/include/asm/signal.h | 1 + arch/m68k/include/asm/signal.h | 1 + arch/mn10300/include/asm/signal.h | 1 + arch/powerpc/include/asm/signal.h | 1 + arch/s390/include/asm/signal.h | 1 + arch/sparc/include/asm/signal.h | 1 + arch/x86/include/asm/signal.h | 2 ++ arch/xtensa/include/asm/signal.h | 1 + include/asm-generic/signal.h | 4 ++++ 13 files changed, 17 insertions(+)
arch/arm/include/asm/signal.h +1 -0
@@ -127,6 +127,7 @@ struct sigaction {__sigrestore_t sa_restorer;sigset_t sa_mask;/* mask last for extensibility */ }; +#define __ARCH_HAS_SA_RESTORERstruct k_sigaction {struct sigaction sa;
arch/avr32/include/asm/signal.h +1 -0
@@ -128,6 +128,7 @@ struct sigaction {__sigrestore_t sa_restorer;sigset_t sa_mask;/* mask last for extensibility */ }; +#define __ARCH_HAS_SA_RESTORERstruct k_sigaction {struct sigaction sa;
arch/cris/include/asm/signal.h +1 -0
@@ -122,6 +122,7 @@ struct sigaction {void (*sa_restorer)(void );sigset_t sa_mask;/* mask last for extensibility */ }; +#define __ARCH_HAS_SA_RESTORERstruct k_sigaction {struct sigaction sa;
arch/h8300/include/asm/signal.h +1 -0
@@ -121,6 +121,7 @@ struct sigaction {void (*sa_restorer)(void );sigset_t sa_mask;/* mask last for extensibility */ }; +#define __ARCH_HAS_SA_RESTORERstruct k_sigaction {struct sigaction sa;
arch/m32r/include/asm/signal.h +1 -0
@@ -123,6 +123,7 @@ struct sigaction {__sigrestore_t sa_restorer;sigset_t sa_mask;/* mask last for extensibility */ }; +#define __ARCH_HAS_SA_RESTORERstruct k_sigaction {struct sigaction sa;
arch/m68k/include/asm/signal.h +1 -0
@@ -119,6 +119,7 @@ struct sigaction {__sigrestore_t sa_restorer;sigset_t sa_mask;/* mask last for extensibility */ }; +#define __ARCH_HAS_SA_RESTORERstruct k_sigaction {struct sigaction sa;
arch/mn10300/include/asm/signal.h +1 -0
@@ -131,6 +131,7 @@ struct sigaction {__sigrestore_t sa_restorer;sigset_t sa_mask;/* mask last for extensibility */ }; +#define __ARCH_HAS_SA_RESTORERstruct k_sigaction {struct sigaction sa;
arch/powerpc/include/asm/signal.h +1 -0
@@ -109,6 +109,7 @@ struct sigaction {__sigrestore_t sa_restorer;sigset_t sa_mask;/* mask last for extensibility */ }; +#define __ARCH_HAS_SA_RESTORERstruct k_sigaction {struct sigaction sa;
arch/s390/include/asm/signal.h +1 -0
@@ -131,6 +131,7 @@ struct sigaction {void (*sa_restorer)(void );sigset_t sa_mask;/* mask last for extensibility */ }; +#define __ARCH_HAS_SA_RESTORERstruct k_sigaction {struct sigaction sa;
arch/sparc/include/asm/signal.h +1 -0
@@ -191,6 +191,7 @@ struct __old_sigaction {unsigned long sa_flags;void (*sa_restorer)(void );/* not used by Linux/SPARC yet */ }; +#define __ARCH_HAS_SA_RESTORER typedef struct sigaltstack { void __user *ss_sp;
arch/x86/include/asm/signal.h +2 -0
@@ -125,6 +125,8 @@ typedef unsigned long sigset_t;extern void do_notify_resume (struct pt_regs *,void *,__u32 );# endif /* __KERNEL__ */ +#define __ARCH_HAS_SA_RESTORER +#ifdef __i386__# ifdef __KERNEL__ struct old_sigaction {
arch/xtensa/include/asm/signal.h +1 -0
@@ -133,6 +133,7 @@ struct sigaction {void (*sa_restorer)(void );sigset_t sa_mask;/* mask last for extensibility */ }; +#define __ARCH_HAS_SA_RESTORERstruct k_sigaction {struct sigaction sa;
include/asm-generic/signal.h +4 -0
@@ -99,6 +99,10 @@ typedef unsigned long old_sigset_t;#include <asm-generic/signal-defs.h> +#ifdef SA_RESTORER +#define __ARCH_HAS_SA_RESTORER +#endif +struct sigaction {__sighandler_t sa_handler;unsigned long sa_flags;
Greg Kroah-Hartman
maintainerPATCH 2/56 kernel/signal.c: use __ARCH_HAS_SA_RESTORER instead of SA_RESTORER
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Morton <[email protected]>
commit 522cff142d7d2f9230839c9e1f21a4d8bcc22a4a upstream.
__ARCH_HAS_SA_RESTORER is the preferred conditional for use in 3.9 and later kernels, per Kees.
--- kernel/signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/signal.c +1 -1
@@ -437,7 +437,7 @@ flush_signal_handlers(struct task_structif (force_default || ka->sa.sa_handler !=SIG_IGN ) ka->sa.sa_handler =SIG_DFL ; ka->sa.sa_flags =0 ; -#ifdef SA_RESTORER +#ifdef __ARCH_HAS_SA_RESTORER ka->sa.sa_restorer =NULL ;#endif sigemptyset (&ka->sa.sa_mask);
Greg Kroah-Hartman
maintainerPATCH 3/56 SUNRPC: Add barriers to ensure read ordering in rpc_wake_up_task_queue_locked
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
commit 1166fde6a923c30f4351515b6a9a1efc513e7d00 upstream.
We need to be careful when testing task->tk_waitqueue in rpc_wake_up_task_queue_locked, because it can be changed while we are holding the queue->lock.
By adding appropriate memory barriers, we can ensure that it is safe to test task->tk_waitqueue for equality if the RPC_TASK_QUEUED bit is set.
--- net/sunrpc/sched.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/sunrpc/sched.c +7 -2
@@ -135,6 +135,8 @@ static void __rpc_add_wait_queue(structlist_add_tail (&task->u.tk_wait.list, &queue->tasks[0 ]); task->tk_waitqueue = queue; queue->qlen++; +/* barrier matches the read in rpc_wake_up_task_queue_locked() */ +smp_wmb ();rpc_set_queued (task); dprintk("RPC: %5u added to queue %p \"%s\"\n",
@@ -369,8 +371,11 @@ static void __rpc_do_wake_up_task(struct*/ static void rpc_wake_up_task_queue_locked (struct rpc_wait_queue *queue,struct rpc_task *task) { -if (RPC_IS_QUEUED (task) && task->tk_waitqueue == queue) -__rpc_do_wake_up_task (queue, task); +if (RPC_IS_QUEUED (task)) { +smp_rmb (); +if (task->tk_waitqueue == queue) +__rpc_do_wake_up_task (queue, task); + } }/*
Greg Kroah-Hartman
maintainerPATCH 4/56 Bluetooth: Fix not closing SCO sockets in the BT_CONNECT2 state
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vinicius Costa Gomes <[email protected]>
commit eb20ff9c91ddcb2d55c1849a87d3db85af5e88a9 upstream.
With deferred setup for SCO, it is possible that userspace closes the socket when it is in the BT_CONNECT2 state, after the Connect Request is received but before the Accept Synchonous Connection is sent.
If this happens the following crash was observed, when the connection is terminated:
[ +0.000003] hci_sync_conn_complete_evt: hci0 status 0x10 [ +0.000005] sco_connect_cfm: hcon ffff88003d1bd800 bdaddr 40:98:4e:32:d7:39 status 16 [ +0.000003] sco_conn_del: hcon ffff88003d1bd800 conn ffff88003cc8e300, err 110 [ +0.000015] BUG: unable to handle kernel NULL pointer dereference at 0000000000000199 [ +0.000906] IP: [<ffffffff810620dd>] __lock_acquire+0xed/0xe82 [ +0.000000] PGD 3d21f067 PUD 3d291067 PMD 0 [ +0.000000] Oops: 0002 [#1] SMP [ +0.000000] Modules linked in: rfcomm bnep btusb bluetooth [ +0.000000] CPU 0 [ +0.000000] Pid: 1481, comm: kworker/u:2H Not tainted 3.9.0-rc1-25019-gad82cdd #1 Bochs Bochs [ +0.000000] RIP: 0010:[<ffffffff810620dd>] [<ffffffff810620dd>] __lock_acquire+0xed/0xe82 [ +0.000000] RSP: 0018:ffff88003c3c19d8 EFLAGS: 00010002 [ +0.000000] RAX: 0000000000000001 RBX: 0000000000000246 RCX: 0000000000000000 [ +0.000000] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff88003d1be868 [ +0.000000] RBP: ffff88003c3c1a98 R08: 0000000000000002 R09: 0000000000000000 [ +0.000000] R10: ffff88003d1be868 R11: ffff88003e20b000 R12: 0000000000000002 [ +0.000000] R13: ffff88003aaa8000 R14: 000000000000006e R15: ffff88003d1be850 [ +0.000000] FS: 0000000000000000(0000) GS:ffff88003e200000(0000) knlGS:0000000000000000 [ +0.000000] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ +0.000000] CR2: 0000000000000199 CR3: 000000003c1cb000 CR4: 00000000000006b0 [ +0.000000] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ +0.000000] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ +0.000000] Process kworker/u:2H (pid: 1481, threadinfo ffff88003c3c0000, task ffff88003aaa8000) [ +0.000000] Stack: [ +0.000000] ffffffff81b16342 0000000000000000 0000000000000000 ffff88003d1be868 [ +0.000000] ffffffff00000000 00018c0c7863e367 000000003c3c1a28 ffffffff8101efbd [ +0.000000] 0000000000000000 ffff88003e3d2400 ffff88003c3c1a38 ffffffff81007c7a [ +0.000000] Call Trace: [ +0.000000] [<ffffffff8101efbd>] ? kvm_clock_read+0x34/0x3b [ +0.000000] [<ffffffff81007c7a>] ? paravirt_sched_clock+0x9/0xd [ +0.000000] [<ffffffff81007fd4>] ? sched_clock+0x9/0xb [ +0.000000] [<ffffffff8104fd7a>] ? sched_clock_local+0x12/0x75 [ +0.000000] [<ffffffff810632d1>] lock_acquire+0x93/0xb1 [ +0.000000] [<ffffffffa0022339>] ? spin_lock+0x9/0xb [bluetooth] [ +0.000000] [<ffffffff8105f3d8>] ? lock_release_holdtime.part.22+0x4e/0x55 [ +0.000000] [<ffffffff814f6038>] _raw_spin_lock+0x40/0x74 [ +0.000000] [<ffffffffa0022339>] ? spin_lock+0x9/0xb [bluetooth] [ +0.000000] [<ffffffff814f6936>] ? _raw_spin_unlock+0x23/0x36 [ +0.000000] [<ffffffffa0022339>] spin_lock+0x9/0xb [bluetooth] [ +0.000000] [<ffffffffa00230cc>] sco_conn_del+0x76/0xbb [bluetooth] [ +0.000000] [<ffffffffa002391d>] sco_connect_cfm+0x2da/0x2e9 [bluetooth] [ +0.000000] [<ffffffffa000862a>] hci_proto_connect_cfm+0x38/0x65 [bluetooth] [ +0.000000] [<ffffffffa0008d30>] hci_sync_conn_complete_evt.isra.79+0x11a/0x13e [bluetooth] [ +0.000000] [<ffffffffa000cd96>] hci_event_packet+0x153b/0x239d [bluetooth] [ +0.000000] [<ffffffff814f68ff>] ? _raw_spin_unlock_irqrestore+0x48/0x5c [ +0.000000] [<ffffffffa00025f6>] hci_rx_work+0xf3/0x2e3 [bluetooth] [ +0.000000] [<ffffffff8103efed>] process_one_work+0x1dc/0x30b [ +0.000000] [<ffffffff8103ef83>] ? process_one_work+0x172/0x30b [ +0.000000] [<ffffffff8103e07f>] ? spin_lock_irq+0x9/0xb [ +0.000000] [<ffffffff8103fc8d>] worker_thread+0x123/0x1d2 [ +0.000000] [<ffffffff8103fb6a>] ? manage_workers+0x240/0x240 [ +0.000000] [<ffffffff81044211>] kthread+0x9d/0xa5 [ +0.000000] [<ffffffff81044174>] ? __kthread_parkme+0x60/0x60 [ +0.000000] [<ffffffff814f75bc>] ret_from_fork+0x7c/0xb0 [ +0.000000] [<ffffffff81044174>] ? __kthread_parkme+0x60/0x60 [ +0.000000] Code: d7 44 89 8d 50 ff ff ff 4c 89 95 58 ff ff ff e8 44 fc ff ff 44 8b 8d 50 ff ff ff 48 85 c0 4c 8b 95 58 ff ff ff 0f 84 7a 04 00 00 <f0> ff 80 98 01 00 00 83 3d 25 41 a7 00 00 45 8b b5 e8 05 00 00 [ +0.000000] RIP [<ffffffff810620dd>] __lock_acquire+0xed/0xe82 [ +0.000000] RSP <ffff88003c3c19d8> [ +0.000000] CR2: 0000000000000199 [ +0.000000] ---[ end trace e73cd3b52352dd34 ]---
--- net/bluetooth/sco.c | 1 + 1 file changed, 1 insertion(+)
net/bluetooth/sco.c +1 -0
@@ -378,6 +378,7 @@ static void __sco_sock_close(struct socksco_chan_del (sk,ECONNRESET );break ; +case BT_CONNECT2 :case BT_CONNECT :case BT_DISCONN :sco_chan_del (sk,ECONNRESET );
Greg Kroah-Hartman
maintainerPATCH 5/56 Bluetooth: Add support for Dell[QCA 0cf3:0036]
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
commit d66629c1325399cf080ba8b2fb086c10e5439cdd upstream.
Add support for the AR9462 chip
T: Bus=03 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0cf3 ProdID=0036 Rev= 0.02 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA A: FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=01 I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms
--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -71,6 +71,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x03F0, 0x311D) },/* Atheros AR3012 with sflash firmware*/ + { USB_DEVICE(0x0CF3, 0x0036) }, { USB_DEVICE(0x0CF3, 0x3004) }, { USB_DEVICE(0x0CF3, 0x311D) }, { USB_DEVICE(0x13d3, 0x3375) },
@@ -93,6 +94,7 @@ MODULE_DEVICE_TABLE(usb, ath3k_table);static struct usb_device_id ath3k_blist_tbl[] = {/* Atheros AR3012 with sflash firmware*/ + {USB_DEVICE (0x0CF3 ,0x0036 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0x3004 ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x0cf3 ,0x311D ), .driver_info =BTUSB_ATH3012 }, {USB_DEVICE (0x13d3 ,0x3375 ), .driver_info =BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
@@ -136,6 +136,7 @@ static struct usb_device_id blacklist_ta { USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE }, /* Atheros 3012 with sflash firmware */ + { USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
Greg Kroah-Hartman
maintainerPATCH 6/56 Bluetooth: Add support for Dell[QCA 0cf3:817a]
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
commit ebaf5795ef57a70a042ea259448a465024e2821d upstream.
Add support for the AR9462 chip
T: Bus=03 Lev=01 Prnt=01 Port=08 Cnt=01 Dev#= 5 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0cf3 ProdID=817a Rev= 0.02 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms
--- drivers/bluetooth/ath3k.c | 2 ++ drivers/bluetooth/btusb.c | 1 + 2 files changed, 3 insertions(+)
drivers/bluetooth/ath3k.c +2 -0
@@ -74,6 +74,7 @@ static struct usb_device_id ath3k_table[ { USB_DEVICE(0x0CF3, 0x0036) }, { USB_DEVICE(0x0CF3, 0x3004) }, { USB_DEVICE(0x0CF3, 0x311D) }, + { USB_DEVICE(0x0CF3, 0x817a) }, { USB_DEVICE(0x13d3, 0x3375) }, { USB_DEVICE(0x04CA, 0x3005) },
@@ -97,6 +98,7 @@ static struct usb_device_id ath3k_blist_ { USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
@@ -139,6 +139,7 @@ static struct usb_device_id blacklist_ta { USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
Greg Kroah-Hartman
maintainerPATCH 7/56 staging: comedi: s626: fix continuous acquisition
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit e4317ce877a31dbb9d96375391c1c4ad2210d637 upstream.
For the s626 driver, there is a bug in the handling of asynchronous commands on the AI subdevice when the stop source is TRIG_NONE. The command should run continuously until cancelled, but the interrupt handler stops the command running after the first scan.
The command set-up function s626_ai_cmd() contains this code:
switch (cmd->stop_src) {
case TRIG_COUNT:
/* data arrives as one packet */
devpriv->ai_sample_count = cmd->stop_arg;
devpriv->ai_continous = 0;
break;
case TRIG_NONE:
/* continous acquisition */
devpriv->ai_continous = 1;
devpriv->ai_sample_count = 0;
break;
}The interrupt handler s626_irq_handler() contains this code:
if (!(devpriv->ai_continous))
devpriv->ai_sample_count--;
if (devpriv->ai_sample_count <= 0) {
devpriv->ai_cmd_running = 0;
/* ... */
}So devpriv->ai_sample_count is only decremented for the TRIG_COUNT case, but devpriv->ai_cmd_running is set to 0 (and the command stopped) regardless.
Fix this in s626_ai_cmd() by setting devpriv->ai_sample_count = 1 for the TRIG_NONE case. The interrupt handler will not decrement it so it will remain greater than 0 and the check for stopping the acquisition will fail.
--- drivers/staging/comedi/drivers/s626.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/comedi/drivers/s626.c +1 -1
@@ -1882,7 +1882,7 @@ static int s626_ai_cmd(struct comedi_devcase TRIG_NONE :/* continous acquisition */ devpriv->ai_continous =1 ; - devpriv->ai_sample_count =0 ; + devpriv->ai_sample_count =1 ;break ; }
Greg Kroah-Hartman
maintainerPATCH 8/56 sysfs: fix race between readdir and lseek
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
commit 991f76f837bf22c5bb07261cfd86525a0a96650c upstream.
While readdir() is running, lseek() may set filp->f_pos as zero, then may leave filp->private_data pointing to one sysfs_dirent object without holding its reference counter, so the sysfs_dirent object may be used after free in next readdir().
This patch holds inode->i_mutex to avoid the problem since the lock is always held in readdir path.
--- fs/sysfs/dir.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
fs/sysfs/dir.c +12 -1
@@ -955,10 +955,21 @@ static int sysfs_readdir(struct file * freturn 0 ; } +static loff_t sysfs_dir_llseek (struct file *file,loff_t offset,int whence) +{ +struct inode *inode = file->f_path.dentry->d_inode; +loff_t ret; + +mutex_lock (&inode->i_mutex); + ret =generic_file_llseek (file, offset, whence); +mutex_unlock (&inode->i_mutex); + +return ret; +}const struct file_operations sysfs_dir_operations = { .read = generic_read_dir, .readdir = sysfs_readdir, .release = sysfs_dir_release, - .llseek = generic_file_llseek, + .llseek = sysfs_dir_llseek, };
Greg Kroah-Hartman
maintainerPATCH 9/56 sysfs: handle failure path correctly for readdir()
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
commit e5110f411d2ee35bf8d202ccca2e89c633060dca upstream.
In case of 'if (filp->f_pos == 0 or 1)' of sysfs_readdir(), the failure from filldir() isn't handled, and the reference counter of the sysfs_dirent object pointed by filp->private_data will be released without clearing filp->private_data, so use after free bug will be triggered later.
This patch returns immeadiately under the situation for fixing the bug, and it is reasonable to return from readdir() when filldir() fails.
--- fs/sysfs/dir.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/sysfs/dir.c +4 -0
@@ -917,6 +917,8 @@ static int sysfs_readdir(struct file * f ino = parent_sd->s_ino;if (filldir (dirent,"." ,1 , filp->f_pos, ino,DT_DIR ) ==0 ) filp->f_pos++; +else +return 0 ; }if (filp->f_pos ==1 ) {if (parent_sd->s_parent)
@@ -925,6 +927,8 @@ static int sysfs_readdir(struct file * f ino = parent_sd->s_ino;if (filldir (dirent,".." ,2 , filp->f_pos, ino,DT_DIR ) ==0 ) filp->f_pos++; +else +return 0 ; }mutex_lock (&sysfs_mutex); for (pos = sysfs_dir_pos(ns, parent_sd, filp->f_pos, pos);
Greg Kroah-Hartman
maintainerPATCH 10/56 b43: A fix for DMA transmission sequence errors
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Iestyn C. Elfick" <[email protected]>
commit b251412db99ccd4495ce372fec7daee27bf06923 upstream.
Intermittently, b43 will report "Out of order TX status report on DMA ring". When this happens, the driver must be reset before communication can resume. The cause of the problem is believed to be an error in the closed-source firmware; however, all versions of the firmware are affected.
This change uses the observation that the expected status is always 2 less than the observed value, and supplies a fake status report to skip one header/data pair.
Not all devices suffer from this problem, but it can occur several times per second under heavy load. As each occurence kills the unmodified driver, this patch makes if possible for the affected devices to function. The patch logs only the first instance of the reset operation to prevent spamming the logs.
--- drivers/net/wireless/b43/dma.c | 65 +++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 12 deletions(-)
drivers/net/wireless/b43/dma.c +53 -12
@@ -1390,8 +1390,12 @@ void b43_dma_handle_txstatus(struct b43_struct b43_dmaring *ring;struct b43_dmadesc_generic *desc;struct b43_dmadesc_meta *meta; +static const struct b43_txstatus fake;/* filled with 0 */ +const struct b43_txstatus *txstat;int slot, firstused;bool frame_succeed; +int skip; +static u8 err_out1, err_out2; ring =parse_cookie (dev, status->cookie, &slot);if (unlikely (!ring))
@@ -1404,13 +1408,36 @@ void b43_dma_handle_txstatus(struct b43_ firstused = ring->current_slot - ring->used_slots +1 ;if (firstused <0 ) firstused = ring->nr_slots + firstused; + + skip =0 ;if (unlikely (slot != firstused)) {/* This possibly is a firmware bug and will result in -* malfunction, memory leaks and/or stall of DMA functionality. */ -b43dbg (dev->wl,"Out of order TX status report on DMA ring %d. " -"Expected %d, but got %d\n" , - ring->index, firstused, slot); -return ; +* malfunction, memory leaks and/or stall of DMA functionality. +*/ +if (slot ==next_slot (ring,next_slot (ring, firstused))) { +/* If a single header/data pair was missed, skip over +* the first two slots in an attempt to recover. +*/ + slot = firstused; + skip =2 ; +if (!err_out1) { +/* Report the error once. */ +b43dbg (dev->wl, +"Skip on DMA ring %d slot %d.\n" , + ring->index, slot); + err_out1 =1 ; + } + }else { +/* More than a single header/data pair were missed. +* Report this error once. +*/ +if (!err_out2) +b43dbg (dev->wl, +"Out of order TX status report on DMA ring %d. Expected %d, but got %d\n" , + ring->index, firstused, slot); + err_out2 =1 ; +return ; + } } ops = ring->ops;
@@ -1424,11 +1451,13 @@ void b43_dma_handle_txstatus(struct b43_ slot, firstused, ring->index);break ; } +if (meta->skb) {struct b43_private_tx_info *priv_info = -b43_get_priv_tx_info (IEEE80211_SKB_CB (meta->skb)); +b43_get_priv_tx_info (IEEE80211_SKB_CB (meta->skb)); -unmap_descbuffer (ring, meta->dmaaddr, meta->skb->len,1 ); +unmap_descbuffer (ring, meta->dmaaddr, + meta->skb->len,1 );kfree (priv_info->bouncebuffer); priv_info->bouncebuffer =NULL ; }else {
@@ -1440,8 +1469,9 @@ void b43_dma_handle_txstatus(struct b43_struct ieee80211_tx_info *info;if (unlikely (!meta->skb)) { -/* This is a scatter-gather fragment of a frame, so -* the skb pointer must not be NULL. */ +/* This is a scatter-gather fragment of a frame, +* so the skb pointer must not be NULL. +*/ b43dbg (dev->wl,"TX status unexpected NULL skb " "at slot %d (first=%d) on ring %d\n" , slot, firstused, ring->index);
@@ -1452,9 +1482,18 @@ void b43_dma_handle_txstatus(struct b43_/* * Call back to inform the ieee80211 subsystem about -* the status of the transmission. +* the status of the transmission. When skipping over +* a missed TX status report, use a status structure +* filled with zeros to indicate that the frame was not +* sent (frame_count 0) and not acknowledged */ - frame_succeed =b43_fill_txstatus_report (dev, info, status); +if (unlikely (skip)) + txstat = &fake; +else + txstat = status; + + frame_succeed =b43_fill_txstatus_report (dev, info, + txstat);#ifdef CONFIG_B43_DEBUG if (frame_succeed) ring->nr_succeed_tx_packets++;
@@ -1482,12 +1521,14 @@ void b43_dma_handle_txstatus(struct b43_/* Everything unmapped and free'd. So it's not used anymore. */ ring->used_slots--; -if (meta->is_last_fragment) { +if (meta->is_last_fragment && !skip) {/* This is the last scatter-gather * fragment of the frame. We are done. */ break ; } slot =next_slot (ring, slot); +if (skip >0 ) + --skip; }if (ring->stopped) {B43_WARN_ON (free_slots (ring) <TX_SLOTS_PER_FRAME );
Greg Kroah-Hartman
maintainerPATCH 11/56 xen-blkback: fix dispatch_rw_block_io() error path
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Beulich <[email protected]>
commit 0e5e098ac22dae38f957e951b70d3cf73beff0f7 upstream.
Commit 7708992 ("xen/blkback: Seperate the bio allocation and the bio submission") consolidated the pendcnt updates to just a single write, neglecting the fact that the error path relied on it getting set to 1 up front (such that the decrement in __end_block_io_op() would actually drop the count to zero, triggering the necessary cleanup actions).
Also remove a misleading and a stale (after said commit) comment.
--- drivers/block/xen-blkback/blkback.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/block/xen-blkback/blkback.c +1 -6
@@ -650,13 +650,7 @@ static int dispatch_rw_block_io(struct x bio->bi_end_io = end_block_io_op; } -/* -* We set it one so that the last submit_bio does not have to call -* atomic_inc. -*/ atomic_set (&pending_req->pendcnt, nbio); - -/* Get a reference count for the disk queue and start sending I/O */ blk_start_plug (&plug);for (i =0 ; i < nbio; i++)
@@ -684,6 +678,7 @@ static int dispatch_rw_block_io(struct x fail_put_bio:for (i =0 ; i < nbio; i++)bio_put (biolist[i]); +atomic_set (&pending_req->pendcnt,1 );__end_block_io_op (pending_req, -EINVAL );msleep (1 );/* back off a bit */ return -EIO ;
Greg Kroah-Hartman
maintainerPATCH 12/56 usb: ftdi_sio: Add support for Mitsubishi FX-USB-AW/-BD
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Holoborodko <[email protected]>
commit 482b0b5d82bd916cc0c55a2abf65bdc69023b843 upstream.
It enhances the driver for FTDI-based USB serial adapters to recognize Mitsubishi Electric Corp. USB/RS422 Converters as FT232BM chips and support them.
https://search.meau.com/?q=FX-USB-AW
--- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 7 +++++++ 2 files changed, 8 insertions(+)
drivers/usb/serial/ftdi_sio.c +1 -0
@@ -646,6 +646,7 @@ static struct usb_device_id id_table_com { USB_DEVICE(FTDI_VID, FTDI_RM_CANVIEW_PID) }, { USB_DEVICE(ACTON_VID, ACTON_SPECTRAPRO_PID) }, { USB_DEVICE(CONTEC_VID, CONTEC_COM1USBH_PID) }, + { USB_DEVICE(MITSUBISHI_VID, MITSUBISHI_FXUSB_PID) }, { USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) }, { USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) }, { USB_DEVICE(BANDB_VID, BANDB_USO9ML2_PID) },
drivers/usb/serial/ftdi_sio_ids.h +7 -0
@@ -584,6 +584,13 @@#define CONTEC_COM1USBH_PID 0x8311/* COM-1(USB)H */ /* +* Mitsubishi Electric Corp. (http://www.meau.com) +* Submitted by Konstantin Holoborodko +*/ +#define MITSUBISHI_VID 0x06D3 +#define MITSUBISHI_FXUSB_PID 0x0284/* USB/RS422 converters: FX-USB-AW/-BD */ + +/* * Definitions for B&B Electronics products. */ #define BANDB_VID 0x0856/* B&B Electronics Vendor ID */
Greg Kroah-Hartman
maintainerPATCH 13/56 vt: synchronize_rcu() under spinlock is not nice...
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
commit e8cd81693bbbb15db57d3c9aa7dd90eda4842874 upstream.
vcs_poll_data_free() calls unregister_vt_notifier(), which calls atomic_notifier_chain_unregister(), which calls synchronize_rcu(). Do it *after* we'd dropped ->f_lock.
--- drivers/tty/vt/vc_screen.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/tty/vt/vc_screen.c +4 -2
@@ -92,7 +92,7 @@ vcs_poll_data_free(struct vcs_poll_datastatic struct vcs_poll_data *vcs_poll_data_get (struct file *file) { -struct vcs_poll_data *poll = file->private_data; +struct vcs_poll_data *poll = file->private_data, *kill =NULL ;if (poll)return poll;
@@ -121,10 +121,12 @@ vcs_poll_data_get(struct file *file) file->private_data = poll; }else {/* someone else raced ahead of us */ -vcs_poll_data_free (poll); + kill = poll; poll = file->private_data; }spin_unlock (&file->f_lock); +if (kill) +vcs_poll_data_free (kill);return poll; }
Greg Kroah-Hartman
maintainerPATCH 14/56 mwifiex: cancel cmd timer and free curr_cmd in shutdown process
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bing Zhao <[email protected]>
commit 084c7189acb3f969c855536166042e27f5dd703f upstream.
curr_cmd points to the command that is in processing or waiting for its command response from firmware. If the function shutdown happens to occur at this time we should cancel the cmd timer and put the command back to free queue.
--- drivers/net/wireless/mwifiex/init.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/mwifiex/init.c +8 -0
@@ -561,6 +561,14 @@ mwifiex_shutdown_drv(struct mwifiex_adapreturn ret; } +/* cancel current command */ +if (adapter->curr_cmd) { +dev_warn (adapter->dev,"curr_cmd is still in processing\n" ); +del_timer (&adapter->cmd_timer); +mwifiex_insert_cmd_to_free_q (adapter, adapter->curr_cmd); + adapter->curr_cmd =NULL ; + } +/* shut down mwifiex */ dev_dbg (adapter->dev,"info: shutdown mwifiex...\n" );
Greg Kroah-Hartman
maintainerPATCH 15/56 net/irda: add missing error path release_sock call
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 896ee0eee6261e30c3623be931c3f621428947df upstream.
This makes sure that release_sock is called for all error conditions in irda_getsockopt.
--- net/irda/af_irda.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/irda/af_irda.c +4 -2
@@ -2584,8 +2584,10 @@ bed: NULL, NULL, NULL);/* Check if the we got some results */ -if (!self->cachedaddr) -return -EAGAIN ;/* Didn't find any devices */ +if (!self->cachedaddr) { + err = -EAGAIN ;/* Didn't find any devices */ + goto out; + } daddr = self->cachedaddr;/* Cleanup */ self->cachedaddr =0 ;
Greg Kroah-Hartman
maintainerPATCH 16/56 usb: xhci: Fix TRB transfer length macro used for Event TRB.
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vivek Gautam <[email protected]>
commit 1c11a172cb30492f5f6a82c6e118fdcd9946c34f upstream.
Use proper macro while extracting TRB transfer length from Transfer event TRBs. Adding a macro EVENT_TRB_LEN (bits 0:23) for the same, and use it instead of TRB_LEN (bits 0:16) in case of event TRBs.
This patch should be backported to kernels as old as 2.6.31, that contain the commit b10de142119a676552df3f0d2e3a9d647036c26a "USB: xhci:
Bulk transfer support". This patch will have issues applying to older kernels.
--- drivers/usb/host/xhci-ring.c | 24 ++++++++++++------------ drivers/usb/host/xhci.h | 4 ++++ 2 files changed, 16 insertions(+), 12 deletions(-)
drivers/usb/host/xhci-ring.c +12 -12
@@ -1960,8 +1960,8 @@ static int process_ctrl_td(struct xhci_hif (event_trb != ep_ring->dequeue && event_trb != td->last_trb) td->urb->actual_length = - td->urb->transfer_buffer_length - -TRB_LEN (le32_to_cpu (event->transfer_len)); + td->urb->transfer_buffer_length - +EVENT_TRB_LEN (le32_to_cpu (event->transfer_len));else td->urb->actual_length =0 ;
@@ -1993,7 +1993,7 @@ static int process_ctrl_td(struct xhci_h/* Maybe the event was for the data stage? */ td->urb->actual_length = td->urb->transfer_buffer_length - -TRB_LEN (le32_to_cpu (event->transfer_len)); +EVENT_TRB_LEN (le32_to_cpu (event->transfer_len));xhci_dbg (xhci,"Waiting for status " "stage event\n" );return 0 ;
@@ -2029,7 +2029,7 @@ static int process_isoc_td(struct xhci_h/* handle completion code */ switch (trb_comp_code) {case COMP_SUCCESS : -if (TRB_LEN (le32_to_cpu (event->transfer_len)) ==0 ) { +if (EVENT_TRB_LEN (le32_to_cpu (event->transfer_len)) ==0 ) { frame->status =0 ;break ; }
@@ -2076,7 +2076,7 @@ static int process_isoc_td(struct xhci_h len +=TRB_LEN (le32_to_cpu (cur_trb->generic.field[2 ])); } len +=TRB_LEN (le32_to_cpu (cur_trb->generic.field[2 ])) - -TRB_LEN (le32_to_cpu (event->transfer_len)); +EVENT_TRB_LEN (le32_to_cpu (event->transfer_len));if (trb_comp_code !=COMP_STOP_INVAL ) { frame->actual_length = len;
@@ -2134,7 +2134,7 @@ static int process_bulk_intr_td(struct xcase COMP_SUCCESS :/* Double check that the HW transferred everything. */ if (event_trb != td->last_trb || -TRB_LEN (le32_to_cpu (event->transfer_len)) !=0 ) { +EVENT_TRB_LEN (le32_to_cpu (event->transfer_len)) !=0 ) {xhci_warn (xhci,"WARN Successful completion " "on short TX\n" );if (td->urb->transfer_flags &URB_SHORT_NOT_OK )
@@ -2162,18 +2162,18 @@ static int process_bulk_intr_td(struct x"%d bytes untransferred\n" , td->urb->ep->desc.bEndpointAddress, td->urb->transfer_buffer_length, - TRB_LEN(le32_to_cpu(event->transfer_len))); + EVENT_TRB_LEN(le32_to_cpu(event->transfer_len)));/* Fast path - was this the last TRB in the TD for this URB? */ if (event_trb == td->last_trb) { -if (TRB_LEN (le32_to_cpu (event->transfer_len)) !=0 ) { +if (EVENT_TRB_LEN (le32_to_cpu (event->transfer_len)) !=0 ) { td->urb->actual_length = td->urb->transfer_buffer_length - -TRB_LEN (le32_to_cpu (event->transfer_len)); +EVENT_TRB_LEN (le32_to_cpu (event->transfer_len));if (td->urb->transfer_buffer_length < td->urb->actual_length) {xhci_warn (xhci,"HC gave bad length " "of %d bytes left\n" , -TRB_LEN (le32_to_cpu (event->transfer_len))); +EVENT_TRB_LEN (le32_to_cpu (event->transfer_len))); td->urb->actual_length =0 ;if (td->urb->transfer_flags &URB_SHORT_NOT_OK ) *status = -EREMOTEIO ;
@@ -2217,7 +2217,7 @@ static int process_bulk_intr_td(struct xif (trb_comp_code !=COMP_STOP_INVAL ) td->urb->actual_length +=TRB_LEN (le32_to_cpu (cur_trb->generic.field[2 ])) - -TRB_LEN (le32_to_cpu (event->transfer_len)); +EVENT_TRB_LEN (le32_to_cpu (event->transfer_len)); }return finish_td (xhci, td, event_trb, event, ep, status, false);
@@ -2283,7 +2283,7 @@ static int handle_tx_event(struct xhci_h* transfer type */ case COMP_SUCCESS : -if (TRB_LEN (le32_to_cpu (event->transfer_len)) ==0 ) +if (EVENT_TRB_LEN (le32_to_cpu (event->transfer_len)) ==0 )break ;if (xhci->quirks &XHCI_TRUST_TX_LENGTH ) trb_comp_code =COMP_SHORT_TX ;
drivers/usb/host/xhci.h +4 -0
@@ -831,6 +831,10 @@ struct xhci_transfer_event {__le32 flags; }; +/* Transfer event TRB length bit mask */ +/* bits 0:23 */ +#define EVENT_TRB_LEN (p) ((p) & 0xffffff) +/** Transfer Event bit fields **/ #define TRB_TO_EP_ID (p) (((p) >> 16) & 0x1f)
Greg Kroah-Hartman
maintainerPATCH 17/56 Btrfs: limit the global reserve to 512mb
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josef Bacik <[email protected]>
commit fdf30d1c1b386e1b73116cc7e0fb14e962b763b0 upstream.
A user reported a problem where he was getting early ENOSPC with hundreds of gigs of free data space and 6 gigs of free metadata space. This is because the global block reserve was taking up the entire free metadata space. This is ridiculous, we have infrastructure in place to throttle if we start using too much of the global reserve, so instead of letting it get this huge just limit it to 512mb so that users can still get work done. This allowed the user to complete his rsync without issues. Thanks
--- fs/btrfs/extent-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/extent-tree.c +1 -1
@@ -3786,7 +3786,7 @@ static void update_global_block_rsv(struspin_lock (&block_rsv->lock);spin_lock (&sinfo->lock); - block_rsv->size = num_bytes; + block_rsv->size =min_t (u64, num_bytes,512 *1024 *1024 ); num_bytes = sinfo->bytes_used + sinfo->bytes_pinned + sinfo->bytes_reserved + sinfo->bytes_readonly +
Greg Kroah-Hartman
maintainerPATCH 18/56 KVM: Clean up error handling during VCPU creation
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kiszka <[email protected]>
commit d780592b99d7d8a5ff905f6bacca519d4a342c76 upstream.
So far kvm_arch_vcpu_setup is responsible for freeing the vcpu struct if it fails. Move this confusing resonsibility back into the hands of kvm_vm_ioctl_create_vcpu. Only kvm_arch_vcpu_setup of x86 is affected, all other archs cannot fail.
--- arch/x86/kvm/x86.c | 5 ----- virt/kvm/kvm_main.c | 11 ++++++----- 2 files changed, 6 insertions(+), 10 deletions(-)
arch/x86/kvm/x86.c +0 -5
@@ -6116,12 +6116,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpuif (r ==0 ) r =kvm_mmu_setup (vcpu);vcpu_put (vcpu); -if (r <0 ) - goto free_vcpu; -return 0 ; -free_vcpu: - kvm_x86_ops->vcpu_free (vcpu);return r; }
virt/kvm/kvm_main.c +6 -5
@@ -1616,18 +1616,18 @@ static int kvm_vm_ioctl_create_vcpu(stru r =kvm_arch_vcpu_setup (vcpu);if (r) -return r; + goto vcpu_destroy;mutex_lock (&kvm->lock);if (atomic_read (&kvm->online_vcpus) ==KVM_MAX_VCPUS ) { r = -EINVAL ; - goto vcpu_destroy; + goto unlock_vcpu_destroy; }kvm_for_each_vcpu (r, v, kvm)if (v->vcpu_id == id) { r = -EEXIST ; - goto vcpu_destroy; + goto unlock_vcpu_destroy; }BUG_ON (kvm->vcpus[atomic_read (&kvm->online_vcpus)]);
@@ -1637,7 +1637,7 @@ static int kvm_vm_ioctl_create_vcpu(stru r =create_vcpu_fd (vcpu);if (r <0 ) {kvm_put_kvm (kvm); - goto vcpu_destroy; + goto unlock_vcpu_destroy; } kvm->vcpus[atomic_read (&kvm->online_vcpus)] = vcpu;
@@ -1651,8 +1651,9 @@ static int kvm_vm_ioctl_create_vcpu(strumutex_unlock (&kvm->lock);return r; -vcpu_destroy: +unlock_vcpu_destroy:mutex_unlock (&kvm->lock); +vcpu_destroy:kvm_arch_vcpu_destroy (vcpu);return r; }
Greg Kroah-Hartman
maintainerPATCH 19/56 x25: Validate incoming call user data lengths
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Daley <[email protected]>
commit c7fd0d48bde943e228e9c28ce971a22d6a1744c4 upstream.
X.25 call user data is being copied in its entirety from incoming messages without consideration to the size of the destination buffers, leading to possible buffer overflows. Validate incoming call user data lengths before these copies are performed.
It appears this issue was noticed some time ago, however nothing seemed to come of it: see http://www.spinics.net/lists/linux-x25/msg00043.html and commit 8db09f26f912f7c90c764806e804b558da520d4f.
--- net/x25/af_x25.c | 6 ++++++ net/x25/x25_in.c | 3 +++ 2 files changed, 9 insertions(+)
net/x25/af_x25.c +6 -0
@@ -960,6 +960,12 @@ int x25_rx_call_request(struct sk_buff *skb_pull (skb,len);/* +* Ensure that the amount of call user data is valid. +*/ +if (skb->len >X25_MAX_CUD_LEN ) + goto out_clear_request; + +/* * Find a listener for the particular address/cud pair. */ sk =x25_find_listener (&source_addr,skb);
net/x25/x25_in.c +3 -0
@@ -127,6 +127,9 @@ static int x25_state1_machine(struct soc* Copy any Call User Data. */ if (skb->len >0 ) { +if (skb->len >X25_MAX_CUD_LEN ) + goto out_clear; +skb_copy_from_linear_data (skb, x25->calluserdata.cuddata, skb->len);
Greg Kroah-Hartman
maintainerPATCH 20/56 x25: Handle undersized/fragmented skbs
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Daley <[email protected]>
commit cb101ed2c3c7c0224d16953fe77bfb9d6c2cb9df upstream.
There are multiple locations in the X.25 packet layer where a skb is assumed to be of at least a certain size and that all its data is currently available at skb->data. These assumptions are not checked, hence buffer overreads may occur. Use pskb_may_pull to check these minimal size assumptions and ensure that data is available at skb->data when necessary, as well as use skb_copy_bits where needed.
--- net/x25/af_x25.c | 31 ++++++++++++++++++++++++------- net/x25/x25_dev.c | 6 ++++++ net/x25/x25_facilities.c | 10 ++++++---- net/x25/x25_in.c | 40 +++++++++++++++++++++++++++++++++++----- net/x25/x25_link.c | 3 +++ net/x25/x25_subr.c | 14 +++++++++++++- 6 files changed, 87 insertions(+), 17 deletions(-)
net/x25/af_x25.c +24 -7
@@ -91,7 +91,7 @@ int x25_parse_address_block(struct sk_buint needed;int rc; -if (skb->len <1 ) { +if (!pskb_may_pull (skb,1 )) {/* packet has no address block */ rc =0 ; goto empty;
@@ -100,7 +100,7 @@ int x25_parse_address_block(struct sk_bu len = *skb->data; needed =1 + (len >>4 ) + (len &0x0f ); -if (skb->len < needed) { +if (!pskb_may_pull (skb, needed)) {/* packet is too short to hold the addresses it claims to hold */ rc =-1 ;
@@ -952,10 +952,10 @@ int x25_rx_call_request(struct sk_buff ** * Facilities length is mandatory in call request packets */ -if (skb->len <1 ) +if (!pskb_may_pull (skb,1 )) goto out_clear_request; len = skb->data[0 ] +1 ; -if (skb->len < len) +if (!pskb_may_pull (skb, len)) goto out_clear_request;skb_pull (skb,len);
@@ -966,6 +966,13 @@ int x25_rx_call_request(struct sk_buff * goto out_clear_request;/* +* Get all the call user data so it can be used in +* x25_find_listener and skb_copy_from_linear_data up ahead. +*/ +if (!pskb_may_pull (skb, skb->len)) + goto out_clear_request; + +/* * Find a listener for the particular address/cud pair. */ sk =x25_find_listener (&source_addr,skb);
@@ -1173,6 +1180,9 @@ static int x25_sendmsg(struct kiocb *ioc* byte of the user data is the logical value of the Q Bit. */ if (test_bit (X25_Q_BIT_FLAG , &x25->flags)) { +if (!pskb_may_pull (skb,1 )) + goto out_kfree_skb; + qbit = skb->data[0 ];skb_pull (skb,1 ); }
@@ -1251,7 +1261,9 @@ static int x25_recvmsg(struct kiocb *iocstruct x25_sock *x25 =x25_sk (sk);struct sockaddr_x25 *sx25 = (struct sockaddr_x25 *)msg->msg_name;size_t copied; -int qbit; +int qbit, header_len = x25->neighbour->extended ? +X25_EXT_MIN_LEN :X25_STD_MIN_LEN ; +struct sk_buff *skb;unsigned char *asmptr;int rc = -ENOTCONN ;
@@ -1272,6 +1284,9 @@ static int x25_recvmsg(struct kiocb *ioc skb =skb_dequeue (&x25->interrupt_in_queue); +if (!pskb_may_pull (skb,X25_STD_MIN_LEN )) + goto out_free_dgram; +skb_pull (skb,X25_STD_MIN_LEN );/*
@@ -1292,10 +1307,12 @@ static int x25_recvmsg(struct kiocb *iocif (!skb) goto out; +if (!pskb_may_pull (skb, header_len)) + goto out_free_dgram; + qbit = (skb->data[0 ] &X25_Q_BIT ) ==X25_Q_BIT ; -skb_pull (skb, x25->neighbour->extended ? -X25_EXT_MIN_LEN :X25_STD_MIN_LEN ); +skb_pull (skb, header_len);if (test_bit (X25_Q_BIT_FLAG , &x25->flags)) { asmptr =skb_push (skb,1 );
net/x25/x25_dev.c +6 -0
@@ -32,6 +32,9 @@ static int x25_receive_data(struct sk_buunsigned short frametype;unsigned int lci; +if (!pskb_may_pull (skb,X25_STD_MIN_LEN )) +return 0 ; + frametype = skb->data[2 ]; lci = ((skb->data[0 ] <<8 ) &0xF00 ) + ((skb->data[1 ] <<0 ) &0x0FF );
@@ -115,6 +118,9 @@ int x25_lapb_receive_frame(struct sk_buf goto drop; } +if (!pskb_may_pull (skb,1 )) +return 0 ; +switch (skb->data[0 ]) {case X25_IFACE_DATA :
net/x25/x25_facilities.c +6 -4
@@ -44,7 +44,7 @@int x25_parse_facilities (struct sk_buff *skb,struct x25_facilities *facilities,struct x25_dte_facilities *dte_facs,unsigned long *vc_fac_mask) { -unsigned char *p = skb->data; +unsigned char *p;unsigned int len; *vc_fac_mask =0 ;
@@ -60,14 +60,16 @@ int x25_parse_facilities(struct sk_buffmemset (dte_facs->called_ae,'\0' ,sizeof (dte_facs->called_ae));memset (dte_facs->calling_ae,'\0' ,sizeof (dte_facs->calling_ae)); -if (skb->len <1 ) +if (!pskb_may_pull (skb,1 ))return 0 ; - len = *p++; + len = skb->data[0 ]; -if (len >= skb->len) +if (!pskb_may_pull (skb,1 + len))return -1 ; + p = skb->data +1 ; +while (len >0 ) {switch (*p &X25_FAC_CLASS_MASK ) {case X25_FAC_CLASS_A :
net/x25/x25_in.c +35 -5
@@ -107,6 +107,8 @@ static int x25_state1_machine(struct soc/* * Parse the data in the frame. */ +if (!pskb_may_pull (skb,X25_STD_MIN_LEN )) + goto out_clear;skb_pull (skb,X25_STD_MIN_LEN ); len = x25_parse_address_block(skb, &source_addr,
@@ -130,9 +132,8 @@ static int x25_state1_machine(struct socif (skb->len >X25_MAX_CUD_LEN ) goto out_clear; -skb_copy_from_linear_data (skb, - x25->calluserdata.cuddata, - skb->len); +skb_copy_bits (skb,0 , x25->calluserdata.cuddata, + skb->len); x25->calluserdata.cudlength = skb->len; }if (!sock_flag (sk,SOCK_DEAD ))
@@ -140,6 +141,9 @@ static int x25_state1_machine(struct socbreak ; }case X25_CLEAR_REQUEST : +if (!pskb_may_pull (skb,X25_STD_MIN_LEN +2 )) + goto out_clear; +x25_write_internal (sk,X25_CLEAR_CONFIRMATION );x25_disconnect (sk,ECONNREFUSED , skb->data[3 ], skb->data[4 ]);break ;
@@ -167,6 +171,9 @@ static int x25_state2_machine(struct socswitch (frametype) {case X25_CLEAR_REQUEST : +if (!pskb_may_pull (skb,X25_STD_MIN_LEN +2 )) + goto out_clear; +x25_write_internal (sk,X25_CLEAR_CONFIRMATION );x25_disconnect (sk,0 , skb->data[3 ], skb->data[4 ]);break ;
@@ -180,6 +187,11 @@ static int x25_state2_machine(struct soc }return 0 ; + +out_clear: +x25_write_internal (sk,X25_CLEAR_REQUEST ); +x25_start_t23timer (sk); +return 0 ; }/*
@@ -209,6 +221,9 @@ static int x25_state3_machine(struct socbreak ;case X25_CLEAR_REQUEST : +if (!pskb_may_pull (skb,X25_STD_MIN_LEN +2 )) + goto out_clear; +x25_write_internal (sk,X25_CLEAR_CONFIRMATION );x25_disconnect (sk,0 , skb->data[3 ], skb->data[4 ]);break ;
@@ -307,6 +322,12 @@ static int x25_state3_machine(struct soc }return queued; + +out_clear: +x25_write_internal (sk,X25_CLEAR_REQUEST ); + x25->state =X25_STATE_2 ; +x25_start_t23timer (sk); +return 0 ; }/*
@@ -316,13 +337,13 @@ static int x25_state3_machine(struct soc*/ static int x25_state4_machine (struct sock *sk,struct sk_buff *skb,int frametype) { +struct x25_sock *x25 =x25_sk (sk); +switch (frametype) {case X25_RESET_REQUEST :x25_write_internal (sk,X25_RESET_CONFIRMATION );case X25_RESET_CONFIRMATION : { -struct x25_sock *x25 =x25_sk (sk); -x25_stop_timer (sk); x25->condition =0x00 ; x25->va =0 ;
@@ -334,6 +355,9 @@ static int x25_state4_machine(struct socbreak ; }case X25_CLEAR_REQUEST : +if (!pskb_may_pull (skb,X25_STD_MIN_LEN +2 )) + goto out_clear; +x25_write_internal (sk,X25_CLEAR_CONFIRMATION );x25_disconnect (sk,0 , skb->data[3 ], skb->data[4 ]);break ;
@@ -343,6 +367,12 @@ static int x25_state4_machine(struct soc }return 0 ; + +out_clear: +x25_write_internal (sk,X25_CLEAR_REQUEST ); + x25->state =X25_STATE_2 ; +x25_start_t23timer (sk); +return 0 ; }/* Higher level upcall for a LAPB frame */
net/x25/x25_link.c +3 -0
@@ -90,6 +90,9 @@ void x25_link_control(struct sk_buff *skbreak ;case X25_DIAGNOSTIC : +if (!pskb_may_pull (skb,X25_STD_MIN_LEN +4 )) +break ; + printk(KERN_WARNING "x25: diagnostic #%d - " "%02X %02X %02X\n", skb->data[3], skb->data[4],
net/x25/x25_subr.c +13 -1
@@ -271,7 +271,11 @@ int x25_decode(struct sock *sk, struct s int *d, int *m) { struct x25_sock *x25 = x25_sk(sk); -unsigned char *frame = skb->data; +unsigned char *frame; + +if (!pskb_may_pull (skb,X25_STD_MIN_LEN )) +return X25_ILLEGAL ; + frame = skb->data; *ns = *nr = *q = *d = *m =0 ;
@@ -296,6 +300,10 @@ int x25_decode(struct sock *sk, struct sif (frame[2 ] ==X25_RR || frame[2 ] ==X25_RNR || frame[2 ] ==X25_REJ ) { +if (!pskb_may_pull (skb,X25_EXT_MIN_LEN )) +return X25_ILLEGAL ; + frame = skb->data; + *nr = (frame[3 ] >>1 ) &0x7F ;return frame[2 ]; }
@@ -310,6 +318,10 @@ int x25_decode(struct sock *sk, struct sif (x25->neighbour->extended) {if ((frame[2 ] &0x01 ) ==X25_DATA ) { +if (!pskb_may_pull (skb,X25_EXT_MIN_LEN )) +return X25_ILLEGAL ; + frame = skb->data; + *q = (frame[0 ] &X25_Q_BIT ) ==X25_Q_BIT ; *d = (frame[0 ] &X25_D_BIT ) ==X25_D_BIT ; *m = (frame[3 ] &X25_EXT_M_BIT ) ==X25_EXT_M_BIT ;
Greg Kroah-Hartman
maintainerPATCH 21/56 batman-adv: bat_socket_read missing checks
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Kot <[email protected]>
commit c00b6856fc642b234895cfabd15b289e76726430 upstream.
Writing a icmp_packet_rr and then reading icmp_packet can lead to kernel memory corruption, if __user *buf is just below TASK_SIZE.
--- net/batman-adv/icmp_socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/batman-adv/icmp_socket.c +2 -2
@@ -136,8 +136,8 @@ static ssize_t bat_socket_read(struct fispin_unlock_bh (&socket_client->lock); - error =__copy_to_user (buf, &socket_packet->icmp_packet, - socket_packet->icmp_len); + error =copy_to_user (buf, &socket_packet->icmp_packet, + socket_packet->icmp_len); packet_len = socket_packet->icmp_len;kfree (socket_packet);
Greg Kroah-Hartman
maintainerPATCH 22/56 batman-adv: Only write requested number of byte to user buffer
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Eckelmann <[email protected]>
commit b5a1eeef04cc7859f34dec9b72ea1b28e4aba07c upstream.
Don't write more than the requested number of bytes of an batman-adv icmp packet to the userspace buffer. Otherwise unrelated userspace memory might get overridden by the kernel.
--- net/batman-adv/icmp_socket.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/batman-adv/icmp_socket.c +2 -3
@@ -136,10 +136,9 @@ static ssize_t bat_socket_read(struct fispin_unlock_bh (&socket_client->lock); - error =copy_to_user (buf, &socket_packet->icmp_packet, - socket_packet->icmp_len); + packet_len =min (count, socket_packet->icmp_len); + error =copy_to_user (buf, &socket_packet->icmp_packet, packet_len); - packet_len = socket_packet->icmp_len;kfree (socket_packet);if (error)
Greg Kroah-Hartman
maintainerPATCH 23/56 KVM: x86: Prevent starting PIT timers in the absence of irqchip support
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kiszka <[email protected]>
commit 0924ab2cfa98b1ece26c033d696651fd62896c69 upstream.
User space may create the PIT and forgets about setting up the irqchips. In that case, firing PIT IRQs will crash the host:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000128 IP: [<ffffffffa10f6280>] kvm_set_irq+0x30/0x170 [kvm] ... Call Trace: [<ffffffffa11228c1>] pit_do_work+0x51/0xd0 [kvm] [<ffffffff81071431>] process_one_work+0x111/0x4d0 [<ffffffff81071bb2>] worker_thread+0x152/0x340 [<ffffffff81075c8e>] kthread+0x7e/0x90 [<ffffffff815a4474>] kernel_thread_helper+0x4/0x10
Prevent this by checking the irqchip mode before starting a timer. We can't deny creating the PIT if the irqchips aren't set up yet as current user land expects this order to work.
--- arch/x86/kvm/i8254.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/x86/kvm/i8254.c +7 -3
@@ -338,11 +338,15 @@ static enum hrtimer_restart pit_timer_fnreturn HRTIMER_NORESTART ; } -static void create_pit_timer (struct kvm_kpit_state *ps,u32 val,int is_period) +static void create_pit_timer (struct kvm *kvm,u32 val,int is_period) { +struct kvm_kpit_state *ps = &kvm->arch.vpit->pit_state;struct kvm_timer *pt = &ps->pit_timer;s64 interval; +if (!irqchip_in_kernel (kvm)) +return ; + interval =muldiv64 (val,NSEC_PER_SEC ,KVM_PIT_FREQ );pr_debug ("create pit timer, interval is %llu nsec\n" , interval);
@@ -394,13 +398,13 @@ static void pit_load_count(struct kvm *k/* FIXME: enhance mode 4 precision */ case 4 :if (!(ps->flags &KVM_PIT_FLAGS_HPET_LEGACY )) { -create_pit_timer (ps, val,0 ); +create_pit_timer (kvm, val,0 ); }break ;case 2 :case 3 :if (!(ps->flags &KVM_PIT_FLAGS_HPET_LEGACY )){ -create_pit_timer (ps, val,1 ); +create_pit_timer (kvm, val,1 ); }break ;default :
Greg Kroah-Hartman
maintainerPATCH 24/56 NFSv4: include bitmap in nfsv4 get acl data
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Adamson <[email protected]>
commit bf118a342f10dafe44b14451a1392c3254629a1f upstream.
The NFSv4 bitmap size is unbounded: a server can return an arbitrary sized bitmap in an FATTR4_WORD0_ACL request. Replace using the nfs4_fattr_bitmap_maxsz as a guess to the maximum bitmask returned by a server with the inclusion of the bitmap (xdr length plus bitmasks) and the acl data xdr length to the (cached) acl page data.
This is a general solution to commit e5012d1f "NFSv4.1: update nfs4_fattr_bitmap_maxsz" and fixes hitting a BUG_ON in xdr_shrink_bufhead when getting ACLs.
Fix a bug in decode_getacl that returned -EINVAL on ACLs > page when getxattr was called with a NULL buffer, preventing ACL > PAGE_SIZE from being retrieved.
--- fs/nfs/nfs4proc.c | 96 ++++++++++++++++++++++++++------------------- fs/nfs/nfs4xdr.c | 31 ++++++++++---- include/linux/nfs_xdr.h | 5 ++ include/linux/sunrpc/xdr.h | 2 net/sunrpc/xdr.c | 3 - 5 files changed, 89 insertions(+), 48 deletions(-)
fs/nfs/nfs4proc.c +57 -39
@@ -3440,19 +3440,6 @@ static inline int nfs4_server_supports_a*/ #define NFS4ACL_MAXPAGES (XATTR_SIZE_MAX >> PAGE_CACHE_SHIFT) -static void buf_to_pages (const void *buf,size_t buflen, -struct page **pages,unsigned int *pgbase) -{ -const void *p = buf; - - *pgbase =offset_in_page (buf); - p -= *pgbase; -while (p < buf + buflen) { - *(pages++) =virt_to_page (p); - p +=PAGE_CACHE_SIZE ; - } -} -static int buf_to_pages_noslab (const void *buf,size_t buflen,struct page **pages,unsigned int *pgbase) {
@@ -3549,9 +3536,19 @@ out:nfs4_set_cached_acl (inode, acl); } +/* +* The getxattr API returns the required buffer length when called with a +* NULL buf. The NFSv4 acl tool then calls getxattr again after allocating +* the required buf. On a NULL buf, we send a page of data to the server +* guessing that the ACL request can be serviced by a page. If so, we cache +* up to the page of ACL data, and the 2nd call to getxattr is serviced by +* the cache. If not so, we throw away the page, and cache the required +* length. The next getxattr call will then produce another round trip to +* the server, this time with the input buf of the required size. +*/ static ssize_t __nfs4_get_acl_uncached (struct inode *inode,void *buf,size_t buflen) { -struct page *pages[NFS4ACL_MAXPAGES ]; +struct page *pages[NFS4ACL_MAXPAGES ] = {NULL , };struct nfs_getaclargs args = { .fh =NFS_FH (inode), .acl_pages = pages,
@@ -3566,41 +3563,60 @@ static ssize_t __nfs4_get_acl_uncached(s .rpc_argp = &args, .rpc_resp = &res, }; -struct page *localpage =NULL ; -int ret; +int ret = -ENOMEM , npages, i, acl_len =0 ; -if (buflen <PAGE_SIZE ) { -/* As long as we're doing a round trip to the server anyway, -* let's be prepared for a page of acl data. */ - localpage =alloc_page (GFP_KERNEL ); - resp_buf =page_address (localpage); -if (localpage ==NULL ) -return -ENOMEM ; - args.acl_pages[0 ] = localpage; - args.acl_pgbase =0 ; - args.acl_len =PAGE_SIZE ; - }else { - resp_buf = buf; -buf_to_pages (buf, buflen, args.acl_pages, &args.acl_pgbase); + npages = (buflen +PAGE_SIZE -1 ) >>PAGE_SHIFT ; +/* As long as we're doing a round trip to the server anyway, +* let's be prepared for a page of acl data. */ +if (npages ==0 ) + npages =1 ; + +for (i =0 ; i < npages; i++) { + pages[i] =alloc_page (GFP_KERNEL ); +if (!pages[i]) + goto out_free; } - ret =nfs4_call_sync (NFS_SERVER (inode)->client,NFS_SERVER (inode), &msg, &args.seq_args, &res.seq_res,0 ); +if (npages >1 ) { +/* for decoding across pages */ + args.acl_scratch =alloc_page (GFP_KERNEL ); +if (!args.acl_scratch) + goto out_free; + } + args.acl_len = npages *PAGE_SIZE ; + args.acl_pgbase =0 ; +/* Let decode_getfacl know not to fail if the ACL data is larger than +* the page we send as a guess */ +if (buf ==NULL ) + res.acl_flags |=NFS4_ACL_LEN_REQUEST ; + resp_buf =page_address (pages[0 ]); + +dprintk ("%s buf %p buflen %ld npages %d args.acl_len %ld\n" , + __func__, buf, buflen, npages, args.acl_len); + ret =nfs4_call_sync (NFS_SERVER (inode)->client,NFS_SERVER (inode), + &msg, &args.seq_args, &res.seq_res,0 );if (ret) goto out_free; -if (res.acl_len > args.acl_len) -nfs4_write_cached_acl (inode,NULL , res.acl_len); + + acl_len = res.acl_len - res.acl_data_offset; +if (acl_len > args.acl_len) +nfs4_write_cached_acl (inode,NULL , acl_len);else -nfs4_write_cached_acl (inode, resp_buf, res.acl_len); +nfs4_write_cached_acl (inode, resp_buf + res.acl_data_offset, + acl_len);if (buf) { ret = -ERANGE ; -if (res.acl_len > buflen) +if (acl_len > buflen) goto out_free; -if (localpage) -memcpy (buf, resp_buf, res.acl_len); +_copy_from_pages (buf, pages, res.acl_data_offset, + res.acl_len); } - ret = res.acl_len; + ret = acl_len; out_free: -if (localpage) -__free_page (localpage); +for (i =0 ; i < npages; i++) +if (pages[i]) +__free_page (pages[i]); +if (args.acl_scratch) +__free_page (args.acl_scratch);return ret; }
@@ -3631,6 +3647,8 @@ static ssize_t nfs4_proc_get_acl(structnfs_zap_acl_cache (inode); ret =nfs4_read_cached_acl (inode, buf, buflen);if (ret != -ENOENT ) +/* -ENOENT is returned if there is no ACL or if there is an ACL +* but no cached acl data, just the acl length */ return ret;return nfs4_get_acl_uncached (inode, buf, buflen); }
fs/nfs/nfs4xdr.c +23 -8
@@ -2374,11 +2374,13 @@ static void nfs4_xdr_enc_getacl(struct rencode_compound_hdr (xdr, req, &hdr);encode_sequence (xdr, &args->seq_args, &hdr);encode_putfh (xdr, args->fh, &hdr); - replen = hdr.replen + op_decode_hdr_maxsz + nfs4_fattr_bitmap_maxsz +1 ; + replen = hdr.replen + op_decode_hdr_maxsz +1 ;encode_getattr_two (xdr,FATTR4_WORD0_ACL ,0 , &hdr);xdr_inline_pages (&req->rq_rcv_buf, replen <<2 , args->acl_pages, args->acl_pgbase, args->acl_len); +xdr_set_scratch_buffer (xdr,page_address (args->acl_scratch),PAGE_SIZE ); +encode_nops (&hdr); }
@@ -4714,17 +4716,18 @@ decode_restorefh(struct xdr_stream *xdr) }static int decode_getacl (struct xdr_stream *xdr,struct rpc_rqst *req, -size_t *acl_len) +struct nfs_getaclres *res) { -__be32 *savep; +__be32 *savep, *bm_p;uint32_t attrlen, bitmap[2 ] = {0 };struct kvec *iov = req->rq_rcv_buf.head;int status; - *acl_len =0 ; + res->acl_len =0 ;if ((status =decode_op_hdr (xdr,OP_GETATTR )) !=0 ) goto out; + bm_p = xdr->p;if ((status =decode_attr_bitmap (xdr, bitmap)) !=0 ) goto out;if ((status =decode_attr_length (xdr, &attrlen, &savep)) !=0 )
@@ -4736,18 +4739,30 @@ static int decode_getacl(struct xdr_stresize_t hdrlen;u32 recvd; +/* The bitmap (xdr len + bitmaps) and the attr xdr len words +* are stored with the acl data to handle the problem of +* variable length bitmaps.*/ + xdr->p = bm_p; + res->acl_data_offset =be32_to_cpup (bm_p) +2 ; + res->acl_data_offset <<=2 ; +/* We ignore &savep and don't do consistency checks on * the attr length. Let userspace figure it out.... */ hdrlen = (u8 *)xdr->p - (u8 *)iov->iov_base; + attrlen += res->acl_data_offset; recvd = req->rq_rcv_buf.len - hdrlen;if (attrlen > recvd) { -dprintk ("NFS: server cheating in getattr" -" acl reply: attrlen %u > recvd %u\n" , +if (res->acl_flags &NFS4_ACL_LEN_REQUEST ) { +/* getxattr interface called with a NULL buf */ + res->acl_len = attrlen; + goto out; + } +dprintk ("NFS: acl reply: attrlen %u > recvd %u\n" , attrlen, recvd);return -EINVAL ; }xdr_read_pages (xdr, attrlen); - *acl_len = attrlen; + res->acl_len = attrlen; }else status = -EOPNOTSUPP ;
@@ -5682,7 +5697,7 @@ nfs4_xdr_dec_getacl(struct rpc_rqst *rqs status =decode_putfh (xdr);if (status) goto out; - status =decode_getacl (xdr, rqstp, &res->acl_len); + status =decode_getacl (xdr, rqstp, res); out:return status;
include/linux/nfs_xdr.h +5 -0
@@ -588,11 +588,16 @@ struct nfs_getaclargs {size_t acl_len;unsigned int acl_pgbase;struct page ** acl_pages; +struct page * acl_scratch;struct nfs4_sequence_args seq_args; }; +/* getxattr ACL interface flags */ +#define NFS4_ACL_LEN_REQUEST 0x0001/* zero length getxattr buffer */ struct nfs_getaclres {size_t acl_len; +size_t acl_data_offset; +int acl_flags;struct nfs4_sequence_res seq_res; };
include/linux/sunrpc/xdr.h +2 -0
@@ -191,6 +191,8 @@ extern int xdr_decode_array2(struct xdr_ struct xdr_array2_desc *desc);extern int xdr_encode_array2 (struct xdr_buf *buf,unsigned int base,struct xdr_array2_desc *desc); +extern void _copy_from_pages (char *p,struct page **pages,size_t pgbase, +size_t len);/* * Provide some simple tools for XDR buffer overflow-checking etc.
net/sunrpc/xdr.c +2 -1
@@ -296,7 +296,7 @@ _copy_to_pages(struct page **pages, size* Copies data into an arbitrary memory location from an array of pages * The copy is assumed to be non-overlapping. */ -static void +void _copy_from_pages (char *p,struct page **pages,size_t pgbase,size_t len) {struct page **pgfrom;
@@ -324,6 +324,7 @@ _copy_from_pages(char *p, struct page ** }while ((len -= copy) !=0 ); } +EXPORT_SYMBOL_GPL (_copy_from_pages);/* * xdr_shrink_bufhead
Greg Kroah-Hartman
maintainerPATCH 25/56 NFSv4: Fix an Oops in the NFSv4 getacl code
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
commit 331818f1c468a24e581aedcbe52af799366a9dfe upstream.
Commit bf118a342f10dafe44b14451a1392c3254629a1f (NFSv4: include bitmap in nfsv4 get acl data) introduces the 'acl_scratch' page for the case where we may need to decode multi-page data. However it fails to take into account the fact that the variable may be NULL (for the case where we're not doing multi-page decode), and it also attaches it to the encoding xdr_stream rather than the decoding one.
The immediate result is an Oops in nfs4_xdr_enc_getacl due to the call to page_address() with a NULL page pointer.
--- fs/nfs/nfs4proc.c | 8 ++++---- fs/nfs/nfs4xdr.c | 5 ++++- include/linux/nfs_xdr.h | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-)
fs/nfs/nfs4proc.c +4 -4
@@ -3578,8 +3578,8 @@ static ssize_t __nfs4_get_acl_uncached(s }if (npages >1 ) {/* for decoding across pages */ - args.acl_scratch =alloc_page (GFP_KERNEL ); -if (!args.acl_scratch) + res.acl_scratch =alloc_page (GFP_KERNEL ); +if (!res.acl_scratch) goto out_free; } args.acl_len = npages *PAGE_SIZE ;
@@ -3615,8 +3615,8 @@ out_free:for (i =0 ; i < npages; i++)if (pages[i])__free_page (pages[i]); -if (args.acl_scratch) -__free_page (args.acl_scratch); +if (res.acl_scratch) +__free_page (res.acl_scratch);return ret; }
fs/nfs/nfs4xdr.c +4 -1
@@ -2379,7 +2379,6 @@ static void nfs4_xdr_enc_getacl(struct rxdr_inline_pages (&req->rq_rcv_buf, replen <<2 , args->acl_pages, args->acl_pgbase, args->acl_len); -xdr_set_scratch_buffer (xdr,page_address (args->acl_scratch),PAGE_SIZE );encode_nops (&hdr); }
@@ -5688,6 +5687,10 @@ nfs4_xdr_dec_getacl(struct rpc_rqst *rqsstruct compound_hdr hdr;int status; +if (res->acl_scratch !=NULL ) { +void *p =page_address (res->acl_scratch); +xdr_set_scratch_buffer (xdr, p,PAGE_SIZE ); + } status =decode_compound_hdr (xdr, &hdr);if (status) goto out;
include/linux/nfs_xdr.h +1 -1
@@ -588,7 +588,6 @@ struct nfs_getaclargs {size_t acl_len;unsigned int acl_pgbase;struct page ** acl_pages; -struct page * acl_scratch;struct nfs4_sequence_args seq_args; };
@@ -598,6 +597,7 @@ struct nfs_getaclres {size_t acl_len;size_t acl_data_offset;int acl_flags; +struct page * acl_scratch;struct nfs4_sequence_res seq_res; };
Greg Kroah-Hartman
maintainerPATCH 26/56 NFS: nfs_getaclargs.acl_len is a size_t
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
commit 56d08fef2369d5ca9ad2e1fc697f5379fd8af751 upstream.
Squelch compiler warnings:
fs/nfs/nfs4proc.c: In function ‘__nfs4_get_acl_uncached’:fs/nfs/nfs4proc.c:3811:14: warning: comparison between signed and
unsigned integer expressions [-Wsign-compare]fs/nfs/nfs4proc.c:3818:15: warning: comparison between signed and
unsigned integer expressions [-Wsign-compare]
Introduced by commit bf118a34 "NFSv4: include bitmap in nfsv4 get acl data", Dec 7, 2011.
--- fs/nfs/nfs4proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/nfs/nfs4proc.c +2 -1
@@ -3563,7 +3563,8 @@ static ssize_t __nfs4_get_acl_uncached(s .rpc_argp = &args, .rpc_resp = &res, }; -int ret = -ENOMEM , npages, i, acl_len =0 ; +int ret = -ENOMEM , npages, i; +size_t acl_len =0 ; npages = (buflen +PAGE_SIZE -1 ) >>PAGE_SHIFT ;/* As long as we're doing a round trip to the server anyway,
Greg Kroah-Hartman
maintainerPATCH 27/56 KVM: Ensure all vcpus are consistent with in-kernel irqchip settings
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Avi Kivity <[email protected]>
commit 3e515705a1f46beb1c942bb8043c16f8ac7b1e9e upstream.
If some vcpus are created before KVM_CREATE_IRQCHIP, then irqchip_in_kernel() and vcpu->arch.apic will be inconsistent, leading to potential NULL pointer dereferences.
Fix by:
- ensuring that no vcpus are installed when KVM_CREATE_IRQCHIP is called
- ensuring that a vcpu has an apic if it is installed after KVM_CREATE_IRQCHIP
This is somewhat long winded because vcpu->arch.apic is created without kvm->lock held.
Based on earlier patch by Michael Ellerman.
--- arch/ia64/kvm/kvm-ia64.c | 5 +++++ arch/x86/kvm/x86.c | 8 ++++++++ include/linux/kvm_host.h | 7 +++++++ virt/kvm/kvm_main.c | 4 ++++ 4 files changed, 24 insertions(+)
arch/ia64/kvm/kvm-ia64.c +5 -0
@@ -1168,6 +1168,11 @@ out:#define PALE_RESET_ENTRY 0x80000000ffffffb0UL +bool kvm_vcpu_compatible (struct kvm_vcpu *vcpu) +{ +return irqchip_in_kernel (vcpu->kcm) == (vcpu->arch.apic !=NULL ); +} +int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) {struct kvm_vcpu *v;
arch/x86/kvm/x86.c +8 -0
@@ -3410,6 +3410,9 @@ long kvm_arch_vm_ioctl(struct file *filp r = -EEXIST ;if (kvm->arch.vpic) goto create_irqchip_unlock; + r = -EINVAL ; +if (atomic_read (&kvm->online_vcpus)) + goto create_irqchip_unlock; r = -ENOMEM ; vpic =kvm_create_pic (kvm);if (vpic) {
@@ -6189,6 +6192,11 @@ void kvm_arch_check_processor_compat(voi kvm_x86_ops->check_processor_compatibility (rtn); } +bool kvm_vcpu_compatible (struct kvm_vcpu *vcpu) +{ +return irqchip_in_kernel (vcpu->kvm) == (vcpu->arch.apic !=NULL ); +} +int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) {struct page *page;
include/linux/kvm_host.h +7 -0
@@ -736,6 +736,13 @@ static inline bool kvm_vcpu_is_bsp(struc {return vcpu->kvm->bsp_vcpu_id == vcpu->vcpu_id; } + +bool kvm_vcpu_compatible (struct kvm_vcpu *vcpu); + +#else + +static inline bool kvm_vcpu_compatible (struct kvm_vcpu *vcpu) {return true; } +#endif #ifdef __KVM_HAVE_DEVICE_ASSIGNMENT
virt/kvm/kvm_main.c +4 -0
@@ -1619,6 +1619,10 @@ static int kvm_vm_ioctl_create_vcpu(stru goto vcpu_destroy;mutex_lock (&kvm->lock); +if (!kvm_vcpu_compatible (vcpu)) { + r = -EINVAL ; + goto unlock_vcpu_destroy; + }if (atomic_read (&kvm->online_vcpus) ==KVM_MAX_VCPUS ) { r = -EINVAL ; goto unlock_vcpu_destroy;
Greg Kroah-Hartman
maintainerPATCH 28/56 macvtap: zerocopy: validate vectors before building skb
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Wang <[email protected]>
commit b92946e2919134ebe2a4083e4302236295ea2a73 upstream.
There're several reasons that the vectors need to be validated:
- Return error when caller provides vectors whose num is greater than UIO_MAXIOV.
- Linearize part of skb when userspace provides vectors grater than MAX_SKB_FRAGS.
- Return error when userspace provides vectors whose total length may exceed
- MAX_SKB_FRAGS * PAGE_SIZE.
the 3rd reason only for 3.0]
--- drivers/net/macvtap.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/macvtap.c +4 -0
@@ -552,6 +552,10 @@ static ssize_t macvtap_get_user(struct mif (unlikely (len <ETH_HLEN )) goto err; + err = -EMSGSIZE ; +if (unlikely (count >UIO_MAXIOV )) + goto err; + skb =macvtap_alloc_skb (&q->sk,NET_IP_ALIGN , len, vnet_hdr.hdr_len, noblock, &err);if (!skb)
Greg Kroah-Hartman
maintainerPATCH 29/56 KVM: Fix buffer overflow in kvm_set_irq()
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Avi Kivity <[email protected]>
commit f2ebd422f71cda9c791f76f85d2ca102ae34a1ed upstream.
kvm_set_irq() has an internal buffer of three irq routing entries, allowing connecting a GSI to three IRQ chips or on MSI. However setup_routing_entry() does not properly enforce this, allowing three irqchip routes followed by an MSI route to overflow the buffer.
Fix by ensuring that an MSI entry is added to an empty list.
--- virt/kvm/irq_comm.c | 1 + 1 file changed, 1 insertion(+)
virt/kvm/irq_comm.c +1 -0
@@ -318,6 +318,7 @@ static int setup_routing_entry(struct kv*/ hlist_for_each_entry (ei, n, &rt->map[ue->gsi], link)if (ei->type ==KVM_IRQ_ROUTING_MSI || + ue->type ==KVM_IRQ_ROUTING_MSI || ue->u.irqchip.irqchip == ei->irqchip.irqchip)return r;
Greg Kroah-Hartman
maintainerPATCH 30/56 mm/hotplug: correctly add new zone to all other nodes zone lists
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiang Liu <[email protected]>
commit 08dff7b7d629807dbb1f398c68dd9cd58dd657a1 upstream.
When online_pages() is called to add new memory to an empty zone, it rebuilds all zone lists by calling build_all_zonelists(). But there's a bug which prevents the new zone to be added to other nodes' zone lists.
online_pages() {
build_all_zonelists()
.....
node_set_state(zone_to_nid(zone), N_HIGH_MEMORY)
}Here the node of the zone is put into N_HIGH_MEMORY state after calling build_all_zonelists(), but build_all_zonelists() only adds zones from nodes in N_HIGH_MEMORY state to the fallback zone lists. build_all_zonelists()
->__build_all_zonelists() ->build_zonelists() ->find_next_best_node() ->for_each_node_state(n, N_HIGH_MEMORY)
So memory in the new zone will never be used by other nodes, and it may cause strange behavor when system is under memory pressure. So put node into N_HIGH_MEMORY state before calling build_all_zonelists().
--- mm/memory_hotplug.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
mm/memory_hotplug.c +8 -7
@@ -453,19 +453,20 @@ int __ref online_pages(unsigned long pfn zone->present_pages += onlined_pages; zone->zone_pgdat->node_present_pages += onlined_pages; -if (need_zonelists_rebuild) -build_all_zonelists (zone); -else -zone_pcp_update (zone); +if (onlined_pages) { +node_set_state (zone_to_nid (zone),N_HIGH_MEMORY ); +if (need_zonelists_rebuild) +build_all_zonelists (zone); +else +zone_pcp_update (zone); + }mutex_unlock (&zonelists_mutex);init_per_zone_wmark_min (); -if (onlined_pages) { +if (onlined_pages)kswapd_run (zone_to_nid (zone)); -node_set_state (zone_to_nid (zone),N_HIGH_MEMORY ); - } vm_total_pages =nr_free_pagecache_pages ();
Greg Kroah-Hartman
maintainerPATCH 31/56 KVM: x86: invalid opcode oops on SET_SREGS with OSXSAVE bit set (CVE-2012-4461)
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Matousek <[email protected]>
commit 6d1068b3a98519247d8ba4ec85cd40ac136dbdf9 upstream.
On hosts without the XSAVE support unprivileged local user can trigger oops similar to the one below by setting X86_CR4_OSXSAVE bit in guest cr4 register using KVM_SET_SREGS ioctl and later issuing KVM_RUN ioctl.
invalid opcode: 0000 [#2] SMP
Modules linked in: tun ip6table_filter ip6_tables ebtable_nat ebtables
...
Pid: 24935, comm: zoog_kvm_monito Tainted: G D 3.2.0-3-686-pae
EIP: 0060:[<f8b9550c>] EFLAGS: 00210246 CPU: 0
EIP is at kvm_arch_vcpu_ioctl_run+0x92a/0xd13 [kvm]
EAX: 00000001 EBX: 000f387e ECX: 00000000 EDX: 00000000
ESI: 00000000 EDI: 00000000 EBP: ef5a0060 ESP: d7c63e70
DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
Process zoog_kvm_monito (pid: 24935, ti=d7c62000 task=ed84a0c0 task.ti=d7c62000)
Stack: 00000001 f70a1200 f8b940a9 ef5a0060 00000000 00200202 f8769009 00000000 ef5a0060 000f387e eda5c020 8722f9c8 00015bae 00000000 ed84a0c0 ed84a0c0 c12bf02d 0000ae80 ef7f8740 fffffffb f359b740 ef5a0060 f8b85dc1 0000ae80 Call Trace: [<f8b940a9>] ? kvm_arch_vcpu_ioctl_set_sregs+0x2fe/0x308 [kvm] ... [<c12bfb44>] ? syscall_call+0x7/0xb Code: 89 e8 e8 14 ee ff ff ba 00 00 04 00 89 e8 e8 98 48 ff ff 85 c0 74
1e 83 7d 48 00 75 18 8b 85 08 07 00 00 31 c9 8b 95 0c 07 00 00 <0f> 01 d1 c7 45 48 01 00 00 00 c7 45 1c 01 00 00 00 0f ae f0 89
EIP: [<f8b9550c>] kvm_arch_vcpu_ioctl_run+0x92a/0xd13 [kvm] SS:ESP 0068:d7c63e70
QEMU first retrieves the supported features via KVM_GET_SUPPORTED_CPUID and then sets them later. So guest's X86_FEATURE_XSAVE should be masked out on hosts without X86_FEATURE_XSAVE, making kvm_set_cr4 with X86_CR4_OSXSAVE fail. Userspaces that allow specifying guest cpuid with X86_FEATURE_XSAVE even on hosts that do not support it, might be susceptible to this attack from inside the guest as well.
Allow setting X86_CR4_OSXSAVE bit only if host has XSAVE support.
--- arch/x86/kvm/x86.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/kvm/x86.c +6 -0
@@ -575,6 +575,9 @@ static bool guest_cpuid_has_xsave(struct {struct kvm_cpuid_entry2 *best; +if (!cpu_has_xsave) +return 0 ; + best =kvm_find_cpuid_entry (vcpu,1 ,0 );return best && (best->ecx &bit (X86_FEATURE_XSAVE )); }
@@ -5854,6 +5857,9 @@ int kvm_arch_vcpu_ioctl_set_sregs(structint pending_vec, max_bits, idx;struct desc_ptr dt; +if (!guest_cpuid_has_xsave (vcpu) && (sregs->cr4 &X86_CR4_OSXSAVE )) +return -EINVAL ; + dt.size = sregs->idt.limit; dt.address = sregs->idt.base; kvm_x86_ops->set_idt (vcpu, &dt);
Greg Kroah-Hartman
maintainerPATCH 32/56 loop: prevent bdev freeing while device in use
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anatol Pomozov <[email protected]>
commit c1681bf8a7b1b98edee8b862a42c19c4e53205fd upstream.
struct block_device lifecycle is defined by its inode (see fs/block_dev.c) - block_device allocated first time we access /dev/loopXX and deallocated on bdev_destroy_inode. When we create the device "losetup /dev/loopXX afile" we want that block_device stay alive until we destroy the loop device with "losetup -d".
But because we do not hold /dev/loopXX inode its counter goes 0, and inode/bdev can be destroyed at any moment. Usually it happens at memory pressure or when user drops inode cache (like in the test below). When later in loop_clr_fd() we want to use bdev we have use-after-free error with following stack:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000280 bd_set_size+0x10/0xa0 loop_clr_fd+0x1f8/0x420 [loop] lo_ioctl+0x200/0x7e0 [loop] lo_compat_ioctl+0x47/0xe0 [loop] compat_blkdev_ioctl+0x341/0x1290 do_filp_open+0x42/0xa0 compat_sys_ioctl+0xc1/0xf20 do_sys_open+0x16e/0x1d0 sysenter_dispatch+0x7/0x1a
To prevent use-after-free we need to grab the device in loop_set_fd() and put it later in loop_clr_fd().
The issue is reprodusible on current Linus head and v3.3. Here is the test:
dd if=/dev/zero of=loop.file bs=1M count=1
while [ true ]; do
losetup /dev/loop0 loop.file
echo 2 > /proc/sys/vm/drop_caches
losetup -d /dev/loop0
done
[ Doing bdgrab/bput in loop_set_fd/loop_clr_fd is safe, because every
time we call loop_set_fd() we check that loop_device->lo_state is Lo_unbound and set it to Lo_bound If somebody will try to set_fd again it will get EBUSY. And if we try to loop_clr_fd() on unbound loop device we'll get ENXIO.
loop_set_fd/loop_clr_fd (and any other loop ioctl) is called under loop_device->lo_ctl_mutex. ]
--- drivers/block/loop.c | 9 ++++++++- fs/block_dev.c | 1 + 2 files changed, 9 insertions(+), 1 deletion(-)
drivers/block/loop.c +8 -1
@@ -928,6 +928,11 @@ static int loop_set_fd(struct loop_devicwake_up_process (lo->lo_thread);if (max_part >0 )ioctl_by_bdev (bdev,BLKRRPART ,0 ); + +/* Grab the block_device to prevent its destruction after we +* put /dev/loopXX inode. Later in loop_clr_fd() we bdput(bdev). +*/ +bdgrab (bdev);return 0 ; out_clr:
@@ -1024,8 +1029,10 @@ static int loop_clr_fd(struct loop_devicmemset (lo->lo_encrypt_key,0 ,LO_KEY_SIZE );memset (lo->lo_crypt_name,0 ,LO_NAME_SIZE );memset (lo->lo_file_name,0 ,LO_NAME_SIZE ); -if (bdev) +if (bdev) { +bdput (bdev);invalidate_bdev (bdev); + }set_capacity (lo->lo_disk,0 );loop_sysfs_exit (lo);if (bdev) {
fs/block_dev.c +1 -0
@@ -576,6 +576,7 @@ struct block_device *bdgrab(struct blockihold (bdev->bd_inode);return bdev; } +EXPORT_SYMBOL (bdgrab);long nr_blockdev_pages (void ) {
Greg Kroah-Hartman
maintainerPATCH 33/56 nfsd4: reject "negative" acl lengths
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: "J. Bruce Fields" <[email protected]>
commit 64a817cfbded8674f345d1117b117f942a351a69 upstream.
Since we only enforce an upper bound, not a lower bound, a "negative" length can get through here.
The symptom seen was a warning when we attempt to a kmalloc with an excessive size.
--- fs/nfsd/nfs4xdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfs4xdr.c +1 -1
@@ -262,7 +262,7 @@ nfsd4_decode_fattr(struct nfsd4_compound iattr->ia_valid |=ATTR_SIZE ; }if (bmval[0 ] &FATTR4_WORD0_ACL ) { -int nace; +u32 nace;struct nfs4_ace *ace;READ_BUF (4 ); len +=4 ;
Greg Kroah-Hartman
maintainerPATCH 34/56 drm/i915: dont set unpin_work if vblank_get fails
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jesse Barnes <[email protected]>
commit 7317c75e66fce0c9f82fbe6f72f7e5256b315422 upstream.
This fixes a race where we may try to finish a page flip and decrement the refcount even if our vblank_get failed and we ended up with a spurious flip pending interrupt.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=34211.
--- drivers/gpu/drm/i915/intel_display.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_display.c +7 -5
@@ -6524,11 +6524,16 @@ static int intel_crtc_page_flip(struct d work->old_fb_obj = intel_fb->obj;INIT_WORK (&work->work, intel_unpin_work_fn); + ret =drm_vblank_get (dev, intel_crtc->pipe); +if (ret) + goto free_work; +/* We borrow the event spin lock for protecting unpin_work */ spin_lock_irqsave (&dev->event_lock, flags);if (intel_crtc->unpin_work) {spin_unlock_irqrestore (&dev->event_lock, flags);kfree (work); +drm_vblank_put (dev, intel_crtc->pipe);DRM_DEBUG_DRIVER ("flip queue: crtc already busy\n" );return -EBUSY ;
@@ -6547,10 +6552,6 @@ static int intel_crtc_page_flip(struct d crtc->fb = fb; - ret =drm_vblank_get (dev, intel_crtc->pipe); -if (ret) - goto cleanup_objs; - work->pending_flip_obj = obj; work->enable_stall_check = true;
@@ -6572,7 +6573,6 @@ static int intel_crtc_page_flip(struct d cleanup_pending:atomic_sub (1 << intel_crtc->plane, &work->old_fb_obj->pending_flip); -cleanup_objs:drm_gem_object_unreference (&work->old_fb_obj->base);drm_gem_object_unreference (&obj->base);mutex_unlock (&dev->struct_mutex);
@@ -6581,6 +6581,8 @@ cleanup_objs: intel_crtc->unpin_work =NULL ;spin_unlock_irqrestore (&dev->event_lock, flags); +drm_vblank_put (dev, intel_crtc->pipe); +free_work:kfree (work);return ret;
Greg Kroah-Hartman
maintainerPATCH 35/56 drm/i915: Dont clobber crtc->fb when queue_flip fails
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ville Syrjälä <[email protected]>
commit 4a35f83b2b7c6aae3fc0d1c4554fdc99dc33ad07 upstream.
Restore crtc->fb to the old framebuffer if queue_flip fails.
While at it, kill the pointless intel_fb temp variable.
v2: Update crtc->fb before queue_flip and restore it back
after a failure.
[Backported for 3.0-stable. Adjusted context. Please cherry-pick commit 7317c75e66fce0c9f82fbe6f72f7e5256b315422 upstream before this patch as it provides necessary context and fixes a panic.]
--- drivers/gpu/drm/i915/intel_display.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_display.c +4 -7
@@ -6507,8 +6507,8 @@ static int intel_crtc_page_flip(struct d {struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_framebuffer *intel_fb; -struct drm_i915_gem_object *obj; +struct drm_framebuffer *old_fb = crtc->fb; +struct drm_i915_gem_object *obj =to_intel_framebuffer (fb)->obj;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct intel_unpin_work *work;unsigned long flags;
@@ -6520,8 +6520,7 @@ static int intel_crtc_page_flip(struct d work->event = event; work->dev = crtc->dev; - intel_fb =to_intel_framebuffer (crtc->fb); - work->old_fb_obj = intel_fb->obj; + work->old_fb_obj =to_intel_framebuffer (old_fb)->obj;INIT_WORK (&work->work, intel_unpin_work_fn); ret =drm_vblank_get (dev, intel_crtc->pipe);
@@ -6541,9 +6540,6 @@ static int intel_crtc_page_flip(struct d intel_crtc->unpin_work = work;spin_unlock_irqrestore (&dev->event_lock, flags); - intel_fb =to_intel_framebuffer (fb); - obj = intel_fb->obj; -mutex_lock (&dev->struct_mutex);/* Reference the objects for the scheduled work. */
@@ -6573,6 +6569,7 @@ static int intel_crtc_page_flip(struct d cleanup_pending:atomic_sub (1 << intel_crtc->plane, &work->old_fb_obj->pending_flip); + crtc->fb = old_fb;drm_gem_object_unreference (&work->old_fb_obj->base);drm_gem_object_unreference (&obj->base);mutex_unlock (&dev->struct_mutex);
Greg Kroah-Hartman
maintainerPATCH 36/56 efivars: explicitly calculate length of VariableName
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Fleming <[email protected]>
commit ec50bd32f1672d38ddce10fb1841cbfda89cfe9a upstream.
It's not wise to assume VariableNameSize represents the length of VariableName, as not all firmware updates VariableNameSize in the same way (some don't update it at all if EFI_SUCCESS is returned). There are even implementations out there that update VariableNameSize with values that are both larger than the string returned in VariableName and smaller than the buffer passed to GetNextVariableName(), which resulted in the following bug report from Michael Schroeder,
Quoted 8 lines
On HP z220 system (firmware version 1.54), some EFI variables are incorrectly named :
ls -d
/sys/firmware/efi/vars/*8be4d*| grep -v -- -8be returns/sys/firmware/efi/vars/dbxDefault-pport8be4df61-93ca-11d2-aa0d-00e098032b8c/sys/firmware/efi/vars/KEKDefault-pport8be4df61-93ca-11d2-aa0d-00e098032b8c/sys/firmware/efi/vars/SecureBoot-pport8be4df61-93ca-11d2-aa0d-00e098032b8c/sys/firmware/efi/vars/SetupMode-Information8be4df61-93ca-11d2-aa0d-00e098032b8c
The issue here is that because we blindly use VariableNameSize without verifying its value, we can potentially read garbage values from the buffer containing VariableName if VariableNameSize is larger than the length of VariableName.
Since VariableName is a string, we can calculate its size by searching for the terminating NULL character.
[Backported for 3.8-stable. Removed workqueue code added in a93bc0c 3.9-rc1.]
--- drivers/firmware/efivars.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/firmware/efivars.c +27 -0
@@ -731,6 +731,31 @@ static ssize_t efivar_delete(struct file }/* +* Returns the size of variable_name, in bytes, including the +* terminating NULL character, or variable_name_size if no NULL +* character is found among the first variable_name_size bytes. +*/ +static unsigned long var_name_strnsize (efi_char16_t *variable_name, +unsigned long variable_name_size) +{ +unsigned long len; +efi_char16_t c; + +/* +* The variable name is, by definition, a NULL-terminated +* string, so make absolutely sure that variable_name_size is +* the value we expect it to be. If not, return the real size. +*/ +for (len =2 ; len <= variable_name_size; len +=sizeof (c)) { + c = variable_name[(len /sizeof (c)) -1 ]; +if (!c) +break ; + } + +return min (len, variable_name_size); +} + +/* * Let's not leave out systab information that snuck into * the efivars driver */
@@ -957,6 +982,8 @@ int register_efivars(struct efivars *efi &vendor_guid);switch (status) {case EFI_SUCCESS : + variable_name_size =var_name_strnsize (variable_name, + variable_name_size); efivar_create_sysfs_entry(efivars, variable_name_size, variable_name,
Greg Kroah-Hartman
maintainerPATCH 37/56 efivars: Handle duplicate names from get_next_variable()
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Fleming <[email protected]>
commit e971318bbed610e28bb3fde9d548e6aaf0a6b02e upstream.
Some firmware exhibits a bug where the same VariableName and VendorGuid values are returned on multiple invocations of GetNextVariableName(). See,
https://bugzilla.kernel.org/show_bug.cgi?id=47631
As a consequence of such a bug, Andre reports hitting the following WARN_ON() in the sysfs code after updating the BIOS on his, "Gigabyte Technology Co., Ltd. To be filled by O.E.M./Z77X-UD3H, BIOS F19e 11/21/2012)" machine,
[ 0.581554] EFI Variables Facility v0.08 2004-May-17 [ 0.584914] ------------[ cut here ]------------ [ 0.585639] WARNING: at /home/andre/linux/fs/sysfs/dir.c:536 sysfs_add_one+0xd4/0x100() [ 0.586381] Hardware name: To be filled by O.E.M. [ 0.587123] sysfs: cannot create duplicate filename '/firmware/efi/vars/SbAslBufferPtrVar-01f33c25-764d-43ea-aeea-6b5a41f3f3e8' [ 0.588694] Modules linked in: [ 0.589484] Pid: 1, comm: swapper/0 Not tainted 3.8.0+ #7 [ 0.590280] Call Trace: [ 0.591066] [<ffffffff81208954>] ? sysfs_add_one+0xd4/0x100 [ 0.591861] [<ffffffff810587bf>] warn_slowpath_common+0x7f/0xc0 [ 0.592650] [<ffffffff810588bc>] warn_slowpath_fmt+0x4c/0x50 [ 0.593429] [<ffffffff8134dd85>] ? strlcat+0x65/0x80 [ 0.594203] [<ffffffff81208954>] sysfs_add_one+0xd4/0x100 [ 0.594979] [<ffffffff81208b78>] create_dir+0x78/0xd0 [ 0.595753] [<ffffffff81208ec6>] sysfs_create_dir+0x86/0xe0 [ 0.596532] [<ffffffff81347e4c>] kobject_add_internal+0x9c/0x220 [ 0.597310] [<ffffffff81348307>] kobject_init_and_add+0x67/0x90 [ 0.598083] [<ffffffff81584a71>] ? efivar_create_sysfs_entry+0x61/0x1c0 [ 0.598859] [<ffffffff81584b2b>] efivar_create_sysfs_entry+0x11b/0x1c0 [ 0.599631] [<ffffffff8158517e>] register_efivars+0xde/0x420 [ 0.600395] [<ffffffff81d430a7>] ? edd_init+0x2f5/0x2f5 [ 0.601150] [<ffffffff81d4315f>] efivars_init+0xb8/0x104 [ 0.601903] [<ffffffff8100215a>] do_one_initcall+0x12a/0x180 [ 0.602659] [<ffffffff81d05d80>] kernel_init_freeable+0x13e/0x1c6 [ 0.603418] [<ffffffff81d05586>] ? loglevel+0x31/0x31 [ 0.604183] [<ffffffff816a6530>] ? rest_init+0x80/0x80 [ 0.604936] [<ffffffff816a653e>] kernel_init+0xe/0xf0 [ 0.605681] [<ffffffff816ce7ec>] ret_from_fork+0x7c/0xb0 [ 0.606414] [<ffffffff816a6530>] ? rest_init+0x80/0x80 [ 0.607143] ---[ end trace 1609741ab737eb29 ]---
There's not much we can do to work around and keep traversing the variable list once we hit this firmware bug. Our only solution is to terminate the loop because, as Lingzhu reports, some machines get stuck when they encounter duplicate names,
Quoted 5 lines
I had an IBM System x3100 M4 and x3850 X5 on which kernel would get stuck in infinite loop creating duplicate sysfs files because, for some reason, there are several duplicate boot entries in nvram getting GetNextVariableName into a circle of iteration (with period > 2).
Also disable the workqueue, as efivar_update_sysfs_entries() uses GetNextVariableName() to figure out which variables have been created since the last iteration. That algorithm isn't going to work if GetNextVariableName() returns duplicates. Note that we don't disable EFI variable creation completely on the affected machines, it's just that any pstore dump-* files won't appear in sysfs until the next boot.
[Backported for 3.0-stable. Removed code related to pstore workqueue but pulled in helper function variable_is_present from a93bc0c; Moved the definition of __efivars to the top for being referenced in variable_is_present.]
--- drivers/firmware/efivars.c | 65 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 3 deletions(-)
drivers/firmware/efivars.c +62 -3
@@ -119,6 +119,8 @@ struct efivar_attribute {ssize_t (*store)(struct efivar_entry *entry,const char *buf,size_t count); }; +static struct efivars __efivars; +static struct efivar_operations ops;#define EFIVAR_ATTR (_name, _mode, _show, _store) \ struct efivar_attribute efivar_attr_##_name = { \
@@ -730,6 +732,28 @@ static ssize_t efivar_delete(struct filereturn count; } +static bool variable_is_present (efi_char16_t *variable_name,efi_guid_t *vendor) +{ +struct efivar_entry *entry, *n; +struct efivars *efivars = &__efivars; +unsigned long strsize1, strsize2; +bool found = false; + + strsize1 =utf16_strsize (variable_name,1024 ); +list_for_each_entry_safe (entry, n, &efivars->list, list) { + strsize2 =utf16_strsize (entry->var.VariableName,1024 ); +if (strsize1 == strsize2 && + !memcmp (variable_name, &(entry->var.VariableName), + strsize2) && + !efi_guidcmp (entry->var.VendorGuid, + *vendor)) { + found = true; +break ; + } + } +return found; +} +/* * Returns the size of variable_name, in bytes, including the * terminating NULL character, or variable_name_size if no NULL
@@ -942,6 +966,28 @@ void unregister_efivars(struct efivars * }EXPORT_SYMBOL_GPL (unregister_efivars); +/* +* Print a warning when duplicate EFI variables are encountered and +* disable the sysfs workqueue since the firmware is buggy. +*/ +static void dup_variable_bug (efi_char16_t *s16,efi_guid_t *vendor_guid, +unsigned long len16) +{ +size_t i, len8 = len16 /sizeof (efi_char16_t); +char *s8; + + s8 =kzalloc (len8,GFP_KERNEL ); +if (!s8) +return ; + +for (i =0 ; i < len8; i++) + s8[i] = s16[i]; + +printk (KERN_WARNING "efivars: duplicate variable: %s-%pUl\n" , + s8, vendor_guid); +kfree (s8); +} +int register_efivars (struct efivars *efivars,const struct efivar_operations *ops,struct kobject *parent_kobj)
@@ -984,6 +1030,22 @@ int register_efivars(struct efivars *eficase EFI_SUCCESS : variable_name_size =var_name_strnsize (variable_name, variable_name_size); + +/* +* Some firmware implementations return the +* same variable name on multiple calls to +* get_next_variable(). Terminate the loop +* immediately as there is no guarantee that +* we'll ever see a different variable name, +* and may end up looping here forever. +*/ +if (variable_is_present (variable_name, &vendor_guid)) { +dup_variable_bug (variable_name, &vendor_guid, + variable_name_size); + status =EFI_NOT_FOUND ; +break ; + } + efivar_create_sysfs_entry(efivars, variable_name_size, variable_name,
@@ -1010,9 +1072,6 @@ out: }EXPORT_SYMBOL_GPL (register_efivars); -static struct efivars __efivars; -static struct efivar_operations ops; -/* * For now we register the efi subsystem with the firmware subsystem * and the vars subsystem with the efi subsystem. In the future, it
Greg Kroah-Hartman
maintainerPATCH 38/56 ext4: use atomic64_t for the per-flexbg free_clusters count
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit 90ba983f6889e65a3b506b30dc606aa9d1d46cd2 upstream.
A user who was using a 8TB+ file system and with a very large flexbg size (> 65536) could cause the atomic_t used in the struct flex_groups to overflow. This was detected by PaX security patchset:
http://forums.grsecurity.net/viewtopic.php?f=3&t=3289&p=12551#p12551
This bug was introduced in commit 9f24e4208f7e, so it's been around since 2.6.30. :-(
Fix this by using an atomic64_t for struct orlav_stats's free_clusters.
[Backported for 3.0-stable. Renamed free_clusters back to free_blocks; fixed a few more atomic_read's of free_blocks left in 3.0.]
fs/ext4/ext4.h +3 -3
@@ -288,9 +288,9 @@ struct ext4_group_desc*/ struct flex_groups { -atomic_t free_inodes; -atomic_t free_blocks; -atomic_t used_dirs; +atomic64_t free_blocks; +atomic_t free_inodes; +atomic_t used_dirs; };#define EXT4_BG_INODE_UNINIT 0x0001/* Inode table/bitmap not in use */
fs/ext4/ialloc.c +9 -9
@@ -345,8 +345,8 @@ static int find_group_flex(struct super_block *sb, struct inode *parent,ext4_group_t ngroups =ext4_get_groups_count (sb);int flex_size =ext4_flex_bg_size (sbi);ext4_group_t best_flex = parent_fbg_group; -int blocks_per_flex = sbi->s_blocks_per_group * flex_size; -int flexbg_free_blocks; +ext4_fsblk_t blocks_per_flex = sbi->s_blocks_per_group * flex_size; +ext4_fsblk_t flexbg_free_blocks;int flex_freeb_ratio;ext4_group_t n_fbg_groups;ext4_group_t i;
@@ -355,7 +355,7 @@ static int find_group_flex(struct super_block *sb, struct inode *parent, sbi->s_log_groups_per_flex; find_close_to_parent: - flexbg_free_blocks =atomic_read (&flex_group[best_flex].free_blocks); + flexbg_free_blocks =atomic64_read (&flex_group[best_flex].free_blocks); flex_freeb_ratio = flexbg_free_blocks *100 / blocks_per_flex;if (atomic_read (&flex_group[best_flex].free_inodes) && flex_freeb_ratio > free_block_ratio)
@@ -370,7 +370,7 @@ find_close_to_parent:if (i == parent_fbg_group || i == parent_fbg_group -1 )continue ; - flexbg_free_blocks =atomic_read (&flex_group[i].free_blocks); + flexbg_free_blocks =atomic64_read (&flex_group[i].free_blocks); flex_freeb_ratio = flexbg_free_blocks *100 / blocks_per_flex; if (flex_freeb_ratio > free_block_ratio &&
@@ -380,14 +380,14 @@ find_close_to_parent: }if ((atomic_read (&flex_group[best_flex].free_inodes) ==0 ) || - ((atomic_read (&flex_group[i].free_blocks) > -atomic_read (&flex_group[best_flex].free_blocks)) && + ((atomic64_read (&flex_group[i].free_blocks) > +atomic64_read (&flex_group[best_flex].free_blocks)) &&atomic_read (&flex_group[i].free_inodes))) best_flex = i; }if (!atomic_read (&flex_group[best_flex].free_inodes) || - !atomic_read (&flex_group[best_flex].free_blocks)) + !atomic64_read (&flex_group[best_flex].free_blocks))return -1 ; found_flexbg:
@@ -406,8 +406,8 @@ out: }struct orlov_stats { +__u64 free_blocks;__u32 free_inodes; -__u32 free_blocks;__u32 used_dirs; };
@@ -424,7 +424,7 @@ static void get_orlov_stats(struct super_block *sb, ext4_group_t g,if (flex_size >1 ) { stats->free_inodes =atomic_read (&flex_group[g].free_inodes); - stats->free_blocks =atomic_read (&flex_group[g].free_blocks); + stats->free_blocks =atomic64_read (&flex_group[g].free_blocks); stats->used_dirs =atomic_read (&flex_group[g].used_dirs);return ; }
fs/ext4/mballoc.c +5 -5
@@ -2814,8 +2814,8 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac,if (sbi->s_log_groups_per_flex) {ext4_group_t flex_group =ext4_flex_group (sbi, ac->ac_b_ex.fe_group); -atomic_sub (ac->ac_b_ex.fe_len, - &sbi->s_flex_groups[flex_group].free_blocks); +atomic64_sub (ac->ac_b_ex.fe_len, + &sbi->s_flex_groups[flex_group].free_blocks); } err =ext4_handle_dirty_metadata (handle,NULL , bitmap_bh);
@@ -4614,7 +4614,7 @@ do_more:if (sbi->s_log_groups_per_flex) {ext4_group_t flex_group =ext4_flex_group (sbi, block_group); -atomic_add (count, &sbi->s_flex_groups[flex_group].free_blocks); +atomic64_add (count, &sbi->s_flex_groups[flex_group].free_blocks); }ext4_mb_unload_buddy (&e4b);
@@ -4745,8 +4745,8 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb,if (sbi->s_log_groups_per_flex) {ext4_group_t flex_group =ext4_flex_group (sbi, block_group); -atomic_add (blocks_freed, - &sbi->s_flex_groups[flex_group].free_blocks); +atomic64_add (blocks_freed, + &sbi->s_flex_groups[flex_group].free_blocks); }ext4_mb_unload_buddy (&e4b);
fs/ext4/resize.c +2 -2
@@ -929,8 +929,8 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) sbi->s_log_groups_per_flex) {ext4_group_t flex_group; flex_group =ext4_flex_group (sbi, input->group); -atomic_add (input->free_blocks_count, - &sbi->s_flex_groups[flex_group].free_blocks); +atomic64_add (input->free_blocks_count, + &sbi->s_flex_groups[flex_group].free_blocks);atomic_add (EXT4_INODES_PER_GROUP (sb), &sbi->s_flex_groups[flex_group].free_inodes); }
fs/ext4/super.c +2 -2
@@ -1992,8 +1992,8 @@ static int ext4_fill_flex_info(struct super_block *sb) flex_group =ext4_flex_group (sbi, i);atomic_add (ext4_free_inodes_count (sb, gdp), &sbi->s_flex_groups[flex_group].free_inodes); -atomic_add (ext4_free_blks_count (sb, gdp), - &sbi->s_flex_groups[flex_group].free_blocks); +atomic64_add (ext4_free_blks_count (sb, gdp), + &sbi->s_flex_groups[flex_group].free_blocks);atomic_add (ext4_used_dirs_count (sb, gdp), &sbi->s_flex_groups[flex_group].used_dirs); }
Signature · 6 lines
1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Greg Kroah-Hartman
maintainerPATCH 39/56 tracing: Protect tracer flags with trace_types_lock
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (Red Hat)" <[email protected]>
commit 69d34da2984c95b33ea21518227e1f9470f11d95 upstream.
Seems that the tracer flags have never been protected from synchronous writes. Luckily, admins don't usually modify the tracing flags via two different tasks. But if scripts were to be used to modify them, then they could get corrupted.
Move the trace_types_lock that protects against tracers changing to also protect the flags being set.
[Backported for 3.4, 3.0-stable. Moved return to after unlock.]
--- kernel/trace/trace.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
kernel/trace/trace.c +12 -7
@@ -2552,7 +2552,7 @@ tracing_trace_options_write(struct filechar buf[64 ];char *cmp;int neg =0 ; -int ret; +int ret =0 ;int i;if (cnt >=sizeof (buf))
@@ -2569,6 +2569,8 @@ tracing_trace_options_write(struct file cmp +=2 ; } +mutex_lock (&trace_types_lock); +for (i =0 ; trace_options[i]; i++) {if (strcmp (cmp, trace_options[i]) ==0 ) {set_tracer_flags (1 << i, !neg);
@@ -2577,13 +2579,13 @@ tracing_trace_options_write(struct file }/* If no option could be set, test the specific tracer options */ -if (!trace_options[i]) { -mutex_lock (&trace_types_lock); +if (!trace_options[i]) ret =set_tracer_option (current_trace, cmp, neg); -mutex_unlock (&trace_types_lock); -if (ret) -return ret; - } + +mutex_unlock (&trace_types_lock); + +if (ret) +return ret; *ppos += cnt;
@@ -4180,7 +4182,10 @@ trace_options_core_write(struct file *fiif (val !=0 && val !=1 )return -EINVAL ; + +mutex_lock (&trace_types_lock);set_tracer_flags (1 << index, val); +mutex_unlock (&trace_types_lock); *ppos += cnt;
Greg Kroah-Hartman
maintainerPATCH 40/56 tracing: Prevent buffer overwrite disabled for latency tracers
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (Red Hat)" <[email protected]>
commit 613f04a0f51e6e68ac6fe571ab79da3c0a5eb4da upstream.
The latency tracers require the buffers to be in overwrite mode, otherwise they get screwed up. Force the buffers to stay in overwrite mode when latency tracers are enabled.
Added a flag_changed() method to the tracer structure to allow the tracers to see what flags are being changed, and also be able to prevent the change from happing.
[Backported for 3.4-stable. Re-added current_trace NULL checks; removed allocated_snapshot field; adapted to tracing_trace_options_write without trace_set_options.]
--- kernel/trace/trace.c | 35 +++++++++++++++++++++++++++++------ kernel/trace/trace.h | 7 +++++++ kernel/trace/trace_irqsoff.c | 19 ++++++++++++++----- kernel/trace/trace_sched_wakeup.c | 18 +++++++++++++----- 4 files changed, 63 insertions(+), 16 deletions(-)
kernel/trace/trace.c +29 -6
@@ -2527,11 +2527,25 @@ static int set_tracer_option(struct tracreturn -EINVAL ; } -static void set_tracer_flags (unsigned int mask,int enabled) +/* Some tracers require overwrite to stay enabled */ +int trace_keep_overwrite (struct tracer *tracer,u32 mask,int set) +{ +if (tracer->enabled && (mask &TRACE_ITER_OVERWRITE ) && !set) +return -1 ; + +return 0 ; +} + +int set_tracer_flag (unsigned int mask,int enabled) {/* do nothing if flag is already set */ if (!!(trace_flags & mask) == !!enabled) -return ; +return 0 ; + +/* Give the tracer a chance to approve the change */ +if (current_trace->flag_changed) +if (current_trace->flag_changed (current_trace, mask, !!enabled)) +return -EINVAL ;if (enabled) trace_flags |= mask;
@@ -2543,6 +2557,8 @@ static void set_tracer_flags(unsigned inif (mask ==TRACE_ITER_OVERWRITE )ring_buffer_change_overwrite (global_trace.buffer, enabled); + +return 0 ; } static ssize_t
@@ -2552,7 +2568,7 @@ tracing_trace_options_write(struct filechar buf[64 ];char *cmp;int neg =0 ; -int ret =0 ; +int ret = -ENODEV ;int i;if (cnt >=sizeof (buf))
@@ -2573,7 +2589,7 @@ tracing_trace_options_write(struct filefor (i =0 ; trace_options[i]; i++) {if (strcmp (cmp, trace_options[i]) ==0 ) { -set_tracer_flags (1 << i, !neg); + ret =set_tracer_flag (1 << i, !neg);break ; } }
@@ -2584,7 +2600,7 @@ tracing_trace_options_write(struct filemutex_unlock (&trace_types_lock); -if (ret) +if (ret <0 )return ret; *ppos += cnt;
@@ -2883,6 +2899,9 @@ static int tracing_set_tracer(const char goto out;trace_branch_disable (); + + current_trace->enabled = false; +if (current_trace && current_trace->reset) current_trace->reset (tr);if (current_trace && current_trace->use_max_tr) {
@@ -2912,6 +2931,7 @@ static int tracing_set_tracer(const char goto out; } + current_trace->enabled = true;trace_branch_enable (tr); out:mutex_unlock (&trace_types_lock);
@@ -4184,9 +4204,12 @@ trace_options_core_write(struct file *fireturn -EINVAL ;mutex_lock (&trace_types_lock); -set_tracer_flags (1 << index, val); + ret =set_tracer_flag (1 << index, val);mutex_unlock (&trace_types_lock); +if (ret <0 ) +return ret; + *ppos += cnt;return cnt;
kernel/trace/trace.h +7 -0
@@ -271,10 +271,14 @@ struct tracer {enum print_line_t (*print_line)(struct trace_iterator *iter);/* If you handled the flag setting, return 0 */ int (*set_flag)(u32 old_flags,u32 bit,int set); +/* Return 0 if OK with change, else return non-zero */ +int (*flag_changed)(struct tracer *tracer, +u32 mask,int set);struct tracer *next;struct tracer_flags *flags;int print_max;int use_max_tr; +bool enabled; };
@@ -776,6 +780,9 @@ extern struct list_head ftrace_events;extern const char *__start___trace_bprintk_fmt[];extern const char *__stop___trace_bprintk_fmt[]; +int trace_keep_overwrite (struct tracer *tracer,u32 mask,int set); +int set_tracer_flag (unsigned int mask,int enabled); +#undef FTRACE_ENTRY#define FTRACE_ENTRY (call, struct_name, id, tstruct, print) \ extern struct ftrace_event_call \
kernel/trace/trace_irqsoff.c +14 -5
@@ -32,7 +32,7 @@ enum {static int trace_type__read_mostly ; -static int save_lat_flag; +static int save_flags;static void stop_irqsoff_tracer (struct trace_array *tr,int graph);static int start_irqsoff_tracer (struct trace_array *tr,int graph);
@@ -544,8 +544,11 @@ static void stop_irqsoff_tracer(struct tstatic void __irqsoff_tracer_init (struct trace_array *tr) { - save_lat_flag = trace_flags &TRACE_ITER_LATENCY_FMT ; - trace_flags |=TRACE_ITER_LATENCY_FMT ; + save_flags = trace_flags; + +/* non overwrite screws up the latency tracers */ +set_tracer_flag (TRACE_ITER_OVERWRITE ,1 ); +set_tracer_flag (TRACE_ITER_LATENCY_FMT ,1 ); tracing_max_latency =0 ; irqsoff_trace = tr;
@@ -559,10 +562,13 @@ static void __irqsoff_tracer_init(structstatic void irqsoff_tracer_reset (struct trace_array *tr) { +int lat_flag = save_flags &TRACE_ITER_LATENCY_FMT ; +int overwrite_flag = save_flags &TRACE_ITER_OVERWRITE ; +stop_irqsoff_tracer (tr,is_graph ()); -if (!save_lat_flag) - trace_flags &= ~TRACE_ITER_LATENCY_FMT ; +set_tracer_flag (TRACE_ITER_LATENCY_FMT , lat_flag); +set_tracer_flag (TRACE_ITER_OVERWRITE , overwrite_flag); }static void irqsoff_tracer_start (struct trace_array *tr)
@@ -595,6 +601,7 @@ static struct tracer irqsoff_tracer __re .print_line = irqsoff_print_line, .flags = &tracer_flags, .set_flag = irqsoff_set_flag, + .flag_changed = trace_keep_overwrite,#ifdef CONFIG_FTRACE_SELFTEST .selftest = trace_selftest_startup_irqsoff,#endif
@@ -628,6 +635,7 @@ static struct tracer preemptoff_tracer _ .print_line = irqsoff_print_line, .flags = &tracer_flags, .set_flag = irqsoff_set_flag, + .flag_changed = trace_keep_overwrite,#ifdef CONFIG_FTRACE_SELFTEST .selftest = trace_selftest_startup_preemptoff,#endif
@@ -663,6 +671,7 @@ static struct tracer preemptirqsoff_trac .print_line = irqsoff_print_line, .flags = &tracer_flags, .set_flag = irqsoff_set_flag, + .flag_changed = trace_keep_overwrite,#ifdef CONFIG_FTRACE_SELFTEST .selftest = trace_selftest_startup_preemptirqsoff,#endif
kernel/trace/trace_sched_wakeup.c +13 -5
@@ -36,7 +36,7 @@ static void __wakeup_reset(struct trace_static int wakeup_graph_entry (struct ftrace_graph_ent *trace);static void wakeup_graph_return (struct ftrace_graph_ret *trace); -static int save_lat_flag; +static int save_flags;#define TRACE_DISPLAY_GRAPH 1
@@ -526,8 +526,11 @@ static void stop_wakeup_tracer(struct trstatic int __wakeup_tracer_init (struct trace_array *tr) { - save_lat_flag = trace_flags &TRACE_ITER_LATENCY_FMT ; - trace_flags |=TRACE_ITER_LATENCY_FMT ; + save_flags = trace_flags; + +/* non overwrite screws up the latency tracers */ +set_tracer_flag (TRACE_ITER_OVERWRITE ,1 ); +set_tracer_flag (TRACE_ITER_LATENCY_FMT ,1 ); tracing_max_latency =0 ; wakeup_trace = tr;
@@ -549,12 +552,15 @@ static int wakeup_rt_tracer_init(structstatic void wakeup_tracer_reset (struct trace_array *tr) { +int lat_flag = save_flags &TRACE_ITER_LATENCY_FMT ; +int overwrite_flag = save_flags &TRACE_ITER_OVERWRITE ; +stop_wakeup_tracer (tr);/* make sure we put back any tasks we are tracing */ wakeup_reset (tr); -if (!save_lat_flag) - trace_flags &= ~TRACE_ITER_LATENCY_FMT ; +set_tracer_flag (TRACE_ITER_LATENCY_FMT , lat_flag); +set_tracer_flag (TRACE_ITER_OVERWRITE , overwrite_flag); }static void wakeup_tracer_start (struct trace_array *tr)
@@ -580,6 +586,7 @@ static struct tracer wakeup_tracer __rea .print_line = wakeup_print_line, .flags = &tracer_flags, .set_flag = wakeup_set_flag, + .flag_changed = trace_keep_overwrite,#ifdef CONFIG_FTRACE_SELFTEST .selftest = trace_selftest_startup_wakeup,#endif
@@ -601,6 +608,7 @@ static struct tracer wakeup_rt_tracer __ .print_line = wakeup_print_line, .flags = &tracer_flags, .set_flag = wakeup_set_flag, + .flag_changed = trace_keep_overwrite,#ifdef CONFIG_FTRACE_SELFTEST .selftest = trace_selftest_startup_wakeup,#endif
Greg Kroah-Hartman
maintainerPATCH 41/56 sky2: Receive Overflows not counted
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mirko Lindner <[email protected]>
[ Upstream commit 9cfe8b156c21cf340b3a10ecb3022fbbc1c39185 ]
The sky2 driver doesn't count the Receive Overflows because the MAC interrupt for this event is not set in the MAC's interrupt mask. The MAC's interrupt mask is set only for Transmit FIFO Underruns.
Fix: The correct setting should be (GM_IS_TX_FF_UR | GM_IS_RX_FF_OR) Otherwise the Receive Overflow event will not generate any interrupt. The Receive Overflow interrupt is handled correctly
--- drivers/net/sky2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/sky2.h +1 -1
@@ -2064,7 +2064,7 @@ enum {GM_IS_RX_FF_OR =1 <<1 ,/* Receive FIFO Overrun */ GM_IS_RX_COMPL =1 <<0 ,/* Frame Reception Complete */ -#define GMAC_DEF_MSK GM_IS_TX_FF_UR +#define GMAC_DEF_MSK (GM_IS_TX_FF_UR | GM_IS_RX_FF_OR) };/* GMAC_LINK_CTRL 16 bit GMAC Link Control Reg (YUKON only) */
Greg Kroah-Hartman
maintainerPATCH 42/56 sky2: Threshold for Pause Packet is set wrong
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mirko Lindner <[email protected]>
[ Upstream commit 74f9f42c1c1650e74fb464f76644c9041f996851 ]
The sky2 driver sets the Rx Upper Threshold for Pause Packet generation to a wrong value which leads to only 2kB of RAM remaining space. This can lead to Rx overflow errors even with activated flow-control.
Fix: We should increase the value to 8192/8
--- drivers/net/sky2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/sky2.c +1 -1
@@ -992,7 +992,7 @@ static void sky2_ramset(struct sky2_hw *sky2_write32 (hw,RB_ADDR (q,RB_RX_UTHP ), tp);sky2_write32 (hw,RB_ADDR (q,RB_RX_LTHP ), space/2 ); - tp = space -2048 /8 ; + tp = space -8192 /8 ;sky2_write32 (hw,RB_ADDR (q,RB_RX_UTPP ), tp);sky2_write32 (hw,RB_ADDR (q,RB_RX_LTPP ), space/4 ); }else {
Greg Kroah-Hartman
maintainerPATCH 43/56 tcp: preserve ACK clocking in TSO
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit f4541d60a449afd40448b06496dcd510f505928e ]
A long standing problem with TSO is the fact that tcp_tso_should_defer() rearms the deferred timer, while it should not.
Current code leads to following bad bursty behavior :
20:11:24.484333 IP A > B: . 297161:316921(19760) ack 1 win 119 20:11:24.484337 IP B > A: . ack 263721 win 1117 20:11:24.485086 IP B > A: . ack 265241 win 1117 20:11:24.485925 IP B > A: . ack 266761 win 1117 20:11:24.486759 IP B > A: . ack 268281 win 1117 20:11:24.487594 IP B > A: . ack 269801 win 1117 20:11:24.488430 IP B > A: . ack 271321 win 1117 20:11:24.489267 IP B > A: . ack 272841 win 1117 20:11:24.490104 IP B > A: . ack 274361 win 1117 20:11:24.490939 IP B > A: . ack 275881 win 1117 20:11:24.491775 IP B > A: . ack 277401 win 1117 20:11:24.491784 IP A > B: . 316921:332881(15960) ack 1 win 119 20:11:24.492620 IP B > A: . ack 278921 win 1117 20:11:24.493448 IP B > A: . ack 280441 win 1117 20:11:24.494286 IP B > A: . ack 281961 win 1117 20:11:24.495122 IP B > A: . ack 283481 win 1117 20:11:24.495958 IP B > A: . ack 285001 win 1117 20:11:24.496791 IP B > A: . ack 286521 win 1117 20:11:24.497628 IP B > A: . ack 288041 win 1117 20:11:24.498459 IP B > A: . ack 289561 win 1117 20:11:24.499296 IP B > A: . ack 291081 win 1117 20:11:24.500133 IP B > A: . ack 292601 win 1117 20:11:24.500970 IP B > A: . ack 294121 win 1117 20:11:24.501388 IP B > A: . ack 295641 win 1117 20:11:24.501398 IP A > B: . 332881:351881(19000) ack 1 win 119
While the expected behavior is more like :
20:19:49.259620 IP A > B: . 197601:202161(4560) ack 1 win 119 20:19:49.260446 IP B > A: . ack 154281 win 1212 20:19:49.261282 IP B > A: . ack 155801 win 1212 20:19:49.262125 IP B > A: . ack 157321 win 1212 20:19:49.262136 IP A > B: . 202161:206721(4560) ack 1 win 119 20:19:49.262958 IP B > A: . ack 158841 win 1212 20:19:49.263795 IP B > A: . ack 160361 win 1212 20:19:49.264628 IP B > A: . ack 161881 win 1212 20:19:49.264637 IP A > B: . 206721:211281(4560) ack 1 win 119 20:19:49.265465 IP B > A: . ack 163401 win 1212 20:19:49.265886 IP B > A: . ack 164921 win 1212 20:19:49.266722 IP B > A: . ack 166441 win 1212 20:19:49.266732 IP A > B: . 211281:215841(4560) ack 1 win 119 20:19:49.267559 IP B > A: . ack 167961 win 1212 20:19:49.268394 IP B > A: . ack 169481 win 1212 20:19:49.269232 IP B > A: . ack 171001 win 1212 20:19:49.269241 IP A > B: . 215841:221161(5320) ack 1 win 119
--- net/ipv4/tcp_output.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/ipv4/tcp_output.c +5 -2
@@ -1579,8 +1579,11 @@ static int tcp_tso_should_defer(struct s goto send_now; } -/* Ok, it looks like it is advisable to defer. */ - tp->tso_deferred =1 | (jiffies <<1 ); +/* Ok, it looks like it is advisable to defer. +* Do not rearm the timer if already set to not break TCP ACK clocking. +*/ +if (!tp->tso_deferred) + tp->tso_deferred =1 | (jiffies <<1 );return 1 ;
Greg Kroah-Hartman
maintainerPATCH 44/56 tcp: undo spurious timeout after SACK reneging
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuchung Cheng <[email protected]>
[ Upstream commit 7ebe183c6d444ef5587d803b64a1f4734b18c564 ]
On SACK reneging the sender immediately retransmits and forces a timeout but disables Eifel (undo). If the (buggy) receiver does not drop any packet this can trigger a false slow-start retransmit storm driven by the ACKs of the original packets. This can be detected with undo and TCP timestamps.
--- net/ipv4/tcp_input.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
net/ipv4/tcp_input.c +2 -5
@@ -2244,11 +2244,8 @@ void tcp_enter_loss(struct sock *sk, intif (tcp_is_reno (tp))tcp_reset_reno_sack (tp); -if (!how) { -/* Push undo marker, if it was plain RTO and nothing -* was retransmitted. */ - tp->undo_marker = tp->snd_una; - }else { + tp->undo_marker = tp->snd_una; +if (how) { tp->sacked_out =0 ; tp->fackets_out =0 ; }
Greg Kroah-Hartman
maintainerPATCH 45/56 8021q: fix a potential use-after-free
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 4a7df340ed1bac190c124c1601bfc10cde9fb4fb ]
vlan_vid_del() could possibly free ->vlan_info after a RCU grace period, however, we may still refer to the freed memory area by 'grp' pointer. Found by code inspection.
This patch moves vlan_vid_del() as behind as possible.
--- net/8021q/vlan.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/8021q/vlan.c +7 -7
@@ -108,13 +108,6 @@ void unregister_vlan_dev(struct net_devi grp =rtnl_dereference (real_dev->vlgrp);BUG_ON (!grp); -/* Take it out of our own structures, but be sure to interlock with -* HW accelerating devices or SW vlan input packet processing if -* VLAN is not 0 (leave it there for 802.1p). -*/ -if (vlan_id && (real_dev->features &NETIF_F_HW_VLAN_FILTER )) - ops->ndo_vlan_rx_kill_vid (real_dev, vlan_id); - grp->nr_vlans--;if (vlan->flags &VLAN_FLAG_GVRP )
@@ -139,6 +132,13 @@ void unregister_vlan_dev(struct net_devicall_rcu (&grp->rcu, vlan_rcu_free); } +/* Take it out of our own structures, but be sure to interlock with +* HW accelerating devices or SW vlan input packet processing if +* VLAN is not 0 (leave it there for 802.1p). +*/ +if (vlan_id && (real_dev->features &NETIF_F_HW_VLAN_FILTER )) + ops->ndo_vlan_rx_kill_vid (real_dev, vlan_id); +/* Get rid of the vlan's reference to real_dev */ dev_put (real_dev); }
Greg Kroah-Hartman
maintainerPATCH 46/56 thermal: shorten too long mcast group name
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masatake YAMATO <[email protected]>
[ Upstream commits 73214f5d9f33b79918b1f7babddd5c8af28dd23d
and f1e79e208076ffe7bad97158275f1c572c04f5c7, the latter adds an assertion to genetlink to prevent this from happening again in the future. ]
The original name is too long.
--- include/linux/thermal.h | 2 +- net/netlink/genetlink.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
include/linux/thermal.h +1 -1
@@ -130,7 +130,7 @@ struct thermal_zone_device {/* Adding event notification support elements */ #define THERMAL_GENL_FAMILY_NAME "thermal_event"#define THERMAL_GENL_VERSION 0x01 -#define THERMAL_GENL_MCAST_GROUP_NAME "thermal_mc_group" +#define THERMAL_GENL_MCAST_GROUP_NAME "thermal_mc_grp"enum events {THERMAL_AUX0 ,
net/netlink/genetlink.c +1 -0
@@ -134,6 +134,7 @@ int genl_register_mc_group(struct genl_fint err =0 ;BUG_ON (grp->name[0 ] =='\0' ); +BUG_ON (memchr (grp->name,'\0' ,GENL_NAMSIZ ) ==NULL );genl_lock ();
Greg Kroah-Hartman
maintainerPATCH 47/56 unix: fix a race condition in unix_release()
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Moore <[email protected]>
[ Upstream commit ded34e0fe8fe8c2d595bfa30626654e4b87621e0 ]
As reported by Jan, and others over the past few years, there is a race condition caused by unix_release setting the sock->sk pointer to NULL before properly marking the socket as dead/orphaned. This can cause a problem with the LSM hook security_unix_may_send() if there is another socket attempting to write to this partially released socket in between when sock->sk is set to NULL and it is marked as dead/orphaned. This patch fixes this by only setting sock->sk to NULL after the socket has been marked as dead; I also take the opportunity to make unix_release_sock() a void function as it only ever returned 0/success.
Dave, I think this one should go on the -stable pile.
Special thanks to Jan for coming up with a reproducer for this problem.
--- net/unix/af_unix.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/unix/af_unix.c +3 -4
@@ -371,7 +371,7 @@ static void unix_sock_destructor(struct#endif } -static int unix_release_sock (struct sock *sk,int embrion) +static void unix_release_sock (struct sock *sk,int embrion) {struct unix_sock *u =unix_sk (sk);struct dentry *dentry;
@@ -444,8 +444,6 @@ static int unix_release_sock(struct sockif (unix_tot_inflight)unix_gc ();/* Garbage collect fds */ - -return 0 ; }static void init_peercred (struct sock *sk)
@@ -682,9 +680,10 @@ static int unix_release(struct socket *sif (!sk)return 0 ; +unix_release_sock (sk,0 ); sock->sk =NULL ; -return unix_release_sock (sk,0 ); +return 0 ; }static int unix_autobind (struct socket *sock)
Greg Kroah-Hartman
maintainerPATCH 48/56 aoe: reserve enough headroom on skbs
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 91c5746425aed8f7188a351f1224a26aa232e4b3 ]
Some network drivers use a non default hard_header_len
Transmitted skb should take into account dev->hard_header_len, or risk crashes or expensive reallocations.
In the case of aoe, lets reserve MAX_HEADER bytes.
David reported a crash in defxx driver, solved by this patch.
--- drivers/block/aoe/aoecmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/aoe/aoecmd.c +2 -1
@@ -30,8 +30,9 @@ new_skb(ulong len) {struct sk_buff *skb; - skb =alloc_skb (len,GFP_ATOMIC ); + skb =alloc_skb (len +MAX_HEADER ,GFP_ATOMIC );if (skb) { +skb_reserve (skb,MAX_HEADER );skb_reset_mac_header (skb);skb_reset_network_header (skb); skb->protocol =__constant_htons (ETH_P_AOE );
Greg Kroah-Hartman
maintainerPATCH 49/56 drivers: net: ethernet: davinci_emac: use netif_wake_queue() while restarting tx queue
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
To restart tx queue use netif_wake_queue() intead of netif_start_queue() so that net schedule will restart transmission immediately which will increase network performance while doing huge data transfers.
--- drivers/net/davinci_emac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/davinci_emac.c +1 -1
@@ -1049,7 +1049,7 @@ static void emac_tx_handler(void *token,struct net_device *ndev = skb->dev;if (unlikely (netif_queue_stopped (ndev))) -netif_start_queue (ndev); +netif_wake_queue (ndev); ndev->stats.tx_packets++; ndev->stats.tx_bytes += len;dev_kfree_skb_any (skb);
Greg Kroah-Hartman
maintainerPATCH 50/56 atl1e: drop pci-msi support because of packet corruption
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mugunthan V N <[email protected]>
[ Upstream commit 188ab1b105c96656f6bcfb49d0d8bb1b1936b632 ]
Usage of pci-msi results in corrupted dma packet transfers to the host.
--- drivers/net/atl1e/atl1e.h | 1 - drivers/net/atl1e/atl1e_main.c | 22 ++-------------------- 2 files changed, 2 insertions(+), 21 deletions(-)
drivers/net/atl1e/atl1e.h +0 -1
@@ -439,7 +439,6 @@ struct atl1e_adapter {struct atl1e_hw hw;struct atl1e_hw_stats hw_stats; -bool have_msi;u32 wol;u16 link_speed;u16 link_duplex;
drivers/net/atl1e/atl1e_main.c +2 -20
@@ -1848,37 +1848,19 @@ static void atl1e_free_irq(struct atl1e_struct net_device *netdev = adapter->netdev;free_irq (adapter->pdev->irq, netdev); - -if (adapter->have_msi) -pci_disable_msi (adapter->pdev); }static int atl1e_request_irq (struct atl1e_adapter *adapter) {struct pci_dev *pdev = adapter->pdev;struct net_device *netdev = adapter->netdev; -int flags =0 ;int err =0 ; - adapter->have_msi = true; - err =pci_enable_msi (adapter->pdev); -if (err) { -netdev_dbg (adapter->netdev, -"Unable to allocate MSI interrupt Error: %d\n" , err); - adapter->have_msi = false; - }else - netdev->irq = pdev->irq; - - -if (!adapter->have_msi) - flags |=IRQF_SHARED ; - err =request_irq (adapter->pdev->irq, atl1e_intr, flags, - netdev->name, netdev); + err =request_irq (pdev->irq, atl1e_intr,IRQF_SHARED , + netdev->name, netdev);if (err) {netdev_dbg (adapter->netdev,"Unable to allocate interrupt Error: %d\n" , err); -if (adapter->have_msi) -pci_disable_msi (adapter->pdev);return err; }netdev_dbg (adapter->netdev,"atl1e_request_irq OK\n" );
Greg Kroah-Hartman
maintainerPATCH 51/56 ipv6: fix bad free of addrconf_init_net
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hong Zhiguo <[email protected]>
[ Upstream commit a79ca223e029aa4f09abb337accf1812c900a800 ]
--- net/ipv6/addrconf.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)
net/ipv6/addrconf.c +10 -16
@@ -4553,26 +4553,20 @@ static void addrconf_sysctl_unregister(sstatic int __net_init addrconf_init_net (struct net *net) { -int err; +int err = -ENOMEM ;struct ipv6_devconf *all, *dflt; - err = -ENOMEM ; - all = &ipv6_devconf; - dflt = &ipv6_devconf_dflt; + all =kmemdup (&ipv6_devconf,sizeof (ipv6_devconf),GFP_KERNEL ); +if (all ==NULL ) + goto err_alloc_all; -if (!net_eq (net, &init_net)) { - all =kmemdup (all,sizeof (ipv6_devconf),GFP_KERNEL ); -if (all ==NULL ) - goto err_alloc_all; + dflt =kmemdup (&ipv6_devconf_dflt,sizeof (ipv6_devconf_dflt),GFP_KERNEL ); +if (dflt ==NULL ) + goto err_alloc_dflt; - dflt =kmemdup (dflt,sizeof (ipv6_devconf_dflt),GFP_KERNEL ); -if (dflt ==NULL ) - goto err_alloc_dflt; - }else { -/* these will be inherited by all namespaces */ - dflt->autoconf = ipv6_defaults.autoconf; - dflt->disable_ipv6 = ipv6_defaults.disable_ipv6; - } +/* these will be inherited by all namespaces */ + dflt->autoconf = ipv6_defaults.autoconf; + dflt->disable_ipv6 = ipv6_defaults.disable_ipv6; net->ipv6.devconf_all = all; net->ipv6.devconf_dflt = dflt;
Greg Kroah-Hartman
maintainerPATCH 52/56 ks8851: Fix interpretation of rxlen field.
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: "[email protected]" <[email protected]>
[ Upstream commit 14bc435ea54cb888409efb54fc6b76c13ef530e9 ]
According to the Datasheet (page 52):
15-12 Reserved
11-0 RXBC Receive Byte Count
This field indicates the present received frame byte size.
The code has a bug:
rxh = ks8851_rdreg32(ks, KS_RXFHSR);
rxstat = rxh & 0xffff;
rxlen = rxh >> 16; // BUG!!! 0xFFF mask should be applied--- drivers/net/ks8851.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ks8851.c +1 -1
@@ -489,7 +489,7 @@ static void ks8851_rx_pkts(struct ks8851for (; rxfc !=0 ; rxfc--) { rxh =ks8851_rdreg32 (ks,KS_RXFHSR ); rxstat = rxh &0xffff ; - rxlen = rxh >>16 ; + rxlen = (rxh >>16 ) &0xfff ;netif_dbg (ks, rx_status, ks->netdev,"rx: stat 0x%04x, len 0x%04x\n" , rxstat, rxlen);
Greg Kroah-Hartman
maintainerPATCH 53/56 net: add a synchronize_net() in netdev_rx_handler_unregister()
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 00cfec37484761a44a3b6f4675a54caa618210ae ]
commit 35d48903e97819 (bonding: fix rx_handler locking) added a race in bonding driver, reported by Steven Rostedt who did a very good diagnosis :
<quoting Steven>
I'm currently debugging a crash in an old 3.0-rt kernel that one of our customers is seeing. The bug happens with a stress test that loads and unloads the bonding module in a loop (I don't know all the details as I'm not the one that is directly interacting with the customer). But the bug looks to be something that may still be present and possibly present in mainline too. It will just be much harder to trigger it in mainline.
In -rt, interrupts are threads, and can schedule in and out just like any other thread. Note, mainline now supports interrupt threads so this may be easily reproducible in mainline as well. I don't have the ability to tell the customer to try mainline or other kernels, so my hands are somewhat tied to what I can do.
But according to a core dump, I tracked down that the eth irq thread crashed in bond_handle_frame() here:
slave = bond_slave_get_rcu(skb->dev);
bond = slave->bond; <--- BUGthe slave returned was NULL and accessing slave->bond caused a NULL pointer dereference.
Looking at the code that unregisters the handler:
void netdev_rx_handler_unregister(struct net_device *dev) {
ASSERT_RTNL();
RCU_INIT_POINTER(dev->rx_handler, NULL);
RCU_INIT_POINTER(dev->rx_handler_data, NULL);
}Which is basically:
dev->rx_handler = NULL;
dev->rx_handler_data = NULL;And looking at __netif_receive_skb() we have:
rx_handler = rcu_dereference(skb->dev->rx_handler);
if (rx_handler) {
if (pt_prev) {
ret = deliver_skb(skb, pt_prev, orig_dev);
pt_prev = NULL;
}
switch (rx_handler(&skb)) {My question to all of you is, what stops this interrupt from happening while the bonding module is unloading? What happens if the interrupt triggers and we have this:
CPU0 CPU1
---- ---- rx_handler = skb->dev->rx_handler
netdev_rx_handler_unregister() {
dev->rx_handler = NULL;
dev->rx_handler_data = NULL; rx_handler()
bond_handle_frame() {
slave = skb->dev->rx_handler;
bond = slave->bond; <-- NULL pointer dereference!!!What protection am I missing in the bond release handler that would prevent the above from happening?
</quoting Steven>
We can fix bug this in two ways. First is adding a test in bond_handle_frame() and others to check if rx_handler_data is NULL.
A second way is adding a synchronize_net() in netdev_rx_handler_unregister() to make sure that a rcu protected reader has the guarantee to see a non NULL rx_handler_data.
The second way is better as it avoids an extra test in fast path.
--- net/core/dev.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/core/dev.c +6 -0
@@ -3070,6 +3070,7 @@ int netdev_rx_handler_register(struct neif (dev->rx_handler)return -EBUSY ; +/* Note: rx_handler_data must be set before rx_handler */ rcu_assign_pointer (dev->rx_handler_data, rx_handler_data);rcu_assign_pointer (dev->rx_handler, rx_handler);
@@ -3090,6 +3091,11 @@ void netdev_rx_handler_unregister(structASSERT_RTNL ();rcu_assign_pointer (dev->rx_handler,NULL ); +/* a reader seeing a non NULL rx_handler in a rcu_read_lock() +* section has a guarantee to see a non NULL rx_handler_data +* as well. +*/ +synchronize_net ();rcu_assign_pointer (dev->rx_handler_data,NULL ); }EXPORT_SYMBOL_GPL (netdev_rx_handler_unregister);
Greg Kroah-Hartman
maintainerPATCH 54/56 pch_gbe: fix ip_summed checksum reporting on rx
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Veaceslav Falico <[email protected]>
[ Upstream commit 76a0e68129d7d24eb995a6871ab47081bbfa0acc ]
skb->ip_summed should be CHECKSUM_UNNECESSARY when the driver reports that checksums were correct and CHECKSUM_NONE in any other case. They're currently placed vice versa, which breaks the forwarding scenario. Fix it by placing them as described above.
--- drivers/net/pch_gbe/pch_gbe_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/pch_gbe/pch_gbe_main.c +2 -2
@@ -1509,9 +1509,9 @@ pch_gbe_clean_rx(struct pch_gbe_adapterskb_put (skb, length); skb->protocol =eth_type_trans (skb, netdev);if (tcp_ip_status &PCH_GBE_RXD_ACC_STAT_TCPIPOK ) - skb->ip_summed =CHECKSUM_NONE ; -else skb->ip_summed =CHECKSUM_UNNECESSARY ; +else + skb->ip_summed =CHECKSUM_NONE ;napi_gro_receive (&adapter->napi, skb); (*work_done)++;
Greg Kroah-Hartman
maintainerPATCH 55/56 smsc75xx: fix jumbo frame support
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steve Glendinning <[email protected]>
[ Upstream commit 4c51e53689569398d656e631c17308d9b8e84650 ]
This patch enables RX of jumbo frames for LAN7500.
Previously the driver would transmit jumbo frames succesfully but would drop received jumbo frames (incrementing the interface errors count).
With this patch applied the device can succesfully receive jumbo frames up to MTU 9000 (9014 bytes on the wire including ethernet header).
--- drivers/net/usb/smsc75xx.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/usb/smsc75xx.c +8 -4
@@ -719,8 +719,12 @@ static int smsc75xx_set_rx_max_frame_lenstatic int smsc75xx_change_mtu (struct net_device *netdev,int new_mtu) {struct usbnet *dev =netdev_priv (netdev); +int ret; + +if (new_mtu >MAX_SINGLE_PACKET_SIZE ) +return -EINVAL ; -int ret =smsc75xx_set_rx_max_frame_length (dev, new_mtu); + ret =smsc75xx_set_rx_max_frame_length (dev, new_mtu +ETH_HLEN );check_warn_return (ret,"Failed to set mac rx frame length" );return usbnet_change_mtu (netdev, new_mtu);
@@ -964,7 +968,7 @@ static int smsc75xx_reset(struct usbnetnetif_dbg (dev, ifup, dev->net,"FCT_TX_CTL set to 0x%08x" , buf); - ret =smsc75xx_set_rx_max_frame_length (dev,1514 ); + ret =smsc75xx_set_rx_max_frame_length (dev, dev->net->mtu +ETH_HLEN );check_warn_return (ret,"Failed to set max rx frame length" ); ret =smsc75xx_read_reg (dev,MAC_RX , &buf);
@@ -1108,8 +1112,8 @@ static int smsc75xx_rx_fixup(struct usbnelse if (rx_cmd_a & (RX_CMD_A_LONG |RX_CMD_A_RUNT )) dev->net->stats.rx_frame_errors++; }else { -/* ETH_FRAME_LEN + 4(CRC) + 2(COE) + 4(Vlan) */ -if (unlikely (size > (ETH_FRAME_LEN +12 ))) { +/* MAX_SINGLE_PACKET_SIZE + 4(CRC) + 2(COE) + 4(Vlan) */ +if (unlikely (size > (MAX_SINGLE_PACKET_SIZE +ETH_HLEN +12 ))) {netif_dbg (dev, rx_err, dev->net,"size err rx_cmd_a=0x%08x" , rx_cmd_a);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 56/56 iommu/amd: Make sure dma_ops are set for hotplug devices
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joerg Roedel <[email protected]>
commit c2a2876e863356b092967ea62bebdb4dd663af80 upstream.
There is a bug introduced with commit 27c2127 that causes devices which are hot unplugged and then hot-replugged to not have per-device dma_ops set. This causes these devices to not function correctly. Fixed with this patch.
--- arch/x86/kernel/amd_iommu.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
arch/x86/kernel/amd_iommu.c +14 -10
@@ -53,6 +53,8 @@ static struct protection_domain *pt_domastatic struct iommu_ops amd_iommu_ops; +static struct dma_map_ops amd_iommu_dma_ops; +/* * general struct to manage commands send to an IOMMU */
@@ -1778,18 +1780,20 @@ static int device_change_notifier(struct domain =domain_for_device (dev); -/* allocate a protection domain if a device is added */ dma_domain =find_protection_domain (devid); -if (dma_domain) - goto out; - dma_domain =dma_ops_domain_alloc (); -if (!dma_domain) - goto out; - dma_domain->target_dev = devid; +if (!dma_domain) { +/* allocate a protection domain if a device is added */ + dma_domain =dma_ops_domain_alloc (); +if (!dma_domain) + goto out; + dma_domain->target_dev = devid; + +spin_lock_irqsave (&iommu_pd_list_lock, flags); +list_add_tail (&dma_domain->list, &iommu_pd_list); +spin_unlock_irqrestore (&iommu_pd_list_lock, flags); + } -spin_lock_irqsave (&iommu_pd_list_lock, flags); -list_add_tail (&dma_domain->list, &iommu_pd_list); -spin_unlock_irqrestore (&iommu_pd_list_lock, flags); + dev->archdata.dma_ops = &amd_iommu_dma_ops;break ;case BUS_NOTIFY_DEL_DEVICE :
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.0.72 release. There are 56 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 Apr 4 22:46:30 UTC 2013. Anything received after that time might be too late.
Quoted 8 lines
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.0.72-rc1.gzand the diffstat can be found below.
thanks,
greg k-h
Patches applied cleanly to 3.0.71, 3.4.38, and 3.8.5
Reviewing patches - will let you know anything odd.
Compiled and booted on the following systems:
HP EliteBook 6930p Intel(R) Core(TM)2 Duo CPU T9400 @ 2.53GHz HP ProBook 6475b AMD A10-4600M APU with Radeon(tm) HD Graphics
dmesgs for all releases look good. No regressions compared to the previous dmesgs for each of these releases.
mips compile problem fixed
Cross-compile tests results:
alpha: defconfig passed on all
arm: defconfig passed on all
arm64: not applicable to 3.0.y, 3.4.y. defconfig passed on 3.8.y
c6x: not applicable to 3.0.y, defconfig passed on 3.4.y, and 3.8.y.
powerpc: wii_defconfig passed on all
sh: defconfig passed on all
sparc: defconfig passed on all
tile: tilegx_defconfig passed on all
mips: defconfig passed on all
mipsel: defconfig passed on all
-- Shuah
Re: [ 14/56] mwifiex: cancel cmd timer and free curr_cmd in shutdown process
In reply to Greg Kroah-HartmanQuoted 13 lines · Greg Kroah-Hartman
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bing Zhao <[email protected]>
commit
084c7189acb3f969c855536166042e27f5dd703fupstream.
curr_cmdpoints to the command that is in processing or waiting for its command response from firmware. If the function shutdown happens to occur at this time we should cancel the cmd timer and put the command back to free queue.
Quoted 4 lines
Tested-by Marco Cesarano <[email protected]>Signed-off-by Bing Zhao <[email protected]>Signed-off-by John W. Linville <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
This also had:
Cc: <[email protected]> # 3.8
so I wonder whether this is good/bad/indifferent for 3.0.y.
Ben.
Quoted 22 lines
--- drivers/net/wireless/mwifiex/init.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/net/wireless/mwifiex/init.c +8
-0@@ -561,6 +561,14 @@ mwifiex_shutdown_drv(struct mwifiex_adapreturn ret; } +/* cancel current command */ +if (adapter->curr_cmd) { +dev_warn (adapter->dev,"curr_cmd is still in processing\n" ); +del_timer (&adapter->cmd_timer); +mwifiex_insert_cmd_to_free_q (adapter, adapter->curr_cmd); + adapter->curr_cmd =NULL ; + } +/* shut down mwifiex */ dev_dbg (adapter->dev,"info: shutdown mwifiex...\n" );
Signature · 3 lines
Ben Hutchings
Power corrupts. Absolute power is kind of neat.
- John Lehman, Secretary of the US Navy 1981-1987RE: [ 14/56] mwifiex: cancel cmd timer and free curr_cmd in shutdown process
Hi Ben, Greg,
Quoted 14 lines
Quoted 9 lines
From: Bing Zhao <[email protected]>
commit
084c7189acb3f969c855536166042e27f5dd703fupstream.
curr_cmdpoints to the command that is in processing or waiting for its command response from firmware. If the function shutdown happens to occur at this time we should cancel the cmd timer and put the command back to free queue.Quoted 4 lines
Tested-by Marco Cesarano <[email protected]>Signed-off-by Bing Zhao <[email protected]>Signed-off-by John W. Linville <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 5 lines
This also had:
Cc: <[email protected]> # 3.8so I wonder whether this is good/bad/indifferent for 3.0.y.
Please drop this patch from stable kernel < 3.8.
Thanks,
Bing
Quoted 2 lines
Ben.