~timg-tpi/ubuntu/+source/linux/+git/bionic:master

Last commit made on 2022-06-22
Get this branch:
git clone -b master https://git.launchpad.net/~timg-tpi/ubuntu/+source/linux/+git/bionic
Only Tim Gardner can upload to this branch. If you are Tim Gardner please log in for upload directions.

Branch merges

Branch information

Recent commits

4422fc9... by Luke Nowakowski-Krijger

UBUNTU: Ubuntu-4.15.0-189.200

Signed-off-by: Luke Nowakowski-Krijger <email address hidden>

362f18b... by Luke Nowakowski-Krijger

UBUNTU: link-to-tracker: update tracking bug

BugLink: https://bugs.launchpad.net/bugs/1979525
Properties: no-test-build
Signed-off-by: Luke Nowakowski-Krijger <email address hidden>

382512c... by Luke Nowakowski-Krijger

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Luke Nowakowski-Krijger <email address hidden>

3c76918... by Andy Shevchenko <email address hidden>

mfd: intel-lpss: Use MODULE_SOFTDEP() instead of implicit request

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

There is no need to handle optional module request in the driver
when user space tools has that feature for ages.

Replace custom code by MODULE_SOFTDEP() macro to let user space know
that we would like to have the DMA driver loaded first, if any.

Signed-off-by: Andy Shevchenko <email address hidden>
Signed-off-by: Lee Jones <email address hidden>
(backported from commit 569fac74627cc332a2097a7a4bfdc654b8e7f273)
Signed-off-by: Kai-Heng Feng <email address hidden>
Acked-by: Luke Nowakowski-Krijger <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

bf7213b... by Kamal Mostafa

UBUNTU: upstream stable to v4.14.277, v4.19.240

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

Ignore: yes
Signed-off-by: Kamal Mostafa <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

53f474f... by Dave Stevenson <email address hidden>

drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare

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

[ Upstream commit 5f18c0782b99e26121efa93d20b76c19e17aa1dd ]

The panel has a prepare call which is before video starts, and an
enable call which is after.
The Toshiba bridge should be configured before video, so move
the relevant power and initialisation calls to prepare.

Fixes: 2f733d6194bd ("drm/panel: Add support for the Raspberry Pi 7" Touchscreen.")
Signed-off-by: Dave Stevenson <email address hidden>
Signed-off-by: Stefan Wahren <email address hidden>
Signed-off-by: Maxime Ripard <email address hidden>
Link: https://patchwork.<email address hidden>
Signed-off-by: Sasha Levin <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

65fde7d... by Dave Stevenson <email address hidden>

drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not initialised

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

[ Upstream commit f92055ae0acb035891e988ce345d6b81a0316423 ]

If a call to rpi_touchscreen_i2c_write from rpi_touchscreen_probe
fails before mipi_dsi_device_register_full is called, then
in trying to log the error message if uses ts->dsi->dev when
it is still NULL.

Use ts->i2c->dev instead, which is initialised earlier in probe.

Fixes: 2f733d6194bd ("drm/panel: Add support for the Raspberry Pi 7" Touchscreen.")
Signed-off-by: Dave Stevenson <email address hidden>
Signed-off-by: Stefan Wahren <email address hidden>
Signed-off-by: Maxime Ripard <email address hidden>
Link: https://patchwork.<email address hidden>
Signed-off-by: Sasha Levin <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

06fa5fa... by Eric Dumazet <email address hidden>

net/sched: cls_u32: fix possible leak in u32_init_knode()

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

[ Upstream commit ec5b0f605b105457f257f2870acad4a5d463984b ]

While investigating a related syzbot report,
I found that whenever call to tcf_exts_init()
from u32_init_knode() is failing, we end up
with an elevated refcount on ht->refcnt

To avoid that, only increase the refcount after
all possible errors have been evaluated.

Fixes: b9a24bb76bf6 ("net_sched: properly handle failure case of tcf_exts_init()")
Signed-off-by: Eric Dumazet <email address hidden>
Cc: Cong Wang <email address hidden>
Cc: Jiri Pirko <email address hidden>
Acked-by: Jamal Hadi Salim <email address hidden>
Signed-off-by: Jakub Kicinski <email address hidden>
Signed-off-by: Sasha Levin <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

20d1afa... by Mark Brown <email address hidden>

ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek

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

[ Upstream commit c775cbf62ed4911e4f0f23880f01815753123690 ]

The MCLK of the WM8731 on the AT91SAM9G20-EK board is connected to the
PCK0 output of the SoC, intended in the reference software to be supplied
using PLLB and programmed to 12MHz. As originally written for use with a
board file the audio driver was responsible for configuring the entire tree
but in the conversion to the common clock framework the registration of
the named pck0 and pllb clocks was removed so the driver has failed to
instantiate ever since.

Since the WM8731 driver has had support for managing a MCLK provided via
the common clock framework for some time we can simply drop all the clock
management code from the machine driver other than configuration of the
sysclk rate, the CODEC driver still respects that configuration from the
machine driver.

Fixes: ff78a189b0ae55f ("ARM: at91: remove old at91-specific clock driver")
Signed-off-by: Mark Brown <email address hidden>
Reviewed-by: Codrin Ciubotariu <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Sasha Levin <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

c9a480b... by Duoming Zhou

ax25: Fix UAF bugs in ax25 timers

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

commit 82e31755e55fbcea6a9dfaae5fe4860ade17cbc0 upstream.

There are race conditions that may lead to UAF bugs in
ax25_heartbeat_expiry(), ax25_t1timer_expiry(), ax25_t2timer_expiry(),
ax25_t3timer_expiry() and ax25_idletimer_expiry(), when we call
ax25_release() to deallocate ax25_dev.

One of the UAF bugs caused by ax25_release() is shown below:

      (Thread 1) | (Thread 2)
ax25_dev_device_up() //(1) |
... | ax25_kill_by_device()
ax25_bind() //(2) |
ax25_connect() | ...
 ax25_std_establish_data_link() |
  ax25_start_t1timer() | ax25_dev_device_down() //(3)
   mod_timer(&ax25->t1timer,..) |
                                    | ax25_release()
   (wait a time) | ...
                                    | ax25_dev_put(ax25_dev) //(4)FREE
   ax25_t1timer_expiry() |
    ax25->ax25_dev->values[..] //USE| ...
     ... |

We increase the refcount of ax25_dev in position (1) and (2), and
decrease the refcount of ax25_dev in position (3) and (4).
The ax25_dev will be freed in position (4) and be used in
ax25_t1timer_expiry().

The fail log is shown below:
==============================================================

[ 106.116942] BUG: KASAN: use-after-free in ax25_t1timer_expiry+0x1c/0x60
[ 106.116942] Read of size 8 at addr ffff88800bda9028 by task swapper/0/0
[ 106.116942] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.17.0-06123-g0905eec574
[ 106.116942] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-14
[ 106.116942] Call Trace:
...
[ 106.116942] ax25_t1timer_expiry+0x1c/0x60
[ 106.116942] call_timer_fn+0x122/0x3d0
[ 106.116942] __run_timers.part.0+0x3f6/0x520
[ 106.116942] run_timer_softirq+0x4f/0xb0
[ 106.116942] __do_softirq+0x1c2/0x651
...

This patch adds del_timer_sync() in ax25_release(), which could ensure
that all timers stop before we deallocate ax25_dev.

Signed-off-by: Duoming Zhou <email address hidden>
Signed-off-by: Paolo Abeni <email address hidden>
[OP: backport to 4.14: adjust context]
Signed-off-by: Ovidiu Panait <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>