From: Greg Kroah-Hartman Date: Fri, 25 Mar 2022 14:04:23 +0000 (+0100) Subject: 5.17-stable patches X-Git-Tag: v4.9.309~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=946fc98fa583f3627db9767558c4e73be0c302a0;p=thirdparty%2Fkernel%2Fstable-queue.git 5.17-stable patches added patches: mac80211-fix-potential-double-free-on-mesh-join.patch tpm-fix-reference-counting-for-struct-tpm_chip.patch tpm-use-try_get_ops-in-tpm-space.c.patch --- diff --git a/queue-5.17/mac80211-fix-potential-double-free-on-mesh-join.patch b/queue-5.17/mac80211-fix-potential-double-free-on-mesh-join.patch new file mode 100644 index 00000000000..61d0b405dcd --- /dev/null +++ b/queue-5.17/mac80211-fix-potential-double-free-on-mesh-join.patch @@ -0,0 +1,84 @@ +From 4a2d4496e15ea5bb5c8e83b94ca8ca7fb045e7d3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Linus=20L=C3=BCssing?= +Date: Thu, 10 Mar 2022 19:35:13 +0100 +Subject: mac80211: fix potential double free on mesh join +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Linus Lüssing + +commit 4a2d4496e15ea5bb5c8e83b94ca8ca7fb045e7d3 upstream. + +While commit 6a01afcf8468 ("mac80211: mesh: Free ie data when leaving +mesh") fixed a memory leak on mesh leave / teardown it introduced a +potential memory corruption caused by a double free when rejoining the +mesh: + + ieee80211_leave_mesh() + -> kfree(sdata->u.mesh.ie); + ... + ieee80211_join_mesh() + -> copy_mesh_setup() + -> old_ie = ifmsh->ie; + -> kfree(old_ie); + +This double free / kernel panics can be reproduced by using wpa_supplicant +with an encrypted mesh (if set up without encryption via "iw" then +ifmsh->ie is always NULL, which avoids this issue). And then calling: + + $ iw dev mesh0 mesh leave + $ iw dev mesh0 mesh join my-mesh + +Note that typically these commands are not used / working when using +wpa_supplicant. And it seems that wpa_supplicant or wpa_cli are going +through a NETDEV_DOWN/NETDEV_UP cycle between a mesh leave and mesh join +where the NETDEV_UP resets the mesh.ie to NULL via a memcpy of +default_mesh_setup in cfg80211_netdev_notifier_call, which then avoids +the memory corruption, too. + +The issue was first observed in an application which was not using +wpa_supplicant but "Senf" instead, which implements its own calls to +nl80211. + +Fixing the issue by removing the kfree()'ing of the mesh IE in the mesh +join function and leaving it solely up to the mesh leave to free the +mesh IE. + +Cc: stable@vger.kernel.org +Fixes: 6a01afcf8468 ("mac80211: mesh: Free ie data when leaving mesh") +Reported-by: Matthias Kretschmer +Signed-off-by: Linus Lüssing +Tested-by: Mathias Kretschmer +Link: https://lore.kernel.org/r/20220310183513.28589-1-linus.luessing@c0d3.blue +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman +--- + net/mac80211/cfg.c | 3 --- + 1 file changed, 3 deletions(-) + +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -2148,14 +2148,12 @@ static int copy_mesh_setup(struct ieee80 + const struct mesh_setup *setup) + { + u8 *new_ie; +- const u8 *old_ie; + struct ieee80211_sub_if_data *sdata = container_of(ifmsh, + struct ieee80211_sub_if_data, u.mesh); + int i; + + /* allocate information elements */ + new_ie = NULL; +- old_ie = ifmsh->ie; + + if (setup->ie_len) { + new_ie = kmemdup(setup->ie, setup->ie_len, +@@ -2165,7 +2163,6 @@ static int copy_mesh_setup(struct ieee80 + } + ifmsh->ie_len = setup->ie_len; + ifmsh->ie = new_ie; +- kfree(old_ie); + + /* now copy the rest of the setup parameters */ + ifmsh->mesh_id_len = setup->mesh_id_len; diff --git a/queue-5.17/series b/queue-5.17/series index 2fea84267a4..e64f1e113ca 100644 --- a/queue-5.17/series +++ b/queue-5.17/series @@ -31,3 +31,6 @@ drm-virtio-ensure-that-objs-is-not-null-in-virtio_gpu_array_put_free.patch jbd2-fix-use-after-free-of-transaction_t-race.patch rcu-don-t-deboost-before-reporting-expedited-quiescent-state.patch uaccess-fix-integer-overflow-on-access_ok.patch +mac80211-fix-potential-double-free-on-mesh-join.patch +tpm-fix-reference-counting-for-struct-tpm_chip.patch +tpm-use-try_get_ops-in-tpm-space.c.patch diff --git a/queue-5.17/tpm-fix-reference-counting-for-struct-tpm_chip.patch b/queue-5.17/tpm-fix-reference-counting-for-struct-tpm_chip.patch new file mode 100644 index 00000000000..69ed87a7612 --- /dev/null +++ b/queue-5.17/tpm-fix-reference-counting-for-struct-tpm_chip.patch @@ -0,0 +1,273 @@ +From 7e0438f83dc769465ee663bb5dcf8cc154940712 Mon Sep 17 00:00:00 2001 +From: Lino Sanfilippo +Date: Wed, 2 Mar 2022 10:43:53 +0100 +Subject: tpm: fix reference counting for struct tpm_chip + +From: Lino Sanfilippo + +commit 7e0438f83dc769465ee663bb5dcf8cc154940712 upstream. + +The following sequence of operations results in a refcount warning: + +1. Open device /dev/tpmrm. +2. Remove module tpm_tis_spi. +3. Write a TPM command to the file descriptor opened at step 1. + +------------[ cut here ]------------ +WARNING: CPU: 3 PID: 1161 at lib/refcount.c:25 kobject_get+0xa0/0xa4 +refcount_t: addition on 0; use-after-free. +Modules linked in: tpm_tis_spi tpm_tis_core tpm mdio_bcm_unimac brcmfmac +sha256_generic libsha256 sha256_arm hci_uart btbcm bluetooth cfg80211 vc4 +brcmutil ecdh_generic ecc snd_soc_core crc32_arm_ce libaes +raspberrypi_hwmon ac97_bus snd_pcm_dmaengine bcm2711_thermal snd_pcm +snd_timer genet snd phy_generic soundcore [last unloaded: spi_bcm2835] +CPU: 3 PID: 1161 Comm: hold_open Not tainted 5.10.0ls-main-dirty #2 +Hardware name: BCM2711 +[] (unwind_backtrace) from [] (show_stack+0x10/0x14) +[] (show_stack) from [] (dump_stack+0xc4/0xd8) +[] (dump_stack) from [] (__warn+0x104/0x108) +[] (__warn) from [] (warn_slowpath_fmt+0x74/0xb8) +[] (warn_slowpath_fmt) from [] (kobject_get+0xa0/0xa4) +[] (kobject_get) from [] (tpm_try_get_ops+0x14/0x54 [tpm]) +[] (tpm_try_get_ops [tpm]) from [] (tpm_common_write+0x38/0x60 [tpm]) +[] (tpm_common_write [tpm]) from [] (vfs_write+0xc4/0x3c0) +[] (vfs_write) from [] (ksys_write+0x58/0xcc) +[] (ksys_write) from [] (ret_fast_syscall+0x0/0x4c) +Exception stack(0xc226bfa8 to 0xc226bff0) +bfa0: 00000000 000105b4 00000003 beafe664 00000014 00000000 +bfc0: 00000000 000105b4 000103f8 00000004 00000000 00000000 b6f9c000 beafe684 +bfe0: 0000006c beafe648 0001056c b6eb6944 +---[ end trace d4b8409def9b8b1f ]--- + +The reason for this warning is the attempt to get the chip->dev reference +in tpm_common_write() although the reference counter is already zero. + +Since commit 8979b02aaf1d ("tpm: Fix reference count to main device") the +extra reference used to prevent a premature zero counter is never taken, +because the required TPM_CHIP_FLAG_TPM2 flag is never set. + +Fix this by moving the TPM 2 character device handling from +tpm_chip_alloc() to tpm_add_char_device() which is called at a later point +in time when the flag has been set in case of TPM2. + +Commit fdc915f7f719 ("tpm: expose spaces via a device link /dev/tpmrm") +already introduced function tpm_devs_release() to release the extra +reference but did not implement the required put on chip->devs that results +in the call of this function. + +Fix this by putting chip->devs in tpm_chip_unregister(). + +Finally move the new implementation for the TPM 2 handling into a new +function to avoid multiple checks for the TPM_CHIP_FLAG_TPM2 flag in the +good case and error cases. + +Cc: stable@vger.kernel.org +Fixes: fdc915f7f719 ("tpm: expose spaces via a device link /dev/tpmrm") +Fixes: 8979b02aaf1d ("tpm: Fix reference count to main device") +Co-developed-by: Jason Gunthorpe +Signed-off-by: Jason Gunthorpe +Signed-off-by: Lino Sanfilippo +Tested-by: Stefan Berger +Reviewed-by: Jason Gunthorpe +Reviewed-by: Jarkko Sakkinen +Signed-off-by: Jarkko Sakkinen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/char/tpm/tpm-chip.c | 46 +++++------------------------ + drivers/char/tpm/tpm.h | 2 + + drivers/char/tpm/tpm2-space.c | 65 ++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 75 insertions(+), 38 deletions(-) + +--- a/drivers/char/tpm/tpm-chip.c ++++ b/drivers/char/tpm/tpm-chip.c +@@ -274,14 +274,6 @@ static void tpm_dev_release(struct devic + kfree(chip); + } + +-static void tpm_devs_release(struct device *dev) +-{ +- struct tpm_chip *chip = container_of(dev, struct tpm_chip, devs); +- +- /* release the master device reference */ +- put_device(&chip->dev); +-} +- + /** + * tpm_class_shutdown() - prepare the TPM device for loss of power. + * @dev: device to which the chip is associated. +@@ -344,7 +336,6 @@ struct tpm_chip *tpm_chip_alloc(struct d + chip->dev_num = rc; + + device_initialize(&chip->dev); +- device_initialize(&chip->devs); + + chip->dev.class = tpm_class; + chip->dev.class->shutdown_pre = tpm_class_shutdown; +@@ -352,39 +343,20 @@ struct tpm_chip *tpm_chip_alloc(struct d + chip->dev.parent = pdev; + chip->dev.groups = chip->groups; + +- chip->devs.parent = pdev; +- chip->devs.class = tpmrm_class; +- chip->devs.release = tpm_devs_release; +- /* get extra reference on main device to hold on +- * behalf of devs. This holds the chip structure +- * while cdevs is in use. The corresponding put +- * is in the tpm_devs_release (TPM2 only) +- */ +- if (chip->flags & TPM_CHIP_FLAG_TPM2) +- get_device(&chip->dev); +- + if (chip->dev_num == 0) + chip->dev.devt = MKDEV(MISC_MAJOR, TPM_MINOR); + else + chip->dev.devt = MKDEV(MAJOR(tpm_devt), chip->dev_num); + +- chip->devs.devt = +- MKDEV(MAJOR(tpm_devt), chip->dev_num + TPM_NUM_DEVICES); +- + rc = dev_set_name(&chip->dev, "tpm%d", chip->dev_num); + if (rc) + goto out; +- rc = dev_set_name(&chip->devs, "tpmrm%d", chip->dev_num); +- if (rc) +- goto out; + + if (!pdev) + chip->flags |= TPM_CHIP_FLAG_VIRTUAL; + + cdev_init(&chip->cdev, &tpm_fops); +- cdev_init(&chip->cdevs, &tpmrm_fops); + chip->cdev.owner = THIS_MODULE; +- chip->cdevs.owner = THIS_MODULE; + + rc = tpm2_init_space(&chip->work_space, TPM2_SPACE_BUFFER_SIZE); + if (rc) { +@@ -396,7 +368,6 @@ struct tpm_chip *tpm_chip_alloc(struct d + return chip; + + out: +- put_device(&chip->devs); + put_device(&chip->dev); + return ERR_PTR(rc); + } +@@ -445,14 +416,9 @@ static int tpm_add_char_device(struct tp + } + + if (chip->flags & TPM_CHIP_FLAG_TPM2 && !tpm_is_firmware_upgrade(chip)) { +- rc = cdev_device_add(&chip->cdevs, &chip->devs); +- if (rc) { +- dev_err(&chip->devs, +- "unable to cdev_device_add() %s, major %d, minor %d, err=%d\n", +- dev_name(&chip->devs), MAJOR(chip->devs.devt), +- MINOR(chip->devs.devt), rc); +- return rc; +- } ++ rc = tpm_devs_add(chip); ++ if (rc) ++ goto err_del_cdev; + } + + /* Make the chip available. */ +@@ -460,6 +426,10 @@ static int tpm_add_char_device(struct tp + idr_replace(&dev_nums_idr, chip, chip->dev_num); + mutex_unlock(&idr_lock); + ++ return 0; ++ ++err_del_cdev: ++ cdev_device_del(&chip->cdev, &chip->dev); + return rc; + } + +@@ -654,7 +624,7 @@ void tpm_chip_unregister(struct tpm_chip + hwrng_unregister(&chip->hwrng); + tpm_bios_log_teardown(chip); + if (chip->flags & TPM_CHIP_FLAG_TPM2 && !tpm_is_firmware_upgrade(chip)) +- cdev_device_del(&chip->cdevs, &chip->devs); ++ tpm_devs_remove(chip); + tpm_del_char_device(chip); + } + EXPORT_SYMBOL_GPL(tpm_chip_unregister); +--- a/drivers/char/tpm/tpm.h ++++ b/drivers/char/tpm/tpm.h +@@ -234,6 +234,8 @@ int tpm2_prepare_space(struct tpm_chip * + size_t cmdsiz); + int tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space, void *buf, + size_t *bufsiz); ++int tpm_devs_add(struct tpm_chip *chip); ++void tpm_devs_remove(struct tpm_chip *chip); + + void tpm_bios_log_setup(struct tpm_chip *chip); + void tpm_bios_log_teardown(struct tpm_chip *chip); +--- a/drivers/char/tpm/tpm2-space.c ++++ b/drivers/char/tpm/tpm2-space.c +@@ -574,3 +574,68 @@ out: + dev_err(&chip->dev, "%s: error %d\n", __func__, rc); + return rc; + } ++ ++/* ++ * Put the reference to the main device. ++ */ ++static void tpm_devs_release(struct device *dev) ++{ ++ struct tpm_chip *chip = container_of(dev, struct tpm_chip, devs); ++ ++ /* release the master device reference */ ++ put_device(&chip->dev); ++} ++ ++/* ++ * Remove the device file for exposed TPM spaces and release the device ++ * reference. This may also release the reference to the master device. ++ */ ++void tpm_devs_remove(struct tpm_chip *chip) ++{ ++ cdev_device_del(&chip->cdevs, &chip->devs); ++ put_device(&chip->devs); ++} ++ ++/* ++ * Add a device file to expose TPM spaces. Also take a reference to the ++ * main device. ++ */ ++int tpm_devs_add(struct tpm_chip *chip) ++{ ++ int rc; ++ ++ device_initialize(&chip->devs); ++ chip->devs.parent = chip->dev.parent; ++ chip->devs.class = tpmrm_class; ++ ++ /* ++ * Get extra reference on main device to hold on behalf of devs. ++ * This holds the chip structure while cdevs is in use. The ++ * corresponding put is in the tpm_devs_release. ++ */ ++ get_device(&chip->dev); ++ chip->devs.release = tpm_devs_release; ++ chip->devs.devt = MKDEV(MAJOR(tpm_devt), chip->dev_num + TPM_NUM_DEVICES); ++ cdev_init(&chip->cdevs, &tpmrm_fops); ++ chip->cdevs.owner = THIS_MODULE; ++ ++ rc = dev_set_name(&chip->devs, "tpmrm%d", chip->dev_num); ++ if (rc) ++ goto err_put_devs; ++ ++ rc = cdev_device_add(&chip->cdevs, &chip->devs); ++ if (rc) { ++ dev_err(&chip->devs, ++ "unable to cdev_device_add() %s, major %d, minor %d, err=%d\n", ++ dev_name(&chip->devs), MAJOR(chip->devs.devt), ++ MINOR(chip->devs.devt), rc); ++ goto err_put_devs; ++ } ++ ++ return 0; ++ ++err_put_devs: ++ put_device(&chip->devs); ++ ++ return rc; ++} diff --git a/queue-5.17/tpm-use-try_get_ops-in-tpm-space.c.patch b/queue-5.17/tpm-use-try_get_ops-in-tpm-space.c.patch new file mode 100644 index 00000000000..7c4f0e3eab4 --- /dev/null +++ b/queue-5.17/tpm-use-try_get_ops-in-tpm-space.c.patch @@ -0,0 +1,51 @@ +From fb5abce6b2bb5cb3d628aaa63fa821da8c4600f9 Mon Sep 17 00:00:00 2001 +From: James Bottomley +Date: Mon, 7 Mar 2022 15:58:03 -0500 +Subject: tpm: use try_get_ops() in tpm-space.c + +From: James Bottomley + +commit fb5abce6b2bb5cb3d628aaa63fa821da8c4600f9 upstream. + +As part of the series conversion to remove nested TPM operations: + +https://lore.kernel.org/all/20190205224723.19671-1-jarkko.sakkinen@linux.intel.com/ + +exposure of the chip->tpm_mutex was removed from much of the upper +level code. In this conversion, tpm2_del_space() was missed. This +didn't matter much because it's usually called closely after a +converted operation, so there's only a very tiny race window where the +chip can be removed before the space flushing is done which causes a +NULL deref on the mutex. However, there are reports of this window +being hit in practice, so fix this by converting tpm2_del_space() to +use tpm_try_get_ops(), which performs all the teardown checks before +acquring the mutex. + +Cc: stable@vger.kernel.org # 5.4.x +Signed-off-by: James Bottomley +Reviewed-by: Jarkko Sakkinen +Signed-off-by: Jarkko Sakkinen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/char/tpm/tpm2-space.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/char/tpm/tpm2-space.c ++++ b/drivers/char/tpm/tpm2-space.c +@@ -58,12 +58,12 @@ int tpm2_init_space(struct tpm_space *sp + + void tpm2_del_space(struct tpm_chip *chip, struct tpm_space *space) + { +- mutex_lock(&chip->tpm_mutex); +- if (!tpm_chip_start(chip)) { ++ ++ if (tpm_try_get_ops(chip) == 0) { + tpm2_flush_sessions(chip, space); +- tpm_chip_stop(chip); ++ tpm_put_ops(chip); + } +- mutex_unlock(&chip->tpm_mutex); ++ + kfree(space->context_buf); + kfree(space->session_buf); + }