~ubuntu-kernel/ubuntu/+source/linux/+git/impish:master-next

Last commit made on 2022-07-07
Get this branch:
git clone -b master-next https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/impish
Members of Ubuntu Kernel Repositories can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

1d72224... by Willy Tarreau <w@1wt.eu>

floppy: use a statically allocated error counter

Interrupt handler bad_flp_intr() may cause a UAF on the recently freed
request just to increment the error count. There's no point keeping
that one in the request anyway, and since the interrupt handler uses a
static pointer to the error which cannot be kept in sync with the
pending request, better make it use a static error counter that's reset
for each new request. This reset now happens when entering
redo_fd_request() for a new request via set_next_request().

One initial concern about a single error counter was that errors on one
floppy drive could be reported on another one, but this problem is not
real given that the driver uses a single drive at a time, as that
PC-compatible controllers also have this limitation by using shared
signals. As such the error count is always for the "current" drive.

Reported-by: Minh Yuan <email address hidden>
Suggested-by: Linus Torvalds <email address hidden>
Tested-by: Denis Efremov <email address hidden>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Linus Torvalds <email address hidden>
(cherry picked from commit f71f01394f742fc4558b3f9f4c7ef4c4cf3b07c8)
CVE-2022-1652
Signed-off-by: Thadeu Lima de Souza Cascardo <email address hidden>
Acked-by: Zachary Tahenakos <email address hidden>
Acked-by: Cengiz Can <email address hidden>
Signed-off-by: Luke Nowakowski-Krijger <email address hidden>

6ac69db... by Johan Hovold <email address hidden>

USB: serial: pl2303: fix type detection for odd device

BugLink: https://bugs.launchpad.net/bugs/1967493

At least one pl2303 device has a bcdUSB of 1.0.1 which most likely was
was intended as 1.1.

Allow bcdDevice 1.0.1 but interpret it as 1.1.

Fixes: 1e9faef4d26d ("USB: serial: pl2303: fix HX type detection")
Cc: <email address hidden> # 5.13
Link: https://lore.kernel.org<email address hidden>
Reported-by: Gary van der Merwe <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Johan Hovold <email address hidden>
(cherry picked from commit beeb68a71edc41648b6948d027b810c5acc7a2aa)
Signed-off-by: Po-Hsu Lin <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Acked-by: Luke Nowakowski-Krijger <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

fa99dd4... by Marc Zyngier <email address hidden>

PCI: xgene: Revert "PCI: xgene: Use inbound resources for setup"

BugLink: https://bugs.launchpad.net/bugs/1952933

Commit 6dce5aa59e0b ("PCI: xgene: Use inbound resources for setup")
killed PCIe on my XGene-1 box (a Mustang board). The machine itself
is still alive, but half of its storage (over NVMe) is gone, and the
NVMe driver just times out.

Note that this machine boots with a device tree provided by the
UEFI firmware (2016 vintage), which could well be non conformant
with the spec, hence the breakage.

With the patch reverted, the box boots 5.17-rc8 with flying colors.

Link: https://<email address hidden>
Link: https://<email address hidden>
Fixes: 6dce5aa59e0b ("PCI: xgene: Use inbound resources for setup")
Signed-off-by: Marc Zyngier <email address hidden>
Signed-off-by: Lorenzo Pieralisi <email address hidden>
Cc: <email address hidden>
Cc: Rob Herring <email address hidden>
Cc: Toan Le <email address hidden>
Cc: Lorenzo Pieralisi <email address hidden>
Cc: Krzysztof Wilczyński <email address hidden>
Cc: Bjorn Helgaas <email address hidden>
Cc: Stéphane Graber <email address hidden>
Cc: dann frazier <email address hidden>
(backported from commit 1874b6d7ab1bdc900e8398026350313ac29caddb)
[dannf: minor context adjustment]
Signed-off-by: dann frazier <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Acked-by: Luke Nowakowski-Krijger <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

98c6d83... by Marc Zyngier <email address hidden>

PCI: xgene: Revert "PCI: xgene: Fix IB window setup"

BugLink: https://bugs.launchpad.net/bugs/1952933

