linux-stable.git/drivers, branch v3.4.106

drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets

2015-02-02T09:05:26+00:00

commit 5188cd44c55db3e92cd9e77a40b5baa7ed4340f7 upstream.

UFO is now disabled on all drivers that work with virtio net headers,
but userland may try to send UFO/IPv6 packets anyway.  Instead of
sending with ID=0, we should select identifiers on their behalf (as we
used to).

Signed-off-by: Ben Hutchings 
Fixes: 916e4cf46d02 ("ipv6: reuse ip6_frag_id from ip6_ufo_append_data")
Signed-off-by: David S. Miller 
[bwh: For 3.2, net/ipv6/output_core.c is a completely new file]
Signed-off-by: Zefan Li

firewire: cdev: prevent kernel stack leaking into ioctl arguments

2015-02-02T09:05:24+00:00

commit eaca2d8e75e90a70a63a6695c9f61932609db212 upstream.

Found by the UC-KLEE tool:  A user could supply less input to
firewire-cdev ioctls than write- or write/read-type ioctl handlers
expect.  The handlers used data from uninitialized kernel stack then.

This could partially leak back to the user if the kernel subsequently
generated fw_cdev_event_'s (to be read from the firewire-cdev fd)
which notably would contain the _u64 closure field which many of the
ioctl argument structures contain.

The fact that the handlers would act on random garbage input is a
lesser issue since all handlers must check their input anyway.

The fix simply always null-initializes the entire ioctl argument buffer
regardless of the actual length of expected user input.  That is, a
runtime overhead of memset(..., 40) is added to each firewirew-cdev
ioctl() call.  [Comment from Clemens Ladisch:  This part of the stack is
most likely to be already in the cache.]

Remarks:
  - There was never any leak from kernel stack to the ioctl output
    buffer itself.  IOW, it was not possible to read kernel stack by a
    read-type or write/read-type ioctl alone; the leak could at most
    happen in combination with read()ing subsequent event data.
  - The actual expected minimum user input of each ioctl from
    include/uapi/linux/firewire-cdev.h is, in bytes:
    [0x00] = 32, [0x05] =  4, [0x0a] = 16, [0x0f] = 20, [0x14] = 16,
    [0x01] = 36, [0x06] = 20, [0x0b] =  4, [0x10] = 20, [0x15] = 20,
    [0x02] = 20, [0x07] =  4, [0x0c] =  0, [0x11] =  0, [0x16] =  8,
    [0x03] =  4, [0x08] = 24, [0x0d] = 20, [0x12] = 36, [0x17] = 12,
    [0x04] = 20, [0x09] = 24, [0x0e] =  4, [0x13] = 40, [0x18] =  4.

Reported-by: David Ramos 
Signed-off-by: Stefan Richter 
Signed-off-by: Zefan Li

of/base: Fix PowerPC address parsing hack

2015-02-02T09:05:22+00:00

commit 746c9e9f92dde2789908e51a354ba90a1962a2eb upstream.

We have a historical hack that treats missing ranges properties as the
equivalent of an empty one. This is needed for ancient PowerMac "bad"
device-trees, and shouldn't be enabled for any other PowerPC platform,
otherwise we get some nasty layout of devices in sysfs or even
duplication when a set of otherwise identically named devices is
created multiple times under a different parent node with no ranges
property.

This fix is needed for the PowerNV i2c busses to be exposed properly
and will fix a number of other embedded cases.

Signed-off-by: Benjamin Herrenschmidt 
Acked-by: Grant Likely 
Signed-off-by: Rob Herring 
Signed-off-by: Zefan Li

can: esd_usb2: fix memory leak on disconnect

2015-02-02T09:05:22+00:00

commit efbd50d2f62fc1f69a3dcd153e63ba28cc8eb27f upstream.

It seems struct esd_usb2 dev is not deallocated on disconnect. The patch adds
the missing deallocation.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov 
Acked-by: Matthias Fuchs 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Zefan Li

can: dev: avoid calling kfree_skb() from interrupt context

2015-02-02T09:05:22+00:00

commit 5247a589c24022ab34e780039cc8000c48f2035e upstream.

