]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Oct 2024 17:03:10 +0000 (19:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Oct 2024 17:03:10 +0000 (19:03 +0200)
added patches:
aoe-fix-the-potential-use-after-free-problem-in-more-places.patch
clk-qcom-clk-rpmh-fix-overflow-in-bcm-vote.patch
clk-qcom-gcc-sm8250-do-not-turn-off-pcie-gdscs-during-gdsc_disable.patch
clk-rockchip-fix-error-for-unknown-clocks.patch
iio-magnetometer-ak8975-fix-reading-for-ak099xx-sensors.patch
input-adp5589-keys-fix-adp5589_gpio_get_value.patch
media-sun4i_csi-implement-link-validate-for-sun4i_csi-subdev.patch
media-uapi-linux-cec.h-cec_msg_set_reply_to-zero-flags.patch
media-venus-fix-use-after-free-bug-in-venus_remove-due-to-race-condition.patch
net-stmmac-fix-zero-division-error-when-disabling-tc-cbs.patch
rtc-at91sam9-fix-of-node-leak-in-probe-error-path.patch
tomoyo-fallback-to-realpath-if-symlink-s-pathname-does-not-exist.patch

13 files changed:
queue-5.10/aoe-fix-the-potential-use-after-free-problem-in-more-places.patch [new file with mode: 0644]
queue-5.10/clk-qcom-clk-rpmh-fix-overflow-in-bcm-vote.patch [new file with mode: 0644]
queue-5.10/clk-qcom-gcc-sm8250-do-not-turn-off-pcie-gdscs-during-gdsc_disable.patch [new file with mode: 0644]
queue-5.10/clk-rockchip-fix-error-for-unknown-clocks.patch [new file with mode: 0644]
queue-5.10/iio-magnetometer-ak8975-fix-reading-for-ak099xx-sensors.patch [new file with mode: 0644]
queue-5.10/input-adp5589-keys-fix-adp5589_gpio_get_value.patch [new file with mode: 0644]
queue-5.10/media-sun4i_csi-implement-link-validate-for-sun4i_csi-subdev.patch [new file with mode: 0644]
queue-5.10/media-uapi-linux-cec.h-cec_msg_set_reply_to-zero-flags.patch [new file with mode: 0644]
queue-5.10/media-venus-fix-use-after-free-bug-in-venus_remove-due-to-race-condition.patch [new file with mode: 0644]
queue-5.10/net-stmmac-fix-zero-division-error-when-disabling-tc-cbs.patch [new file with mode: 0644]
queue-5.10/rtc-at91sam9-fix-of-node-leak-in-probe-error-path.patch [new file with mode: 0644]
queue-5.10/series
queue-5.10/tomoyo-fallback-to-realpath-if-symlink-s-pathname-does-not-exist.patch [new file with mode: 0644]

diff --git a/queue-5.10/aoe-fix-the-potential-use-after-free-problem-in-more-places.patch b/queue-5.10/aoe-fix-the-potential-use-after-free-problem-in-more-places.patch
new file mode 100644 (file)
index 0000000..f6644e4
--- /dev/null
@@ -0,0 +1,98 @@
+From 6d6e54fc71ad1ab0a87047fd9c211e75d86084a3 Mon Sep 17 00:00:00 2001
+From: Chun-Yi Lee <joeyli.kernel@gmail.com>
+Date: Wed, 2 Oct 2024 11:54:58 +0800
+Subject: aoe: fix the potential use-after-free problem in more places
+
+From: Chun-Yi Lee <joeyli.kernel@gmail.com>
+
+commit 6d6e54fc71ad1ab0a87047fd9c211e75d86084a3 upstream.
+
+For fixing CVE-2023-6270, f98364e92662 ("aoe: fix the potential
+use-after-free problem in aoecmd_cfg_pkts") makes tx() calling dev_put()
+instead of doing in aoecmd_cfg_pkts(). It avoids that the tx() runs
+into use-after-free.
+
+Then Nicolai Stange found more places in aoe have potential use-after-free
+problem with tx(). e.g. revalidate(), aoecmd_ata_rw(), resend(), probe()
+and aoecmd_cfg_rsp(). Those functions also use aoenet_xmit() to push
+packet to tx queue. So they should also use dev_hold() to increase the
+refcnt of skb->dev.
+
+On the other hand, moving dev_put() to tx() causes that the refcnt of
+skb->dev be reduced to a negative value, because corresponding
+dev_hold() are not called in revalidate(), aoecmd_ata_rw(), resend(),
+probe(), and aoecmd_cfg_rsp(). This patch fixed this issue.
+
+Cc: stable@vger.kernel.org
+Link: https://nvd.nist.gov/vuln/detail/CVE-2023-6270
+Fixes: f98364e92662 ("aoe: fix the potential use-after-free problem in aoecmd_cfg_pkts")
+Reported-by: Nicolai Stange <nstange@suse.com>
+Signed-off-by: Chun-Yi Lee <jlee@suse.com>
+Link: https://lore.kernel.org/stable/20240624064418.27043-1-jlee%40suse.com
+Link: https://lore.kernel.org/r/20241002035458.24401-1-jlee@suse.com
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/block/aoe/aoecmd.c |   13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+--- a/drivers/block/aoe/aoecmd.c
++++ b/drivers/block/aoe/aoecmd.c
+@@ -362,6 +362,7 @@ ata_rw_frameinit(struct frame *f)
+       }
+       ah->cmdstat = ATA_CMD_PIO_READ | writebit | extbit;
++      dev_hold(t->ifp->nd);
+       skb->dev = t->ifp->nd;
+ }
+@@ -402,6 +403,8 @@ aoecmd_ata_rw(struct aoedev *d)
+               __skb_queue_head_init(&queue);
+               __skb_queue_tail(&queue, skb);
+               aoenet_xmit(&queue);
++      } else {
++              dev_put(f->t->ifp->nd);
+       }
+       return 1;
+ }
+@@ -484,10 +487,13 @@ resend(struct aoedev *d, struct frame *f
+       memcpy(h->dst, t->addr, sizeof h->dst);
+       memcpy(h->src, t->ifp->nd->dev_addr, sizeof h->src);
++      dev_hold(t->ifp->nd);
+       skb->dev = t->ifp->nd;
+       skb = skb_clone(skb, GFP_ATOMIC);
+-      if (skb == NULL)
++      if (skb == NULL) {
++              dev_put(t->ifp->nd);
+               return;
++      }
+       f->sent = ktime_get();
+       __skb_queue_head_init(&queue);
+       __skb_queue_tail(&queue, skb);
+@@ -618,6 +624,8 @@ probe(struct aoetgt *t)
+               __skb_queue_head_init(&queue);
+               __skb_queue_tail(&queue, skb);
+               aoenet_xmit(&queue);
++      } else {
++              dev_put(f->t->ifp->nd);
+       }
+ }
+@@ -1403,6 +1411,7 @@ aoecmd_ata_id(struct aoedev *d)
+       ah->cmdstat = ATA_CMD_ID_ATA;
+       ah->lba3 = 0xa0;
++      dev_hold(t->ifp->nd);
+       skb->dev = t->ifp->nd;
+       d->rttavg = RTTAVG_INIT;
+@@ -1412,6 +1421,8 @@ aoecmd_ata_id(struct aoedev *d)
+       skb = skb_clone(skb, GFP_ATOMIC);
+       if (skb)
+               f->sent = ktime_get();
++      else
++              dev_put(t->ifp->nd);
+       return skb;
+ }
diff --git a/queue-5.10/clk-qcom-clk-rpmh-fix-overflow-in-bcm-vote.patch b/queue-5.10/clk-qcom-clk-rpmh-fix-overflow-in-bcm-vote.patch
new file mode 100644 (file)
index 0000000..e013741
--- /dev/null
@@ -0,0 +1,36 @@
+From a4e5af27e6f6a8b0d14bc0d7eb04f4a6c7291586 Mon Sep 17 00:00:00 2001
+From: Mike Tipton <quic_mdtipton@quicinc.com>
+Date: Fri, 9 Aug 2024 10:51:29 +0530
+Subject: clk: qcom: clk-rpmh: Fix overflow in BCM vote
+
+From: Mike Tipton <quic_mdtipton@quicinc.com>
+
+commit a4e5af27e6f6a8b0d14bc0d7eb04f4a6c7291586 upstream.
+
+Valid frequencies may result in BCM votes that exceed the max HW value.
+Set vote ceiling to BCM_TCS_CMD_VOTE_MASK to ensure the votes aren't
+truncated, which can result in lower frequencies than desired.
+
+Fixes: 04053f4d23a4 ("clk: qcom: clk-rpmh: Add IPA clock support")
+Cc: stable@vger.kernel.org
+Signed-off-by: Mike Tipton <quic_mdtipton@quicinc.com>
+Reviewed-by: Taniya Das <quic_tdas@quicinc.com>
+Signed-off-by: Imran Shaik <quic_imrashai@quicinc.com>
+Link: https://lore.kernel.org/r/20240809-clk-rpmh-bcm-vote-fix-v2-1-240c584b7ef9@quicinc.com
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/clk/qcom/clk-rpmh.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/clk/qcom/clk-rpmh.c
++++ b/drivers/clk/qcom/clk-rpmh.c
+@@ -270,6 +270,8 @@ static int clk_rpmh_bcm_send_cmd(struct
+               cmd_state = 0;
+       }
++      cmd_state = min(cmd_state, BCM_TCS_CMD_VOTE_MASK);
++
+       if (c->last_sent_aggr_state != cmd_state) {
+               cmd.addr = c->res_addr;
+               cmd.data = BCM_TCS_CMD(1, enable, 0, cmd_state);
diff --git a/queue-5.10/clk-qcom-gcc-sm8250-do-not-turn-off-pcie-gdscs-during-gdsc_disable.patch b/queue-5.10/clk-qcom-gcc-sm8250-do-not-turn-off-pcie-gdscs-during-gdsc_disable.patch
new file mode 100644 (file)
index 0000000..e8960d7
--- /dev/null
@@ -0,0 +1,57 @@
+From ade508b545c969c72cd68479f275a5dd640fd8b9 Mon Sep 17 00:00:00 2001
+From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+Date: Fri, 19 Jul 2024 19:12:38 +0530
+Subject: clk: qcom: gcc-sm8250: Do not turn off PCIe GDSCs during gdsc_disable()
+
+From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+
+commit ade508b545c969c72cd68479f275a5dd640fd8b9 upstream.
+
+With PWRSTS_OFF_ON, PCIe GDSCs are turned off during gdsc_disable(). This
+can happen during scenarios such as system suspend and breaks the resume
+of PCIe controllers from suspend.
+
+So use PWRSTS_RET_ON to indicate the GDSC driver to not turn off the GDSCs
+during gdsc_disable() and allow the hardware to transition the GDSCs to
+retention when the parent domain enters low power state during system
+suspend.
+
+Cc: stable@vger.kernel.org # 5.7
+Fixes: 3e5770921a88 ("clk: qcom: gcc: Add global clock controller driver for SM8250")
+Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+Link: https://lore.kernel.org/r/20240719134238.312191-1-manivannan.sadhasivam@linaro.org
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/clk/qcom/gcc-sm8250.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/clk/qcom/gcc-sm8250.c
++++ b/drivers/clk/qcom/gcc-sm8250.c
+@@ -3229,7 +3229,7 @@ static struct gdsc pcie_0_gdsc = {
+       .pd = {
+               .name = "pcie_0_gdsc",
+       },
+-      .pwrsts = PWRSTS_OFF_ON,
++      .pwrsts = PWRSTS_RET_ON,
+ };
+ static struct gdsc pcie_1_gdsc = {
+@@ -3237,7 +3237,7 @@ static struct gdsc pcie_1_gdsc = {
+       .pd = {
+               .name = "pcie_1_gdsc",
+       },
+-      .pwrsts = PWRSTS_OFF_ON,
++      .pwrsts = PWRSTS_RET_ON,
+ };
+ static struct gdsc pcie_2_gdsc = {
+@@ -3245,7 +3245,7 @@ static struct gdsc pcie_2_gdsc = {
+       .pd = {
+               .name = "pcie_2_gdsc",
+       },
+-      .pwrsts = PWRSTS_OFF_ON,
++      .pwrsts = PWRSTS_RET_ON,
+ };
+ static struct gdsc ufs_card_gdsc = {
diff --git a/queue-5.10/clk-rockchip-fix-error-for-unknown-clocks.patch b/queue-5.10/clk-rockchip-fix-error-for-unknown-clocks.patch
new file mode 100644 (file)
index 0000000..adc8c36
--- /dev/null
@@ -0,0 +1,43 @@
+From 12fd64babaca4dc09d072f63eda76ba44119816a Mon Sep 17 00:00:00 2001
+From: Sebastian Reichel <sebastian.reichel@collabora.com>
+Date: Mon, 25 Mar 2024 20:33:36 +0100
+Subject: clk: rockchip: fix error for unknown clocks
+
+From: Sebastian Reichel <sebastian.reichel@collabora.com>
+
+commit 12fd64babaca4dc09d072f63eda76ba44119816a upstream.
+
+There is a clk == NULL check after the switch to check for
+unsupported clk types. Since clk is re-assigned in a loop,
+this check is useless right now for anything but the first
+round. Let's fix this up by assigning clk = NULL in the
+loop before the switch statement.
+
+Fixes: a245fecbb806 ("clk: rockchip: add basic infrastructure for clock branches")
+Cc: stable@vger.kernel.org
+Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
+[added fixes + stable-cc]
+Link: https://lore.kernel.org/r/20240325193609.237182-6-sebastian.reichel@collabora.com
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/clk/rockchip/clk.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/clk/rockchip/clk.c
++++ b/drivers/clk/rockchip/clk.c
+@@ -442,12 +442,13 @@ void rockchip_clk_register_branches(stru
+                                   struct rockchip_clk_branch *list,
+                                   unsigned int nr_clk)
+ {
+-      struct clk *clk = NULL;
++      struct clk *clk;
+       unsigned int idx;
+       unsigned long flags;
+       for (idx = 0; idx < nr_clk; idx++, list++) {
+               flags = list->flags;
++              clk = NULL;
+               /* catch simple muxes */
+               switch (list->branch_type) {
diff --git a/queue-5.10/iio-magnetometer-ak8975-fix-reading-for-ak099xx-sensors.patch b/queue-5.10/iio-magnetometer-ak8975-fix-reading-for-ak099xx-sensors.patch
new file mode 100644 (file)
index 0000000..4c02a4d
--- /dev/null
@@ -0,0 +1,78 @@
+From 129464e86c7445a858b790ac2d28d35f58256bbe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?=
+ <barnabas.czeman@mainlining.org>
+Date: Mon, 19 Aug 2024 00:29:40 +0200
+Subject: iio: magnetometer: ak8975: Fix reading for ak099xx sensors
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Barnabás Czémán <barnabas.czeman@mainlining.org>
+
+commit 129464e86c7445a858b790ac2d28d35f58256bbe upstream.
+
+Move ST2 reading with overflow handling after measurement data
+reading.
+ST2 register read have to be read after read measurment data,
+because it means end of the reading and realease the lock on the data.
+Remove ST2 read skip on interrupt based waiting because ST2 required to
+be read out at and of the axis read.
+
+Fixes: 57e73a423b1e ("iio: ak8975: add ak09911 and ak09912 support")
+Signed-off-by: Barnabás Czémán <barnabas.czeman@mainlining.org>
+Link: https://patch.msgid.link/20240819-ak09918-v4-2-f0734d14cfb9@mainlining.org
+Cc: <Stable@vger.kernel.org>
+Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iio/magnetometer/ak8975.c |   32 ++++++++++++++++----------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+
+--- a/drivers/iio/magnetometer/ak8975.c
++++ b/drivers/iio/magnetometer/ak8975.c
+@@ -661,22 +661,8 @@ static int ak8975_start_read_axis(struct
+       if (ret < 0)
+               return ret;
+-      /* This will be executed only for non-interrupt based waiting case */
+-      if (ret & data->def->ctrl_masks[ST1_DRDY]) {
+-              ret = i2c_smbus_read_byte_data(client,
+-                                             data->def->ctrl_regs[ST2]);
+-              if (ret < 0) {
+-                      dev_err(&client->dev, "Error in reading ST2\n");
+-                      return ret;
+-              }
+-              if (ret & (data->def->ctrl_masks[ST2_DERR] |
+-                         data->def->ctrl_masks[ST2_HOFL])) {
+-                      dev_err(&client->dev, "ST2 status error 0x%x\n", ret);
+-                      return -EINVAL;
+-              }
+-      }
+-
+-      return 0;
++      /* Return with zero if the data is ready. */
++      return !data->def->ctrl_regs[ST1_DRDY];
+ }
+ /* Retrieve raw flux value for one of the x, y, or z axis.  */
+@@ -703,6 +689,20 @@ static int ak8975_read_axis(struct iio_d
+       if (ret < 0)
+               goto exit;
++      /* Read out ST2 for release lock on measurment data. */
++      ret = i2c_smbus_read_byte_data(client, data->def->ctrl_regs[ST2]);
++      if (ret < 0) {
++              dev_err(&client->dev, "Error in reading ST2\n");
++              goto exit;
++      }
++
++      if (ret & (data->def->ctrl_masks[ST2_DERR] |
++                 data->def->ctrl_masks[ST2_HOFL])) {
++              dev_err(&client->dev, "ST2 status error 0x%x\n", ret);
++              ret = -EINVAL;
++              goto exit;
++      }
++
+       mutex_unlock(&data->lock);
+       pm_runtime_mark_last_busy(&data->client->dev);
diff --git a/queue-5.10/input-adp5589-keys-fix-adp5589_gpio_get_value.patch b/queue-5.10/input-adp5589-keys-fix-adp5589_gpio_get_value.patch
new file mode 100644 (file)
index 0000000..0a6e6da
--- /dev/null
@@ -0,0 +1,49 @@
+From c684771630e64bc39bddffeb65dd8a6612a6b249 Mon Sep 17 00:00:00 2001
+From: Nuno Sa <nuno.sa@analog.com>
+Date: Tue, 1 Oct 2024 07:47:23 -0700
+Subject: Input: adp5589-keys - fix adp5589_gpio_get_value()
+
+From: Nuno Sa <nuno.sa@analog.com>
+
+commit c684771630e64bc39bddffeb65dd8a6612a6b249 upstream.
+
+The adp5589 seems to have the same behavior as similar devices as
+explained in commit 910a9f5636f5 ("Input: adp5588-keys - get value from
+data out when dir is out").
+
+Basically, when the gpio is set as output we need to get the value from
+ADP5589_GPO_DATA_OUT_A register instead of ADP5589_GPI_STATUS_A.
+
+Fixes: 9d2e173644bb ("Input: ADP5589 - new driver for I2C Keypad Decoder and I/O Expander")
+Signed-off-by: Nuno Sa <nuno.sa@analog.com>
+Link: https://lore.kernel.org/r/20241001-b4-dev-adp5589-fw-conversion-v1-2-fca0149dfc47@analog.com
+Cc: stable@vger.kernel.org
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/input/keyboard/adp5589-keys.c |   13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+--- a/drivers/input/keyboard/adp5589-keys.c
++++ b/drivers/input/keyboard/adp5589-keys.c
+@@ -390,10 +390,17 @@ static int adp5589_gpio_get_value(struct
+       struct adp5589_kpad *kpad = gpiochip_get_data(chip);
+       unsigned int bank = kpad->var->bank(kpad->gpiomap[off]);
+       unsigned int bit = kpad->var->bit(kpad->gpiomap[off]);
++      int val;
+-      return !!(adp5589_read(kpad->client,
+-                             kpad->var->reg(ADP5589_GPI_STATUS_A) + bank) &
+-                             bit);
++      mutex_lock(&kpad->gpio_lock);
++      if (kpad->dir[bank] & bit)
++              val = kpad->dat_out[bank];
++      else
++              val = adp5589_read(kpad->client,
++                                 kpad->var->reg(ADP5589_GPI_STATUS_A) + bank);
++      mutex_unlock(&kpad->gpio_lock);
++
++      return !!(val & bit);
+ }
+ static void adp5589_gpio_set_value(struct gpio_chip *chip,
diff --git a/queue-5.10/media-sun4i_csi-implement-link-validate-for-sun4i_csi-subdev.patch b/queue-5.10/media-sun4i_csi-implement-link-validate-for-sun4i_csi-subdev.patch
new file mode 100644 (file)
index 0000000..547dd5e
--- /dev/null
@@ -0,0 +1,45 @@
+From 2dc5d5d401f5c6cecd97800ffef82e8d17d228f0 Mon Sep 17 00:00:00 2001
+From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
+Date: Wed, 19 Jun 2024 02:46:16 +0300
+Subject: media: sun4i_csi: Implement link validate for sun4i_csi subdev
+
+From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
+
+commit 2dc5d5d401f5c6cecd97800ffef82e8d17d228f0 upstream.
+
+The sun4i_csi driver doesn't implement link validation for the subdev it
+registers, leaving the link between the subdev and its source
+unvalidated. Fix it, using the v4l2_subdev_link_validate() helper.
+
+Fixes: 577bbf23b758 ("media: sunxi: Add A10 CSI driver")
+Cc: stable@vger.kernel.org
+Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
+Acked-by: Chen-Yu Tsai <wens@csie.org>
+Reviewed-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
+Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
++++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
+@@ -40,6 +40,10 @@ static const struct media_entity_operati
+       .link_validate = v4l2_subdev_link_validate,
+ };
++static const struct media_entity_operations sun4i_csi_subdev_entity_ops = {
++      .link_validate = v4l2_subdev_link_validate,
++};
++
+ static int sun4i_csi_notify_bound(struct v4l2_async_notifier *notifier,
+                                 struct v4l2_subdev *subdev,
+                                 struct v4l2_async_subdev *asd)
+@@ -245,6 +249,7 @@ static int sun4i_csi_probe(struct platfo
+       v4l2_subdev_init(subdev, &sun4i_csi_subdev_ops);
+       subdev->flags = V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
+       subdev->entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;
++      subdev->entity.ops = &sun4i_csi_subdev_entity_ops;
+       subdev->owner = THIS_MODULE;
+       snprintf(subdev->name, sizeof(subdev->name), "sun4i-csi-0");
+       v4l2_set_subdevdata(subdev, csi);
diff --git a/queue-5.10/media-uapi-linux-cec.h-cec_msg_set_reply_to-zero-flags.patch b/queue-5.10/media-uapi-linux-cec.h-cec_msg_set_reply_to-zero-flags.patch
new file mode 100644 (file)
index 0000000..eefe46a
--- /dev/null
@@ -0,0 +1,44 @@
+From 599f6899051cb70c4e0aa9fd591b9ee220cb6f14 Mon Sep 17 00:00:00 2001
+From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+Date: Wed, 7 Aug 2024 09:22:10 +0200
+Subject: media: uapi/linux/cec.h: cec_msg_set_reply_to: zero flags
+
+From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+
+commit 599f6899051cb70c4e0aa9fd591b9ee220cb6f14 upstream.
+
+The cec_msg_set_reply_to() helper function never zeroed the
+struct cec_msg flags field, this can cause unexpected behavior
+if flags was uninitialized to begin with.
+
+Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+Fixes: 0dbacebede1e ("[media] cec: move the CEC framework out of staging and to media")
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/uapi/linux/cec.h |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/include/uapi/linux/cec.h
++++ b/include/uapi/linux/cec.h
+@@ -132,6 +132,8 @@ static inline void cec_msg_init(struct c
+  * Set the msg destination to the orig initiator and the msg initiator to the
+  * orig destination. Note that msg and orig may be the same pointer, in which
+  * case the change is done in place.
++ *
++ * It also zeroes the reply, timeout and flags fields.
+  */
+ static inline void cec_msg_set_reply_to(struct cec_msg *msg,
+                                       struct cec_msg *orig)
+@@ -139,7 +141,9 @@ static inline void cec_msg_set_reply_to(
+       /* The destination becomes the initiator and vice versa */
+       msg->msg[0] = (cec_msg_destination(orig) << 4) |
+                     cec_msg_initiator(orig);
+-      msg->reply = msg->timeout = 0;
++      msg->reply = 0;
++      msg->timeout = 0;
++      msg->flags = 0;
+ }
+ /* cec_msg flags field */
diff --git a/queue-5.10/media-venus-fix-use-after-free-bug-in-venus_remove-due-to-race-condition.patch b/queue-5.10/media-venus-fix-use-after-free-bug-in-venus_remove-due-to-race-condition.patch
new file mode 100644 (file)
index 0000000..24e0248
--- /dev/null
@@ -0,0 +1,50 @@
+From c5a85ed88e043474161bbfe54002c89c1cb50ee2 Mon Sep 17 00:00:00 2001
+From: Zheng Wang <zyytlz.wz@163.com>
+Date: Tue, 18 Jun 2024 14:55:59 +0530
+Subject: media: venus: fix use after free bug in venus_remove due to race condition
+
+From: Zheng Wang <zyytlz.wz@163.com>
+
+commit c5a85ed88e043474161bbfe54002c89c1cb50ee2 upstream.
+
+in venus_probe, core->work is bound with venus_sys_error_handler, which is
+used to handle error. The code use core->sys_err_done to make sync work.
+The core->work is started in venus_event_notify.
+
+If we call venus_remove, there might be an unfished work. The possible
+sequence is as follows:
+
+CPU0                  CPU1
+
+                     |venus_sys_error_handler
+venus_remove         |
+hfi_destroy                     |
+venus_hfi_destroy       |
+kfree(hdev);        |
+                     |hfi_reinit
+                                        |venus_hfi_queues_reinit
+                     |//use hdev
+
+Fix it by canceling the work in venus_remove.
+
+Cc: stable@vger.kernel.org
+Fixes: af2c3834c8ca ("[media] media: venus: adding core part and helper functions")
+Signed-off-by: Zheng Wang <zyytlz.wz@163.com>
+Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
+Signed-off-by: Stanimir Varbanov <stanimir.k.varbanov@gmail.com>
+Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/media/platform/qcom/venus/core.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/media/platform/qcom/venus/core.c
++++ b/drivers/media/platform/qcom/venus/core.c
+@@ -366,6 +366,7 @@ static int venus_remove(struct platform_
+       struct device *dev = core->dev;
+       int ret;
++      cancel_delayed_work_sync(&core->work);
+       ret = pm_runtime_get_sync(dev);
+       WARN_ON(ret < 0);
diff --git a/queue-5.10/net-stmmac-fix-zero-division-error-when-disabling-tc-cbs.patch b/queue-5.10/net-stmmac-fix-zero-division-error-when-disabling-tc-cbs.patch
new file mode 100644 (file)
index 0000000..9b84c6c
--- /dev/null
@@ -0,0 +1,42 @@
+From 675faf5a14c14a2be0b870db30a70764df81e2df Mon Sep 17 00:00:00 2001
+From: KhaiWenTan <khai.wen.tan@linux.intel.com>
+Date: Wed, 18 Sep 2024 14:14:22 +0800
+Subject: net: stmmac: Fix zero-division error when disabling tc cbs
+
+From: KhaiWenTan <khai.wen.tan@linux.intel.com>
+
+commit 675faf5a14c14a2be0b870db30a70764df81e2df upstream.
+
+The commit b8c43360f6e4 ("net: stmmac: No need to calculate speed divider
+when offload is disabled") allows the "port_transmit_rate_kbps" to be
+set to a value of 0, which is then passed to the "div_s64" function when
+tc-cbs is disabled. This leads to a zero-division error.
+
+When tc-cbs is disabled, the idleslope, sendslope, and credit values the
+credit values are not required to be configured. Therefore, adding a return
+statement after setting the txQ mode to DCB when tc-cbs is disabled would
+prevent a zero-division error.
+
+Fixes: b8c43360f6e4 ("net: stmmac: No need to calculate speed divider when offload is disabled")
+Cc: <stable@vger.kernel.org>
+Co-developed-by: Choong Yong Liang <yong.liang.choong@linux.intel.com>
+Signed-off-by: Choong Yong Liang <yong.liang.choong@linux.intel.com>
+Signed-off-by: KhaiWenTan <khai.wen.tan@linux.intel.com>
+Reviewed-by: Simon Horman <horms@kernel.org>
+Link: https://patch.msgid.link/20240918061422.1589662-1-khai.wen.tan@linux.intel.com
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
+@@ -363,6 +363,7 @@ static int tc_setup_cbs(struct stmmac_pr
+                       return ret;
+               priv->plat->tx_queues_cfg[queue].mode_to_use = MTL_QUEUE_DCB;
++              return 0;
+       }
+       /* Final adjustments for HW */
diff --git a/queue-5.10/rtc-at91sam9-fix-of-node-leak-in-probe-error-path.patch b/queue-5.10/rtc-at91sam9-fix-of-node-leak-in-probe-error-path.patch
new file mode 100644 (file)
index 0000000..a426339
--- /dev/null
@@ -0,0 +1,32 @@
+From 73580e2ee6adfb40276bd420da3bb1abae204e10 Mon Sep 17 00:00:00 2001
+From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+Date: Sun, 25 Aug 2024 20:31:03 +0200
+Subject: rtc: at91sam9: fix OF node leak in probe() error path
+
+From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+
+commit 73580e2ee6adfb40276bd420da3bb1abae204e10 upstream.
+
+Driver is leaking an OF node reference obtained from
+of_parse_phandle_with_fixed_args().
+
+Fixes: 43e112bb3dea ("rtc: at91sam9: make use of syscon/regmap to access GPBR registers")
+Cc: stable@vger.kernel.org
+Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+Link: https://lore.kernel.org/r/20240825183103.102904-1-krzysztof.kozlowski@linaro.org
+Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/rtc/rtc-at91sam9.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/rtc/rtc-at91sam9.c
++++ b/drivers/rtc/rtc-at91sam9.c
+@@ -368,6 +368,7 @@ static int at91_rtc_probe(struct platfor
+               return ret;
+       rtc->gpbr = syscon_node_to_regmap(args.np);
++      of_node_put(args.np);
+       rtc->gpbr_offset = args.args[0];
+       if (IS_ERR(rtc->gpbr)) {
+               dev_err(&pdev->dev, "failed to retrieve gpbr regmap, aborting.\n");
index c471b64df639bfb01b0bfa7a5ba695652d59c54f..58077a54579adbdcd71167d0dcd78cb06bbba5a4 100644 (file)
@@ -406,3 +406,15 @@ exfat-fix-memory-leak-in-exfat_load_bitmap.patch
 nfsd-fix-delegation_blocked-to-block-correctly-for-at-least-30-seconds.patch
 nfsd-map-the-ebadmsg-to-nfserr_io-to-avoid-warning.patch
 nfsd-fix-nfsv4-s-putpubfh-operation.patch
+aoe-fix-the-potential-use-after-free-problem-in-more-places.patch
+clk-rockchip-fix-error-for-unknown-clocks.patch
+media-sun4i_csi-implement-link-validate-for-sun4i_csi-subdev.patch
+media-uapi-linux-cec.h-cec_msg_set_reply_to-zero-flags.patch
+clk-qcom-clk-rpmh-fix-overflow-in-bcm-vote.patch
+media-venus-fix-use-after-free-bug-in-venus_remove-due-to-race-condition.patch
+clk-qcom-gcc-sm8250-do-not-turn-off-pcie-gdscs-during-gdsc_disable.patch
+iio-magnetometer-ak8975-fix-reading-for-ak099xx-sensors.patch
+tomoyo-fallback-to-realpath-if-symlink-s-pathname-does-not-exist.patch
+net-stmmac-fix-zero-division-error-when-disabling-tc-cbs.patch
+rtc-at91sam9-fix-of-node-leak-in-probe-error-path.patch
+input-adp5589-keys-fix-adp5589_gpio_get_value.patch
diff --git a/queue-5.10/tomoyo-fallback-to-realpath-if-symlink-s-pathname-does-not-exist.patch b/queue-5.10/tomoyo-fallback-to-realpath-if-symlink-s-pathname-does-not-exist.patch
new file mode 100644 (file)
index 0000000..eb5a04d
--- /dev/null
@@ -0,0 +1,52 @@
+From ada1986d07976d60bed5017aa38b7f7cf27883f7 Mon Sep 17 00:00:00 2001
+From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
+Date: Wed, 25 Sep 2024 22:30:59 +0900
+Subject: tomoyo: fallback to realpath if symlink's pathname does not exist
+
+From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
+
+commit ada1986d07976d60bed5017aa38b7f7cf27883f7 upstream.
+
+Alfred Agrell found that TOMOYO cannot handle execveat(AT_EMPTY_PATH)
+inside chroot environment where /dev and /proc are not mounted, for
+commit 51f39a1f0cea ("syscalls: implement execveat() system call") missed
+that TOMOYO tries to canonicalize argv[0] when the filename fed to the
+executed program as argv[0] is supplied using potentially nonexistent
+pathname.
+
+Since "/dev/fd/<fd>" already lost symlink information used for obtaining
+that <fd>, it is too late to reconstruct symlink's pathname. Although
+<filename> part of "/dev/fd/<fd>/<filename>" might not be canonicalized,
+TOMOYO cannot use tomoyo_realpath_nofollow() when /dev or /proc is not
+mounted. Therefore, fallback to tomoyo_realpath_from_path() when
+tomoyo_realpath_nofollow() failed.
+
+Reported-by: Alfred Agrell <blubban@gmail.com>
+Closes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1082001
+Fixes: 51f39a1f0cea ("syscalls: implement execveat() system call")
+Cc: stable@vger.kernel.org # v3.19+
+Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ security/tomoyo/domain.c |    9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+--- a/security/tomoyo/domain.c
++++ b/security/tomoyo/domain.c
+@@ -725,10 +725,13 @@ int tomoyo_find_next_domain(struct linux
+       ee->r.obj = &ee->obj;
+       ee->obj.path1 = bprm->file->f_path;
+       /* Get symlink's pathname of program. */
+-      retval = -ENOENT;
+       exename.name = tomoyo_realpath_nofollow(original_name);
+-      if (!exename.name)
+-              goto out;
++      if (!exename.name) {
++              /* Fallback to realpath if symlink's pathname does not exist. */
++              exename.name = tomoyo_realpath_from_path(&bprm->file->f_path);
++              if (!exename.name)
++                      goto out;
++      }
+       tomoyo_fill_path_info(&exename);
+ retry:
+       /* Check 'aggregator' directive. */