Commit c7a75d07827a ("PCI: xgene: Fix IB window setup") tried to
fix the damages that 6dce5aa59e0b ("PCI: xgene: Use inbound resources
for setup") caused, but actually didn't improve anything for some
plarforms (at least Mustang and m400 are still broken).

Given that 6dce5aa59e0b has been reverted, revert this patch as well,
restoring the PCIe support on XGene to its pre-5.5, working state.

Link: https://<email address hidden>
Link: https://<email address hidden>
Fixes: c7a75d07827a ("PCI: xgene: Fix IB window setup")
Signed-off-by: Marc Zyngier <email address hidden>
Signed-off-by: Lorenzo Pieralisi <email address hidden>
Cc: <email address hidden>
Cc: Rob Herring <email address hidden>
Cc: Toan Le <email address hidden>
Cc: Lorenzo Pieralisi <email address hidden>
Cc: Krzysztof Wilczyński <email address hidden>
Cc: Bjorn Helgaas <email address hidden>
Cc: Stéphane Graber <email address hidden>
Cc: dann frazier <email address hidden>
(cherry picked from commit 825da4e9cec68713fbb02dc6f71fe1bf65fe8050)
Signed-off-by: dann frazier <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Acked-by: Luke Nowakowski-Krijger <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

226183a... by Po-Hsu Lin

Revert "UBUNTU: SAUCE: selftests: net: Make test for VXLAN underlay in non-default VRF an expected failure"

BugLink: https://bugs.launchpad.net/bugs/1975691

This reverts commit 3829acb7f33d2bcf746b2df598c9a3066713fc2d.

With the broken test case, "underlay in a VRF", fixed in the
test_vxlan_under_vrf.sh, we should remove the SAUCE patches that mark
this test failure as an expected failure to catch regressions in the
future. This could reduce maintenance cost as well.

Signed-off-by: Po-Hsu Lin <email address hidden>

Acked-by: Luke Nowakowski-Krijger <email address hidden>
Acked-by: Tim Gardner <email address hidden>

b673f43... by Po-Hsu Lin

Revert "UBUNTU: SAUCE: selftests: net: Don't fail test_vxlan_under_vrf on xfail"

BugLink: https://bugs.launchpad.net/bugs/1975691

This reverts commit 7d9c6353c36a560ca73ca1bea35e16f62b4bec69.

With the broken test case, "underlay in a VRF", fixed in the
test_vxlan_under_vrf.sh, we should remove the SAUCE patches that mark
this test failure as an expected failure to catch regressions in the
future. This could reduce maintenance cost as well.

Signed-off-by: Po-Hsu Lin <email address hidden>

Acked-by: Luke Nowakowski-Krijger <email address hidden>
Acked-by: Tim Gardner <email address hidden>

c443122... by Frank Heimes

s390/mm: use non-quiescing sske for KVM switch to keyed guest

s390/mm: use non-quiescing sske for KVM switch to keyed guest

From: Christian Borntraeger <email address hidden>

The switch to a keyed guest does not require a classic sske as the other
guest CPUs are not accessing the key before the switch is complete.
By using the NQ SSKE things are faster especially with multiple guests.

Signed-off-by: Christian Borntraeger <email address hidden>
Suggested-by: Janis Schoetterl-Glausch <email address hidden>
Reviewed-by: Claudio Imbrenda <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Christian Borntraeger <email address hidden>
Signed-off-by: Heiko Carstens <email address hidden>
(cherry picked from commit 3ae11dbcfac906a8c3a480e98660a823130dc16a)
Signed-off-by: Frank Heimes <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

30c862d... by Christian Borntraeger <email address hidden>

s390/gmap: voluntarily schedule during key setting

BugLink: https://bugs.launchpad.net/bugs/1975582

With large and many guest with storage keys it is possible to create
large latencies or stalls during initial key setting:

rcu: INFO: rcu_sched self-detected stall on CPU
rcu: 18-....: (2099 ticks this GP) idle=54e/1/0x4000000000000002 softirq=35598716/35598716 fqs=998
       (t=2100 jiffies g=155867385 q=20879)
Task dump for CPU 18:
CPU 1/KVM R running task 0 1030947 256019 0x06000004
Call Trace:
sched_show_task
rcu_dump_cpu_stacks
rcu_sched_clock_irq
update_process_times
tick_sched_handle
tick_sched_timer
__hrtimer_run_queues
hrtimer_interrupt
do_IRQ
ext_int_handler
ptep_zap_key

The mmap lock is held during the page walking but since this is a
semaphore scheduling is still possible. Same for the kvm srcu.
To minimize overhead do this on every segment table entry or large page.

Signed-off-by: Christian Borntraeger <email address hidden>
Reviewed-by: Alexander Gordeev <email address hidden>
Reviewed-by: Claudio Imbrenda <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Christian Borntraeger <email address hidden>
Signed-off-by: Heiko Carstens <email address hidden>
(cherry picked from commit 6d5946274df1fff539a7eece458a43be733d1db8)
Signed-off-by: Frank Heimes <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

c06e335... by Kevin Hao <email address hidden>

powerpc: Export mmu_feature_keys[] as non-GPL

BugLink: https://bugs.launchpad.net/bugs/1976248

When the mmu_feature_keys[] was introduced in the commit c12e6f24d413
("powerpc: Add option to use jump label for mmu_has_feature()"),
it is unlikely that it would be used either directly or indirectly in
the out of tree modules. So we exported it as GPL only.

But with the evolution of the codes, especially the PPC_KUAP support, it
may be indirectly referenced by some primitive macro or inline functions
such as get_user() or __copy_from_user_inatomic(), this will make it
impossible to build many non GPL modules (such as ZFS) on ppc
architecture. Fix this by exposing the mmu_feature_keys[] to the non-GPL
modules too.

Fixes: 7613f5a66bec ("powerpc/64s/kuap: Use mmu_has_feature()")
Reported-by: Nathaniel Filardo <email address hidden>
Signed-off-by: Kevin Hao <email address hidden>
Signed-off-by: Michael Ellerman <email address hidden>
Link: https://<email address hidden>
(backported from commit d9e5c3e9e75162f845880535957b7fd0b4637d23 upstream)
Signed-off-by: Dimitri John Ledkov <email address hidden>
Acked-by: Cengiz Can <email address hidden>
Acked-by: Andrea Righi <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

84f02b2... by Eric Dumazet <email address hidden>

llc: fix netdevice reference leaks in llc_ui_bind()

commit 764f4eb6846f5475f1244767d24d25dd86528a4a upstream.

Whenever llc_ui_bind() and/or llc_ui_autobind()
took a reference on a netdevice but subsequently fail,
they must properly release their reference
or risk the infamous message from unregister_netdevice()
at device dismantle.

unregister_netdevice: waiting for eth0 to become free. Usage count = 3

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Eric Dumazet <email address hidden>
Reported-by: 赵子轩 <email address hidden>
Reported-by: Stoyan Manolov <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Jakub Kicinski <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
CVE-2022-28356
(cherry picked from 571df3393f523b59cba87e2f3e80a3a624030f9c linux-5.10.y)
Signed-off-by: Cengiz Can <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>