ikfree_skb() is Called in can_free_echo_skb(), which might be called from (TX
Error) interrupt, which triggers the folloing warning:

[ 1153.360705] ------------[ cut here ]------------
[ 1153.360715] WARNING: CPU: 0 PID: 31 at net/core/skbuff.c:563 skb_release_head_state+0xb9/0xd0()
[ 1153.360772] Call Trace:
[ 1153.360778]  [] dump_stack+0x41/0x52
[ 1153.360782]  [] warn_slowpath_common+0x7e/0xa0
[ 1153.360784]  [] ? skb_release_head_state+0xb9/0xd0
[ 1153.360786]  [] ? skb_release_head_state+0xb9/0xd0
[ 1153.360788]  [] warn_slowpath_null+0x22/0x30
[ 1153.360791]  [] skb_release_head_state+0xb9/0xd0
[ 1153.360793]  [] skb_release_all+0x10/0x30
[ 1153.360795]  [] kfree_skb+0x36/0x80
[ 1153.360799]  [] ? can_free_echo_skb+0x28/0x40 [can_dev]
[ 1153.360802]  [] can_free_echo_skb+0x28/0x40 [can_dev]
[ 1153.360805]  [] esd_pci402_interrupt+0x34c/0x57a [esd402]
[ 1153.360809]  [] handle_irq_event_percpu+0x35/0x180
[ 1153.360811]  [] ? handle_irq_event_percpu+0xa3/0x180
[ 1153.360813]  [] handle_irq_event+0x31/0x50
[ 1153.360816]  [] handle_fasteoi_irq+0x6f/0x120
[ 1153.360818]  [] ? handle_edge_irq+0x110/0x110
[ 1153.360822]  [] handle_irq+0x71/0x90
[ 1153.360823]    [] do_IRQ+0x3c/0xd0
[ 1153.360829]  [] common_interrupt+0x2c/0x34
[ 1153.360834]  [] ? finish_task_switch+0x47/0xf0
[ 1153.360836]  [] __schedule+0x35b/0x7e0
[ 1153.360839]  [] ? console_unlock+0x2c4/0x4d0
[ 1153.360842]  [] ? n_tty_receive_buf_common+0x890/0x890
[ 1153.360845]  [] ? process_one_work+0x196/0x370
[ 1153.360847]  [] schedule+0x23/0x60
[ 1153.360849]  [] worker_thread+0x161/0x460
[ 1153.360852]  [] ? __wake_up_locked+0x1f/0x30
[ 1153.360854]  [] ? rescuer_thread+0x2f0/0x2f0
[ 1153.360856]  [] kthread+0xa1/0xc0
[ 1153.360859]  [] ret_from_kernel_thread+0x21/0x30
[ 1153.360861]  [] ? kthread_create_on_node+0x110/0x110
[ 1153.360863] ---[ end trace 5ff83639cbb74b35 ]---

This patch replaces the kfree_skb() by dev_kfree_skb_any().

Signed-off-by: Thomas Körper 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Zefan Li

rt2x00: do not align payload on modern H/W

2015-02-02T09:05:21+00:00

commit cfd9167af14eb4ec21517a32911d460083ee3d59 upstream.

RT2800 and newer hardware require padding between header and payload if
header length is not multiple of 4.

For historical reasons we also align payload to to 4 bytes boundary, but
such alignment is not needed on modern H/W.

Patch fixes skb_under_panic problems reported from time to time:

https://bugzilla.kernel.org/show_bug.cgi?id=84911
https://bugzilla.kernel.org/show_bug.cgi?id=72471
http://marc.info/?l=linux-wireless&m=139108549530402&w=2
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1087591

Panic happened because we eat 4 bytes of skb headroom on each
(re)transmission when sending frame without the payload and the header
length not being multiple of 4 (i.e. QoS header has 26 bytes). On such
case because paylad_aling=2 is bigger than header_align=0 we increase
header_align by 4 bytes. To prevent that we could change the check to:

	if (payload_length && payload_align > header_align)
		header_align += 4;

but not aligning payload at all is more effective and alignment is not
really needed by H/W (that has been tested on OpenWrt project for few
years now).

Reported-and-tested-by: Antti S. Lankila 
Debugged-by: Antti S. Lankila 
Reported-by: Henrik Asp 
Originally-From: Helmut Schaa 
Signed-off-by: Stanislaw Gruszka 
Signed-off-by: John W. Linville 
Signed-off-by: Zefan Li

srp-target: Retry when QP creation fails with ENOMEM

2015-02-02T09:05:20+00:00

commit ab477c1ff5e0a744c072404bf7db51bfe1f05b6e upstream.

It is not guaranteed to that srp_sq_size is supported
by the HCA. So if we failed to create the QP with ENOMEM,
try with a smaller srp_sq_size. Keep it up until we hit
MIN_SRPT_SQ_SIZE, then fail the connection.

Reported-by: Mark Lehrer 
Signed-off-by: Bart Van Assche 
Signed-off-by: Sagi Grimberg 
Signed-off-by: Nicholas Bellinger 
Signed-off-by: Zefan Li

scsi: only re-lock door after EH on devices that were reset

2015-02-02T09:05:19+00:00

commit 48379270fe6808cf4612ee094adc8da2b7a83baa upstream.

Setups that use the blk-mq I/O path can lock up if a host with a single
device that has its door locked enters EH.  Make sure to only send the
command to re-lock the door to devices that actually were reset and thus
might have lost their state.  Otherwise the EH code might be get blocked
on blk_get_request as all requests for non-reset devices might be in use.

Signed-off-by: Christoph Hellwig 
Reported-by: Meelis Roos 
Tested-by: Meelis Roos 
Reviewed-by: Martin K. Petersen 
Signed-off-by: Zefan Li

Input: alps - allow up to 2 invalid packets without resetting device

2015-02-02T09:05:19+00:00

commit 9d720b34c0a432639252f63012e18b0507f5b432 upstream.

On some Dell Latitude laptops ALPS device or Dell EC send one invalid byte
in 6 bytes ALPS packet. In this case psmouse driver enter out of sync
state. It looks like that all other bytes in packets are valid and also
device working properly. So there is no need to do full device reset, just
need to wait for byte which match condition for first byte (start of
packet). Because ALPS packets are bigger (6 or 8 bytes) default limit is
small.

This patch increase number of invalid bytes to size of 2 ALPS packets which
psmouse driver can drop before do full reset.

Resetting ALPS devices take some time and when doing reset on some Dell
laptops touchpad, trackstick and also keyboard do not respond. So it is
better to do it only if really necessary.

Signed-off-by: Pali Rohár 
Tested-by: Pali Rohár 
Reviewed-by: Hans de Goede 
Signed-off-by: Dmitry Torokhov 
Signed-off-by: Zefan Li

Input: alps - ignore potential bare packets when device is out of sync

2015-02-02T09:05:18+00:00

commit 4ab8f7f320f91f279c3f06a9795cfea5c972888a upstream.

5th and 6th byte of ALPS trackstick V3 protocol match condition for first
byte of PS/2 3 bytes packet. When driver enters out of sync state and ALPS
trackstick is sending data then driver match 5th, 6th and next 1st bytes as
PS/2.

It basically means if user is using trackstick when driver is in out of
sync state driver will never resync. Processing these bytes as 3 bytes PS/2
data cause total mess (random cursor movements, random clicks) and make
trackstick unusable until psmouse driver decide to do full device reset.

Lot of users reported problems with ALPS devices on Dell Latitude E6440,
E6540 and E7440 laptops. ALPS device or Dell EC for unknown reason send
some invalid ALPS PS/2 bytes which cause driver out of sync. It looks like
that i8042 and psmouse/alps driver always receive group of 6 bytes packets
so there are no missing bytes and no bytes were inserted between valid
ones.

This patch does not fix root of problem with ALPS devices found in Dell
Latitude laptops but it does not allow to process some (invalid)
subsequence of 6 bytes ALPS packets as 3 bytes PS/2 when driver is out of
sync.

So with this patch trackstick input device does not report bogus data when
also driver is out of sync, so trackstick should be usable on those
machines.

Signed-off-by: Pali Rohár 
Tested-by: Pali Rohár 
Reviewed-by: Hans de Goede 
Signed-off-by: Dmitry Torokhov 
Signed-off-by: Zefan Li