5.10.253-rc1 review
Subsystems (9)
Greg Kroah-Hartman
maintainerPATCH 10/491 bus: fsl-mc: fix use-after-free in driver_override_show()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gui-Dong Han <[email protected]>
[ Upstream commit 148891e95014b5dc5878acefa57f1940c281c431 ]
The driver_override_show() function reads the driver_override string without holding the device_lock. However, driver_override_store() uses driver_set_override(), which modifies and frees the string while holding the device_lock.
This can result in a concurrent use-after-free if the string is freed by the store function while being read by the show function.
Fix this by holding the device_lock around the read operation.
--- drivers/bus/fsl-mc/fsl-mc-bus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/bus/fsl-mc/fsl-mc-bus.c +5 -1
@@ -194,8 +194,12 @@ static ssize_t driver_override_show(struct device *dev, struct device_attribute *attr, char *buf) { struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev); +ssize_t len; -return sysfs_emit (buf,"%s\n" , mc_dev->driver_override); +device_lock (dev); + len =sysfs_emit (buf,"%s\n" , mc_dev->driver_override); +device_unlock (dev); +return len; }static DEVICE_ATTR_RW (driver_override);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 11/491 drm/tegra: dsi: fix device leak on probe
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit bfef062695570842cf96358f2f46f4c6642c6689 ]
Make sure to drop the reference taken when looking up the companion (ganged) device and its driver data during probe().
Note that holding a reference to a device does not prevent its driver data from going away so there is no point in keeping the reference.
--- drivers/gpu/drm/tegra/dsi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/tegra/dsi.c +2 -4
@@ -1539,11 +1539,9 @@ static int tegra_dsi_ganged_probe(struct tegra_dsi *dsi)return -EPROBE_DEFER ; dsi->slave =platform_get_drvdata (gangster); - -if (!dsi->slave) { -put_device (&gangster->dev); +put_device (&gangster->dev); +if (!dsi->slave)return -EPROBE_DEFER ; - } dsi->slave->master = dsi; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 12/491 bus: omap-ocp2scp: Convert to platform remove callback returning void
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 854f89a5b56354ba4135e0e1f0e57ab2caee59ee ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove().
Trivially convert this driver from always returning zero in the remove callback to the void returning variant.
Stable-dep-of: 5eb63e9bb65d ("bus: omap-ocp2scp: fix OF populate on driver rebind")
--- drivers/bus/omap-ocp2scp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/bus/omap-ocp2scp.c +2 -4
@@ -84,12 +84,10 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)return ret; } -static int omap_ocp2scp_remove (struct platform_device *pdev) +static void omap_ocp2scp_remove (struct platform_device *pdev) {pm_runtime_disable (&pdev->dev);device_for_each_child (&pdev->dev,NULL , ocp2scp_remove_devices); - -return 0 ; }#ifdef CONFIG_OF
@@ -103,7 +101,7 @@ MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table);static struct platform_driver omap_ocp2scp_driver = { .probe = omap_ocp2scp_probe, - .remove = omap_ocp2scp_remove, + .remove_new = omap_ocp2scp_remove, .driver = { .name ="omap-ocp2scp" , .of_match_table =of_match_ptr (omap_ocp2scp_id_table),
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 13/491 bus: omap-ocp2scp: fix OF populate on driver rebind
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 5eb63e9bb65d88abde647ced50fe6ad40c11de1a ]
Since commit c6e126de43e7 ("of: Keep track of populated platform devices") child devices will not be created by of_platform_populate() if the devices had previously been deregistered individually so that the OF_POPULATED flag is still set in the corresponding OF nodes.
Switch to using of_platform_depopulate() instead of open coding so that the child devices are created if the driver is rebound.
--- drivers/bus/omap-ocp2scp.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/bus/omap-ocp2scp.c +2 -11
@@ -17,15 +17,6 @@#define OCP2SCP_TIMING 0x18#define SYNC2_MASK 0xf -static int ocp2scp_remove_devices (struct device *dev,void *c) -{ -struct platform_device *pdev =to_platform_device (dev); - -platform_device_unregister (pdev); - -return 0 ; -} -static int omap_ocp2scp_probe (struct platform_device *pdev) {int ret;
@@ -79,7 +70,7 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)pm_runtime_disable (&pdev->dev); err0: -device_for_each_child (&pdev->dev,NULL , ocp2scp_remove_devices); +of_platform_depopulate (&pdev->dev);return ret; }
@@ -87,7 +78,7 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)static void omap_ocp2scp_remove (struct platform_device *pdev) {pm_runtime_disable (&pdev->dev); -device_for_each_child (&pdev->dev,NULL , ocp2scp_remove_devices); +of_platform_depopulate (&pdev->dev); }#ifdef CONFIG_OF
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 14/491 clk: tegra: tegra124-emc: fix device leak on set_rate()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit da61439c63d34ae6503d080a847f144d587e3a48 ]
Make sure to drop the reference taken when looking up the EMC device and its driver data on first set_rate().
Note that holding a reference to a device does not prevent its driver data from going away so there is no point in keeping the reference.
--- drivers/clk/tegra/clk-tegra124-emc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/tegra/clk-tegra124-emc.c +1 -1
@@ -190,8 +190,8 @@ static struct tegra_emc *emc_ensure_emc_driver(struct tegra_clk_emc *tegra) tegra->emc_node =NULL ; tegra->emc =platform_get_drvdata (pdev); +put_device (&pdev->dev);if (!tegra->emc) { -put_device (&pdev->dev);pr_err ("%s: cannot find EMC driver\n" , __func__);return NULL ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 15/491 ALSA: hda/conexant: Add quirk for HP ZBook Studio G4
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 1585cf83e98db32463e5d54161b06a5f01fe9976 ]
It was reported that we need the same quirk for HP ZBook Studio G4 (SSID 103c:826b) as other HP models to make the mute-LED working.
--- sound/pci/hda/patch_conexant.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_conexant.c +1 -0
@@ -1026,6 +1026,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {SND_PCI_QUIRK (0x103c ,0x8174 ,"HP Spectre x360" ,CXT_FIXUP_HP_SPECTRE ),SND_PCI_QUIRK (0x103c ,0x822e ,"HP ProBook 440 G4" ,CXT_FIXUP_MUTE_LED_GPIO ),SND_PCI_QUIRK (0x103c ,0x8231 ,"HP ProBook 450 G4" ,CXT_FIXUP_MUTE_LED_GPIO ), +SND_PCI_QUIRK (0x103c ,0x826b ,"HP ZBook Studio G4" ,CXT_FIXUP_MUTE_LED_GPIO ),SND_PCI_QUIRK (0x103c ,0x828c ,"HP EliteBook 840 G4" ,CXT_FIXUP_HP_DOCK ),SND_PCI_QUIRK (0x103c ,0x8299 ,"HP 800 G3 SFF" ,CXT_FIXUP_HP_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 16/491 hwmon: (max16065) Use READ/WRITE_ONCE to avoid compiler optimization induced race
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gui-Dong Han <[email protected]>
[ Upstream commit 007be4327e443d79c9dd9e56dc16c36f6395d208 ]
Simply copying shared data to a local variable cannot prevent data races. The compiler is allowed to optimize away the local copy and re-read the shared memory, causing a Time-of-Check Time-of-Use (TOCTOU) issue if the data changes between the check and the usage.
To enforce the use of the local variable, use READ_ONCE() when reading the shared data and WRITE_ONCE() when updating it. Apply these macros to the three identified locations (curr_sense, adc, and fault) where local variables are used for error validation, ensuring the value remains consistent.
--- drivers/hwmon/max16065.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/hwmon/max16065.c +13 -13
@@ -151,27 +151,27 @@ static struct max16065_data *max16065_update_device(struct device *dev)int i;for (i =0 ; i < data->num_adc; i++) - data->adc[i] - =max16065_read_adc (client,MAX16065_ADC (i)); +WRITE_ONCE (data->adc[i], +max16065_read_adc (client,MAX16065_ADC (i)));if (data->have_current) { - data->adc[MAX16065_NUM_ADC ] - =max16065_read_adc (client,MAX16065_CSP_ADC ); - data->curr_sense - =i2c_smbus_read_byte_data (client, -MAX16065_CURR_SENSE ); +WRITE_ONCE (data->adc[MAX16065_NUM_ADC ], +max16065_read_adc (client,MAX16065_CSP_ADC )); +WRITE_ONCE (data->curr_sense, +i2c_smbus_read_byte_data (client,MAX16065_CURR_SENSE )); }for (i =0 ; i <2 ; i++) - data->fault[i] - =i2c_smbus_read_byte_data (client,MAX16065_FAULT (i)); +WRITE_ONCE (data->fault[i], +i2c_smbus_read_byte_data (client,MAX16065_FAULT (i)));/* * MAX16067 and MAX16068 have separate undervoltage and * overvoltage alarm bits. Squash them together. */ if (data->chip == max16067 || data->chip == max16068) - data->fault[0 ] |= data->fault[1 ]; +WRITE_ONCE (data->fault[0 ], + data->fault[0 ] | data->fault[1 ]); data->last_updated = jiffies; data->valid =1 ;
@@ -185,7 +185,7 @@ static ssize_t max16065_alarm_show(struct device *dev, {struct sensor_device_attribute_2 *attr2 =to_sensor_dev_attr_2 (da);struct max16065_data *data =max16065_update_device (dev); -int val = data->fault[attr2->nr]; +int val =READ_ONCE (data->fault[attr2->nr]);if (val <0 )return val;
@@ -203,7 +203,7 @@ static ssize_t max16065_input_show(struct device *dev, {struct sensor_device_attribute *attr =to_sensor_dev_attr (da);struct max16065_data *data =max16065_update_device (dev); -int adc = data->adc[attr->index]; +int adc =READ_ONCE (data->adc[attr->index]);if (unlikely (adc <0 ))return adc;
@@ -216,7 +216,7 @@ static ssize_t max16065_current_show(struct device *dev, struct device_attribute *da, char *buf) { struct max16065_data *data = max16065_update_device(dev); -int curr_sense = data->curr_sense; +int curr_sense =READ_ONCE (data->curr_sense);if (unlikely (curr_sense <0 ))return curr_sense;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 17/491 ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 7bc0df86c2384bc1e2012a2c946f82305054da64 ]
Acer Swift SF314 (SSID 1025:136d) needs a bit of tweaks of the pin configurations for NID 0x16 and 0x19 to make the headphone / headset jack working. NID 0x17 can remain as is for the working speaker, and the built-in mic is supported via SOF.
--- sound/pci/hda/patch_conexant.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/pci/hda/patch_conexant.c +10 -0
@@ -239,6 +239,7 @@ enum {CXT_PINCFG_SWS_JS201D ,CXT_PINCFG_TOP_SPEAKER ,CXT_FIXUP_HP_A_U , + CXT_FIXUP_ACER_SWIFT_HP, };/* for hda_fixup_thinkpad_acpi() */
@@ -969,6 +970,14 @@ static const struct hda_fixup cxt_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = cxt_fixup_hp_a_u, }, + [CXT_FIXUP_ACER_SWIFT_HP] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { + {0x16 ,0x0321403f },/* Headphone */ + {0x19 ,0x40f001f0 },/* Mic */ + { } + }, + }, };static const struct snd_pci_quirk cxt5045_fixups[] = {
@@ -1018,6 +1027,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {SND_PCI_QUIRK (0x1025 ,0x0543 ,"Acer Aspire One 522" ,CXT_FIXUP_STEREO_DMIC ),SND_PCI_QUIRK (0x1025 ,0x054c ,"Acer Aspire 3830TG" ,CXT_FIXUP_ASPIRE_DMIC ),SND_PCI_QUIRK (0x1025 ,0x054f ,"Acer Aspire 4830T" ,CXT_FIXUP_ASPIRE_DMIC ), +SND_PCI_QUIRK (0x1025 ,0x136d ,"Acer Swift SF314" ,CXT_FIXUP_ACER_SWIFT_HP ),SND_PCI_QUIRK (0x103c ,0x8079 ,"HP EliteBook 840 G3" ,CXT_FIXUP_HP_DOCK ),SND_PCI_QUIRK (0x103c ,0x807C ,"HP EliteBook 820 G3" ,CXT_FIXUP_HP_DOCK ), SND_PCI_QUIRK(0x103c, 0x80FD, "HP ProBook 640 G2", CXT_FIXUP_HP_DOCK),
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 18/491 net: arcnet: com20020-pci: fix support for 2.5Mbit cards
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ethan Nelson-Moore <[email protected]>
[ Upstream commit c7d9be66b71af490446127c6ffcb66d6bb71b8b9 ]
Commit 8c14f9c70327 ("ARCNET: add com20020 PCI IDs with metadata") converted the com20020-pci driver to use a card info structure instead of a single flag mask in driver_data. However, it failed to take into account that in the original code, driver_data of 0 indicates a card with no special flags, not a card that should not have any card info structure. This introduced a null pointer dereference when cards with no flags were probed.
Commit bd6f1fd5d33d ("net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe()") then papered over this issue by rejecting cards with no driver_data instead of resolving the problem at its source.
Fix the original issue by introducing a new card info structure for 2.5Mbit cards that does not set any flags and using it if no driver_data is present.
--- drivers/net/arcnet/com20020-pci.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/net/arcnet/com20020-pci.c +15 -1
@@ -114,6 +114,8 @@ static const struct attribute_group com2 .attrs = com20020_state_attrs, }; +static struct com20020_pci_card_info card_info_2p5mbit; +static void com20020pci_remove (struct pci_dev *pdev); static int com20020pci_probe(struct pci_dev *pdev,
@@ -139,7 +141,7 @@ static int com20020pci_probe(struct pci_ ci = (struct com20020_pci_card_info *)id->driver_data;if (!ci) -return -EINVAL ; + ci = &card_info_2p5mbit; priv->ci = ci; mm = &ci->misc_map;
@@ -346,6 +348,18 @@ static struct com20020_pci_card_info car .flags = ARC_IS_5MBIT, }; +static struct com20020_pci_card_info card_info_2p5mbit = { + .name ="ARC-PCI" , + .devcount =1 , + .chan_map_tbl = { + { + .bar =2 , + .offset =0x00 , + .size =0x08 , + }, + }, +}; +static struct com20020_pci_card_info card_info_sohard = { .name ="SOHARD SH ARC-PCI" , .devcount =1 ,
Greg Kroah-Hartman
maintainerPATCH 19/491 media: dvb-core: fix wrong reinitialization of ringbuffer on reopen
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit bfbc0b5b32a8f28ce284add619bf226716a59bc0 upstream.
dvb_dvr_open() calls dvb_ringbuffer_init() when a new reader opens the DVR device. dvb_ringbuffer_init() calls init_waitqueue_head(), which reinitializes the waitqueue list head to empty.
Since dmxdev->dvr_buffer.queue is a shared waitqueue (all opens of the same DVR device share it), this orphans any existing waitqueue entries from io_uring poll or epoll, leaving them with stale prev/next pointers while the list head is reset to {self, self}.
The waitqueue and spinlock in dvr_buffer are already properly initialized once in dvb_dmxdev_init(). The open path only needs to reset the buffer data pointer, size, and read/write positions.
Replace the dvb_ringbuffer_init() call in dvb_dvr_open() with direct assignment of data/size and a call to dvb_ringbuffer_reset(), which properly resets pread, pwrite, and error with correct memory ordering without touching the waitqueue or spinlock.
--- drivers/media/dvb-core/dmxdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/dvb-core/dmxdev.c +3 -1
@@ -178,7 +178,9 @@ static int dvb_dvr_open(struct inode *inmutex_unlock (&dmxdev->mutex);return -ENOMEM ; } -dvb_ringbuffer_init (&dmxdev->dvr_buffer, mem,DVR_BUFFER_SIZE ); + dmxdev->dvr_buffer.data = mem; + dmxdev->dvr_buffer.size =DVR_BUFFER_SIZE ; +dvb_ringbuffer_reset (&dmxdev->dvr_buffer);if (dmxdev->may_do_mmap)dvb_vb2_init (&dmxdev->dvr_vb2_ctx,"dvr" , file->f_flags &O_NONBLOCK );
Greg Kroah-Hartman
maintainerPATCH 2/491 ip6_tunnel: Fix usage of skb_vlan_inet_prepare()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
Backports of commit 81c734dae203 "ip6_tunnel: use skb_vlan_inet_prepare() in __ip6_tnl_rcv()" broke IPv6 tunnelling in stable branches 5.10-6.12 inclusive. This is because the return value of skb_vlan_inet_prepare() had the opposite sense (0 for error rather than for success) before commit 9990ddf47d416 "net: tunnel: make skb_vlan_inet_prepare() return drop reasons".
For branches including commit c504e5c2f964 "net: skb: introduce kfree_skb_reason()" etc. (i.e. 6.1 and newer) it was simple to backport commit 9990ddf47d416, but for 5.10 and 5.15 that doesn't seem to be practical.
So just reverse the sense of the return value test here.
--- net/ipv6/ip6_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/ip6_tunnel.c +1 -1
@@ -876,7 +876,7 @@ static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,skb_reset_network_header (skb); -if (skb_vlan_inet_prepare (skb, true)) { +if (!skb_vlan_inet_prepare (skb, true)) {DEV_STATS_INC (tunnel->dev, rx_length_errors);DEV_STATS_INC (tunnel->dev, rx_errors); goto drop;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 20/491 nfc: pn533: properly drop the usb interface reference on disconnect
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 12133a483dfa832241fbbf09321109a0ea8a520e upstream.
When the device is disconnected from the driver, there is a "dangling" reference count on the usb interface that was grabbed in the probe callback. Fix this up by properly dropping the reference after we are done with it.
--- drivers/nfc/pn533/usb.c | 1 + 1 file changed, 1 insertion(+)
drivers/nfc/pn533/usb.c +1 -0
@@ -633,6 +633,7 @@ static void pn533_usb_disconnect(structusb_free_urb (phy->out_urb);usb_free_urb (phy->ack_urb);kfree (phy->ack_buffer); +usb_put_dev (phy->udev);nfc_info (&interface->dev,"NXP PN533 NFC device disconnected\n" ); }
Greg Kroah-Hartman
maintainerPATCH 21/491 net: usb: kaweth: validate USB endpoints
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 4b063c002ca759d1b299988ee23f564c9609c875 upstream.
The kaweth driver should validate that the device it is probing has the proper number and types of USB endpoints it is expecting before it binds to it. If a malicious device were to not have the same urbs the driver will crash later on when it blindly accesses these endpoints.
--- drivers/net/usb/kaweth.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/usb/kaweth.c +13 -0
@@ -883,6 +883,13 @@ static int kaweth_probe(const eth_addr_t bcast_addr = {0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF };int result =0 ;int rv = -EIO ; +static const u8 bulk_ep_addr[] = { +1 |USB_DIR_IN , +2 |USB_DIR_OUT , +0 }; +static const u8 int_ep_addr[] = { +3 |USB_DIR_IN , +0 }; dev_dbg(dev, "Kawasaki Device Probe (Device number:%d): 0x%4.4x:0x%4.4x:0x%4.4x\n",
@@ -896,6 +903,12 @@ static int kaweth_probe( (int )udev->descriptor.bLength, (int)udev->descriptor.bDescriptorType); +if (!usb_check_bulk_endpoints (intf, bulk_ep_addr) || + !usb_check_int_endpoints (intf, int_ep_addr)) { +dev_err (dev,"couldn't find required endpoints\n" ); +return -ENODEV ; + } + netdev =alloc_etherdev (sizeof (*kaweth));if (!netdev)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 22/491 net: usb: kalmia: validate USB endpoints
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit c58b6c29a4c9b8125e8ad3bca0637e00b71e2693 upstream.
The kalmia driver should validate that the device it is probing has the proper number and types of USB endpoints it is expecting before it binds to it. If a malicious device were to not have the same urbs the driver will crash later on when it blindly accesses these endpoints.
--- drivers/net/usb/kalmia.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/usb/kalmia.c +7 -0
@@ -132,11 +132,18 @@ kalmia_bind(struct usbnet *dev, struct u {int status;u8 ethernet_addr[ETH_ALEN ]; +static const u8 ep_addr[] = { +1 |USB_DIR_IN , +2 |USB_DIR_OUT , +0 };/* Don't bind to AT command interface */ if (intf->cur_altsetting->desc.bInterfaceClass !=USB_CLASS_VENDOR_SPEC )return -EINVAL ; +if (!usb_check_bulk_endpoints (intf, ep_addr)) +return -ENODEV ; + dev->in =usb_rcvbulkpipe (dev->udev,0x81 &USB_ENDPOINT_NUMBER_MASK ); dev->out =usb_sndbulkpipe (dev->udev,0x02 &USB_ENDPOINT_NUMBER_MASK ); dev->status =NULL ;
Greg Kroah-Hartman
maintainerPATCH 23/491 net: usb: pegasus: validate USB endpoints
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 11de1d3ae5565ed22ef1f89d73d8f2d00322c699 upstream.
The pegasus driver should validate that the device it is probing has the proper number and types of USB endpoints it is expecting before it binds to it. If a malicious device were to not have the same urbs the driver will crash later on when it blindly accesses these endpoints.
--- drivers/net/usb/pegasus.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/usb/pegasus.c +12 -1
@@ -841,8 +841,19 @@ static void unlink_all_urbs(pegasus_t *pstatic int alloc_urbs (pegasus_t *pegasus) { +static const u8 bulk_ep_addr[] = { +1 |USB_DIR_IN , +2 |USB_DIR_OUT , +0 }; +static const u8 int_ep_addr[] = { +3 |USB_DIR_IN , +0 };int res = -ENOMEM ; +if (!usb_check_bulk_endpoints (pegasus->intf, bulk_ep_addr) || + !usb_check_int_endpoints (pegasus->intf, int_ep_addr)) +return -ENODEV ; + pegasus->rx_urb =usb_alloc_urb (0 ,GFP_KERNEL );if (!pegasus->rx_urb) {return res;
@@ -1197,6 +1208,7 @@ static int pegasus_probe(struct usb_inte pegasus =netdev_priv (net); pegasus->dev_index = dev_index; + pegasus->intf = intf; res =alloc_urbs (pegasus);if (res <0 ) {
@@ -1208,7 +1220,6 @@ static int pegasus_probe(struct usb_inteINIT_DELAYED_WORK (&pegasus->carrier_check, check_carrier); - pegasus->intf = intf; pegasus->usb = dev; pegasus->net = net;
Greg Kroah-Hartman
maintainerPATCH 24/491 can: ems_usb: ems_usb_read_bulk_callback(): check the proper length of a message
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 38a01c9700b0dcafe97dfa9dc7531bf4a245deff upstream.
When looking at the data in a USB urb, the actual_length is the size of the buffer passed to the driver, not the transfer_buffer_length which is set by the driver as the max size of the buffer.
When parsing the messages in ems_usb_read_bulk_callback() properly check the size both at the beginning of parsing the message to make sure it is big enough for the expected structure, and at the end of the message to make sure we don't overflow past the end of the buffer for the next message.
--- drivers/net/can/usb/ems_usb.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/can/usb/ems_usb.c +6 -1
@@ -438,6 +438,11 @@ static void ems_usb_read_bulk_callback(s start =CPC_HEADER_SIZE ;while (msg_count) { +if (start +CPC_MSG_HEADER_LEN > urb->actual_length) { +netdev_err (netdev,"format error\n" ); +break ; + } + msg = (struct ems_cpc_msg *)&ibuf[start];switch (msg->type) {
@@ -467,7 +472,7 @@ static void ems_usb_read_bulk_callback(s start +=CPC_MSG_HEADER_LEN + msg->length; msg_count--; -if (start > urb->transfer_buffer_length) { +if (start > urb->actual_length) {netdev_err (netdev,"format error\n" );break ; }
Greg Kroah-Hartman
maintainerPATCH 25/491 can: ucan: Fix infinite loop from zero-length messages
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 1e446fd0582ad8be9f6dafb115fc2e7245f9bea7 upstream.
If a broken ucan device gets a message with the message length field set to 0, then the driver will loop for forever in ucan_read_bulk_callback(), hanging the system. If the length is 0, just skip the message and go on to the next one.
This has been fixed in the kvaser_usb driver in the past in commit 0c73772cd2b8 ("can: kvaser_usb: leaf: Fix potential infinite loop in command parsers"), so there must be some broken devices out there like this somewhere.
--- drivers/net/can/usb/ucan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/usb/ucan.c +1 -1
@@ -745,7 +745,7 @@ static void ucan_read_bulk_callback(stru len =le16_to_cpu (m->len);/* check sanity (length of content) */ -if (urb->actual_length - pos < len) { +if ((len ==0 ) || (urb->actual_length - pos < len)) {netdev_warn (up->netdev,"invalid message (short; no data; l:%d)\n" , urb->actual_length);
Greg Kroah-Hartman
maintainerPATCH 26/491 HID: Add HID_CLAIMED_INPUT guards in raw_event callbacks missing them
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit ecfa6f34492c493a9a1dc2900f3edeb01c79946b upstream.
In commit 2ff5baa9b527 ("HID: appleir: Fix potential NULL dereference at raw event handle"), we handle the fact that raw event callbacks can happen even for a HID device that has not been "claimed" causing a crash if a broken device were attempted to be connected to the system.
Fix up the remaining in-tree HID drivers that forgot to add this same check to resolve the same issue.
--- drivers/hid/hid-cmedia.c | 2 +- drivers/hid/hid-creative-sb0540.c | 2 +- drivers/hid/hid-zydacron.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/hid/hid-cmedia.c +1 -1
@@ -57,7 +57,7 @@ static int cmhid_raw_event(struct hid_de {struct cmhid *cm =hid_get_drvdata (hid); -if (len !=CM6533_JD_RAWEV_LEN ) +if (len !=CM6533_JD_RAWEV_LEN || !(hid->claimed &HID_CLAIMED_INPUT )) goto out;if (memcmp (data+CM6533_JD_SFX_OFFSET , ji_sfx,sizeof (ji_sfx))) goto out;
drivers/hid/hid-creative-sb0540.c +1 -1
@@ -153,7 +153,7 @@ static int creative_sb0540_raw_event(stru64 code, main_code;int key; -if (len !=6 ) +if (len !=6 || !(hid->claimed &HID_CLAIMED_INPUT ))return 0 ;/* From daemons/hw_hiddev.c sb0540_rec() in lirc */
drivers/hid/hid-zydacron.c +1 -1
@@ -114,7 +114,7 @@ static int zc_raw_event(struct hid_devicunsigned key;unsigned short index; -if (report->id == data[0 ]) { +if (report->id == data[0 ] && (hdev->claimed &HID_CLAIMED_INPUT )) {/* break keys */ for (index =0 ; index <4 ; index++) {
Greg Kroah-Hartman
maintainerPATCH 27/491 x86/efi: defer freeing of boot services memory
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Rapoport (Microsoft) <[email protected]>
commit a4b0bf6a40f3c107c67a24fbc614510ef5719980 upstream.
efi_free_boot_services() frees memory occupied by EFI_BOOT_SERVICES_CODE and EFI_BOOT_SERVICES_DATA using memblock_free_late().
There are two issue with that: memblock_free_late() should be used for memory allocated with memblock_alloc() while the memory reserved with memblock_reserve() should be freed with free_reserved_area().
More acutely, with CONFIG_DEFERRED_STRUCT_PAGE_INIT=y efi_free_boot_services() is called before deferred initialization of the memory map is complete.
Benjamin Herrenschmidt reports that this causes a leak of ~140MB of RAM on EC2 t3a.nano instances which only have 512MB or RAM.
If the freed memory resides in the areas that memory map for them is still uninitialized, they won't be actually freed because memblock_free_late() calls memblock_free_pages() and the latter skips uninitialized pages.
Using free_reserved_area() at this point is also problematic because __free_page() accesses the buddy of the freed page and that again might end up in uninitialized part of the memory map.
Delaying the entire efi_free_boot_services() could be problematic because in addition to freeing boot services memory it updates efi.memmap without any synchronization and that's undesirable late in boot when there is concurrency.
More robust approach is to only defer freeing of the EFI boot services memory.
Split efi_free_boot_services() in two. First efi_unmap_boot_services() collects ranges that should be freed into an array then efi_free_boot_services() later frees them after deferred init is complete.
--- arch/x86/include/asm/efi.h | 2 - arch/x86/platform/efi/efi.c | 2 - arch/x86/platform/efi/quirks.c | 55 ++++++++++++++++++++++++++++++++++-- drivers/firmware/efi/mokvar-table.c | 2 - 4 files changed, 55 insertions(+), 6 deletions(-)
arch/x86/include/asm/efi.h +1 -1
@@ -151,7 +151,7 @@ extern int __init efi_reuse_config(u64 textern void efi_delete_dummy_variable (void );extern void efi_switch_mm (struct mm_struct *mm);extern void efi_recover_from_page_fault (unsigned long phys_addr); -extern void efi_free_boot_services (void ); +extern void efi_unmap_boot_services (void );/* kexec external ABI */ struct efi_setup_data {
arch/x86/platform/efi/efi.c +1 -1
@@ -831,7 +831,7 @@ static void __init __efi_enter_virtual_m }efi_check_for_embedded_firmwares (); -efi_free_boot_services (); +efi_unmap_boot_services ();if (!efi_is_mixed ())efi_native_runtime_setup ();
arch/x86/platform/efi/quirks.c +52 -3
89 lines not on this page · raw message
drivers/firmware/efi/mokvar-table.c +1 -1
@@ -85,7 +85,7 @@ static struct kobject *mokvar_kobj;* as an alternative to ordinary EFI variables, due to platform-dependent * limitations. The memory occupied by this table is marked as reserved. * -* This routine must be called before efi_free_boot_services() in order +* This routine must be called before efi_unmap_boot_services() in order * to guarantee that it can mark the table as reserved. * * Implicit inputs:
Greg Kroah-Hartman
maintainerPATCH 28/491 ALSA: usb-audio: Use correct version for UAC3 header validation
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jun Seo <[email protected]>
commit 54f9d645a5453d0bfece0c465d34aaf072ea99fa upstream.
The entry of the validators table for UAC3 AC header descriptor is defined with the wrong protocol version UAC_VERSION_2, while it should have been UAC_VERSION_3. This results in the validator never matching for actual UAC3 devices (protocol == UAC_VERSION_3), causing their header descriptors to bypass validation entirely. A malicious USB device presenting a truncated UAC3 header could exploit this to cause out-of-bounds reads when the driver later accesses unvalidated descriptor fields.
The bug was introduced in the same commit as the recently fixed UAC3 feature unit sub-type typo, and appears to be from the same copy-paste error when the UAC3 section was created from the UAC2 section.
--- sound/usb/validate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/validate.c +1 -1
@@ -281,7 +281,7 @@ static const struct usb_desc_validator a/* UAC_VERSION_2, UAC2_SAMPLE_RATE_CONVERTER: not implemented yet */ /* UAC3 */ - FIXED(UAC_VERSION_2, UAC_HEADER, struct uac3_ac_header_descriptor), + FIXED(UAC_VERSION_3, UAC_HEADER, struct uac3_ac_header_descriptor),FIXED (UAC_VERSION_3 ,UAC_INPUT_TERMINAL , struct uac3_input_terminal_descriptor), FIXED(UAC_VERSION_3, UAC_OUTPUT_TERMINAL,
Greg Kroah-Hartman
maintainerPATCH 29/491 wifi: radiotap: reject radiotap with unknown bits
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit c854758abe0b8d86f9c43dc060ff56a0ee5b31e0 upstream.
The radiotap parser is currently only used with the radiotap namespace (not with vendor namespaces), but if the undefined field 18 is used, the alignment/size is unknown as well. In this case, iterator->_next_ns_data isn't initialized (it's only set for skipping vendor namespaces), and syzbot points out that we later compare against this uninitialized value.
Fix this by moving the rejection of unknown radiotap fields down to after the in-namespace lookup, so it will really use iterator->_next_ns_data only for vendor namespaces, even in case undefined fields are present.
--- net/wireless/radiotap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/wireless/radiotap.c +2 -2
@@ -240,14 +240,14 @@ int ieee80211_radiotap_iterator_next(default :if (!iterator->current_namespace || iterator->_arg_index >= iterator->current_namespace->n_bits) { -if (iterator->current_namespace == &radiotap_ns) -return -ENOENT ; align =0 ; }else { align = iterator->current_namespace->align_size[iterator->_arg_index].align; size = iterator->current_namespace->align_size[iterator->_arg_index].size; }if (!align) { +if (iterator->current_namespace == &radiotap_ns) +return -ENOENT ;/* skip all subsequent data */ iterator->_arg = iterator->_next_ns_data;/* give up on this namespace */
Greg Kroah-Hartman
maintainerPATCH 3/491 scsi: lpfc: Properly set WC for DPP mapping
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Krause <[email protected]>
[ Upstream commit bffda93a51b40afd67c11bf558dc5aae83ca0943 ]
Using set_memory_wc() to enable write-combining for the DPP portion of the MMIO mapping is wrong as set_memory_*() is meant to operate on RAM only, not MMIO mappings. In fact, as used currently triggers a BUG_ON() with enabled CONFIG_DEBUG_VIRTUAL.
Simply map the DPP region separately and in addition to the already existing mappings, avoiding any possible negative side effects for these.
--- drivers/scsi/lpfc/lpfc_init.c | 2 ++ drivers/scsi/lpfc/lpfc_sli.c | 36 +++++++++++++++++++++++++++++------ drivers/scsi/lpfc/lpfc_sli4.h | 3 +++ 3 files changed, 35 insertions(+), 6 deletions(-)
drivers/scsi/lpfc/lpfc_init.c +2 -0
@@ -10558,6 +10558,8 @@ lpfc_sli4_pci_mem_unset(struct lpfc_hba *phba)iounmap (phba->sli4_hba.conf_regs_memmap_p);if (phba->sli4_hba.dpp_regs_memmap_p)iounmap (phba->sli4_hba.dpp_regs_memmap_p); +if (phba->sli4_hba.dpp_regs_memmap_wc_p) +iounmap (phba->sli4_hba.dpp_regs_memmap_wc_p);break ;case LPFC_SLI_INTF_IF_TYPE_1 :default :
drivers/scsi/lpfc/lpfc_sli.c +30 -6
@@ -14966,6 +14966,32 @@ lpfc_dual_chute_pci_bar_map(struct lpfc_hba *phba, uint16_t pci_barset)return NULL ; } +static __maybe_unused void __iomem * +lpfc_dpp_wc_map (struct lpfc_hba *phba,uint8_t dpp_barset) +{ + +/* DPP region is supposed to cover 64-bit BAR2 */ +if (dpp_barset !=WQ_PCI_BAR_4_AND_5 ) { +lpfc_log_msg (phba,KERN_WARNING ,LOG_INIT , +"3273 dpp_barset x%x != WQ_PCI_BAR_4_AND_5\n" , + dpp_barset); +return NULL ; + } + +if (!phba->sli4_hba.dpp_regs_memmap_wc_p) { +void __iomem *dpp_map; + + dpp_map =ioremap_wc (phba->pci_bar2_map, +pci_resource_len (phba->pcidev, +PCI_64BIT_BAR4 )); + +if (dpp_map) + phba->sli4_hba.dpp_regs_memmap_wc_p = dpp_map; + } + +return phba->sli4_hba.dpp_regs_memmap_wc_p; +} +/** * lpfc_modify_hba_eq_delay - Modify Delay Multiplier on EQs * @phba: HBA structure that EQs are on.
@@ -15876,9 +15902,6 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq,uint8_t dpp_barset;uint32_t dpp_offset;uint8_t wq_create_version; -#ifdef CONFIG_X86 -unsigned long pg_addr; -#endif /* sanity check on queue memory */ if (!wq || !cq)
@@ -16070,14 +16093,15 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq,#ifdef CONFIG_X86 /* Enable combined writes for DPP aperture */ - pg_addr = (unsigned long )(wq->dpp_regaddr) &PAGE_MASK ; - rc =set_memory_wc (pg_addr,1 ); -if (rc) { + bar_memmap_p =lpfc_dpp_wc_map (phba, dpp_barset); +if (!bar_memmap_p) {lpfc_printf_log (phba,KERN_ERR ,LOG_INIT ,"3272 Cannot setup Combined " "Write on WQ[%d] - disable DPP\n" , wq->queue_id); phba->cfg_enable_dpp =0 ; + }else { + wq->dpp_regaddr = bar_memmap_p + dpp_offset; }#else phba->cfg_enable_dpp =0 ;
drivers/scsi/lpfc/lpfc_sli4.h +3 -0
@@ -772,6 +772,9 @@ struct lpfc_sli4_hba {void __iomem *dpp_regs_memmap_p;/* Kernel memory mapped address for * dpp registers */ +void __iomem *dpp_regs_memmap_wc_p;/* Kernel memory mapped address for +* dpp registers with write combining +*/ union { struct { /* IF Type 0, BAR 0 PCI cfg space reg mem map */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 30/491 IB/mthca: Add missed mthca_unmap_user_db() for mthca_create_srq()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
commit 117942ca43e2e3c3d121faae530989931b7f67e1 upstream.
Fix a user triggerable leak on the system call failure path.
--- drivers/infiniband/hw/mthca/mthca_provider.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mthca/mthca_provider.c +3 -2
@@ -436,6 +436,8 @@ static int mthca_create_srq(struct ib_srif (context &&ib_copy_to_udata (udata, &srq->srqn,sizeof (__u32))) {mthca_free_srq (to_mdev (ibsrq->device), srq); +mthca_unmap_user_db (to_mdev (ibsrq->device), &context->uar, + context->db_tab, ucmd.db_index);return -EFAULT ; }
@@ -444,6 +446,7 @@ static int mthca_create_srq(struct ib_srstatic int mthca_destroy_srq (struct ib_srq *srq,struct ib_udata *udata) { +mthca_free_srq (to_mdev (srq->device),to_msrq (srq));if (udata) {struct mthca_ucontext *context = rdma_udata_to_drv_context(
@@ -454,8 +457,6 @@ static int mthca_destroy_srq(struct ib_smthca_unmap_user_db (to_mdev (srq->device), &context->uar, context->db_tab,to_msrq (srq)->db_index); } - -mthca_free_srq (to_mdev (srq->device),to_msrq (srq));return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 31/491 net/sched: ets: fix divide by zero in the offload path
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Davide Caratti <[email protected]>
commit e35626f610f3d2b7953ccddf6a77453da22b3a9e upstream.
Offloading ETS requires computing each class' WRR weight: this is done by averaging over the sums of quanta as 'q_sum' and 'q_psum'. Using unsigned int, the same integer size as the individual DRR quanta, can overflow and even cause division by zero, like it happened in the following splat:
Oops: divide error: 0000 [#1] SMP PTI CPU: 13 UID: 0 PID: 487 Comm: tc Tainted: G E 6.19.0-virtme #45 PREEMPT(full) Tainted: [E]=UNSIGNED_MODULE Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 RIP: 0010:ets_offload_change+0x11f/0x290 [sch_ets] Code: e4 45 31 ff eb 03 41 89 c7 41 89 cb 89 ce 83 f9 0f 0f 87 b7 00 00 00 45 8b 08 31 c0 45 01 cc 45 85 c9 74 09 41 6b c4 64 31 d2 <41> f7 f2 89 c2 44 29 fa 45 89 df 41 83 fb 0f 0f 87 c7 00 00 00 44 RSP: 0018:ffffd0a180d77588 EFLAGS: 00010246 RAX: 00000000ffffff38 RBX: ffff8d3d482ca000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffd0a180d77660 RBP: ffffd0a180d77690 R08: ffff8d3d482ca2d8 R09: 00000000fffffffe R10: 0000000000000000 R11: 0000000000000000 R12: 00000000fffffffe R13: ffff8d3d472f2000 R14: 0000000000000003 R15: 0000000000000000 FS: 00007f440b6c2740(0000) GS:ffff8d3dc9803000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000003cdd2000 CR3: 0000000007b58002 CR4: 0000000000172ef0 Call Trace: <TASK> ets_qdisc_change+0x870/0xf40 [sch_ets] qdisc_create+0x12b/0x540 tc_modify_qdisc+0x6d7/0xbd0 rtnetlink_rcv_msg+0x168/0x6b0 netlink_rcv_skb+0x5c/0x110 netlink_unicast+0x1d6/0x2b0 netlink_sendmsg+0x22e/0x470 ____sys_sendmsg+0x38a/0x3c0 ___sys_sendmsg+0x99/0xe0 __sys_sendmsg+0x8a/0xf0 do_syscall_64+0x111/0xf80 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f440b81c77e Code: 4d 89 d8 e8 d4 bc 00 00 4c 8b 5d f8 41 8b 93 08 03 00 00 59 5e 48 83 f8 fc 74 11 c9 c3 0f 1f 80 00 00 00 00 48 8b 45 10 0f 05 <c9> c3 83 e2 39 83 fa 08 75 e7 e8 13 ff ff ff 0f 1f 00 f3 0f 1e fa RSP: 002b:00007fff951e4c10 EFLAGS: 00000202 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 0000000000481820 RCX: 00007f440b81c77e RDX: 0000000000000000 RSI: 00007fff951e4cd0 RDI: 0000000000000003 RBP: 00007fff951e4c20 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000202 R12: 00007fff951f4fa8 R13: 00000000699ddede R14: 00007f440bb01000 R15: 0000000000486980 </TASK> Modules linked in: sch_ets(E) netdevsim(E) ---[ end trace 0000000000000000 ]--- RIP: 0010:ets_offload_change+0x11f/0x290 [sch_ets] Code: e4 45 31 ff eb 03 41 89 c7 41 89 cb 89 ce 83 f9 0f 0f 87 b7 00 00 00 45 8b 08 31 c0 45 01 cc 45 85 c9 74 09 41 6b c4 64 31 d2 <41> f7 f2 89 c2 44 29 fa 45 89 df 41 83 fb 0f 0f 87 c7 00 00 00 44 RSP: 0018:ffffd0a180d77588 EFLAGS: 00010246 RAX: 00000000ffffff38 RBX: ffff8d3d482ca000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffd0a180d77660 RBP: ffffd0a180d77690 R08: ffff8d3d482ca2d8 R09: 00000000fffffffe R10: 0000000000000000 R11: 0000000000000000 R12: 00000000fffffffe R13: ffff8d3d472f2000 R14: 0000000000000003 R15: 0000000000000000 FS: 00007f440b6c2740(0000) GS:ffff8d3dc9803000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000003cdd2000 CR3: 0000000007b58002 CR4: 0000000000172ef0 Kernel panic - not syncing: Fatal exception Kernel Offset: 0x30000000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff) ---[ end Kernel panic - not syncing: Fatal exception ]---
Fix this using 64-bit integers for 'q_sum' and 'q_psum'.
--- net/sched/sch_ets.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/sched/sch_ets.c +8 -4
@@ -115,12 +115,12 @@ static void ets_offload_change(struct Qdstruct ets_sched *q =qdisc_priv (sch);struct tc_ets_qopt_offload qopt;unsigned int w_psum_prev =0 ; -unsigned int q_psum =0 ; -unsigned int q_sum =0 ;unsigned int quantum;unsigned int w_psum;unsigned int weight;unsigned int i; +u64 q_psum =0 ; +u64 q_sum =0 ;if (!tc_can_offload (dev) || !dev->netdev_ops->ndo_setup_tc)return ;
@@ -138,8 +138,12 @@ static void ets_offload_change(struct Qdfor (i =0 ; i < q->nbands; i++) { quantum = q->classes[i].quantum; - q_psum += quantum; - w_psum = quantum ? q_psum *100 / q_sum :0 ; +if (quantum) { + q_psum += quantum; + w_psum =div64_u64 (q_psum *100 , q_sum); + }else { + w_psum =0 ; + } weight = w_psum - w_psum_prev; w_psum_prev = w_psum;
Greg Kroah-Hartman
maintainerPATCH 32/491 Squashfs: check metadata block offset is within range
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phillip Lougher <[email protected]>
commit fdb24a820a5832ec4532273282cbd4f22c291a0d upstream.
Syzkaller reports a "general protection fault in squashfs_copy_data"
This is ultimately caused by a corrupted index look-up table, which produces a negative metadata block offset.
This is subsequently passed to squashfs_copy_data (via squashfs_read_metadata) where the negative offset causes an out of bounds access.
The fix is to check that the offset is within range in squashfs_read_metadata. This will trap this and other cases.
--- fs/squashfs/cache.c | 3 +++ 1 file changed, 3 insertions(+)
fs/squashfs/cache.c +3 -0
@@ -340,6 +340,9 @@ int squashfs_read_metadata(struct super_if (unlikely (length <0 ))return -EIO ; +if (unlikely (*offset <0 || *offset >=SQUASHFS_METADATA_SIZE )) +return -EIO ; +while (length) { entry =squashfs_cache_get (sb, msblk->block_cache, *block,0 );if (entry->error) {
Greg Kroah-Hartman
maintainerPATCH 33/491 drbd: fix "LOGIC BUG" in drbd_al_begin_io_nonblock()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars Ellenberg <[email protected]>
commit ab140365fb62c0bdab22b2f516aff563b2559e3b upstream.
Even though we check that we "should" be able to do lc_get_cumulative() while holding the device->al_lock spinlock, it may still fail, if some other code path decided to do lc_try_lock() with bad timing.
If that happened, we logged "LOGIC BUG for enr=...", but still did not return an error.
The rest of the code now assumed that this request has references for the relevant activity log extents.
The implcations are that during an active resync, mutual exclusivity of resync versus application IO is not guaranteed. And a potential crash at this point may not realizs that these extents could have been target of in-flight IO and would need to be resynced just in case.
Also, once the request completes, it will give up activity log references it does not even hold, which will trigger a BUG_ON(refcnt == 0) in lc_put().
Fix:
Do not crash the kernel for a condition that is harmless during normal
operation: also catch "e->refcnt == 0", not only "e == NULL" when being noisy about "al_complete_io() called on inactive extent %u\n".
And do not try to be smart and "guess" whether something will work, then be surprised when it does not.
Deal with the fact that it may or may not work. If it does not, remember a possible "partially in activity log" state (only possible for requests that cross extent boundaries), and return an error code from drbd_al_begin_io_nonblock().
A latter call for the same request will then resume from where we left off.
--- drivers/block/drbd/drbd_actlog.c | 53 ++++++++++++++++--------------------- drivers/block/drbd/drbd_interval.h | 5 ++- 2 files changed, 27 insertions(+), 31 deletions(-)
drivers/block/drbd/drbd_actlog.c +23 -30
@@ -483,38 +483,20 @@ void drbd_al_begin_io(struct drbd_deviceint drbd_al_begin_io_nonblock (struct drbd_device *device,struct drbd_interval *i) { -struct lru_cache *al = device->act_log;/* for bios crossing activity log extent boundaries, * we may need to activate two extents in one go */ unsigned first = i->sector >> (AL_EXTENT_SHIFT -9 );unsigned last = i->size ==0 ? first : (i->sector + (i->size >>9 ) -1 ) >> (AL_EXTENT_SHIFT -9 ); -unsigned nr_al_extents; -unsigned available_update_slots;unsigned enr; -D_ASSERT (device, first <= last); - - nr_al_extents =1 + last - first;/* worst case: all touched extends are cold. */ - available_update_slots =min (al->nr_elements - al->used, - al->max_pending_changes - al->pending_changes); - -/* We want all necessary updates for a given request within the same transaction -* We could first check how many updates are *actually* needed, -* and use that instead of the worst-case nr_al_extents */ -if (available_update_slots < nr_al_extents) { -/* Too many activity log extents are currently "hot". -* -* If we have accumulated pending changes already, -* we made progress. -* -* If we cannot get even a single pending change through, -* stop the fast path until we made some progress, -* or requests to "cold" extents could be starved. */ -if (!al->pending_changes) -__set_bit (__LC_STARVING, &device->act_log->flags); -return -ENOBUFS ; +if (i->partially_in_al_next_enr) { +D_ASSERT (device, first < i->partially_in_al_next_enr); +D_ASSERT (device, last >= i->partially_in_al_next_enr); + first = i->partially_in_al_next_enr; } +D_ASSERT (device, first <= last); +/* Is resync active in this area? */ for (enr = first; enr <= last; enr++) {struct lc_element *tmp;
@@ -529,14 +511,21 @@ int drbd_al_begin_io_nonblock(struct drb } } -/* Checkout the refcounts. -* Given that we checked for available elements and update slots above, -* this has to be successful. */ +/* Try to checkout the refcounts. */ for (enr = first; enr <= last; enr++) {struct lc_element *al_ext; al_ext =lc_get_cumulative (device->act_log, enr); -if (!al_ext) -drbd_info (device,"LOGIC BUG for enr=%u\n" , enr); + +if (!al_ext) { +/* Did not work. We may have exhausted the possible +* changes per transaction. Or raced with someone +* "locking" it against changes. +* Remember where to continue from. +*/ +if (enr > first) + i->partially_in_al_next_enr = enr; +return -ENOBUFS ; + } }return 0 ; }
@@ -556,7 +545,11 @@ void drbd_al_complete_io(struct drbd_devfor (enr = first; enr <= last; enr++) { extent =lc_find (device->act_log, enr); -if (!extent) { +/* Yes, this masks a bug elsewhere. However, during normal +* operation this is harmless, so no need to crash the kernel +* by the BUG_ON(refcount == 0) in lc_put(). +*/ +if (!extent || extent->refcnt ==0 ) {drbd_err (device,"al_complete_io() called on inactive extent %u\n" , enr);continue ; }
drivers/block/drbd/drbd_interval.h +4 -1
@@ -8,12 +8,15 @@struct drbd_interval {struct rb_node rb;sector_t sector;/* start sector of the interval */ -unsigned int size;/* size in bytes */ sector_t end;/* highest interval end in subtree */ +unsigned int size;/* size in bytes */ unsigned int local:1 /* local or remote request? */ ;unsigned int waiting:1 ;/* someone is waiting for completion */ unsigned int completed:1 ;/* this has been completed already; * ignore for conflict detection */ + +/* to resume a partially successful drbd_al_begin_io_nonblock(); */ +unsigned int partially_in_al_next_enr; };static inline void drbd_clear_interval (struct drbd_interval *i)
Greg Kroah-Hartman
maintainerPATCH 4/491 scsi: ufs: core: Move link recovery for hibern8 exit failure to wl_resume
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Wang <[email protected]>
[ Upstream commit 62c015373e1cdb1cdca824bd2dbce2dac0819467 ]
Move the link recovery trigger from ufshcd_uic_pwr_ctrl() to __ufshcd_wl_resume(). Ensure link recovery is only attempted when hibern8 exit fails during resume, not during hibern8 enter in suspend. Improve error handling and prevent unnecessary link recovery attempts.
--- drivers/scsi/ufs/ufshcd.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/scsi/ufs/ufshcd.c +9 -9
@@ -3880,14 +3880,6 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd)spin_unlock_irqrestore (hba->host->host_lock, flags);mutex_unlock (&hba->uic_cmd_mutex); -/* -* If the h8 exit fails during the runtime resume process, it becomes -* stuck and cannot be recovered through the error handler. To fix -* this, use link recovery instead of the error handler. -*/ -if (ret && hba->pm_op_in_progress) - ret =ufshcd_link_recovery (hba); -return ret; }
@@ -8727,7 +8719,15 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) }else {dev_err (hba->dev,"%s: hibern8 exit failed %d\n" , __func__, ret); - goto vendor_suspend; +/* +* If the h8 exit fails during the runtime resume +* process, it becomes stuck and cannot be recovered +* through the error handler. To fix this, use link +* recovery instead of the error handler. +*/ + ret =ufshcd_link_recovery (hba); +if (ret) + goto vendor_suspend; } }else if (ufshcd_is_link_off (hba)) {/*
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 5/491 ALSA: usb-audio: Cap the packet size pre-calculations
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 7fe8dec3f628e9779f1631576f8e693370050348 ]
We calculate the possible packet sizes beforehand for adaptive and synchronous endpoints, but we didn't take care of the max frame size for those pre-calculated values. When a device or a bus limits the packet size, a high sample rate or a high number of channels may lead to the packet sizes that are larger than the given limit, which results in an error from the USB core at submitting URBs.
As a simple workaround, just add the sanity checks of pre-calculated packet sizes to have the upper boundary of ep->maxframesize.
--- sound/usb/endpoint.c | 3 +++ 1 file changed, 3 insertions(+)
sound/usb/endpoint.c +3 -0
@@ -1099,6 +1099,9 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,return -EINVAL ; } + ep->packsize[0 ] =min (ep->packsize[0 ], ep->maxframesize); + ep->packsize[1 ] =min (ep->packsize[1 ], ep->maxframesize); +/* calculate the frequency in 16.16 format */ ep->freqm = ep->freqn; ep->freqshift =INT_MIN ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 6/491 btrfs: fix incorrect key offset in error message in check_dev_extent_item()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Harmstone <[email protected]>
[ Upstream commit 511dc8912ae3e929c1a182f5e6b2326516fd42a0 ]
Fix the error message in check_dev_extent_item(), when an overlapping stripe is encountered. For dev extents, objectid is the disk number and offset the physical address, so prev_key->objectid should actually be prev_key->offset.
(I can't take any credit for this one - this was discovered by Chris and his friend Claude.)
--- fs/btrfs/tree-checker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/tree-checker.c +1 -1
@@ -1630,7 +1630,7 @@ static int check_dev_extent_item(const struct extent_buffer *leaf,if (unlikely (prev_key->offset + prev_len > key->offset)) {generic_err (leaf, slot,"dev extent overlap, prev offset %llu len %llu current offset %llu" , - prev_key->objectid, prev_len, key->offset); + prev_key->offset, prev_len, key->offset);return -EUCLEAN ; } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 7/491 ARM: OMAP2+: add missing of_node_put before break and return
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Qing <[email protected]>
[ Upstream commit 883f464c1d23663047eda4f2bcf622365e2d0dd0 ]
Fix following coccicheck warning:
WARNING: Function "for_each_matching_node_and_match" should have of_node_put() before return.
Early exits from for_each_matching_node_and_match should decrement the node reference counter.
Message-Id: <[email protected]>
Stable-dep-of: 93a04ab480c8 ("ARM: omap2: Fix reference count leaks in omap_control_init()")
--- arch/arm/mach-omap2/cm_common.c | 8 ++++++-- arch/arm/mach-omap2/control.c | 19 ++++++++++++++----- arch/arm/mach-omap2/prm_common.c | 8 ++++++-- 3 files changed, 26 insertions(+), 9 deletions(-)
arch/arm/mach-omap2/cm_common.c +6 -2
@@ -333,8 +333,10 @@ int __init omap2_cm_base_init(void) data = (struct omap_prcm_init_data *)match->data; ret =of_address_to_resource (np,0 , &res); -if (ret) +if (ret) { +of_node_put (np);return ret; + }if (data->index ==TI_CLKM_CM ) mem = &cm_base;
@@ -380,8 +382,10 @@ int __init omap_cm_init(void)continue ; ret =omap2_clk_provider_init (np, data->index,NULL , data->mem); -if (ret) +if (ret) { +of_node_put (np);return ret; + } }return 0 ;
arch/arm/mach-omap2/control.c +14 -5
@@ -774,8 +774,10 @@ int __init omap2_control_base_init(void) data = (struct control_init_data *)match->data; mem =of_iomap (np,0 ); -if (!mem) +if (!mem) { +of_node_put (np);return -ENOMEM ; + }if (data->index ==TI_CLKM_CTRL ) { omap2_ctrl_base = mem;
@@ -815,22 +817,24 @@ int __init omap_control_init(void)if (scm_conf) { syscon =syscon_node_to_regmap (scm_conf); -if (IS_ERR (syscon)) -return PTR_ERR (syscon); +if (IS_ERR (syscon)) { + ret =PTR_ERR (syscon); + goto of_node_put; + }if (of_get_child_by_name (scm_conf,"clocks" )) { ret =omap2_clk_provider_init (scm_conf, data->index, syscon,NULL );if (ret) -return ret; + goto of_node_put; } }else {/* No scm_conf found, direct access */ ret =omap2_clk_provider_init (np, data->index,NULL , data->mem);if (ret) -return ret; + goto of_node_put; } }
@@ -841,6 +845,11 @@ int __init omap_control_init(void) }return 0 ; + +of_node_put: +of_node_put (np); +return ret; + }/**
arch/arm/mach-omap2/prm_common.c +6 -2
@@ -752,8 +752,10 @@ int __init omap2_prm_base_init(void) data = (struct omap_prcm_init_data *)match->data; ret =of_address_to_resource (np,0 , &res); -if (ret) +if (ret) { +of_node_put (np);return ret; + } data->mem =ioremap (res.start,resource_size (&res));
@@ -799,8 +801,10 @@ int __init omap_prcm_init(void) data = match->data; ret =omap2_clk_provider_init (np, data->index,NULL , data->mem); -if (ret) +if (ret) { +of_node_put (np);return ret; + } }omap_cm_init ();
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 8/491 ARM: omap2: Fix reference count leaks in omap_control_init()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wentao Liang <[email protected]>
[ Upstream commit 93a04ab480c8bbcb7d9004be139c538c8a0c1bc8 ]
The of_get_child_by_name() function increments the reference count of child nodes, causing multiple reference leaks in omap_control_init():
1. scm_conf node never released in normal/error paths
2. clocks node leak when checking existence
3. Missing scm_conf release before np in error paths
Fix these leaks by adding proper of_node_put() calls and separate error handling.
--- arch/arm/mach-omap2/control.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/control.c +10 -4
@@ -798,7 +798,7 @@ int __init omap2_control_base_init(void)*/ int __init omap_control_init (void ) { -struct device_node *np, *scm_conf; +struct device_node *np, *scm_conf, *clocks_node;const struct of_device_id *match;const struct omap_prcm_init_data *data;int ret;
@@ -819,16 +819,19 @@ int __init omap_control_init(void)if (IS_ERR (syscon)) { ret =PTR_ERR (syscon); - goto of_node_put; + goto err_put_scm_conf; } -if (of_get_child_by_name (scm_conf,"clocks" )) { + clocks_node =of_get_child_by_name (scm_conf,"clocks" ); +if (clocks_node) { +of_node_put (clocks_node); ret =omap2_clk_provider_init (scm_conf, data->index, syscon,NULL );if (ret) - goto of_node_put; + goto err_put_scm_conf; } +of_node_put (scm_conf); }else {/* No scm_conf found, direct access */ ret = omap2_clk_provider_init(np, data->index, NULL,
@@ -846,6 +849,9 @@ int __init omap_control_init(void)return 0 ; +err_put_scm_conf: +if (scm_conf) +of_node_put (scm_conf); of_node_put:of_node_put (np);return ret;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 9/491 bus: fsl-mc: Replace snprintf and sprintf with sysfs_emit in sysfs show functions
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chelsy Ratnawat <[email protected]>
[ Upstream commit a50522c805a6c575c80f41b04706e084d814e116 ]
Use sysfs_emit() instead of snprintf()/sprintf() when writing to sysfs buffers, as recommended by the kernel documentation.
Stable-dep-of: 148891e95014 ("bus: fsl-mc: fix use-after-free in driver_override_show()")
--- drivers/bus/fsl-mc/fsl-mc-bus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/bus/fsl-mc/fsl-mc-bus.c +3 -3
@@ -151,8 +151,8 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, {struct fsl_mc_device *mc_dev =to_fsl_mc_device (dev); -return sprintf (buf,"fsl-mc:v%08Xd%s\n" , mc_dev->obj_desc.vendor, - mc_dev->obj_desc.type); +return sysfs_emit (buf,"fsl-mc:v%08Xd%s\n" , mc_dev->obj_desc.vendor, + mc_dev->obj_desc.type); }static DEVICE_ATTR_RO (modalias);
@@ -195,7 +195,7 @@ static ssize_t driver_override_show(struct device *dev, {struct fsl_mc_device *mc_dev =to_fsl_mc_device (dev); -return snprintf (buf,PAGE_SIZE ,"%s\n" , mc_dev->driver_override); +return sysfs_emit (buf,"%s\n" , mc_dev->driver_override); }static DEVICE_ATTR_RW (driver_override);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainercover 5.10.253-rc1 review
This is the start of the stable review cycle for the 5.10.253 release. There are 491 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 15 Apr 2026 15:57:08 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.253-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.10.253-rc1
Jens Axboe <[email protected]>
io_uring/poll: correctly handle io_poll_add() return value on update
Manivannan Sadhasivam <[email protected]>
Revert "PCI: Enable ACS after configuring IOMMU for OF platforms"
Yang Yingliang <[email protected]>
device property: fix of node refcount leak in fwnode_graph_get_next_endpoint()
Greg Kroah-Hartman <[email protected]>
s390/syscalls: Add spectre boundary for syscall dispatch table
Yang Yang <[email protected]>
batman-adv: avoid OGM aggregation when skb tailroom is insufficient
Andy Shevchenko <[email protected]>
device property: Allow secondary lookup in fwnode_get_next_child_node()
Andy Shevchenko <[email protected]>
device property: Allow error pointer to be passed to fwnode APIs
Daniel Scally <[email protected]>
device property: Check fwnode->secondary when finding properties
Daniel Scally <[email protected]>
device property: Check fwnode->secondary in fwnode_graph_get_next_endpoint()
Andy Shevchenko <[email protected]>
device property: Unify access to of_node
Andy Shevchenko <[email protected]>
device property: Retrieve fwnode from of_node via accessor
Daniel Scally <[email protected]>
media: device property: Return true in fwnode_device_is_available for NULL ops
Saravana Kannan <[email protected]>
device property: Add fwnode_is_ancestor_of() and fwnode_get_next_parent_dev()
Jaskaran Singh <[email protected]>
nvme: nvme-fc: Ensure ->ioerr_work is cancelled in nvme_fc_delete_ctrl()
Jaskaran Singh <[email protected]>
Revert "nvme: nvme-fc: Ensure ->ioerr_work is cancelled in nvme_fc_delete_ctrl()"
Penghe Geng <[email protected]>
mmc: core: Avoid bitfield RMW for claim/retune flags
Ulf Hansson <[email protected]>
mmc: core: Drop reference counting of the bus_ops
Ulf Hansson <[email protected]>
mmc: core: Drop superfluous validations in mmc_hw|sw_reset()
Ulf Hansson <[email protected]>
mmc: core: Drop redundant member in struct mmc host
Maarten Lankhorst <[email protected]>
drm: Fix use-after-free on framebuffers and property blobs when calling drm_dev_unplug
Luiz Augusto von Dentz <[email protected]>
Bluetooth: L2CAP: Fix accepting multiple L2CAP_ECRED_CONN_REQ
Li Chen <[email protected]>
ext4: publish jinode after initialization
Baokun Li <[email protected]>
ext4: fix iloc.bh leak in ext4_fc_replay_inode() error paths
Yuto Ohnuki <[email protected]>
xfs: stop reclaim before pushing AIL during unmount
Yuto Ohnuki <[email protected]>
xfs: save ailp before dropping the AIL lock in push callbacks
Zqiang <[email protected]>
ext4: fix the might_sleep() warnings in kvfree()
Jinjiang Tu <[email protected]>
mm/huge_memory: fix folio isn't locked in softleaf_to_folio()
Kevin Hao <[email protected]>
net: macb: Move devm_{free,request}_irq() out of spin lock area
Jimmy Hu <[email protected]>
usb: gadget: uvc: fix NULL pointer dereference during unbind race
Kuen-Han Tsai <[email protected]>
usb: gadget: u_ether: Fix race between gether_disconnect and eth_stop
Michael Zimmermann <[email protected]>
usb: gadget: f_hid: move list and spinlock inits from bind to alloc
Greg Kroah-Hartman <[email protected]>
net: rfkill: prevent unlimited numbers of rfkill events from being created
Andrea Mayer <[email protected]>
seg6: separate dst_cache for input and output paths in seg6 lwtunnel
Guangshuo Li <[email protected]>
cpufreq: governor: fix double free in cpufreq_dbs_governor_init() error path
Liao Chang <[email protected]>
cpufreq: governor: Free dbs_data directly when gov->init() fails
Florian Westphal <[email protected]>
netlink: add nla be16/32 types to minlen array
Jon Hunter <[email protected]>
ASoC: tegra: Fix Master Volume Control
Kuninori Morimoto <[email protected]>
ASoC: soc-core: don't use discriminatory terms on snd_soc_runtime_get_dai_fmt()
GuoHan Zhao <[email protected]>
xen/privcmd: unregister xenstore notifier on module exit
David Howells <[email protected]>
rxrpc: Fix key/keyring checks in setsockopt(RXRPC_SECURITY_KEY/KEYRING)
Tyllis Xu <[email protected]>
net: stmmac: fix integer underflow in chain mode
Pengpeng Hou <[email protected]>
net: qualcomm: qca_uart: report the consumed byte on RX skb allocation failure
Johan Hovold <[email protected]>
mmc: vub300: fix NULL-deref on disconnect
David Carlier <[email protected]>
net: altera-tse: fix skb leak on DMA mapping error in tse_start_xmit()
Ruide Cao <[email protected]>
batman-adv: reject oversized global TT response buffers
Pengpeng Hou <[email protected]>
nfc: pn533: allocate rx skb before consuming bytes
Shawn Guo <[email protected]>
arm64: dts: hisilicon: hi3798cv200: Add missing dma-ranges
Shawn Guo <[email protected]>
arm64: dts: hisilicon: poplar: Correct PCIe reset GPIO polarity
Thomas Fourier <[email protected]>
wifi: brcmsmac: Fix dma_free_coherent() size
Oleh Konko <[email protected]>
tipc: fix bc_ackers underflow on duplicate GRP_ACK_MSG
Tuan Do <[email protected]>
netfilter: nft_ct: fix use-after-free in timeout object destroy
John Johansen <[email protected]>
apparmor: fix race between freeing data and fs accessing it
John Johansen <[email protected]>
apparmor: fix race on rawdata dereference
John Johansen <[email protected]>
apparmor: fix differential encoding verification
John Johansen <[email protected]>
apparmor: fix unprivileged local user can do privileged policy management
John Johansen <[email protected]>
apparmor: Fix double free of ns_name in aa_replace_profiles()
Massimiliano Pellizzer <[email protected]>
apparmor: fix missing bounds check on DEFAULT table in verify_dfa()
Massimiliano Pellizzer <[email protected]>
apparmor: fix side-effect bug in match_char() macro usage
John Johansen <[email protected]>
apparmor: fix: limit the number of levels of policy namespaces
Massimiliano Pellizzer <[email protected]>
apparmor: replace recursive profile removal with iterative approach
Massimiliano Pellizzer <[email protected]>
apparmor: fix memory leak in verify_header
Massimiliano Pellizzer <[email protected]>
apparmor: validate DFA start states are in bounds in unpack_pdb
Ricardo Ribalda <[email protected]>
media: uvcvideo: Use heuristic to find stream entity
Thadeu Lima de Souza Cascardo <[email protected]>
media: uvcvideo: Mark invalid entities with id UVC_INVALID_ENTITY_ID
Ricardo Ribalda <[email protected]>
media: uvcvideo: Implement UVC_EXT_GPIO_UNIT
Ricardo Ribalda <[email protected]>
media: uvcvideo: Allow extra entities
Ricardo Ribalda <[email protected]>
media: uvcvideo: Move guid to entity
David Hildenbrand (Red Hat) <[email protected]>
mm/hugetlb: fix excessive IPI broadcasts when unsharing PMD tables using mmu_gather
David Hildenbrand (Red Hat) <[email protected]>
mm/rmap: fix two comments related to huge_pmd_unshare()
David Hildenbrand (Red Hat) <[email protected]>
mm/hugetlb: fix two comments related to huge_pmd_unshare()
David Hildenbrand (Red Hat) <[email protected]>
mm/hugetlb: fix hugetlb_pmd_shared()
Jane Chu <[email protected]>
mm/hugetlb: fix copy_hugetlb_page_range() to use ->pt_share_count
Miaohe Lin <[email protected]>
mm/hugetlb: make detecting shared pte more reliable
David Hildenbrand (Arm) <[email protected]>
mm/hugetlb: fix skipping of unsharing of pmd page tables
Dmitry Torokhov <[email protected]>
Input: uinput - take event lock when submitting FF request "event"
Mikhail Gavrilov <[email protected]>
Input: uinput - fix circular locking dependency with ff-core
Greg Kroah-Hartman <[email protected]>
xfrm_user: fix info leak in build_report()
Johan Hovold <[email protected]>
wifi: rt2x00usb: fix devres lifetime
Eric Biggers <[email protected]>
lib/crypto: chacha: Zeroize permuted_state before it leaves scope
Jens Axboe <[email protected]>
io_uring/tctx: work around xa_store() allocation error issue
Taegu Ha <[email protected]>
usb: gadget: f_uac1_legacy: validate control request size
Kuen-Han Tsai <[email protected]>
usb: gadget: f_rndis: Protect RNDIS options with mutex
Kuen-Han Tsai <[email protected]>
usb: gadget: f_subset: Fix unbalanced refcnt in geth_free
Cengiz Can <[email protected]>
nvmet-tcp: fix use-before-check of sg in bounds validation
Sebastian Urban <[email protected]>
usb: gadget: dummy_hcd: fix premature URB completion when ZLP follows partial transfer
Alan Stern <[email protected]>
USB: dummy-hcd: Fix locking/synchronization error
Konrad Dybcio <[email protected]>
thunderbolt: Fix property read in nhi_wake_supported()
Yufan Chen <[email protected]>
net: ftgmac100: fix ring allocation unwind on open failure
Yang Yang <[email protected]>
vxlan: validate ND option lengths in vxlan_na_create
Yifan Wu <[email protected]>
netfilter: ipset: drop logically empty buckets in mtype_del
Ian Abbott <[email protected]>
comedi: me4000: Fix potential overrun of firmware buffer
Ian Abbott <[email protected]>
comedi: me_daq: Fix potential overrun of firmware buffer
Ian Abbott <[email protected]>
comedi: ni_atmio16d: Fix invalid clean-up after failed attach
Ian Abbott <[email protected]>
comedi: Reinit dev->spinlock between attachments to low-level drivers
Deepanshu Kartikey <[email protected]>
comedi: dt2815: add hardware detection to prevent crash
Oliver Neukum <[email protected]>
cdc-acm: new quirk for EPSON HMD
Yang Yang <[email protected]>
bridge: br_nd_send: validate ND option lengths
Claudiu Beznea <[email protected]>
phy: renesas: rcar-gen3-usb2: Assert PLL reset on PHY power off
Claudiu Beznea <[email protected]>
phy: renesas: rcar-gen3-usb2: Lock around hardware registers and driver data
Claudiu Beznea <[email protected]>
phy: renesas: rcar-gen3-usb2: Move IRQ request in probe
Claudiu Beznea <[email protected]>
phy: renesas: rcar-gen3-usb2: Fix role detection on unbind/bind
Justin Chen <[email protected]>
usb: ehci-brcm: fix sleep during atomic
Heitor Alves de Siqueira <[email protected]>
usb: usbtmc: Flush anchored URBs in usbtmc_release
Guangshuo Li <[email protected]>
usb: ulpi: fix double free in ulpi_register_interface() error path
Miao Li <[email protected]>
usb: quirks: add DELAY_INIT quirk for another Silicon Motion flash drive
Ethan Tidmore <[email protected]>
iio: gyro: mpu3050: Fix out-of-sequence free_irq()
Ethan Tidmore <[email protected]>
iio: gyro: mpu3050: Move iio_device_register() to correct location
Ethan Tidmore <[email protected]>
iio: gyro: mpu3050: Fix irq resource leak
Ethan Tidmore <[email protected]>
iio: gyro: mpu3050: Fix incorrect free_irq() variable
Francesco Lavra <[email protected]>
iio: imu: st_lsm6dsx: Set FIFO ODR for accelerometer and gyroscope only
David Lechner <[email protected]>
iio: light: vcnl4035: fix scan buffer on big-endian
Antoniu Miclaus <[email protected]>
iio: dac: ad5770r: fix error return in ad5770r_read_raw()
Zoltan Illes <[email protected]>
Input: xpad - add support for Razer Wolverine V3 Pro
Christoffer Sandberg <[email protected]>
Input: i8042 - add TUXEDO InfinityBook Max 16 Gen10 AMD to i8042 quirk table
Bart Van Assche <[email protected]>
Input: synaptics-rmi4 - fix a locking bug in an error path
JP Hein <[email protected]>
USB: core: add NO_LPM quirk for Razer Kiyo Pro webcam
Wanquan Zhong <[email protected]>
USB: serial: option: add support for Rolling Wireless RW135R-GL
Frej Drejhammar <[email protected]>
USB: serial: io_edgeport: add support for Blackbox IC135A
Thomas Zimmermann <[email protected]>
drm/ast: dp501: Fix initialization of SCU2C
Sanman Pradhan <[email protected]>
hwmon: (occ) Fix division by zero in occ_show_power_1()
Maciej W. Rozycki <[email protected]>
MIPS: Fix the GCC version check for `__multi3' workaround
Oleh Konko <[email protected]>
Bluetooth: SMP: force responder MITM requirements before building the pairing response
Oleh Konko <[email protected]>
Bluetooth: SMP: derive legacy responder STK authentication from MITM state
Takashi Iwai <[email protected]>
ALSA: ctxfi: Fix missing SPDIFI1 index handling
Berk Cem Goksel <[email protected]>
ALSA: caiaq: fix stack out-of-bounds read in init_card
Ernestas Kulik <[email protected]>
USB: serial: option: add MeiG Smart SRM825WN
Yasuaki Torimaru <[email protected]>
wifi: wilc1000: fix u8 overflow in SSID scan buffer size calculation
Greg Kroah-Hartman <[email protected]>
drm/ioc32: stop speculation on the drm_compat_ioctl path
Paul Walmsley <[email protected]>
riscv: kgdb: fix several debug register assignment bugs
Sanman Pradhan <[email protected]>
hwmon: (occ) Fix missing newline in occ_show_extended()
Sanman Pradhan <[email protected]>
hwmon: (pxe1610) Check return value of page-select write in probe
Alex Guo <[email protected]>
media: dvb-frontends: w7090p: fix null-ptr-deref in w7090p_tuner_write_serpar and w7090p_tuner_read_serpar
Sasha Levin <[email protected]>
Revert "media: dvb-frontends: w7090p: fix null-ptr-deref in w7090p_tuner_write_serpar and w7090p_tuner_read_serpar"
David Jeffery <[email protected]>
scsi: core: Wake up the error handler when final completions race against each other
Sasha Levin <[email protected]>
Revert "scsi: core: Wake up the error handler when final completions race against each other"
Ian Forbes <[email protected]>
drm/vmwgfx: Add seqno waiter for sync_files
Sasha Levin <[email protected]>
Revert "drm/vmwgfx: Add seqno waiter for sync_files"
Ard Biesheuvel <[email protected]>
efi/mokvar-table: Avoid repeated map/unmap of the same page
Eric Dumazet <[email protected]>
ipv6: avoid overflows in ip6_datagram_send_ctl()
Xiang Mei <[email protected]>
net/sched: cls_flow: fix NULL pointer dereference on shared blocks
Xiang Mei <[email protected]>
net/sched: cls_fw: fix NULL pointer dereference on shared blocks
Martin Schiller <[email protected]>
net/x25: Fix overflow when accumulating packets
Martin Schiller <[email protected]>
net/x25: Fix potential double free of skb
Saeed Mahameed <[email protected]>
net/mlx5: Avoid "No data available" when FW version queries fail
Fedor Pchelkin <[email protected]>
net: macb: properly unregister fixed rate clocks
Fedor Pchelkin <[email protected]>
net: macb: fix clk handling on PCI glue driver removal
Weiming Shi <[email protected]>
rds: ib: reject FRMR registration before IB connection is established
Keenan Dong <[email protected]>
Bluetooth: MGMT: validate LTK enc_size on load
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: reject immediate NF_QUEUE verdict
Pablo Neira Ayuso <[email protected]>
netfilter: x_tables: restrict xt_check_match/xt_check_target extensions for NFPROTO_ARP
Qi Tang <[email protected]>
netfilter: ctnetlink: zero expect NAT fields when CTA_EXPECT_NAT absent
Qi Tang <[email protected]>
netfilter: nf_conntrack_helper: pass helper to expect cleanup
Florian Westphal <[email protected]>
netfilter: ipset: use nla_strcmp for IPSET_ATTR_NAME attr
Florian Westphal <[email protected]>
netfilter: x_tables: ensure names are nul-terminated
Florian Westphal <[email protected]>
netfilter: nfnetlink_log: account for netlink header size
Zhengchuan Liang <[email protected]>
net: ipv6: flowlabel: defer exclusive option free until RCU teardown
Alexei Starovoitov <[email protected]>
bpf: Fix regsafe() for pointers to packet
Suraj Gupta <[email protected]>
net: xilinx: axienet: Correct BD length masks to match AXIDMA IP spec
Pengpeng Hou <[email protected]>
NFC: pn533: bound the UART receive buffer
Yochai Eisenrich <[email protected]>
net: sched: cls_api: fix tc_chain_fill_node to initialize tcm_info to zero to prevent an info-leak
Paolo Abeni <[email protected]>
ipv6: prevent possible UaF in addrconf_permanent_addr()
Xiang Mei <[email protected]>
net/sched: sch_hfsc: fix divide-by-zero in rtsc_min()
Yang Yang <[email protected]>
bridge: br_nd_send: linearize skb before parsing ND options
Eric Dumazet <[email protected]>
ip6_tunnel: clear skb2->cb[] in ip4ip6_err()
Eric Dumazet <[email protected]>
ipv6: icmp: clear skb2->cb[] in ip6_err_gen_icmpv6_unreach()
Thomas Bogendoerfer <[email protected]>
tg3: Fix race for querying speed/duplex
Yochai Eisenrich <[email protected]>
net: ipv6: ndisc: fix ndisc_ra_useropt to initialize nduseropt_padX fields to zero to prevent an info-leak
Jiayuan Chen <[email protected]>
net: qrtr: replace qrtr_tx_flow radix_tree with xarray to fix memory leak
Loic Poulain <[email protected]>
net: qrtr: Release distant nodes along the bridge node
Loic Poulain <[email protected]>
net: qrtr: Add GFP flags parameter to qrtr_alloc_ctrl_packet
Norbert Szetei <[email protected]>
crypto: af-alg - fix NULL pointer dereference in scatterwalk
Lee Jones <[email protected]>
HID: multitouch: Check to ensure report responses match the request
Josh Poimboeuf <[email protected]>
objtool: Fix Clang jump table detection
Deepanshu Kartikey <[email protected]>
atm: lec: fix use-after-free in sock_def_readable()
Benoît Sevens <[email protected]>
HID: wacom: fix out-of-bounds read in wacom_intuos_bt_irq
Davidlohr Bueso <[email protected]>
futex: Clear stale exiting pointer in futex_lock_pi() retry path
Tomi Valkeinen <[email protected]>
dmaengine: xilinx_dma: Fix reset related timeout with two-channel AXIDMA
Radhey Shyam Pandey <[email protected]>
dmaengine: xilinx_dma: Program interrupt delay timeout
Filipe Manana <[email protected]>
btrfs: fix lost error when running device stats on multiple devices fs
Mark Harmstone <[email protected]>
btrfs: fix super block offset in error message in btrfs_validate_super()
Marek Vasut <[email protected]>
dmaengine: xilinx: xilinx_dma: Fix unmasked residue subtraction
Marek Vasut <[email protected]>
dmaengine: xilinx: xilinx_dma: Fix residue calculation for cyclic DMA
Marek Vasut <[email protected]>
dmaengine: xilinx: xilinx_dma: Fix dma_device directions
Felix Gu <[email protected]>
phy: ti: j721e-wiz: Fix device node reference leak in wiz_get_lane_phy_types()
Helen Koike <[email protected]>
ext4: reject mount if bigalloc with s_first_data_block != 0
Ye Bin <[email protected]>
ext4: avoid allocate block from corrupted group in ext4_mb_find_by_goal()
Jan Kara <[email protected]>
ext4: make recently_deleted() properly work with lazy itable initialization
Deepanshu Kartikey <[email protected]>
ext4: convert inline data to extents when truncate exceeds inline size
Milos Nikic <[email protected]>
jbd2: gracefully abort on checkpointing state corruptions
Greg Kroah-Hartman <[email protected]>
scsi: ses: Handle positive SCSI error from ses_recv_diag()
Tyllis Xu <[email protected]>
scsi: ibmvfc: Fix OOB access in ibmvfc_discover_targets_done()
Zhan Xusheng <[email protected]>
alarmtimer: Fix argument order in alarm_timer_forward()
xietangxin <[email protected]>
virtio_net: Fix UAF on dst_ops when IFF_XMIT_DST_RELEASE is cleared and napi_tx is false
Yuchan Nam <[email protected]>
media: mc, v4l2: serialize REINIT and REQBUFS with req_queue_mutex
Viresh Kumar <[email protected]>
cpufreq: conservative: Reset requested_freq on limits change
Ali Norouzi <[email protected]>
can: gw: fix OOB heap access in cgw_csum_crc8_rel()
Vasily Gorbik <[email protected]>
s390/barrier: Make array_index_mask_nospec() __always_inline
Marc Kleine-Budde <[email protected]>
spi: spi-fsl-lpspi: fix teardown order issue (UAF)
Marc Buerg <[email protected]>
sysctl: fix uninitialized variable in proc_do_large_bitmap
Sanman Pradhan <[email protected]>
hwmon: (adm1177) fix sysfs ABI violation and current unit conversion
Weiming Shi <[email protected]>
ACPI: EC: clean up handlers on probe failure in acpi_ec_setup()
Rafael J. Wysocki <[email protected]>
ACPI: EC: Install address space handler at the namespace root
Hans de Goede <[email protected]>
ACPI: EC: Fix ECDT probe ordering issues
Hans de Goede <[email protected]>
ACPI: EC: Fix EC address space handler unregistration
Hans de Goede <[email protected]>
ACPICA: Allow address_space_handler Install and _REG execution as 2 separate steps
Hans de Goede <[email protected]>
ACPICA: include/acpi/acpixf.h: Fix indentation
Cezary Rojewski <[email protected]>
ASoC: Intel: catpt: Fix the device initialization
Samasth Norway Ananda <[email protected]>
drm/i915/gmbus: fix spurious timeout on 512-byte burst reads
Mike Rapoport (Microsoft) <[email protected]>
x86/efi: efi_unmap_boot_services: fix calculation of ranges_to_free size
Andy Lutomirski <[email protected]>
x86/fault: Improve kernel-executing-user-memory handling
Andy Lutomirski <[email protected]>
x86/fault: Fold mm_fault_error() into do_user_addr_fault()
Yihang Li <[email protected]>
scsi: scsi_transport_sas: Fix the maximum channel scanning issue
Chuck Lever <[email protected]>
RDMA/rw: Fall back to direct SGE on MR pool exhaustion
Andy Shevchenko <[email protected]>
regmap: Synchronize cache for the page selector
Paolo Valerio <[email protected]>
net: macb: use the current queue number for stats
David Carlier <[email protected]>
netfilter: ctnetlink: use netlink policy range checks
Florian Westphal <[email protected]>
netlink: allow be16 and be32 types in all uint policy checks
Florian Westphal <[email protected]>
netlink: introduce bigendian integer types
Jakub Kicinski <[email protected]>
netlink: hide validation union fields from kdoc
Florian Westphal <[email protected]>
netfilter: nft_payload: reject out-of-range attributes via policy
Florian Westphal <[email protected]>
netlink: introduce NLA_POLICY_MAX_BE
Weiming Shi <[email protected]>
netfilter: nf_conntrack_sip: fix use of uninitialized rtp_addr in process_sdp
Pablo Neira Ayuso <[email protected]>
netfilter: nf_conntrack_expect: skip expectations in other netns via proc
Ren Wei <[email protected]>
netfilter: ip6t_rt: reject oversized addrnr in rt_mt6_check()
Weiming Shi <[email protected]>
netfilter: nfnetlink_log: fix uninitialized padding leak in NFULA_PAYLOAD
Pengpeng Hou <[email protected]>
Bluetooth: btusb: clamp SCO altsetting table indices
Hyunwoo Kim <[email protected]>
Bluetooth: L2CAP: Fix ERTM re-init and zero pdu_len infinite loop
Miguel Ojeda <[email protected]>
dma-mapping: add missing inline for dma_free_attrs
Wei Fang <[email protected]>
net: enetc: fix the output issue of 'ethtool --show-ring'
Yochai Eisenrich <[email protected]>
net: fix fanout UAF in packet_release() via NETDEV_UP race
Alok Tiwari <[email protected]>
platform/olpc: olpc-xo175-ec: Fix overflow error message to print inlen
Sabrina Dubroca <[email protected]>
rtnetlink: count IFLA_INFO_SLAVE_KIND in if_nlmsg_size
Qi Tang <[email protected]>
net/smc: fix double-free of smc_spd_priv when tee() duplicates splice pipe buffer
Yang Yang <[email protected]>
openvswitch: validate MPLS set/set_masked payload length
Toke Høiland-Jørgensen <[email protected]>
net: openvswitch: Avoid releasing netdev before teardown completes
Jakub Kicinski <[email protected]>
nfc: nci: fix circular locking dependency in nci_close_device
Luca Leonardo Scorcia <[email protected]>
pinctrl: mediatek: common: Fix probe failure for devices without EINT
Helen Koike <[email protected]>
Bluetooth: L2CAP: Fix null-ptr-deref on l2cap_sock_ready_cb
Anas Iqbal <[email protected]>
Bluetooth: hci_ll: Fix firmware leak on error path
Hyunwoo Kim <[email protected]>
Bluetooth: L2CAP: Validate PDU length before reading SDU length in l2cap_ecred_data_rcv()
Oliver Hartkopp <[email protected]>
can: statistics: add missing atomic access in hot path
Eric Dumazet <[email protected]>
af_key: validate families in pfkey_send_migrate()
Sabrina Dubroca <[email protected]>
esp: fix skb leak with espintcp and async crypto
Steffen Klassert <[email protected]>
xfrm: Fix the usage of skb->sk
Sabrina Dubroca <[email protected]>
xfrm: call xdo_dev_state_delete during state update
Uzair Mughal <[email protected]>
ALSA: hda/realtek: Add headset jack quirk for Thinkpad X390
Isaac J. Manjarres <[email protected]>
dma-buf: Include ioctl.h in UAPI header
Mark Brown <[email protected]>
ASoC: fsl_easrc: Fix event generation in fsl_easrc_iec958_put_bits()
Mark Brown <[email protected]>
ASoC: fsl_easrc: Fix event generation in fsl_easrc_iec958_set_reg()
Romain Sioen <[email protected]>
HID: mcp2221: cancel last I2C command on read error
Keith Busch <[email protected]>
nvme-pci: ensure we're polling a polled queue
Hans de Goede <[email protected]>
platform/x86: touchscreen_dmi: Add quirk for y-inverted Goodix touchscreen on SUPI S10
Leif Skunberg <[email protected]>
platform/x86: intel-hid: Enable 5-button array on ThinkPad X1 Fold 16 Gen 1
Günther Noack <[email protected]>
HID: asus: avoid memory leak in asus_report_fixup()
Danilo Krummrich <[email protected]>
sh: platform_early: remove pdev->driver_override check
Juergen Gross <[email protected]>
xen/privcmd: add boot control for restricted usage in domU
Juergen Gross <[email protected]>
xen/privcmd: restrict usage in unprivileged domU
Florian Westphal <[email protected]>
netfilter: nft_set_pipapo: split gc into unlink and reclaim phase
Josh Law <[email protected]>
tools/bootconfig: fix fd leak in load_xbc_file() on fstat failure
Kamal Dasu <[email protected]>
mtd: rawnand: brcmnand: skip DMA during panic write
Kamal Dasu <[email protected]>
mtd: rawnand: brcmnand: move to polling in pio mode on oops write
Kamal Dasu <[email protected]>
mtd: rawnand: brcmnand: read/write oob during EDU transfer
Kamal Dasu <[email protected]>
mtd: rawnand: serialize lock/unlock against other NAND operations
Christophe JAILLET <[email protected]>
i2c: fsi: Fix a potential leak in fsi_i2c_probe()
Sanman Pradhan <[email protected]>
hwmon: (pmbus/isl68137) Fix unchecked return value and use sysfs_emit()
Weiming Shi <[email protected]>
icmp: fix NULL pointer dereference in icmp_tag_validation()
Anas Iqbal <[email protected]>
net: dsa: bcm_sf2: fix missing clk_disable_unprepare() in error paths
Weiming Shi <[email protected]>
nfnetlink_osf: validate individual option lengths in fingerprints
Xiang Mei <[email protected]>
net: bonding: fix NULL deref in bond_debug_rlb_hash_show
Xiang Mei <[email protected]>
udp_tunnel: fix NULL deref caused by udp_sock_create6 when CONFIG_IPV6=n
Fedor Pchelkin <[email protected]>
net: macb: fix uninitialized rx_fs_lock
Guenter Roeck <[email protected]>
wifi: wlcore: Return -ENOMEM instead of -EAGAIN if there is not enough headroom
Xiang Mei <[email protected]>
wifi: mac80211: fix NULL deref in mesh_matches_local()
Kohei Enju <[email protected]>
igc: fix missing update of skb->tail in igc_xmit_frame()
Nikola Z. Ivanov <[email protected]>
net: usb: aqc111: Do not perform PM inside suspend callback
Bart Van Assche <[email protected]>
PM: runtime: Fix a race condition related to device removal
Rafael J. Wysocki <[email protected]>
sched: idle: Consolidate the handling of two special cases
Justin Chen <[email protected]>
net: bcmgenet: increase WoL poll timeout
Jenny Guanni Qu <[email protected]>
netfilter: nf_conntrack_h323: check for zero length in DecodeQ931()
Jenny Guanni Qu <[email protected]>
netfilter: xt_time: use unsigned int for monthday bit shift
Pablo Neira Ayuso <[email protected]>
netfilter: xt_CT: drop pending enqueued packets on template removal
Pablo Neira Ayuso <[email protected]>
netfilter: nft_ct: drop pending enqueued packets on removal
Andrii Melnychenko <[email protected]>
netfilter: nft_ct: add seqadj extension for natted connections
Jenny Guanni Qu <[email protected]>
netfilter: nf_conntrack_h323: fix OOB read in decode_int() CONS case
Lukas Johannes Möller <[email protected]>
netfilter: nf_conntrack_sip: fix Content-Length u32 truncation in sip_help_tcp()
Hyunwoo Kim <[email protected]>
netfilter: ctnetlink: fix use-after-free in ctnetlink_dump_exp_ct()
Florian Westphal <[email protected]>
netfilter: ctnetlink: remove refcounting in expectation dumpers
Jiayuan Chen <[email protected]>
net/rose: fix NULL pointer dereference in rose_transmit_link on reconnect
Luiz Augusto von Dentz <[email protected]>
Bluetooth: HIDP: Fix possible UAF
Christian Eggers <[email protected]>
Bluetooth: SMP: make SM/PER/KDU/BI-04-C happy
Christian Eggers <[email protected]>
Bluetooth: LE L2CAP: Disconnect if sum of payload sizes exceed SDU
Christian Eggers <[email protected]>
Bluetooth: LE L2CAP: Disconnect if received packet's SDU exceeds IMTU
Peddolla Harshavardhan Reddy <[email protected]>
wifi: cfg80211: cancel pmsr_free_wk in cfg80211_pmsr_wdev_down
Richard Genoud <[email protected]>
soc: fsl: qbman: fix race condition in qman_destroy_fq
Ethan Tidmore <[email protected]>
staging: rtl8723bs: fix null dereference in find_network
Eric Biggers <[email protected]>
net/tcp-md5: Fix MAC comparison to be constant-time
Eric Biggers <[email protected]>
smb: client: Compare MACs in constant time
Mehul Rao <[email protected]>
ALSA: pcm: fix use-after-free on linked stream runtime in snd_pcm_drain()
Oswald Buddenhagen <[email protected]>
ALSA: pcm: fix wait_time calculations
Sean Christopherson <[email protected]>
KVM: SVM: Initialize AVIC VMCB fields if AVIC is enabled with in-kernel APIC
Marc Kleine-Budde <[email protected]>
can: gs_usb: gs_can_open(): always configure bitrates before starting device
Jiasheng Jiang <[email protected]>
usb: gadget: f_tcm: Fix NULL pointer dereferences in nexus handling
Xu Yang <[email protected]>
usb: roles: get usb role switch from parent only for usb-b-connector
Jean-Baptiste Maneyrol <[email protected]>
iio: imu: inv_icm42600: fix odr switch when turning buffer off
Maíra Canal <[email protected]>
pmdomain: bcm: bcm2835-power: Increase ASB control timeout
Finn Thain <[email protected]>
mtd: Avoid boot crash in RedBoot partition table parser
Corentin Labbe <[email protected]>
mtd: partitions: redboot: fix style issues
Jeff Layton <[email protected]>
nfsd: fix heap overflow in NFSv4.0 LOCK replay cache
Chuck Lever <[email protected]>
NFSD: Hold net reference for the lifetime of /proc/fs/nfs/exports fd
Tom Rix <[email protected]>
nfsd: define exports_proc_ops with CONFIG_PROC_FS
Catalin Marinas <[email protected]>
arm64: mm: Add PTE_DIRTY back to PAGE_KERNEL* to fix kexec/hibernation
Thomas Fourier <[email protected]>
drm/msm: Fix dma_free_attrs() buffer size
Thorsten Blum <[email protected]>
crypto: atmel-sha204a - Fix OOM ->tfm_count leak
Long Li <[email protected]>
xfs: fix integer overflow in bmap intent sort comparator
Long Li <[email protected]>
xfs: ensure dquot item is deleted from AIL only after log shutdown
Harald Freudenberger <[email protected]>
s390/zcrypt: Enable AUTOSEL_DOM for CCA serialnr sysfs attribute
Henrique Carvalho <[email protected]>
smb: client: fix iface port assignment in parse_server_interfaces
Paulo Alcantara <[email protected]>
smb: client: fix atomic open with O_DIRECT & O_SYNC
Antoniu Miclaus <[email protected]>
iio: light: bh1780: fix PM runtime leak on error path
Maíra Canal <[email protected]>
pmdomain: bcm: bcm2835-power: Fix broken reset status read
Huiwen He <[email protected]>
tracing: Fix syscall events activation by ensuring refcount hits zero
Darrick J. Wong <[email protected]>
iomap: reject delalloc mappings during writeback
Heiko Carstens <[email protected]>
s390/xor: Fix xor_xc_2() inline assembly constraints
Paul Moses <[email protected]>
net/sched: act_gate: snapshot parameters with RCU on replace
Natalie Vock <[email protected]>
drm/amd/display: Use GFP_ATOMIC in dc_create_stream_for_sink
Andrew Lunn <[email protected]>
net: phy: register phy led_triggers during probe to avoid AB-BA deadlock
Thorsten Blum <[email protected]>
smb: client: Don't log plaintext credentials in cifs_set_cifscreds
Daniil Dulov <[email protected]>
wifi: cfg80211: cancel rfkill_block work in wiphy_unregister()
Vahagn Vardanian <[email protected]>
wifi: mac80211: fix NULL pointer dereference in mesh_rx_csa_frame()
Daniel Hodges <[email protected]>
wifi: libertas: fix use-after-free in lbs_free_adapter()
Damien Le Moal <[email protected]>
ata: libata-scsi: refactor ata_scsi_translate()
Hannes Reinecke <[email protected]>
ata: libata: remove pointless VPRINTK() calls
Brian Foster <[email protected]>
ext4: fix dirtyclusters double decrement on fs shutdown
Zhang Yi <[email protected]>
ext4: drop extent cache when splitting extent fails
Zhang Yi <[email protected]>
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
Jeongjun Park <[email protected]>
drm/exynos: vidi: use ctx->lock to protect struct vidi_context member variables related to memory alloc/free
Jeongjun Park <[email protected]>
drm/exynos: vidi: fix to avoid directly dereferencing user pointer
Jeongjun Park <[email protected]>
drm/exynos: vidi: use priv->vidi_dev for ctx lookup in vidi_connection_ioctl()
Ankit Garg <[email protected]>
gve: defer interrupt enabling until NAPI registration
Frederic Weisbecker <[email protected]>
net: Handle napi_schedule() calls from non-interrupt
Alex Deucher <[email protected]>
drm/radeon: apply state adjust rules to some additional HAINAN vairants
Ilpo Järvinen <[email protected]>
serial: 8250: Add late synchronize_irq() to shutdown to handle DW UART BUSY
Raul E Rangel <[email protected]>
serial: 8250: Fix TX deadlock when using DMA
Martin Roukala (né Peres) <[email protected]>
serial: 8250_pci: add support for the AX99100
Guanghui Feng <[email protected]>
iommu/vt-d: Fix intel iommu iotlb sync hardlockup and retry
Chen Ni <[email protected]>
mtd: rawnand: cadence: Fix error check for dma_alloc_coherent() in cadence_nand_init()
Luke Wang <[email protected]>
mmc: sdhci: fix timing selection for 1-bit bus width
Matthew Schwartz <[email protected]>
mmc: sdhci-pci-gli: fix GL9750 DMA write corruption
Lukas Johannes Möller <[email protected]>
Bluetooth: L2CAP: Validate L2CAP_INFO_RSP payload length before access
Lukas Johannes Möller <[email protected]>
Bluetooth: L2CAP: Fix type confusion in l2cap_ecred_reconf_rsp()
Fedor Pchelkin <[email protected]>
net: macb: fix use-after-free access to PTP clock
Ian Ray <[email protected]>
NFC: nxp-nci: allow GPIOs to sleep
Ira Weiny <[email protected]>
nvdimm/bus: Fix potential use after free in asynchronous initialization
Jeff Layton <[email protected]>
sunrpc: fix cache_request leak in cache_release
Jens Axboe <[email protected]>
io_uring/io-wq: check IO_WQ_BIT_EXIT inside work run loop
Eric Dumazet <[email protected]>
l2tp: do not use sock_hold() in pppol2tp_session_get_sock()
Paul Chaignon <[email protected]>
bpf: Forget ranges when refining tnum after JSET
Jean-Baptiste Maneyrol <[email protected]>
iio: imu: inv_icm42600: fix odr switch to the same value
Antoniu Miclaus <[email protected]>
iio: gyro: mpu3050-i2c: fix pm_runtime error handling
Antoniu Miclaus <[email protected]>
iio: gyro: mpu3050-core: fix pm_runtime error handling
Chris Spencer <[email protected]>
iio: chemical: bme680: Fix measurement wait duration calculation
Lukas Schmid <[email protected]>
iio: potentiometer: mcp4131: fix double application of wiper shift
Oleksij Rempel <[email protected]>
iio: dac: ds4424: reject -128 RAW value
Filipe Manana <[email protected]>
btrfs: abort transaction on failure to update root in the received subvol ioctl
Josh Law <[email protected]>
lib/bootconfig: check bounds before writing in __xbc_open_brace()
Josh Law <[email protected]>
lib/bootconfig: fix snprintf truncation check in xbc_node_compose_key_after()
Shashank Balaji <[email protected]>
x86/apic: Disable x2apic on resume if the kernel expects so
Josh Law <[email protected]>
lib/bootconfig: fix off-by-one in xbc_verify_tree() unclosed brace error
Calvin Owens <[email protected]>
tracing: Fix trace_buf_size= cmdline parameter with sizes >= 2G
Alysa Liu <[email protected]>
drm/amdgpu: Fix use-after-free race in VM acquire
Fan Wu <[email protected]>
net: ethernet: arc: emac: quiesce interrupts before requesting IRQ
Jian Zhang <[email protected]>
net: ncsi: fix skb leak in error paths
Helge Deller <[email protected]>
parisc: Fix initial page table creation for boot
Dave Airlie <[email protected]>
nouveau/dpcd: return EBUSY for aux xfer if the device is asleep
Helge Deller <[email protected]>
parisc: Increase initial mapping to 64 MB with KALLSYMS
Sven Eckelmann <[email protected]>
batman-adv: Avoid double-rtnl_lock ELP metric worker
Ariel Silver <[email protected]>
media: dvb-net: fix OOB access in ULE extension header tables
Greg Kroah-Hartman <[email protected]>
staging: rtl8723bs: properly validate the data in rtw_get_ie_ex()
Luka Gejak <[email protected]>
staging: rtl8723bs: fix potential out-of-bounds read in rtw_restruct_wmm_ie
Marc Zyngier <[email protected]>
irqchip/gic-v3-its: Limit number of per-device MSIs to the range the ITS supports
Steven Rostedt <[email protected]>
time/jiffies: Mark jiffies_64_to_clock_t() notrace
Randy Dunlap <[email protected]>
time: add kernel-doc in time.c
Max Kellermann <[email protected]>
ceph: fix i_nlink underrun during async unlink
Raphael Zimmer <[email protected]>
libceph: Fix potential out-of-bounds access in ceph_handle_auth_reply()
Mehul Rao <[email protected]>
tipc: fix divide-by-zero in tipc_sk_filter_connect()
Felix Gu <[email protected]>
mmc: mmci: Fix device_node reference leak in of_get_dml_pipe_index()
Kalesh Singh <[email protected]>
mm/tracing: rss_stat: ensure curr is false from kthread context
Ziyi Guo <[email protected]>
usb: image: mdc800: kill download URB on timeout
Oliver Neukum <[email protected]>
usb: mdc800: handle signal and read racing
Fan Wu <[email protected]>
usb: renesas_usbhs: fix use-after-free in ISR during device removal
Oliver Neukum <[email protected]>
usb: class: cdc-wdm: fix reordering issue in read code path
Alan Stern <[email protected]>
USB: core: Limit the length of unkillable synchronous timeouts
Alan Stern <[email protected]>
USB: usbtmc: Use usb_bulk_msg_killable() with user-specified timeouts
Alan Stern <[email protected]>
USB: usbcore: Introduce usb_bulk_msg_killable()
Marc Zyngier <[email protected]>
usb: cdc-acm: Restore CAP_BRK functionnality to CH343
Gabor Juhos <[email protected]>
usb: core: don't power off roothub PHYs if phy_set_mode() fails
Greg Kroah-Hartman <[email protected]>
usb: misc: uss720: properly clean up reference in uss720_probe()
Oliver Neukum <[email protected]>
usb: yurex: fix race in probe
Zilin Guan <[email protected]>
usb: xhci: Fix memory leak in xhci_disable_slot()
Christoffer Sandberg <[email protected]>
usb/core/quirks: Add Huawei ME906S-device to wakeup quirk
Oleksij Rempel <[email protected]>
net: usb: lan78xx: skip LTM configuration for LAN7850
Oleksij Rempel <[email protected]>
net: usb: lan78xx: fix silent drop of packets with checksum errors
Qingye Zhao <[email protected]>
cgroup: fix race between task migration and iteration
Casey Connolly <[email protected]>
ASoC: detect empty DMI strings
Chen Ni <[email protected]>
ASoC: amd: acp3x-rt5682-max9836: Add missing error check for clock acquisition
Ben Dooks <[email protected]>
ACPI: OSL: fix __iomem type on return from acpi_os_map_generic_address()
Matt Vollrath <[email protected]>
e1000/e1000e: Fix leak in DMA error cleanup
Alok Tiwari <[email protected]>
i40e: fix src IP mask checks and memcpy argument names in cloud filter
Sungwoo Kim <[email protected]>
nvme-pci: Fix slab-out-of-bounds in nvme_dbbuf_set
Rafael J. Wysocki <[email protected]>
sched: idle: Make skipping governor callbacks more consistent
Peng Fan <[email protected]>
regulator: pca9450: Correct interrupt type
Frieder Schrempf <[email protected]>
regulator: pca9450: Make IRQ optional
Yuan Tan <[email protected]>
netfilter: xt_IDLETIMER: reject rev0 reuse of ALARM timer labels
Hyunwoo Kim <[email protected]>
netfilter: nfnetlink_cthelper: fix OOB read in nfnl_cthelper_dump_table()
Hyunwoo Kim <[email protected]>
netfilter: nfnetlink_queue: fix entry leak in bridge verdict error path
David Dull <[email protected]>
netfilter: x_tables: guard option walkers against 1-byte tail reads
Jenny Guanni Qu <[email protected]>
netfilter: nft_set_pipapo: fix stack out-of-bounds read in pipapo_drop()
Wenyuan Li <[email protected]>
can: hi311x: hi3110_open(): add check for hi3110_power_enable() return value
Shuangpeng Bai <[email protected]>
serial: caif: hold tty->link reference in ldisc_open and ser_release
matteo.cotifava <[email protected]>
ASoC: soc-core: flush delayed work before removing DAIs and widgets
Amadeusz Sławiński <[email protected]>
ASoC: core: Do not call link_exit() on uninitialized rtd objects
Cezary Rojewski <[email protected]>
ASoC: core: Exit all links before removing their components
Kuninori Morimoto <[email protected]>
ASoC: soc-core: accept zero format at snd_soc_runtime_set_dai_fmt()
Kuninori Morimoto <[email protected]>
ASoC: soc-core: add snd_soc_runtime_get_dai_fmt()
Kuninori Morimoto <[email protected]>
ASoC: soc-core: move snd_soc_runtime_set_dai_fmt() to upside
Kuninori Morimoto <[email protected]>
ASoC: don't indicate error message for snd_soc_[pcm_]dai_xxx()
Pierre-Louis Bossart <[email protected]>
ASoC: topology: use inclusive language for bclk and fsync
matteo.cotifava <[email protected]>
ASoC: soc-core: drop delayed_work_pending() check before flush
Weiming Shi <[email protected]>
net/sched: teql: fix NULL pointer dereference in iptunnel_xmit on TEQL slave xmit
Gal Pressman <[email protected]>
net/mlx5e: Fix DMA FIFO desync on error CQE SQ recovery
Hangbin Liu <[email protected]>
bonding: handle BOND_LINK_FAIL, BOND_LINK_BACK as valid link states
J. Neuschäfer <[email protected]>
powerpc: 83xx: km83xx: Fix keymile vendor prefix
Bjorn Andersson <[email protected]>
remoteproc: sysmon: Correct subsys_name_len type in QMI request
Christophe Leroy (CS GROUP) <[email protected]>
powerpc/uaccess: Fix inline assembly for clang build on PPC32
Tomas Henzl <[email protected]>
scsi: ses: Fix devices attaching to different hosts
Sofia Schneider <[email protected]>
ACPI: OSI: Add DMI quirk for Acer Aspire One D255
Al Viro <[email protected]>
unshare: fix unshare_fs() handling
Piotr Mazek <[email protected]>
ACPI: PM: Save NVS memory on Lenovo G70-35
Jan Kiszka <[email protected]>
scsi: storvsc: Fix scheduling while atomic on PREEMPT_RT
Jiayuan Chen <[email protected]>
net: ipv6: fix panic when IPv4 route references loopback IPv6 nexthop
Fernando Fernandez Mancera <[email protected]>
net: vxlan: fix nd_tbl NULL dereference when IPv6 is disabled
Fernando Fernandez Mancera <[email protected]>
net: bridge: fix nd_tbl NULL dereference when IPv6 is disabled
Jakub Kicinski <[email protected]>
nfc: rawsock: cancel tx_work before socket teardown
Jakub Kicinski <[email protected]>
nfc: nci: clear NCI_DATA_EXCHANGE before calling completion callback
Jakub Kicinski <[email protected]>
nfc: nci: free skb on nci_transceive early error paths
Ian Ray <[email protected]>
net: nfc: nci: Fix zero-length proprietary notifications
Raju Rangoju <[email protected]>
amd-xgbe: fix sleep while atomic on suspend/resume
Jakub Kicinski <[email protected]>
ipv6: fix NULL pointer deref in ip6_rt_get_dev_rcu()
David Thomson <[email protected]>
xen/acpi-processor: fix _CST detection using undersized evaluation buffer
Eric Dumazet <[email protected]>
indirect_call_wrapper: do not reevaluate function pointer
Bart Van Assche <[email protected]>
wifi: wlcore: Fix a locking bug
Bart Van Assche <[email protected]>
wifi: cw1200: Fix locking in error paths
Alban Bedel <[email protected]>
can: mcp251x: fix deadlock in error path of mcp251x_open
Oliver Hartkopp <[email protected]>
can: bcm: fix locking for bcm_op runtime updates
Jiayuan Chen <[email protected]>
atm: lec: fix null-ptr-deref in lec_arp_clear_vccs
Chintan Vankar <[email protected]>
net: ethernet: ti: am65-cpsw-nuss/cpsw-ale: Fix multicast entry handling in ALE table
Jonathan Teh <[email protected]>
platform/x86: thinkpad_acpi: Fix errors reading battery thresholds
Paolo Abeni <[email protected]>
selftests: mptcp: more stable simult_flows tests
Lars Ellenberg <[email protected]>
drbd: fix "LOGIC BUG" in drbd_al_begin_io_nonblock()
Phillip Lougher <[email protected]>
Squashfs: check metadata block offset is within range
Davide Caratti <[email protected]>
net/sched: ets: fix divide by zero in the offload path
Jason Gunthorpe <[email protected]>
IB/mthca: Add missed mthca_unmap_user_db() for mthca_create_srq()
Johannes Berg <[email protected]>
wifi: radiotap: reject radiotap with unknown bits
Jun Seo <[email protected]>
ALSA: usb-audio: Use correct version for UAC3 header validation
Mike Rapoport (Microsoft) <[email protected]>
x86/efi: defer freeing of boot services memory
Greg Kroah-Hartman <[email protected]>
HID: Add HID_CLAIMED_INPUT guards in raw_event callbacks missing them
Greg Kroah-Hartman <[email protected]>
can: ucan: Fix infinite loop from zero-length messages
Greg Kroah-Hartman <[email protected]>
can: ems_usb: ems_usb_read_bulk_callback(): check the proper length of a message
Greg Kroah-Hartman <[email protected]>
net: usb: pegasus: validate USB endpoints
Greg Kroah-Hartman <[email protected]>
net: usb: kalmia: validate USB endpoints
Greg Kroah-Hartman <[email protected]>
net: usb: kaweth: validate USB endpoints
Greg Kroah-Hartman <[email protected]>
nfc: pn533: properly drop the usb interface reference on disconnect
Jens Axboe <[email protected]>
media: dvb-core: fix wrong reinitialization of ringbuffer on reopen
Ethan Nelson-Moore <[email protected]>
net: arcnet: com20020-pci: fix support for 2.5Mbit cards
Takashi Iwai <[email protected]>
ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
Gui-Dong Han <[email protected]>
hwmon: (max16065) Use READ/WRITE_ONCE to avoid compiler optimization induced race
Takashi Iwai <[email protected]>
ALSA: hda/conexant: Add quirk for HP ZBook Studio G4
Johan Hovold <[email protected]>
clk: tegra: tegra124-emc: fix device leak on set_rate()
Johan Hovold <[email protected]>
bus: omap-ocp2scp: fix OF populate on driver rebind
Uwe Kleine-König <[email protected]>
bus: omap-ocp2scp: Convert to platform remove callback returning void
Johan Hovold <[email protected]>
drm/tegra: dsi: fix device leak on probe
Gui-Dong Han <[email protected]>
bus: fsl-mc: fix use-after-free in driver_override_show()
Chelsy Ratnawat <[email protected]>
bus: fsl-mc: Replace snprintf and sprintf with sysfs_emit in sysfs show functions
Wentao Liang <[email protected]>
ARM: omap2: Fix reference count leaks in omap_control_init()
Wang Qing <[email protected]>
ARM: OMAP2+: add missing of_node_put before break and return
Mark Harmstone <[email protected]>
btrfs: fix incorrect key offset in error message in check_dev_extent_item()
Takashi Iwai <[email protected]>
ALSA: usb-audio: Cap the packet size pre-calculations
Peter Wang <[email protected]>
scsi: ufs: core: Move link recovery for hibern8 exit failure to wl_resume
Mathias Krause <[email protected]>
scsi: lpfc: Properly set WC for DPP mapping
Ben Hutchings <[email protected]>
ip6_tunnel: Fix usage of skb_vlan_inet_prepare()
Thomas Weißschuh <[email protected]>
ARM: clean up the memset64() C wrapper
-------------
Diffstat:
Documentation/hwmon/adm1177.rst | 8 +- Makefile | 4 +- arch/arm/include/asm/string.h | 14 +- arch/arm/mach-omap2/cm_common.c | 8 +- arch/arm/mach-omap2/control.c | 29 +- arch/arm/mach-omap2/prm_common.c | 8 +- .../boot/dts/hisilicon/hi3798cv200-poplar.dts | 2 +- arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 1 + arch/arm64/include/asm/pgtable-prot.h | 10 +- arch/mips/lib/multi3.c | 6 +- arch/parisc/include/asm/pgtable.h | 2 +- arch/parisc/kernel/head.S | 7 +- arch/powerpc/include/asm/uaccess.h | 2 +- arch/powerpc/platforms/83xx/km83xx.c | 4 +- arch/riscv/kernel/kgdb.c | 7 +- arch/s390/include/asm/barrier.h | 4 +- arch/s390/kernel/entry.S | 7 +- arch/s390/lib/xor.c | 4 +- arch/sh/drivers/platform_early.c | 4 - arch/x86/include/asm/efi.h | 2 +- arch/x86/kernel/apic/apic.c | 6 + arch/x86/kvm/svm/avic.c | 2 +- arch/x86/kvm/svm/svm.c | 2 +- arch/x86/mm/fault.c | 118 +++---- arch/x86/platform/efi/efi.c | 2 +- arch/x86/platform/efi/quirks.c | 55 +++- crypto/af_alg.c | 4 +- drivers/acpi/acpica/evxfregn.c | 92 +++++- drivers/acpi/ec.c | 49 ++- drivers/acpi/osi.c | 13 + drivers/acpi/osl.c | 2 +- drivers/acpi/sleep.c | 8 + drivers/ata/libata-core.c | 3 - drivers/ata/libata-sata.c | 2 - drivers/ata/libata-scsi.c | 123 +++----- drivers/ata/libata-sff.c | 4 - drivers/ata/libata.h | 1 - drivers/base/power/runtime.c | 1 + drivers/base/property.c | 205 ++++++++---- drivers/base/regmap/regmap.c | 30 +- drivers/block/drbd/drbd_actlog.c | 53 ++-- drivers/block/drbd/drbd_interval.h | 5 +- drivers/bluetooth/btusb.c | 5 +- drivers/bluetooth/hci_ll.c | 2 + drivers/bus/fsl-mc/fsl-mc-bus.c | 10 +- drivers/bus/omap-ocp2scp.c | 19 +- drivers/clk/tegra/clk-tegra124-emc.c | 2 +- drivers/cpufreq/cpufreq_conservative.c | 12 + drivers/cpufreq/cpufreq_governor.c | 13 +- drivers/cpufreq/cpufreq_governor.h | 1 + drivers/cpuidle/cpuidle.c | 10 - drivers/crypto/atmel-sha204a.c | 5 +- drivers/dma/xilinx/xilinx_dma.c | 66 ++-- drivers/firmware/efi/mokvar-table.c | 20 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +- drivers/gpu/drm/ast/ast_dp501.c | 2 +- drivers/gpu/drm/drm_file.c | 5 +- drivers/gpu/drm/drm_ioc32.c | 2 + drivers/gpu/drm/drm_mode_config.c | 9 +- drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 72 ++++- drivers/gpu/drm/i915/display/intel_gmbus.c | 4 +- drivers/gpu/drm/msm/msm_gpummu.c | 2 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 + drivers/gpu/drm/radeon/si_dpm.c | 4 +- drivers/gpu/drm/tegra/dsi.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- drivers/hid/hid-asus.c | 15 +- drivers/hid/hid-cmedia.c | 2 +- drivers/hid/hid-creative-sb0540.c | 2 +- drivers/hid/hid-mcp2221.c | 2 + drivers/hid/hid-multitouch.c | 7 + drivers/hid/hid-zydacron.c | 2 +- drivers/hid/wacom_wac.c | 10 + drivers/hwmon/adm1177.c | 54 ++-- drivers/hwmon/max16065.c | 26 +- drivers/hwmon/occ/common.c | 19 +- drivers/hwmon/pmbus/isl68137.c | 7 +- drivers/hwmon/pmbus/pxe1610.c | 5 +- drivers/i2c/busses/i2c-fsi.c | 1 + drivers/iio/chemical/bme680_core.c | 2 +- drivers/iio/dac/ad5770r.c | 2 +- drivers/iio/dac/ds4424.c | 2 +- drivers/iio/gyro/mpu3050-core.c | 50 ++- drivers/iio/gyro/mpu3050-i2c.c | 3 +- drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 2 + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 3 + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 2 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 4 + drivers/iio/light/bh1780.c | 4 +- drivers/iio/light/vcnl4035.c | 18 +- drivers/iio/potentiometer/mcp4131.c | 2 +- drivers/infiniband/core/rw.c | 27 +- drivers/infiniband/hw/mthca/mthca_provider.c | 5 +- drivers/input/joystick/xpad.c | 2 + drivers/input/misc/uinput.c | 35 ++- drivers/input/rmi4/rmi_f54.c | 4 +- drivers/input/serio/i8042-acpipnpio.h | 7 + drivers/iommu/intel/dmar.c | 3 +- drivers/irqchip/irq-gic-v3-its.c | 4 + drivers/media/dvb-core/dmxdev.c | 4 +- drivers/media/dvb-core/dvb_net.c | 3 + drivers/media/dvb-frontends/dib7000p.c | 10 +- drivers/media/mc/mc-request.c | 5 + drivers/media/usb/uvc/uvc_ctrl.c | 33 +- drivers/media/usb/uvc/uvc_driver.c | 234 ++++++++++++-- drivers/media/usb/uvc/uvc_entity.c | 1 + drivers/media/usb/uvc/uvcvideo.h | 27 +- drivers/media/v4l2-core/v4l2-ioctl.c | 5 +- drivers/mmc/core/block.c | 2 +- drivers/mmc/core/core.c | 110 +------ drivers/mmc/host/mmci_qcom_dml.c | 1 + drivers/mmc/host/sdhci-pci-gli.c | 9 + drivers/mmc/host/sdhci.c | 9 +- drivers/mmc/host/vub300.c | 2 +- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 63 +++- drivers/mtd/nand/raw/cadence-nand-controller.c | 2 +- drivers/mtd/nand/raw/nand_base.c | 14 +- drivers/mtd/parsers/redboot.c | 71 +++-- drivers/net/arcnet/com20020-pci.c | 16 +- drivers/net/bonding/bond_debugfs.c | 16 +- drivers/net/bonding/bond_main.c | 8 +- drivers/net/caif/caif_serial.c | 3 + drivers/net/can/spi/hi311x.c | 5 +- drivers/net/can/spi/mcp251x.c | 15 +- drivers/net/can/usb/ems_usb.c | 7 +- drivers/net/can/usb/gs_usb.c | 13 +- drivers/net/can/usb/ucan.c | 2 +- drivers/net/dsa/bcm_sf2.c | 8 +- drivers/net/ethernet/altera/altera_tse_main.c | 1 + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 10 - drivers/net/ethernet/amd/xgbe/xgbe-main.c | 1 - drivers/net/ethernet/amd/xgbe/xgbe.h | 3 - drivers/net/ethernet/arc/emac_main.c | 11 + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 2 +- drivers/net/ethernet/broadcom/tg3.c | 2 +- drivers/net/ethernet/cadence/macb_main.c | 18 +- drivers/net/ethernet/cadence/macb_pci.c | 10 +- drivers/net/ethernet/cadence/macb_ptp.c | 4 +- drivers/net/ethernet/faraday/ftgmac100.c | 28 +- .../net/ethernet/freescale/enetc/enetc_ethtool.c | 2 + drivers/net/ethernet/google/gve/gve.h | 1 + drivers/net/ethernet/google/gve/gve_main.c | 5 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 2 - drivers/net/ethernet/intel/e1000e/netdev.c | 2 - drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 14 +- drivers/net/ethernet/intel/igc/igc_main.c | 7 +- drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 4 +- .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 1 - drivers/net/ethernet/mellanox/mlx5/core/fw.c | 49 ++- .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 4 +- drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 11 +- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ethernet/ti/cpsw_ale.c | 9 +- drivers/net/ethernet/xilinx/xilinx_axienet.h | 4 +- drivers/net/phy/phy_device.c | 13 +- drivers/net/usb/aqc111.c | 12 +- drivers/net/usb/kalmia.c | 7 + drivers/net/usb/kaweth.c | 13 + drivers/net/usb/lan78xx.c | 8 +- drivers/net/usb/lan78xx.h | 3 + drivers/net/usb/pegasus.c | 13 +- drivers/net/virtio_net.c | 1 + drivers/net/vxlan/vxlan_core.c | 11 +- .../net/wireless/broadcom/brcm80211/brcmsmac/dma.c | 2 +- drivers/net/wireless/marvell/libertas/main.c | 4 +- drivers/net/wireless/microchip/wilc1000/hif.c | 2 +- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 2 +- drivers/net/wireless/st/cw1200/pm.c | 2 + drivers/net/wireless/ti/wlcore/main.c | 4 +- drivers/net/wireless/ti/wlcore/tx.c | 2 +- drivers/nfc/nxp-nci/i2c.c | 4 +- drivers/nfc/pn533/uart.c | 14 +- drivers/nfc/pn533/usb.c | 1 + drivers/nvdimm/bus.c | 5 +- drivers/nvme/host/fc.c | 2 +- drivers/nvme/host/pci.c | 5 +- drivers/nvme/target/tcp.c | 6 +- drivers/pci/pci-driver.c | 8 - drivers/pci/pci.c | 10 +- drivers/pci/pci.h | 1 - drivers/phy/renesas/phy-rcar-gen3-usb2.c | 122 +++++--- drivers/phy/ti/phy-j721e-wiz.c | 2 + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 9 +- drivers/platform/olpc/olpc-xo175-ec.c | 2 +- drivers/platform/x86/intel-hid.c | 7 + drivers/platform/x86/thinkpad_acpi.c | 6 +- drivers/platform/x86/touchscreen_dmi.c | 18 ++ drivers/regulator/pca9450-regulator.c | 41 ++- drivers/remoteproc/qcom_sysmon.c | 2 +- drivers/s390/crypto/zcrypt_ccamisc.c | 12 +- drivers/s390/crypto/zcrypt_cex4.c | 3 +- drivers/scsi/ibmvscsi/ibmvfc.c | 3 +- drivers/scsi/lpfc/lpfc_init.c | 2 + drivers/scsi/lpfc/lpfc_sli.c | 36 ++- drivers/scsi/lpfc/lpfc_sli4.h | 3 + drivers/scsi/scsi_lib.c | 3 +- drivers/scsi/scsi_transport_sas.c | 2 +- drivers/scsi/ses.c | 7 +- drivers/scsi/storvsc_drv.c | 5 +- drivers/scsi/ufs/ufshcd.c | 18 +- drivers/soc/bcm/bcm2835-power.c | 33 +- drivers/soc/fsl/qbman/qman.c | 24 +- drivers/spi/spi-fsl-lpspi.c | 3 +- drivers/staging/comedi/drivers.c | 8 + drivers/staging/comedi/drivers/dt2815.c | 12 + drivers/staging/comedi/drivers/me4000.c | 16 +- drivers/staging/comedi/drivers/me_daq.c | 35 ++- drivers/staging/comedi/drivers/ni_atmio16d.c | 3 +- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 16 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 13 +- drivers/thunderbolt/nhi.c | 2 +- drivers/tty/serial/8250/8250_dma.c | 15 + drivers/tty/serial/8250/8250_pci.c | 17 + drivers/tty/serial/8250/8250_port.c | 6 + drivers/usb/class/cdc-acm.c | 14 + drivers/usb/class/cdc-acm.h | 2 + drivers/usb/class/cdc-wdm.c | 4 +- drivers/usb/class/usbtmc.c | 9 +- drivers/usb/common/ulpi.c | 5 +- drivers/usb/core/message.c | 97 ++++-- drivers/usb/core/phy.c | 8 +- drivers/usb/core/quirks.c | 7 + drivers/usb/gadget/function/f_hid.c | 11 +- drivers/usb/gadget/function/f_rndis.c | 3 + drivers/usb/gadget/function/f_subset.c | 7 + drivers/usb/gadget/function/f_tcm.c | 14 + drivers/usb/gadget/function/f_uac1_legacy.c | 47 ++- drivers/usb/gadget/function/f_uvc.c | 46 ++- drivers/usb/gadget/function/u_ether.c | 8 +- drivers/usb/gadget/function/uvc.h | 3 + drivers/usb/gadget/function/uvc_v4l2.c | 13 +- drivers/usb/gadget/udc/dummy_hcd.c | 13 +- drivers/usb/host/ehci-brcm.c | 4 +- drivers/usb/host/xhci.c | 4 +- drivers/usb/image/mdc800.c | 6 +- drivers/usb/misc/uss720.c | 2 +- drivers/usb/misc/yurex.c | 2 +- drivers/usb/renesas_usbhs/common.c | 9 + drivers/usb/roles/class.c | 7 +- drivers/usb/serial/io_edgeport.c | 3 + drivers/usb/serial/io_usbvend.h | 1 + drivers/usb/serial/option.c | 4 + drivers/xen/privcmd.c | 76 ++++- drivers/xen/xen-acpi-processor.c | 7 +- fs/btrfs/disk-io.c | 4 +- fs/btrfs/ioctl.c | 3 +- fs/btrfs/tree-checker.c | 2 +- fs/btrfs/volumes.c | 5 +- fs/ceph/dir.c | 15 +- fs/cifs/cifsencrypt.c | 3 +- fs/cifs/cifsglob.h | 11 + fs/cifs/connect.c | 1 - fs/cifs/dir.c | 1 + fs/cifs/file.c | 17 +- fs/cifs/smb2ops.c | 18 +- fs/cifs/smb2transport.c | 4 +- fs/ext4/extents.c | 22 +- fs/ext4/fast_commit.c | 17 +- fs/ext4/ialloc.c | 6 + fs/ext4/inode.c | 27 +- fs/ext4/mballoc.c | 37 +-- fs/ext4/super.c | 13 +- fs/iomap/buffered-io.c | 7 +- fs/jbd2/checkpoint.c | 15 +- fs/nfsd/nfs4xdr.c | 9 +- fs/nfsd/nfsctl.c | 31 +- fs/nfsd/state.h | 17 +- fs/squashfs/cache.c | 3 + fs/xfs/xfs_bmap_item.c | 3 +- fs/xfs/xfs_dquot.c | 8 +- fs/xfs/xfs_dquot_item.c | 9 +- fs/xfs/xfs_inode_item.c | 9 +- fs/xfs/xfs_mount.c | 7 +- include/acpi/acpixf.h | 138 +++++---- include/asm-generic/tlb.h | 77 ++++- include/linux/dma-mapping.h | 4 +- include/linux/fwnode.h | 10 +- include/linux/hugetlb.h | 17 +- include/linux/indirect_call_wrapper.h | 18 +- include/linux/irqchip/arm-gic-v3.h | 1 + include/linux/mm_types.h | 2 + include/linux/mmc/host.h | 12 +- include/linux/netfilter/ipset/ip_set.h | 2 +- include/linux/property.h | 5 +- include/linux/security.h | 1 + include/linux/swapops.h | 6 + include/linux/usb.h | 8 +- include/net/netfilter/nf_conntrack_timeout.h | 1 + include/net/netfilter/nf_tables.h | 5 + include/net/netlink.h | 39 ++- include/net/tc_act/tc_gate.h | 33 +- include/net/udp_tunnel.h | 2 +- include/sound/soc-dai.h | 85 ++++- include/sound/soc.h | 2 + include/trace/events/kmem.h | 8 +- include/uapi/linux/dma-buf.h | 1 + include/uapi/linux/netfilter/nf_conntrack_common.h | 4 + include/uapi/sound/asoc.h | 22 +- io_uring/io-wq.c | 2 +- io_uring/io_uring.c | 39 ++- kernel/bpf/verifier.c | 11 +- kernel/cgroup/cgroup.c | 1 + kernel/fork.c | 2 +- kernel/futex/core.c | 3 +- kernel/sched/idle.c | 39 ++- kernel/sysctl.c | 2 +- kernel/time/alarmtimer.c | 2 +- kernel/time/time.c | 171 +++++++++- kernel/trace/trace.c | 6 +- kernel/trace/trace_events.c | 51 ++- lib/bootconfig.c | 6 +- lib/crypto/chacha.c | 4 + lib/nlattr.c | 22 ++ mm/hugetlb.c | 143 ++++----- mm/mmu_gather.c | 36 +++ mm/rmap.c | 20 +- net/atm/lec.c | 98 +++--- net/atm/lec.h | 2 +- net/batman-adv/bat_iv_ogm.c | 3 + net/batman-adv/bat_v_elp.c | 10 +- net/batman-adv/hard-interface.c | 8 +- net/batman-adv/hard-interface.h | 1 + net/batman-adv/translation-table.c | 9 +- net/bluetooth/hidp/core.c | 16 +- net/bluetooth/l2cap_core.c | 55 +++- net/bluetooth/l2cap_sock.c | 3 + net/bluetooth/mgmt.c | 3 + net/bluetooth/smp.c | 13 +- net/bridge/br_arp_nd_proxy.c | 18 +- net/bridge/br_device.c | 2 +- net/bridge/br_input.c | 2 +- net/can/af_can.c | 4 +- net/can/af_can.h | 2 +- net/can/bcm.c | 1 + net/can/gw.c | 6 +- net/can/proc.c | 3 +- net/ceph/auth.c | 6 +- net/core/dev.c | 2 +- net/core/rtnetlink.c | 9 +- net/ipv4/esp4.c | 11 +- net/ipv4/icmp.c | 4 +- net/ipv4/tcp_ipv4.c | 5 +- net/ipv6/addrconf.c | 6 +- net/ipv6/datagram.c | 10 + net/ipv6/esp6.c | 11 +- net/ipv6/icmp.c | 3 + net/ipv6/ip6_flowlabel.c | 5 - net/ipv6/ip6_tunnel.c | 7 +- net/ipv6/ndisc.c | 3 + net/ipv6/netfilter/ip6t_rt.c | 4 + net/ipv6/route.c | 11 +- net/ipv6/seg6_iptunnel.c | 34 +- net/ipv6/tcp_ipv6.c | 5 +- net/ipv6/xfrm6_output.c | 4 +- net/key/af_key.c | 19 +- net/l2tp/l2tp_ppp.c | 25 +- net/mac80211/mesh.c | 6 + net/ncsi/ncsi-aen.c | 3 +- net/ncsi/ncsi-rsp.c | 16 +- net/netfilter/ipset/ip_set_core.c | 4 +- net/netfilter/ipset/ip_set_hash_gen.h | 2 +- net/netfilter/ipset/ip_set_list_set.c | 4 +- net/netfilter/nf_conntrack_expect.c | 4 + net/netfilter/nf_conntrack_h323_asn1.c | 4 + net/netfilter/nf_conntrack_helper.c | 2 +- net/netfilter/nf_conntrack_netlink.c | 89 +++--- net/netfilter/nf_conntrack_proto_tcp.c | 10 +- net/netfilter/nf_conntrack_sip.c | 20 +- net/netfilter/nf_tables_api.c | 12 +- net/netfilter/nfnetlink_cthelper.c | 8 +- net/netfilter/nfnetlink_log.c | 10 +- net/netfilter/nfnetlink_osf.c | 13 + net/netfilter/nfnetlink_queue.c | 4 +- net/netfilter/nft_ct.c | 11 +- net/netfilter/nft_payload.c | 6 +- net/netfilter/nft_set_pipapo.c | 46 ++- net/netfilter/nft_set_pipapo.h | 2 + net/netfilter/x_tables.c | 23 ++ net/netfilter/xt_CT.c | 4 + net/netfilter/xt_IDLETIMER.c | 6 + net/netfilter/xt_cgroup.c | 6 + net/netfilter/xt_dccp.c | 4 +- net/netfilter/xt_rateest.c | 5 + net/netfilter/xt_tcpudp.c | 6 +- net/netfilter/xt_time.c | 4 +- net/nfc/nci/core.c | 31 +- net/nfc/nci/data.c | 12 +- net/nfc/rawsock.c | 11 + net/openvswitch/flow_netlink.c | 2 + net/openvswitch/vport-netdev.c | 9 +- net/packet/af_packet.c | 1 + net/qrtr/af_qrtr.c | 66 ++-- net/rds/ib_rdma.c | 7 +- net/rfkill/core.c | 40 ++- net/rose/af_rose.c | 5 + net/rxrpc/af_rxrpc.c | 6 - net/rxrpc/key.c | 2 +- net/sched/act_gate.c | 264 +++++++++++----- net/sched/cls_api.c | 1 + net/sched/cls_flow.c | 10 +- net/sched/cls_fw.c | 14 +- net/sched/sch_ets.c | 12 +- net/sched/sch_hfsc.c | 4 +- net/sched/sch_teql.c | 1 + net/smc/smc_rx.c | 9 +- net/sunrpc/cache.c | 26 +- net/tipc/group.c | 6 +- net/tipc/socket.c | 2 + net/wireless/core.c | 1 + net/wireless/pmsr.c | 1 + net/wireless/radiotap.c | 4 +- net/x25/x25_in.c | 9 +- net/x25/x25_subr.c | 1 + net/xfrm/xfrm_interface_core.c | 2 +- net/xfrm/xfrm_output.c | 7 +- net/xfrm/xfrm_policy.c | 2 +- net/xfrm/xfrm_state.c | 1 + net/xfrm/xfrm_user.c | 1 + security/apparmor/apparmorfs.c | 228 ++++++++------ security/apparmor/include/label.h | 16 +- security/apparmor/include/lib.h | 12 + security/apparmor/include/match.h | 1 + security/apparmor/include/policy.h | 13 +- security/apparmor/include/policy_ns.h | 2 + security/apparmor/include/policy_unpack.h | 83 +++-- security/apparmor/label.c | 12 +- security/apparmor/match.c | 58 +++- security/apparmor/policy.c | 82 ++++- security/apparmor/policy_ns.c | 2 + security/apparmor/policy_unpack.c | 74 +++-- security/security.c | 1 + sound/core/pcm_lib.c | 11 +- sound/core/pcm_native.c | 25 +- sound/pci/ctxfi/ctdaio.c | 1 + sound/pci/hda/patch_conexant.c | 11 + sound/pci/hda/patch_realtek.c | 1 + sound/soc/amd/acp3x-rt5682-max9836.c | 9 +- sound/soc/fsl/fsl_easrc.c | 14 +- sound/soc/intel/catpt/device.c | 10 +- sound/soc/intel/catpt/dsp.c | 3 - sound/soc/meson/meson-codec-glue.c | 3 - sound/soc/soc-core.c | 344 +++++++++++++++------ sound/soc/soc-dai.c | 63 ++++ sound/soc/soc-dapm.c | 24 +- sound/soc/soc-pcm.c | 10 +- sound/soc/soc-topology.c | 24 +- sound/soc/soc-utils.c | 29 ++ sound/soc/sof/topology.c | 6 +- sound/soc/tegra/tegra_pcm.c | 3 + sound/usb/caiaq/device.c | 2 +- sound/usb/endpoint.c | 3 + sound/usb/validate.c | 2 +- tools/bootconfig/main.c | 7 +- tools/objtool/check.c | 5 +- tools/testing/selftests/net/mptcp/simult_flows.sh | 11 +- 458 files changed, 5215 insertions(+), 2261 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 35/491 platform/x86: thinkpad_acpi: Fix errors reading battery thresholds
5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Teh <[email protected]>
[ Upstream commit 53e977b1d50c46f2c4ec3865cd13a822f58ad3cd ]
Check whether the battery supports the relevant charge threshold before reading the value to silence these errors:
thinkpad_acpi: acpi_evalf(BCTG, dd, ...) failed: AE_NOT_FOUND
ACPI: \_SB_.PCI0.LPC_.EC__.HKEY: BCTG: evaluate failedthinkpad_acpi: acpi_evalf(BCSG, dd, ...) failed: AE_NOT_FOUND
ACPI: \_SB_.PCI0.LPC_.EC__.HKEY: BCSG: evaluate failed
when reading the charge thresholds via sysfs on platforms that do not support them such as the ThinkPad T400.
--- drivers/platform/x86/thinkpad_acpi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +4 -2
@@ -9412,14 +9412,16 @@ static int tpacpi_battery_get(int what, int battery, int *ret) {switch (what) {case THRESHOLD_START : - if ACPI_FAILURE(tpacpi_battery_acpi_eval(GET_START, ret, battery)) +if (!battery_info.batteries[battery].start_support || +ACPI_FAILURE (tpacpi_battery_acpi_eval (GET_START , ret, battery)))return -ENODEV ;/* The value is in the low 8 bits of the response */ *ret = *ret &0xFF ;return 0 ;case THRESHOLD_STOP : - if ACPI_FAILURE(tpacpi_battery_acpi_eval(GET_STOP, ret, battery)) +if (!battery_info.batteries[battery].stop_support || +ACPI_FAILURE (tpacpi_battery_acpi_eval (GET_STOP , ret, battery)))return -ENODEV ;/* Value is in lower 8 bits */ *ret = *ret &0xFF ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 44/491 ipv6: fix NULL pointer deref in ip6_rt_get_dev_rcu()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 2ffb4f5c2ccb2fa1c049dd11899aee7967deef5a ]
l3mdev_master_dev_rcu() can return NULL when the slave device is being un-slaved from a VRF. All other callers deal with this, but we lost the fallback to loopback in ip6_rt_pcpu_alloc() -> ip6_rt_get_dev_rcu() with commit 4832c30d5458 ("net: ipv6: put host and anycast routes on device with address").
KASAN: null-ptr-deref in range [0x0000000000000108-0x000000000000010f] RIP: 0010:ip6_rt_pcpu_alloc (net/ipv6/route.c:1418) Call Trace: ip6_pol_route (net/ipv6/route.c:2318) fib6_rule_lookup (net/ipv6/fib6_rules.c:115) ip6_route_output_flags (net/ipv6/route.c:2607) vrf_process_v6_outbound (drivers/net/vrf.c:437)
I was tempted to rework the un-slaving code to clear the flag first and insert synchronize_rcu() before we remove the upper. But looks like the explicit fallback to loopback_dev is an established pattern. And I guess avoiding the synchronize_rcu() is nice, too.
--- net/ipv6/route.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/route.c +2 -1
@@ -1013,7 +1013,8 @@ static struct net_device *ip6_rt_get_dev_rcu(const struct fib6_result *res)*/ if (netif_is_l3_slave (dev) && !rt6_need_strict (&res->f6i->fib6_dst.addr)) - dev =l3mdev_master_dev_rcu (dev); + dev =l3mdev_master_dev_rcu (dev) ? : +dev_net (dev)->loopback_dev;else if (!netif_is_l3_master (dev)) dev =dev_net (dev)->loopback_dev;/* last case is netif_is_l3_master(dev) is true in which
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 45/491 amd-xgbe: fix sleep while atomic on suspend/resume
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raju Rangoju <[email protected]>
[ Upstream commit e2f27363aa6d983504c6836dd0975535e2e9dba0 ]
The xgbe_powerdown() and xgbe_powerup() functions use spinlocks (spin_lock_irqsave) while calling functions that may sleep:
- napi_disable() can sleep waiting for NAPI polling to complete
- flush_workqueue() can sleep waiting for pending work items
This causes a "BUG: scheduling while atomic" error during suspend/resume cycles on systems using the AMD XGBE Ethernet controller.
The spinlock protection in these functions is unnecessary as these functions are called from suspend/resume paths which are already serialized by the PM core
Fix this by removing the spinlock. Since only code that takes this lock is xgbe_powerdown() and xgbe_powerup(), remove it completely.
--- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 10 ---------- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 1 - drivers/net/ethernet/amd/xgbe/xgbe.h | 3 --- 3 files changed, 14 deletions(-)
drivers/net/ethernet/amd/xgbe/xgbe-drv.c +0 -10
@@ -1181,7 +1181,6 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller) {struct xgbe_prv_data *pdata =netdev_priv (netdev);struct xgbe_hw_if *hw_if = &pdata->hw_if; -unsigned long flags;DBGPR ("-->xgbe_powerdown\n" );
@@ -1192,8 +1191,6 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)return -EINVAL ; } -spin_lock_irqsave (&pdata->lock, flags); -if (caller ==XGMAC_DRIVER_CONTEXT )netif_device_detach (netdev);
@@ -1209,8 +1206,6 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller) pdata->power_down =1 ; -spin_unlock_irqrestore (&pdata->lock, flags); -DBGPR ("<--xgbe_powerdown\n" );return 0 ;
@@ -1220,7 +1215,6 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller) {struct xgbe_prv_data *pdata =netdev_priv (netdev);struct xgbe_hw_if *hw_if = &pdata->hw_if; -unsigned long flags;DBGPR ("-->xgbe_powerup\n" );
@@ -1231,8 +1225,6 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)return -EINVAL ; } -spin_lock_irqsave (&pdata->lock, flags); - pdata->power_down =0 ;xgbe_napi_enable (pdata,0 );
@@ -1247,8 +1239,6 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)xgbe_start_timers (pdata); -spin_unlock_irqrestore (&pdata->lock, flags); -DBGPR ("<--xgbe_powerup\n" );return 0 ;
drivers/net/ethernet/amd/xgbe/xgbe-main.c +0 -1
@@ -185,7 +185,6 @@ struct xgbe_prv_data *xgbe_alloc_pdata(struct device *dev) pdata->netdev = netdev; pdata->dev = dev; -spin_lock_init (&pdata->lock);spin_lock_init (&pdata->xpcs_lock);mutex_init (&pdata->rss_mutex);spin_lock_init (&pdata->tstamp_lock);
drivers/net/ethernet/amd/xgbe/xgbe.h +0 -3
@@ -1050,9 +1050,6 @@ struct xgbe_prv_data {unsigned int pp3;unsigned int pp4; -/* Overall device lock */ -spinlock_t lock; -/* XPCS indirect addressing lock */ spinlock_t xpcs_lock;unsigned int xpcs_window_def_reg;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 46/491 net: nfc: nci: Fix zero-length proprietary notifications
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Ray <[email protected]>
[ Upstream commit f7d92f11bd33a6eb49c7c812255ef4ab13681f0f ]
NCI NFC controllers may have proprietary OIDs with zero-length payload. One example is: drivers/nfc/nxp-nci/core.c, NXP_NCI_RF_TXLDO_ERROR_NTF.
Allow a zero length payload in proprietary notifications *only*.
Before:
-- >8 --
kernel: nci: nci_recv_frame: len 3
-- >8 --
After:
-- >8 --
kernel: nci: nci_recv_frame: len 3
kernel: nci: nci_ntf_packet: NCI RX: MT=ntf, PBF=0, GID=0x1, OID=0x23, plen=0
kernel: nci: nci_ntf_packet: unknown ntf opcode 0x123
kernel: nfc nfc0: NFC: RF transmitter couldn't start. Bad power and/or configuration? -- >8 --
After fixing the hardware:
-- >8 --
kernel: nci: nci_recv_frame: len 27
kernel: nci: nci_ntf_packet: NCI RX: MT=ntf, PBF=0, GID=0x1, OID=0x5, plen=24
kernel: nci: nci_rf_intf_activated_ntf_packet: rf_discovery_id 1 -- >8 --
--- net/nfc/nci/core.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
net/nfc/nci/core.c +11 -1
@@ -1460,10 +1460,20 @@ static bool nci_valid_size(struct sk_buff *skb)BUILD_BUG_ON (NCI_CTRL_HDR_SIZE !=NCI_DATA_HDR_SIZE );if (skb->len < hdr_size || - !nci_plen (skb->data) || skb->len < hdr_size +nci_plen (skb->data)) {return false; } + +if (!nci_plen (skb->data)) { +/* Allow zero length in proprietary notifications (0x20 - 0x3F). */ +if (nci_opcode_oid (nci_opcode (skb->data)) >=0x20 && +nci_mt (skb->data) ==NCI_MT_NTF_PKT ) +return true; + +/* Disallow zero length otherwise. */ +return false; + } +return true; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 47/491 nfc: nci: free skb on nci_transceive early error paths
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 7bd4b0c4779f978a6528c9b7937d2ca18e936e2c ]
nci_transceive() takes ownership of the skb passed by the caller, but the -EPROTO, -EINVAL, and -EBUSY error paths return without freeing it.
Due to issues clearing NCI_DATA_EXCHANGE fixed by subsequent changes the nci/nci_dev selftest hits the error path occasionally in NIPA, and kmemleak detects leaks:
unreferenced object 0xff11000015ce6a40 (size 640):
comm "nci_dev", pid 3954, jiffies 4295441246
hex dump (first 32 bytes):
6b 6b 6b 6b 00 a4 00 0c 02 e1 03 6b 6b 6b 6b 6b kkkk.......kkkkk 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
backtrace (crc 7c40cc2a):
kmem_cache_alloc_node_noprof+0x492/0x630
__alloc_skb+0x11e/0x5f0
alloc_skb_with_frags+0xc6/0x8f0
sock_alloc_send_pskb+0x326/0x3f0
nfc_alloc_send_skb+0x94/0x1d0
rawsock_sendmsg+0x162/0x4c0
do_syscall_64+0x117/0xfc0--- net/nfc/nci/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/nfc/nci/core.c +7 -2
@@ -1014,18 +1014,23 @@ static int nci_transceive(struct nfc_dev *nfc_dev, struct nfc_target *target,struct nci_conn_info *conn_info; conn_info = ndev->rf_conn_info; -if (!conn_info) +if (!conn_info) { +kfree_skb (skb);return -EPROTO ; + }pr_debug ("target_idx %d, len %d\n" , target->idx, skb->len);if (!ndev->target_active_prot) {pr_err ("unable to exchange data, no active target\n" ); +kfree_skb (skb);return -EINVAL ; } -if (test_and_set_bit (NCI_DATA_EXCHANGE , &ndev->flags)) +if (test_and_set_bit (NCI_DATA_EXCHANGE , &ndev->flags)) { +kfree_skb (skb);return -EBUSY ; + }/* store cb and context to be used on receiving data */ conn_info->data_exchange_cb = cb;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 48/491 nfc: nci: clear NCI_DATA_EXCHANGE before calling completion callback
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 0efdc02f4f6d52f8ca5d5889560f325a836ce0a8 ]
Move clear_bit(NCI_DATA_EXCHANGE) before invoking the data exchange callback in nci_data_exchange_complete().
The callback (e.g. rawsock_data_exchange_complete) may immediately schedule another data exchange via schedule_work(tx_work). On a multi-CPU system, tx_work can run and reach nci_transceive() before the current nci_data_exchange_complete() clears the flag, causing test_and_set_bit(NCI_DATA_EXCHANGE) to return -EBUSY and the new transfer to fail.
This causes intermittent flakes in nci/nci_dev in NIPA:
# # RUN NCI.NCI1_0.t4t_tag_read ...
# # t4t_tag_read: Test terminated by timeout
# # FAIL NCI.NCI1_0.t4t_tag_read
# not ok 3 NCI.NCI1_0.t4t_tag_read
--- net/nfc/nci/data.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/nfc/nci/data.c +8 -4
@@ -33,7 +33,8 @@ void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb, conn_info =nci_get_conn_info_by_conn_id (ndev, conn_id);if (!conn_info) {kfree_skb (skb); - goto exit; +clear_bit (NCI_DATA_EXCHANGE , &ndev->flags); +return ; } cb = conn_info->data_exchange_cb;
@@ -45,6 +46,12 @@ void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb,del_timer_sync (&ndev->data_timer);clear_bit (NCI_DATA_EXCHANGE_TO , &ndev->flags); +/* Mark the exchange as done before calling the callback. +* The callback (e.g. rawsock_data_exchange_complete) may +* want to immediately queue another data exchange. +*/ +clear_bit (NCI_DATA_EXCHANGE , &ndev->flags); +if (cb) {/* forward skb to nfc core */ cb (cb_context, skb, err);
@@ -54,9 +61,6 @@ void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb,/* no waiting callback, free skb */ kfree_skb (skb); } - -exit: -clear_bit (NCI_DATA_EXCHANGE , &ndev->flags); }/* ----------------- NCI TX Data ----------------- */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 49/491 nfc: rawsock: cancel tx_work before socket teardown
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit d793458c45df2aed498d7f74145eab7ee22d25aa ]
In rawsock_release(), cancel any pending tx_work and purge the write queue before orphaning the socket. rawsock_tx_work runs on the system workqueue and calls nfc_data_exchange which dereferences the NCI device. Without synchronization, tx_work can race with socket and device teardown when a process is killed (e.g. by SIGKILL), leading to use-after-free or leaked references.
Set SEND_SHUTDOWN first so that if tx_work is already running it will see the flag and skip transmitting, then use cancel_work_sync to wait for any in-progress execution to finish, and finally purge any remaining queued skbs.
--- net/nfc/rawsock.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
net/nfc/rawsock.c +11 -0
@@ -66,6 +66,17 @@ static int rawsock_release(struct socket *sock)if (sock->type ==SOCK_RAW )nfc_sock_unlink (&raw_sk_list, sk); +if (sk->sk_state ==TCP_ESTABLISHED ) { +/* Prevent rawsock_tx_work from starting new transmits and +* wait for any in-progress work to finish. This must happen +* before the socket is orphaned to avoid a race where +* rawsock_tx_work runs after the NCI device has been freed. +*/ + sk->sk_shutdown |=SEND_SHUTDOWN ; +cancel_work_sync (&nfc_rawsock (sk)->tx_work); +rawsock_write_queue_purge (sk); + } +sock_orphan (sk);sock_put (sk);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 50/491 net: bridge: fix nd_tbl NULL dereference when IPv6 is disabled
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fernando Fernandez Mancera <[email protected]>
[ Upstream commit e5e890630533bdc15b26a34bb8e7ef539bdf1322 ]
When booting with the 'ipv6.disable=1' parameter, the nd_tbl is never initialized because inet6_init() exits before ndisc_init() is called which initializes it. Then, if neigh_suppress is enabled and an ICMPv6 Neighbor Discovery packet reaches the bridge, br_do_suppress_nd() will dereference ipv6_stub->nd_tbl which is NULL, passing it to neigh_lookup(). This causes a kernel NULL pointer dereference.
BUG: kernel NULL pointer dereference, address: 0000000000000268 Oops: 0000 [#1] PREEMPT SMP NOPTI [...] RIP: 0010:neigh_lookup+0x16/0xe0 [...] Call Trace: <IRQ> ? neigh_lookup+0x16/0xe0 br_do_suppress_nd+0x160/0x290 [bridge] br_handle_frame_finish+0x500/0x620 [bridge] br_handle_frame+0x353/0x440 [bridge] __netif_receive_skb_core.constprop.0+0x298/0x1110 __netif_receive_skb_one_core+0x3d/0xa0 process_backlog+0xa0/0x140 __napi_poll+0x2c/0x170 net_rx_action+0x2c4/0x3a0 handle_softirqs+0xd0/0x270 do_softirq+0x3f/0x60
Fix this by replacing IS_ENABLED(IPV6) call with ipv6_mod_enabled() in the callers. This is in essence disabling NS/NA suppression when IPv6 is disabled.
--- net/bridge/br_device.c | 2 +- net/bridge/br_input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/bridge/br_device.c +1 -1
@@ -70,7 +70,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) eth_hdr(skb)->h_proto == htons(ETH_P_RARP)) && br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED)) {br_do_proxy_suppress_arp (skb, br, vid,NULL ); - } else if (IS_ENABLED(CONFIG_IPV6) && + } else if (ipv6_mod_enabled() && skb->protocol == htons(ETH_P_IPV6) && br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED) && pskb_may_pull(skb, sizeof(struct ipv6hdr) +
net/bridge/br_input.c +1 -1
@@ -124,7 +124,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb (skb->protocol == htons(ETH_P_ARP) || skb->protocol == htons(ETH_P_RARP))) {br_do_proxy_suppress_arp (skb, br, vid, p); - } else if (IS_ENABLED(CONFIG_IPV6) && + } else if (ipv6_mod_enabled() && skb->protocol == htons(ETH_P_IPV6) && br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED) && pskb_may_pull(skb, sizeof(struct ipv6hdr) +
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 51/491 net: vxlan: fix nd_tbl NULL dereference when IPv6 is disabled
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fernando Fernandez Mancera <[email protected]>
[ Upstream commit 168ff39e4758897d2eee4756977d036d52884c7e ]
When booting with the 'ipv6.disable=1' parameter, the nd_tbl is never initialized because inet6_init() exits before ndisc_init() is called which initializes it. If an IPv6 packet is injected into the interface, route_shortcircuit() is called and a NULL pointer dereference happens on neigh_lookup().
BUG: kernel NULL pointer dereference, address: 0000000000000380 Oops: Oops: 0000 [#1] SMP NOPTI [...] RIP: 0010:neigh_lookup+0x20/0x270 [...] Call Trace: <TASK> vxlan_xmit+0x638/0x1ef0 [vxlan] dev_hard_start_xmit+0x9e/0x2e0 __dev_queue_xmit+0xbee/0x14e0 packet_sendmsg+0x116f/0x1930 __sys_sendto+0x1f5/0x200 __x64_sys_sendto+0x24/0x30 do_syscall_64+0x12f/0x1590 entry_SYSCALL_64_after_hwframe+0x76/0x7e
Fix this by adding an early check on route_shortcircuit() when protocol is ETH_P_IPV6. Note that ipv6_mod_enabled() cannot be used here because VXLAN can be built-in even when IPv6 is built as a module.
--- drivers/net/vxlan/vxlan_core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/vxlan/vxlan_core.c +5 -0
@@ -2258,6 +2258,11 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb) {struct ipv6hdr *pip6; +/* check if nd_tbl is not initiliazed due to +* ipv6.disable=1 set during boot +*/ +if (!ipv6_stub->nd_tbl) +return false;if (!pskb_may_pull (skb,sizeof (struct ipv6hdr )))return false; pip6 =ipv6_hdr (skb);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 52/491 net: ipv6: fix panic when IPv4 route references loopback IPv6 nexthop
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
[ Upstream commit 21ec92774d1536f71bdc90b0e3d052eff99cf093 ]
When a standalone IPv6 nexthop object is created with a loopback device (e.g., "ip -6 nexthop add id 100 dev lo"), fib6_nh_init() misclassifies it as a reject route. This is because nexthop objects have no destination prefix (fc_dst=::), causing fib6_is_reject() to match any loopback nexthop. The reject path skips fib_nh_common_init(), leaving nhc_pcpu_rth_output unallocated. If an IPv4 route later references this nexthop, __mkroute_output() dereferences NULL nhc_pcpu_rth_output and panics.
Simplify the check in fib6_nh_init() to only match explicit reject routes (RTF_REJECT) instead of using fib6_is_reject(). The loopback promotion heuristic in fib6_is_reject() is handled separately by ip6_route_info_create_nh(). After this change, the three cases behave as follows:
1. Explicit reject route ("ip -6 route add unreachable 2001:db8::/64"):
RTF_REJECT is set, enters reject path, skips fib_nh_common_init(). No behavior change.
2. Implicit loopback reject route ("ip -6 route add 2001:db8::/32 dev lo"):
RTF_REJECT is not set, takes normal path, fib_nh_common_init() is called. ip6_route_info_create_nh() still promotes it to reject afterward. nhc_pcpu_rth_output is allocated but unused, which is harmless.
3. Standalone nexthop object ("ip -6 nexthop add id 100 dev lo"):
RTF_REJECT is not set, takes normal path, fib_nh_common_init() is called. nhc_pcpu_rth_output is properly allocated, fixing the crash when IPv4 routes reference this nexthop.
--- net/ipv6/route.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
net/ipv6/route.c +3 -5
@@ -3408,7 +3408,6 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, {struct net_device *dev =NULL ;struct inet6_dev *idev =NULL ; -int addr_type;int err; fib6_nh->fib_nh_family =AF_INET6 ;
@@ -3449,11 +3448,10 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, fib6_nh->fib_nh_weight =1 ; -/* We cannot add true routes via loopback here, -* they would result in kernel looping; promote them to reject routes +/* Reset the nexthop device to the loopback device in case of reject +* routes. */ - addr_type =ipv6_addr_type (&cfg->fc_dst); -if (fib6_is_reject (cfg->fc_flags, dev, addr_type)) { +if (cfg->fc_flags &RTF_REJECT ) {/* hold loopback dev/idev if we haven't done so. */ if (dev != net->loopback_dev) {if (dev) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 53/491 scsi: storvsc: Fix scheduling while atomic on PREEMPT_RT
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kiszka <[email protected]>
[ Upstream commit 57297736c08233987e5d29ce6584c6ca2a831b12 ]
This resolves the follow splat and lock-up when running with PREEMPT_RT enabled on Hyper-V:
[ 415.140818] BUG: scheduling while atomic: stress-ng-iomix/1048/0x00000002
[ 415.140822] INFO: lockdep is turned off.
[ 415.140823] Modules linked in: intel_rapl_msr intel_rapl_common intel_uncore_frequency_common intel_pmc_core pmt_telemetry pmt_discovery pmt_class intel_pmc_ssram_telemetry intel_vsec ghash_clmulni_intel aesni_intel rapl binfmt_misc nls_ascii nls_cp437 vfat fat snd_pcm hyperv_drm snd_timer drm_client_lib drm_shmem_helper snd sg soundcore drm_kms_helper pcspkr hv_balloon hv_utils evdev joydev drm configfs efi_pstore nfnetlink vsock_loopback vmw_vsock_virtio_transport_common hv_sock vmw_vsock_vmci_transport vsock vmw_vmci efivarfs autofs4 ext4 crc16 mbcache jbd2 sr_mod sd_mod cdrom hv_storvsc serio_raw hid_generic scsi_transport_fc hid_hyperv scsi_mod hid hv_netvsc hyperv_keyboard scsi_common
[ 415.140846] Preemption disabled at:
[ 415.140847] [<ffffffffc0656171>] storvsc_queuecommand+0x2e1/0xbe0 [hv_storvsc]
[ 415.140854] CPU: 8 UID: 0 PID: 1048 Comm: stress-ng-iomix Not tainted 6.19.0-rc7 #30 PREEMPT_{RT,(full)}
[ 415.140856] Hardware name: Microsoft Corporation Virtual Machine/Virtual Machine, BIOS Hyper-V UEFI Release v4.1 09/04/2024
[ 415.140857] Call Trace:
[ 415.140861] <TASK>
[ 415.140861] ? storvsc_queuecommand+0x2e1/0xbe0 [hv_storvsc]
[ 415.140863] dump_stack_lvl+0x91/0xb0
[ 415.140870] __schedule_bug+0x9c/0xc0
[ 415.140875] __schedule+0xdf6/0x1300
[ 415.140877] ? rtlock_slowlock_locked+0x56c/0x1980
[ 415.140879] ? rcu_is_watching+0x12/0x60
[ 415.140883] schedule_rtlock+0x21/0x40
[ 415.140885] rtlock_slowlock_locked+0x502/0x1980
[ 415.140891] rt_spin_lock+0x89/0x1e0
[ 415.140893] hv_ringbuffer_write+0x87/0x2a0
[ 415.140899] vmbus_sendpacket_mpb_desc+0xb6/0xe0
[ 415.140900] ? rcu_is_watching+0x12/0x60
[ 415.140902] storvsc_queuecommand+0x669/0xbe0 [hv_storvsc]
[ 415.140904] ? HARDIRQ_verbose+0x10/0x10
[ 415.140908] ? __rq_qos_issue+0x28/0x40
[ 415.140911] scsi_queue_rq+0x760/0xd80 [scsi_mod]
[ 415.140926] __blk_mq_issue_directly+0x4a/0xc0
[ 415.140928] blk_mq_issue_direct+0x87/0x2b0
[ 415.140931] blk_mq_dispatch_queue_requests+0x120/0x440
[ 415.140933] blk_mq_flush_plug_list+0x7a/0x1a0
[ 415.140935] __blk_flush_plug+0xf4/0x150
[ 415.140940] __submit_bio+0x2b2/0x5c0
[ 415.140944] ? submit_bio_noacct_nocheck+0x272/0x360
[ 415.140946] submit_bio_noacct_nocheck+0x272/0x360
[ 415.140951] ext4_read_bh_lock+0x3e/0x60 [ext4]
[ 415.140995] ext4_block_write_begin+0x396/0x650 [ext4]
[ 415.141018] ? __pfx_ext4_da_get_block_prep+0x10/0x10 [ext4]
[ 415.141038] ext4_da_write_begin+0x1c4/0x350 [ext4]
[ 415.141060] generic_perform_write+0x14e/0x2c0
[ 415.141065] ext4_buffered_write_iter+0x6b/0x120 [ext4]
[ 415.141083] vfs_write+0x2ca/0x570
[ 415.141087] ksys_write+0x76/0xf0
[ 415.141089] do_syscall_64+0x99/0x1490
[ 415.141093] ? rcu_is_watching+0x12/0x60
[ 415.141095] ? finish_task_switch.isra.0+0xdf/0x3d0
[ 415.141097] ? rcu_is_watching+0x12/0x60
[ 415.141098] ? lock_release+0x1f0/0x2a0
[ 415.141100] ? rcu_is_watching+0x12/0x60
[ 415.141101] ? finish_task_switch.isra.0+0xe4/0x3d0
[ 415.141103] ? rcu_is_watching+0x12/0x60
[ 415.141104] ? __schedule+0xb34/0x1300
[ 415.141106] ? hrtimer_try_to_cancel+0x1d/0x170
[ 415.141109] ? do_nanosleep+0x8b/0x160
[ 415.141111] ? hrtimer_nanosleep+0x89/0x100
[ 415.141114] ? __pfx_hrtimer_wakeup+0x10/0x10
[ 415.141116] ? xfd_validate_state+0x26/0x90
[ 415.141118] ? rcu_is_watching+0x12/0x60
[ 415.141120] ? do_syscall_64+0x1e0/0x1490
[ 415.141121] ? do_syscall_64+0x1e0/0x1490
[ 415.141123] ? rcu_is_watching+0x12/0x60
[ 415.141124] ? do_syscall_64+0x1e0/0x1490
[ 415.141125] ? do_syscall_64+0x1e0/0x1490
[ 415.141127] ? irqentry_exit+0x140/0x7e0
[ 415.141129] entry_SYSCALL_64_after_hwframe+0x76/0x7eget_cpu() disables preemption while the spinlock hv_ringbuffer_write is using is converted to an rt-mutex under PREEMPT_RT.
--- drivers/scsi/storvsc_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/storvsc_drv.c +3 -2
@@ -1832,8 +1832,9 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd) cmd_request->payload_sz = payload_sz;/* Invokes the vsc to start an IO */ - ret =storvsc_do_io (dev, cmd_request,get_cpu ()); -put_cpu (); +migrate_disable (); + ret =storvsc_do_io (dev, cmd_request,smp_processor_id ()); +migrate_enable ();if (ret == -EAGAIN ) {if (payload_sz >sizeof (cmd_request->mpb))
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 36/491 net: ethernet: ti: am65-cpsw-nuss/cpsw-ale: Fix multicast entry handling in ALE table
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chintan Vankar <[email protected]>
[ Upstream commit be11a537224d72b906db6b98510619770298c8a4 ]
In the current implementation, flushing multicast entries in MAC mode incorrectly deletes entries for all ports instead of only the target port, disrupting multicast traffic on other ports. The cause is adding multicast entries by setting only host port bit, and not setting the MAC port bits.
Fix this by setting the MAC port's bit in the port mask while adding the multicast entry. Also fix the flush logic to preserve the host port bit during removal of MAC port and free ALE entries when mask contains only host port.
--- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ethernet/ti/cpsw_ale.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/ethernet/ti/am65-cpsw-nuss.c +1 -1
@@ -305,7 +305,7 @@ static void am65_cpsw_nuss_ndo_slave_set_rx_mode(struct net_device *ndev)cpsw_ale_set_allmulti (common->ale, ndev->flags &IFF_ALLMULTI , port->port_id); - port_mask =ALE_PORT_HOST ; + port_mask =BIT (port->port_id) |ALE_PORT_HOST ;/* Clear all mcast from ALE */ cpsw_ale_flush_multicast (common->ale, port_mask,-1 );
drivers/net/ethernet/ti/cpsw_ale.c +4 -5
@@ -420,14 +420,13 @@ static void cpsw_ale_flush_mcast(struct cpsw_ale *ale, u32 *ale_entry, ale->port_mask_bits);if ((mask & port_mask) ==0 )return ;/* ports dont intersect, not interested */ - mask &= ~port_mask; + mask &= (~port_mask |ALE_PORT_HOST ); -/* free if only remaining port is host port */ -if (mask) +if (mask ==0x0 || mask ==ALE_PORT_HOST ) +cpsw_ale_set_entry_type (ale_entry,ALE_TYPE_FREE ); +else cpsw_ale_set_port_mask (ale_entry, mask, ale->port_mask_bits); -else -cpsw_ale_set_entry_type (ale_entry,ALE_TYPE_FREE ); }int cpsw_ale_flush_multicast (struct cpsw_ale *ale,int port_mask,int vid)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 54/491 ACPI: PM: Save NVS memory on Lenovo G70-35
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Piotr Mazek <[email protected]>
[ Upstream commit 023cd6d90f8aa2ef7b72d84be84a18e61ecebd64 ]
[821d6f0359b0614792ab8e2fb93b503e25a65079] prevented machines produced later than 2012 from saving NVS region to accelerate S3.
Despite being made after 2012, Lenovo G70-35 still needs NVS memory saving during S3. A quirk is introduced for this platform.
--- drivers/acpi/sleep.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/acpi/sleep.c +8 -0
@@ -372,6 +372,14 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "80E1"), }, }, + { + .callback = init_nvs_save_s3, + .ident = "Lenovo G70-35", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "80Q5"), + }, + },/* * ThinkPad X1 Tablet(2016) cannot do suspend-to-idle using * the Low Power S0 Idle firmware interface (see
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 55/491 unshare: fix unshare_fs() handling
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit 6c4b2243cb6c0755159bd567130d5e12e7b10d9f ]
There's an unpleasant corner case in unshare(2), when we have a CLONE_NEWNS in flags and current->fs hadn't been shared at all; in that case copy_mnt_ns() gets passed current->fs instead of a private copy, which causes interesting warts in proof of correctness]
Quoted 1 line
I guess if private means
fs->users== 1, the condition could still be true.
Unfortunately, it's worse than just a convoluted proof of correctness. Consider the case when we have CLONE_NEWCGROUP in addition to CLONE_NEWNS (and current->fs->users == 1).
We pass current->fs to copy_mnt_ns(), all right. Suppose it succeeds and flips current->fs->{pwd,root} to corresponding locations in the new namespace. Now we proceed to copy_cgroup_ns(), which fails (e.g. with -ENOMEM). We call put_mnt_ns() on the namespace created by copy_mnt_ns(), it's destroyed and its mount tree is dissolved, but... current->fs->root and current->fs->pwd are both left pointing to now detached mounts.
They are pinning those, so it's not a UAF, but it leaves the calling process with unshare(2) failing with -ENOMEM _and_ leaving it with pwd and root on detached isolated mounts. The last part is clearly a bug.
There is other fun related to that mess (races with pivot_root(), including the one between pivot_root() and fork(), of all things), but this one is easy to isolate and fix - treat CLONE_NEWNS as "allocate a new fs_struct even if it hadn't been shared in the first place". Sure, we could go for something like "if both CLONE_NEWNS *and* one of the things that might end up failing after copy_mnt_ns() call in create_new_namespaces() are set, force allocation of new fs_struct", but let's keep it simple - the cost of copy_fs_struct() is trivial.
Another benefit is that copy_mnt_ns() with CLONE_NEWNS *always* gets a freshly allocated fs_struct, yet to be attached to anything. That seriously simplifies the analysis...
FWIW, that bug had been there since the introduction of unshare(2) ;-/
--- kernel/fork.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/fork.c +1 -1
@@ -2989,7 +2989,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)return 0 ;/* don't need lock here; in the worst case we'll do useless copy */ -if (fs->users ==1 ) +if (!(unshare_flags &CLONE_NEWNS ) && fs->users ==1 )return 0 ; *new_fsp =copy_fs_struct (fs);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 56/491 ACPI: OSI: Add DMI quirk for Acer Aspire One D255
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sofia Schneider <[email protected]>
[ Upstream commit 5ede90206273ff156a778254f0f972a55e973c89 ]
The screen backlight turns off during boot (specifically during udev device initialization) when returning true for _OSI("Windows 2009").
Analyzing the device's DSDT reveals that the firmware takes a different code path when Windows 7 is reported, which leads to the backlight shutoff. Add a DMI quirk to invoke dmi_disable_osi_win7 for this model.
--- drivers/acpi/osi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/acpi/osi.c +13 -0
@@ -413,6 +413,19 @@ static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = { }, }, +/* +* The screen backlight turns off during udev device creation +* when returning true for _OSI("Windows 2009") +*/ + { + .callback = dmi_disable_osi_win7, + .ident = "Acer Aspire One D255", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "AOD255"), + }, + }, + /* * The wireless hotkey does not work on those machines when * returning true for _OSI("Windows 2012")
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 57/491 scsi: ses: Fix devices attaching to different hosts
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomas Henzl <[email protected]>
[ Upstream commit 70ca8caa96ce473647054f5c7b9dab5423902402 ]
On a multipath SAS system some devices don't end up with correct symlinks from the SCSI device to its enclosure. Some devices even have enclosure links pointing to enclosures attached to different SCSI hosts.
ses_match_to_enclosure() calls enclosure_for_each_device() which iterates over all enclosures on the system, not just enclosures attached to the current SCSI host.
Replace the iteration with a direct call to ses_enclosure_find_by_addr().
--- drivers/scsi/ses.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/scsi/ses.c +2 -3
@@ -497,9 +497,8 @@ struct efd { };static int ses_enclosure_find_by_addr (struct enclosure_device *edev, -void *data) +struct efd *efd) { -struct efd *efd = data;int i;struct ses_component *scomp;
@@ -652,7 +651,7 @@ static void ses_match_to_enclosure(struct enclosure_device *edev,if (efd.addr) { efd.dev = &sdev->sdev_gendev; -enclosure_for_each_device (ses_enclosure_find_by_addr, &efd); +ses_enclosure_find_by_addr (edev, &efd); } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 58/491 powerpc/uaccess: Fix inline assembly for clang build on PPC32
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy (CS GROUP) <[email protected]>
[ Upstream commit 0ee95a1d458630272d0415d0ffa9424fcb606c90 ]
Test robot reports the following error with clang-16.0.6:
In file included from kernel/rseq.c:75:
include/linux/rseq_entry.h:141:3: error: invalid operand for instruction
unsafe_get_user(offset, &ucs->post_commit_offset, efault);
^
include/linux/uaccess.h:608:2: note: expanded from macro 'unsafe_get_user'
arch_unsafe_get_user(x, ptr, local_label); \
^
arch/powerpc/include/asm/uaccess.h:518:2: note: expanded from macro 'arch_unsafe_get_user'
__get_user_size_goto(__gu_val, __gu_addr, sizeof(*(p)), e); \
^
arch/powerpc/include/asm/uaccess.h:284:2: note: expanded from macro '__get_user_size_goto'
__get_user_size_allowed(x, ptr, size, __gus_retval); \
^
arch/powerpc/include/asm/uaccess.h:275:10: note: expanded from macro '__get_user_size_allowed'
case 8: __get_user_asm2(x, (u64 __user *)ptr, retval); break; \
^
arch/powerpc/include/asm/uaccess.h:258:4: note: expanded from macro '__get_user_asm2'
" li %1+1,0\n" \
^
<inline asm>:7:5: note: instantiated into assembly here
li 31+1,0
^
1 error generated.On PPC32, for 64 bits vars a pair of registers is used. Usually the lower register in the pair is the high part and the higher register is the low part. GCC uses r3/r4 ... r11/r12 ... r14/r15 ... r30/r31
In older kernel code inline assembly was using %1 and %1+1 to represent 64 bits values. However here it looks like clang uses r31 as high part, allthough r32 doesn't exist hence the error.
Allthoug %1+1 should work, most places now use %L1 instead of %1+1, so let's do the same here.
With that change, the build doesn't fail anymore and a disassembly shows clang uses r17/r18 and r31/r14 pair when GCC would have used r16/r17 and r30/r31:
Disassembly of section .fixup: 00000000 <.fixup>: 0: 38 a0 ff f2 li r5,-14 4: 3a 20 00 00 li r17,0 8: 3a 40 00 00 li r18,0 c: 48 00 00 00 b c <.fixup+0xc> c: R_PPC_REL24 .text+0xbc 10: 38 a0 ff f2 li r5,-14 14: 3b e0 00 00 li r31,0 18: 39 c0 00 00 li r14,0 1c: 48 00 00 00 b 1c <.fixup+0x1c> 1c: R_PPC_REL24 .text+0x144
--- arch/powerpc/include/asm/uaccess.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/include/asm/uaccess.h +1 -1
@@ -279,7 +279,7 @@ extern long __get_user_bad(void);".section .fixup,\"ax\"\n" \"4: li %0,%3\n" \" li %1,0\n" \ -" li %1+1,0\n" \ +" li %L1,0\n" \" b 3b\n" \".previous\n" \EX_TABLE (1b ,4b ) \
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 59/491 remoteproc: sysmon: Correct subsys_name_len type in QMI request
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Andersson <[email protected]>
[ Upstream commit da994db94e60f9a9411108ddf4d1836147ad4c9c ]
The QMI message encoder has up until recently read a single byte (as elem_size == 1), but with the introduction of big endian support it's become apparent that this field is expected to be a full u32 - regardless of the size of the length in the encoded message (which is what elem_size specifies).
The result is that the encoder now reads past the length byte and rejects the unreasonably large length formed when including the following 3 bytes from the subsys_name array.
Fix this by changing to the expected type.
--- drivers/remoteproc/qcom_sysmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/remoteproc/qcom_sysmon.c +1 -1
@@ -196,7 +196,7 @@ static struct qmi_elem_info ssctl_shutdown_resp_ei[] = { };struct ssctl_subsys_event_req { -u8 subsys_name_len; +u32 subsys_name_len;char subsys_name[SSCTL_SUBSYS_NAME_LENGTH ];u32 event;u8 evt_driven_valid;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 60/491 powerpc: 83xx: km83xx: Fix keymile vendor prefix
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: J. Neuschäfer <[email protected]>
[ Upstream commit 691417ffe7821721e0a28bd25ad8c0dc0d4ae4ad ]
When kmeter.c was refactored into km83xx.c in 2011, the "keymile" vendor prefix was changed to upper-case "Keymile". The devicetree at arch/powerpc/boot/dts/kmeter1.dts never underwent the same change, suggesting that this was simply a mistake.
--- arch/powerpc/platforms/83xx/km83xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/platforms/83xx/km83xx.c +2 -2
@@ -156,8 +156,8 @@ machine_device_initcall(mpc83xx_km, mpc83xx_declare_of_platform_devices);/* list of the supported boards */ static char *board[]__initdata = { -"Keymile,KMETER1" , -"Keymile,kmpbec8321" , +"keymile,KMETER1" , +"keymile,kmpbec8321" ,NULL };
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 61/491 bonding: handle BOND_LINK_FAIL, BOND_LINK_BACK as valid link states
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 3348be7978f450ede0c308a4e8416ac716cf1015 ]
Before the fixed commit, we check slave->new_link during commit state, which values are only BOND_LINK_{NOCHANGE, UP, DOWN}. After the commit, we start using slave->link_new_state, which state also could be BOND_LINK_{FAIL, BACK}.
For example, when we set updelay/downdelay, after a failover, the slave->link_new_state could be set to BOND_LINK_{FAIL, BACK} in bond_miimon_inspect(). And later in bond_miimon_commit(), it will treat it as invalid and print an error, which would cause confusion for users.
[ 106.440254] bond0: (slave veth2): link status down for interface, disabling it in 200 ms [ 106.440265] bond0: (slave veth2): invalid new link 1 on slave [ 106.648276] bond0: (slave veth2): link status definitely down, disabling slave [ 107.480271] bond0: (slave veth2): link status up, enabling it in 200 ms [ 107.480288] bond0: (slave veth2): invalid new link 3 on slave [ 107.688302] bond0: (slave veth2): link status definitely up, 10000 Mbps full duplex
Let's handle BOND_LINK_{FAIL, BACK} as valid link states.
--- drivers/net/bonding/bond_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +7 -1
@@ -2592,8 +2592,14 @@ static void bond_miimon_commit(struct bonding *bond)continue ; +case BOND_LINK_FAIL : +case BOND_LINK_BACK : +slave_dbg (bond->dev, slave->dev,"link_new_state %d on slave\n" , + slave->link_new_state); +continue ; +default : -slave_err (bond->dev, slave->dev,"invalid new link %d on slave\n" , +slave_err (bond->dev, slave->dev,"invalid link_new_state %d on slave\n" , slave->link_new_state);bond_propose_link_state (slave,BOND_LINK_NOCHANGE );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 62/491 net/mlx5e: Fix DMA FIFO desync on error CQE SQ recovery
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gal Pressman <[email protected]>
[ Upstream commit 1633111d69053512d099658d4a05fc736fab36b0 ]
In case of a TX error CQE, a recovery flow is triggered, mlx5e_reset_txqsq_cc_pc() resets dma_fifo_cc to 0 but not dma_fifo_pc, desyncing the DMA FIFO producer and consumer.
After recovery, the producer pushes new DMA entries at the old dma_fifo_pc, while the consumer reads from position 0. This causes us to unmap stale DMA addresses from before the recovery.
The DMA FIFO is a purely software construct with no HW counterpart. At the point of reset, all WQEs have been flushed so dma_fifo_cc is already equal to dma_fifo_pc. There is no need to reset either counter, similar to how skb_fifo pc/cc are untouched.
Remove the 'dma_fifo_cc = 0' reset.
This fixes the following WARNING:
WARNING: CPU: 0 PID: 0 at drivers/iommu/dma-iommu.c:1240 iommu_dma_unmap_page+0x79/0x90
Modules linked in: mlx5_vdpa vringh vdpa bonding mlx5_ib mlx5_vfio_pci ipip mlx5_fwctl tunnel4 mlx5_core ib_ipoib geneve ip6_gre ip_gre gre nf_tables ip6_tunnel rdma_ucm ib_uverbs ib_umad vfio_pci vfio_pci_core act_mirred act_skbedit act_vlan vhost_net vhost tap ip6table_mangle ip6table_nat ip6table_filter ip6_tables iptable_mangle cls_matchall nfnetlink_cttimeout act_gact cls_flower sch_ingress vhost_iotlb iptable_raw tunnel6 vfio_iommu_type1 vfio openvswitch nsh rpcsec_gss_krb5 auth_rpcgss oid_registry xt_conntrack xt_MASQUERADE nf_conntrack_netlink nfnetlink iptable_nat nf_nat xt_addrtype br_netfilter overlay zram zsmalloc rpcrdma ib_iser libiscsi scsi_transport_iscsi rdma_cm iw_cm ib_cm ib_core fuse [last unloaded: nf_tables]
CPU: 0 UID: 0 PID: 0 Comm: swapper/0 Not tainted 6.13.0-rc5_for_upstream_min_debug_2024_12_30_21_33 #1
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
RIP: 0010:iommu_dma_unmap_page+0x79/0x90
Code: 2b 4d 3b 21 72 26 4d 3b 61 08 73 20 49 89 d8 44 89 f9 5b 4c 89 f2 4c 89 e6 48 89 ef 5d 41 5c 41 5d 41 5e 41 5f e9 c7 ae 9e ff <0f> 0b 5b 5d 41 5c 41 5d 41 5e 41 5f c3 66 2e 0f 1f 84 00 00 00 00
Call Trace:
<IRQ>
? __warn+0x7d/0x110
? iommu_dma_unmap_page+0x79/0x90
? report_bug+0x16d/0x180
? handle_bug+0x4f/0x90
? exc_invalid_op+0x14/0x70
? asm_exc_invalid_op+0x16/0x20
? iommu_dma_unmap_page+0x79/0x90
? iommu_dma_unmap_page+0x2e/0x90
dma_unmap_page_attrs+0x10d/0x1b0
mlx5e_tx_wi_dma_unmap+0xbe/0x120 [mlx5_core]
mlx5e_poll_tx_cq+0x16d/0x690 [mlx5_core]
mlx5e_napi_poll+0x8b/0xac0 [mlx5_core]
__napi_poll+0x24/0x190
net_rx_action+0x32a/0x3b0
? mlx5_eq_comp_int+0x7e/0x270 [mlx5_core]
? notifier_call_chain+0x35/0xa0
handle_softirqs+0xc9/0x270
irq_exit_rcu+0x71/0xd0
common_interrupt+0x7f/0xa0
</IRQ>
<TASK>
asm_common_interrupt+0x22/0x40--- drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c +0 -1
@@ -28,7 +28,6 @@ static void mlx5e_reset_txqsq_cc_pc(struct mlx5e_txqsq *sq)"SQ 0x%x: cc (0x%x) != pc (0x%x)\n" , sq->sqn, sq->cc, sq->pc); sq->cc =0 ; - sq->dma_fifo_cc =0 ; sq->pc =0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 63/491 net/sched: teql: fix NULL pointer dereference in iptunnel_xmit on TEQL slave xmit
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weiming Shi <[email protected]>
[ Upstream commit 0cc0c2e661af418bbf7074179ea5cfffc0a5c466 ]
teql_master_xmit() calls netdev_start_xmit(skb, slave) to transmit through slave devices, but does not update skb->dev to the slave device beforehand.
When a gretap tunnel is a TEQL slave, the transmit path reaches iptunnel_xmit() which saves dev = skb->dev (still pointing to teql0 master) and later calls iptunnel_xmit_stats(dev, pkt_len). This function does:
get_cpu_ptr(dev->tstats)
Since teql_master_setup() does not set dev->pcpu_stat_type to NETDEV_PCPU_STAT_TSTATS, the core network stack never allocates tstats for teql0, so dev->tstats is NULL. get_cpu_ptr(NULL) computes NULL + __per_cpu_offset[cpu], resulting in a page fault.
BUG: unable to handle page fault for address: ffff8880e6659018 #PF: supervisor write access in kernel mode #PF: error_code(0x0002) - not-present page PGD 68bc067 P4D 68bc067 PUD 0 Oops: Oops: 0002 [#1] SMP KASAN PTI RIP: 0010:iptunnel_xmit (./include/net/ip_tunnels.h:664 net/ipv4/ip_tunnel_core.c:89) Call Trace: <TASK> ip_tunnel_xmit (net/ipv4/ip_tunnel.c:847) __gre_xmit (net/ipv4/ip_gre.c:478) gre_tap_xmit (net/ipv4/ip_gre.c:779) teql_master_xmit (net/sched/sch_teql.c:319) dev_hard_start_xmit (net/core/dev.c:3887) sch_direct_xmit (net/sched/sch_generic.c:347) __dev_queue_xmit (net/core/dev.c:4802) neigh_direct_output (net/core/neighbour.c:1660) ip_finish_output2 (net/ipv4/ip_output.c:237) __ip_finish_output.part.0 (net/ipv4/ip_output.c:315) ip_mc_output (net/ipv4/ip_output.c:369) ip_send_skb (net/ipv4/ip_output.c:1508) udp_send_skb (net/ipv4/udp.c:1195) udp_sendmsg (net/ipv4/udp.c:1485) inet_sendmsg (net/ipv4/af_inet.c:859) __sys_sendto (net/socket.c:2206)
Fix this by setting skb->dev = slave before calling netdev_start_xmit(), so that tunnel xmit functions see the correct slave device with properly allocated tstats.
--- net/sched/sch_teql.c | 1 + 1 file changed, 1 insertion(+)
net/sched/sch_teql.c +1 -0
@@ -315,6 +315,7 @@ static netdev_tx_t teql_master_xmit(struct sk_buff *skb, struct net_device *dev)if (__netif_tx_trylock (slave_txq)) {unsigned int length =qdisc_pkt_len (skb); + skb->dev = slave;if (!netif_xmit_frozen_or_stopped (slave_txq) &&netdev_start_xmit (skb, slave, slave_txq, false) ==NETDEV_TX_OK ) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 37/491 atm: lec: fix null-ptr-deref in lec_arp_clear_vccs
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
[ Upstream commit 101bacb303e89dc2e0640ae6a5e0fb97c4eb45bb ]
syzkaller reported a null-ptr-deref in lec_arp_clear_vccs(). This issue can be easily reproduced using the syzkaller reproducer.
In the ATM LANE (LAN Emulation) module, the same atm_vcc can be shared by multiple lec_arp_table entries (e.g., via entry->vcc or entry->recv_vcc). When the underlying VCC is closed, lec_vcc_close() iterates over all ARP entries and calls lec_arp_clear_vccs() for each matched entry.
For example, when lec_vcc_close() iterates through the hlists in priv->lec_arp_empty_ones or other ARP tables:
1. In the first iteration, for the first matched ARP entry sharing the VCC, lec_arp_clear_vccs() frees the associated vpriv (which is vcc->user_back) and sets vcc->user_back to NULL.
2. In the second iteration, for the next matched ARP entry sharing the same VCC, lec_arp_clear_vccs() is called again. It obtains a NULL vpriv from vcc->user_back (via LEC_VCC_PRIV(vcc)) and then attempts to dereference it via vcc->pop = vpriv->old_pop, leading to a null-ptr-deref crash.
Fix this by adding a null check for vpriv before dereferencing it. If vpriv is already NULL, it means the VCC has been cleared by a previous call, so we can safely skip the cleanup and just clear the entry's vcc/recv_vcc pointers.
The entire cleanup block (including vcc_release_async()) is placed inside the vpriv guard because a NULL vpriv indicates the VCC has already been fully released by a prior iteration — repeating the teardown would redundantly set flags and trigger callbacks on an already-closing socket.
The Fixes tag points to the initial commit because the entry->vcc path has been vulnerable since the original code. The entry->recv_vcc path was later added by commit 8d9f73c0ad2f ("atm: fix a memory leak of vcc->user_back") with the same pattern, and both paths are fixed here.
--- net/atm/lec.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
net/atm/lec.c +15 -11
@@ -1262,24 +1262,28 @@ static void lec_arp_clear_vccs(struct lec_arp_table *entry)struct lec_vcc_priv *vpriv =LEC_VCC_PRIV (vcc);struct net_device *dev = (struct net_device *)vcc->proto_data; - vcc->pop = vpriv->old_pop; -if (vpriv->xoff) -netif_wake_queue (dev); -kfree (vpriv); - vcc->user_back =NULL ; - vcc->push = entry->old_push; -vcc_release_async (vcc, -EPIPE ); +if (vpriv) { + vcc->pop = vpriv->old_pop; +if (vpriv->xoff) +netif_wake_queue (dev); +kfree (vpriv); + vcc->user_back =NULL ; + vcc->push = entry->old_push; +vcc_release_async (vcc, -EPIPE ); + } entry->vcc =NULL ; }if (entry->recv_vcc) {struct atm_vcc *vcc = entry->recv_vcc;struct lec_vcc_priv *vpriv =LEC_VCC_PRIV (vcc); -kfree (vpriv); - vcc->user_back =NULL ; +if (vpriv) { +kfree (vpriv); + vcc->user_back =NULL ; - entry->recv_vcc->push = entry->old_recv_push; -vcc_release_async (entry->recv_vcc, -EPIPE ); + entry->recv_vcc->push = entry->old_recv_push; +vcc_release_async (entry->recv_vcc, -EPIPE ); + } entry->recv_vcc =NULL ; } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 64/491 ASoC: soc-core: drop delayed_work_pending() check before flush
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: matteo.cotifava <[email protected]>
[ Upstream commit 3c99c9f0ed60582c1c9852b685d78d5d3a50de63 ]
The delayed_work_pending() check before flush_delayed_work() in soc_free_pcm_runtime() is unnecessary and racy. flush_delayed_work() is safe to call unconditionally - it is a no-op when no work is pending. Remove the check.
The original check was added by commit 9c9b65203492 ("ASoC: core:
only flush inited work during free") but delayed_work_pending() followed by flush_delayed_work() has a time-of-check/time-of-use window where work can become pending between the two calls.
--- sound/soc/soc-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/soc-core.c +1 -2
@@ -401,8 +401,7 @@ static void soc_free_pcm_runtime(struct snd_soc_pcm_runtime *rtd)list_del (&rtd->list); -if (delayed_work_pending (&rtd->delayed_work)) -flush_delayed_work (&rtd->delayed_work); +flush_delayed_work (&rtd->delayed_work);snd_soc_pcm_component_free (rtd);/*
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 65/491 ASoC: topology: use inclusive language for bclk and fsync
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit f026c123001bcc15b78311495cec79a8b73c3cf2 ]
Mirror suggested changes in alsa-lib.
Stable-dep-of: 95bc5c225513 ("ASoC: soc-core: flush delayed work before removing DAIs and widgets")
--- include/sound/soc-dai.h | 32 ++++++++++++++++++++------------ include/uapi/sound/asoc.h | 22 ++++++++++++++-------- sound/soc/soc-topology.c | 24 ++++++++++++------------ sound/soc/sof/topology.c | 6 +++--- 4 files changed, 49 insertions(+), 35 deletions(-)
include/sound/soc-dai.h +20 -12
@@ -72,21 +72,29 @@ struct snd_compr_stream;#define SND_SOC_DAIFMT_IB_IF (4 << 8)/* invert BCLK + FRM */ /* -* DAI hardware clock masters. +* DAI hardware clock providers/consumers * * This is wrt the codec, the inverse is true for the interface -* i.e. if the codec is clk and FRM master then the interface is -* clk and frame secondary. +* i.e. if the codec is clk and FRM provider then the interface is +* clk and frame consumer. */ -#define SND_SOC_DAIFMT_CBM_CFM (1 << 12)/* codec clk & FRM master */ -#define SND_SOC_DAIFMT_CBS_CFM (2 << 12)/* codec clk secondary & FRM master */ -#define SND_SOC_DAIFMT_CBM_CFS (3 << 12)/* codec clk master & frame secondary */ -#define SND_SOC_DAIFMT_CBS_CFS (4 << 12)/* codec clk & FRM secondary */ - -#define SND_SOC_DAIFMT_FORMAT_MASK 0x000f -#define SND_SOC_DAIFMT_CLOCK_MASK 0x00f0 -#define SND_SOC_DAIFMT_INV_MASK 0x0f00 -#define SND_SOC_DAIFMT_MASTER_MASK 0xf000 +#define SND_SOC_DAIFMT_CBP_CFP (1 << 12)/* codec clk provider & frame provider */ +#define SND_SOC_DAIFMT_CBC_CFP (2 << 12)/* codec clk consumer & frame provider */ +#define SND_SOC_DAIFMT_CBP_CFC (3 << 12)/* codec clk provider & frame consumer */ +#define SND_SOC_DAIFMT_CBC_CFC (4 << 12)/* codec clk consumer & frame follower */ + +/* previous definitions kept for backwards-compatibility, do not use in new contributions */ +#define SND_SOC_DAIFMT_CBM_CFM SND_SOC_DAIFMT_CBP_CFP +#define SND_SOC_DAIFMT_CBS_CFM SND_SOC_DAIFMT_CBC_CFP +#define SND_SOC_DAIFMT_CBM_CFS SND_SOC_DAIFMT_CBP_CFC +#define SND_SOC_DAIFMT_CBS_CFS SND_SOC_DAIFMT_CBC_CFC + +#define SND_SOC_DAIFMT_FORMAT_MASK 0x000f +#define SND_SOC_DAIFMT_CLOCK_MASK 0x00f0 +#define SND_SOC_DAIFMT_INV_MASK 0x0f00 +#define SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK 0xf000 + +#define SND_SOC_DAIFMT_MASTER_MASK SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK/* * Master Clock Directions
include/uapi/sound/asoc.h +14 -8
@@ -170,16 +170,22 @@#define SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP (1 << 3)/* DAI topology BCLK parameter -* For the backwards capability, by default codec is bclk master +* For the backwards capability, by default codec is bclk provider */ -#define SND_SOC_TPLG_BCLK_CM 0/* codec is bclk master */ -#define SND_SOC_TPLG_BCLK_CS 1/* codec is bclk slave */ +#define SND_SOC_TPLG_BCLK_CP 0/* codec is bclk provider */ +#define SND_SOC_TPLG_BCLK_CC 1/* codec is bclk consumer */ +/* keep previous definitions for compatibility */ +#define SND_SOC_TPLG_BCLK_CM SND_SOC_TPLG_BCLK_CP +#define SND_SOC_TPLG_BCLK_CS SND_SOC_TPLG_BCLK_CC/* DAI topology FSYNC parameter -* For the backwards capability, by default codec is fsync master +* For the backwards capability, by default codec is fsync provider */ -#define SND_SOC_TPLG_FSYNC_CM 0/* codec is fsync master */ -#define SND_SOC_TPLG_FSYNC_CS 1/* codec is fsync slave */ +#define SND_SOC_TPLG_FSYNC_CP 0/* codec is fsync provider */ +#define SND_SOC_TPLG_FSYNC_CC 1/* codec is fsync consumer */ +/* keep previous definitions for compatibility */ +#define SND_SOC_TPLG_FSYNC_CM SND_SOC_TPLG_FSYNC_CP +#define SND_SOC_TPLG_FSYNC_CS SND_SOC_TPLG_FSYNC_CC/* * Block Header.
@@ -336,8 +342,8 @@ struct snd_soc_tplg_hw_config {__u8 clock_gated;/* SND_SOC_TPLG_DAI_CLK_GATE_ value */ __u8 invert_bclk;/* 1 for inverted BCLK, 0 for normal */ __u8 invert_fsync;/* 1 for inverted frame clock, 0 for normal */ -__u8 bclk_master;/* SND_SOC_TPLG_BCLK_ value */ -__u8 fsync_master;/* SND_SOC_TPLG_FSYNC_ value */ +__u8 bclk_provider;/* SND_SOC_TPLG_BCLK_ value */ +__u8 fsync_provider;/* SND_SOC_TPLG_FSYNC_ value */ __u8 mclk_direction;/* SND_SOC_TPLG_MCLK_ value */ __le16 reserved;/* for 32bit alignment */ __le32 mclk_rate;/* MCLK or SYSCLK freqency in Hz */
sound/soc/soc-topology.c +12 -12
@@ -2173,7 +2173,7 @@ static void set_link_hw_format(struct snd_soc_dai_link *link, struct snd_soc_tplg_link_config *cfg) {struct snd_soc_tplg_hw_config *hw_config; -unsigned char bclk_master, fsync_master; +unsigned char bclk_provider, fsync_provider;unsigned char invert_bclk, invert_fsync;int i;
@@ -2213,18 +2213,18 @@ static void set_link_hw_format(struct snd_soc_dai_link *link, link->dai_fmt |=SND_SOC_DAIFMT_IB_IF ;/* clock masters */ - bclk_master = (hw_config->bclk_master == -SND_SOC_TPLG_BCLK_CM ); - fsync_master = (hw_config->fsync_master == -SND_SOC_TPLG_FSYNC_CM ); -if (bclk_master && fsync_master) - link->dai_fmt |=SND_SOC_DAIFMT_CBM_CFM ; -else if (!bclk_master && fsync_master) - link->dai_fmt |=SND_SOC_DAIFMT_CBS_CFM ; -else if (bclk_master && !fsync_master) - link->dai_fmt |=SND_SOC_DAIFMT_CBM_CFS ; + bclk_provider = (hw_config->bclk_provider == +SND_SOC_TPLG_BCLK_CP ); + fsync_provider = (hw_config->fsync_provider == +SND_SOC_TPLG_FSYNC_CP ); +if (bclk_provider && fsync_provider) + link->dai_fmt |=SND_SOC_DAIFMT_CBP_CFP ; +else if (!bclk_provider && fsync_provider) + link->dai_fmt |=SND_SOC_DAIFMT_CBC_CFP ; +else if (bclk_provider && !fsync_provider) + link->dai_fmt |=SND_SOC_DAIFMT_CBP_CFC ;else - link->dai_fmt |=SND_SOC_DAIFMT_CBS_CFS ; + link->dai_fmt |=SND_SOC_DAIFMT_CBC_CFC ; } }
sound/soc/sof/topology.c +3 -3
@@ -2786,15 +2786,15 @@ static void sof_dai_set_format(struct snd_soc_tplg_hw_config *hw_config, struct sof_ipc_dai_config *config) {/* clock directions wrt codec */ -if (hw_config->bclk_master ==SND_SOC_TPLG_BCLK_CM ) { +if (hw_config->bclk_provider ==SND_SOC_TPLG_BCLK_CM ) {/* codec is bclk master */ -if (hw_config->fsync_master ==SND_SOC_TPLG_FSYNC_CM ) +if (hw_config->fsync_provider ==SND_SOC_TPLG_FSYNC_CM ) config->format |=SOF_DAI_FMT_CBM_CFM ;else config->format |=SOF_DAI_FMT_CBM_CFS ; }else {/* codec is bclk slave */ -if (hw_config->fsync_master ==SND_SOC_TPLG_FSYNC_CM ) +if (hw_config->fsync_provider ==SND_SOC_TPLG_FSYNC_CM ) config->format |=SOF_DAI_FMT_CBS_CFM ;else config->format |=SOF_DAI_FMT_CBS_CFS ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 66/491 ASoC: dont indicate error message for snd_soc_[pcm_]dai_xxx()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuninori Morimoto <[email protected]>
[ Upstream commit 62462e018220895267450155b188f5804f54c202 ]
All snd_soc_dai_xxx() and snd_soc_pcm_dai_xxx() itself indicate error message if failed.
Its caller doesn't need to indicate duplicated error message. This patch removes it.
Stable-dep-of: 95bc5c225513 ("ASoC: soc-core: flush delayed work before removing DAIs and widgets")
--- sound/soc/soc-core.c | 16 +++------------- sound/soc/soc-dapm.c | 24 ++++++------------------ sound/soc/soc-pcm.c | 10 ++-------- 3 files changed, 11 insertions(+), 39 deletions(-)
sound/soc/soc-core.c +3 -13
@@ -1099,12 +1099,8 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,/* create compress_device if possible */ ret =snd_soc_dai_compress_new (cpu_dai, rtd, num); -if (ret != -ENOTSUPP ) { -if (ret <0 ) -dev_err (card->dev,"ASoC: can't create compress %s\n" , - dai_link->stream_name); +if (ret != -ENOTSUPP )return ret; - }/* create the pcm */ ret =soc_new_pcm (rtd, num);
@@ -1432,11 +1428,8 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,for_each_rtd_codec_dais (rtd, i, codec_dai) { ret =snd_soc_dai_set_fmt (codec_dai, dai_fmt); -if (ret !=0 && ret != -ENOTSUPP ) { -dev_warn (codec_dai->dev, -"ASoC: Failed to set DAI format: %d\n" , ret); +if (ret !=0 && ret != -ENOTSUPP )return ret; - } }/*
@@ -1465,11 +1458,8 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, fmt = inv_dai_fmt; ret =snd_soc_dai_set_fmt (cpu_dai, fmt); -if (ret !=0 && ret != -ENOTSUPP ) { -dev_warn (cpu_dai->dev, -"ASoC: Failed to set DAI format: %d\n" , ret); +if (ret !=0 && ret != -ENOTSUPP )return ret; - } }return 0 ;
sound/soc/soc-dapm.c +6 -18
@@ -3856,11 +3856,9 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w, source = path->source->priv; ret =snd_soc_dai_startup (source, substream); -if (ret <0 ) { -dev_err (source->dev, -"ASoC: startup() failed: %d\n" , ret); +if (ret <0 ) goto out; - } +snd_soc_dai_activate (source, substream->stream); }
@@ -3869,11 +3867,9 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w, sink = path->sink->priv; ret =snd_soc_dai_startup (sink, substream); -if (ret <0 ) { -dev_err (sink->dev, -"ASoC: startup() failed: %d\n" , ret); +if (ret <0 ) goto out; - } +snd_soc_dai_activate (sink, substream->stream); }
@@ -3968,11 +3964,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,snd_soc_dapm_widget_for_each_sink_path (w, path) { sink = path->sink->priv; - ret =snd_soc_dai_digital_mute (sink,0 , -SNDRV_PCM_STREAM_PLAYBACK ); -if (ret !=0 && ret != -ENOTSUPP ) -dev_warn (sink->dev, -"ASoC: Failed to unmute: %d\n" , ret); +snd_soc_dai_digital_mute (sink,0 ,SNDRV_PCM_STREAM_PLAYBACK ); ret =0 ; }break ;
@@ -3981,11 +3973,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,snd_soc_dapm_widget_for_each_sink_path (w, path) { sink = path->sink->priv; - ret =snd_soc_dai_digital_mute (sink,1 , -SNDRV_PCM_STREAM_PLAYBACK ); -if (ret !=0 && ret != -ENOTSUPP ) -dev_warn (sink->dev, -"ASoC: Failed to mute: %d\n" , ret); +snd_soc_dai_digital_mute (sink,1 ,SNDRV_PCM_STREAM_PLAYBACK ); ret =0 ; }
sound/soc/soc-pcm.c +2 -8
@@ -821,10 +821,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) goto out; ret =snd_soc_pcm_dai_prepare (substream); -if (ret <0 ) { -dev_err (rtd->dev,"ASoC: DAI prepare error: %d\n" , ret); +if (ret <0 ) goto out; - }/* cancel any delayed stream shutdown that is pending */ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
@@ -2414,8 +2412,6 @@ static int dpcm_run_update_shutdown(struct snd_soc_pcm_runtime *fe, int stream) fe->dai_link->name); err =snd_soc_pcm_dai_bespoke_trigger (substream,SNDRV_PCM_TRIGGER_STOP ); -if (err <0 ) -dev_err (fe->dev,"ASoC: trigger FE failed %d\n" , err); }else {dev_dbg (fe->dev,"ASoC: trigger FE %s cmd stop\n" , fe->dai_link->name);
@@ -2492,10 +2488,8 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream) fe->dai_link->name); ret =snd_soc_pcm_dai_bespoke_trigger (substream,SNDRV_PCM_TRIGGER_START ); -if (ret <0 ) { -dev_err (fe->dev,"ASoC: bespoke trigger FE failed %d\n" , ret); +if (ret <0 ) goto hw_free; - } }else {dev_dbg (fe->dev,"ASoC: trigger FE %s cmd start\n" , fe->dai_link->name);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 67/491 ASoC: soc-core: move snd_soc_runtime_set_dai_fmt() to upside
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuninori Morimoto <[email protected]>
[ Upstream commit 4d1a98b5f1abaad0ba7177fdb389a9f78584bc3a ]
This patch moves snd_soc_runtime_set_dai_fmt() to upside. This is prepare to support snd_soc_runtime_get_dai_fmt().
Stable-dep-of: 95bc5c225513 ("ASoC: soc-core: flush delayed work before removing DAIs and widgets")
--- sound/soc/soc-core.c | 124 +++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 62 deletions(-)
sound/soc/soc-core.c +62 -62
@@ -1055,6 +1055,68 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card, }EXPORT_SYMBOL_GPL (snd_soc_add_pcm_runtime); +/** +* snd_soc_runtime_set_dai_fmt() - Change DAI link format for a ASoC runtime +* @rtd: The runtime for which the DAI link format should be changed +* @dai_fmt: The new DAI link format +* +* This function updates the DAI link format for all DAIs connected to the DAI +* link for the specified runtime. +* +* Note: For setups with a static format set the dai_fmt field in the +* corresponding snd_dai_link struct instead of using this function. +* +* Returns 0 on success, otherwise a negative error code. +*/ +int snd_soc_runtime_set_dai_fmt (struct snd_soc_pcm_runtime *rtd, +unsigned int dai_fmt) +{ +struct snd_soc_dai *cpu_dai; +struct snd_soc_dai *codec_dai; +unsigned int inv_dai_fmt; +unsigned int i; +int ret; + +for_each_rtd_codec_dais (rtd, i, codec_dai) { + ret =snd_soc_dai_set_fmt (codec_dai, dai_fmt); +if (ret !=0 && ret != -ENOTSUPP ) +return ret; + } + +/* +* Flip the polarity for the "CPU" end of a CODEC<->CODEC link +* the component which has non_legacy_dai_naming is Codec +*/ + inv_dai_fmt = dai_fmt & ~SND_SOC_DAIFMT_MASTER_MASK ; +switch (dai_fmt &SND_SOC_DAIFMT_MASTER_MASK ) { +case SND_SOC_DAIFMT_CBM_CFM : + inv_dai_fmt |=SND_SOC_DAIFMT_CBS_CFS ; +break ; +case SND_SOC_DAIFMT_CBM_CFS : + inv_dai_fmt |=SND_SOC_DAIFMT_CBS_CFM ; +break ; +case SND_SOC_DAIFMT_CBS_CFM : + inv_dai_fmt |=SND_SOC_DAIFMT_CBM_CFS ; +break ; +case SND_SOC_DAIFMT_CBS_CFS : + inv_dai_fmt |=SND_SOC_DAIFMT_CBM_CFM ; +break ; + } +for_each_rtd_cpu_dais (rtd, i, cpu_dai) { +unsigned int fmt = dai_fmt; + +if (cpu_dai->component->driver->non_legacy_dai_naming) + fmt = inv_dai_fmt; + + ret =snd_soc_dai_set_fmt (cpu_dai, fmt); +if (ret !=0 && ret != -ENOTSUPP ) +return ret; + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (snd_soc_runtime_set_dai_fmt); +static int soc_init_pcm_runtime (struct snd_soc_card *card,struct snd_soc_pcm_runtime *rtd) {
@@ -1404,68 +1466,6 @@ static void soc_remove_aux_devices(struct snd_soc_card *card) } } -/** -* snd_soc_runtime_set_dai_fmt() - Change DAI link format for a ASoC runtime -* @rtd: The runtime for which the DAI link format should be changed -* @dai_fmt: The new DAI link format -* -* This function updates the DAI link format for all DAIs connected to the DAI -* link for the specified runtime. -* -* Note: For setups with a static format set the dai_fmt field in the -* corresponding snd_dai_link struct instead of using this function. -* -* Returns 0 on success, otherwise a negative error code. -*/ -int snd_soc_runtime_set_dai_fmt (struct snd_soc_pcm_runtime *rtd, -unsigned int dai_fmt) -{ -struct snd_soc_dai *cpu_dai; -struct snd_soc_dai *codec_dai; -unsigned int inv_dai_fmt; -unsigned int i; -int ret; - -for_each_rtd_codec_dais (rtd, i, codec_dai) { - ret =snd_soc_dai_set_fmt (codec_dai, dai_fmt); -if (ret !=0 && ret != -ENOTSUPP ) -return ret; - } - -/* -* Flip the polarity for the "CPU" end of a CODEC<->CODEC link -* the component which has non_legacy_dai_naming is Codec -*/ - inv_dai_fmt = dai_fmt & ~SND_SOC_DAIFMT_MASTER_MASK ; -switch (dai_fmt &SND_SOC_DAIFMT_MASTER_MASK ) { -case SND_SOC_DAIFMT_CBM_CFM : - inv_dai_fmt |=SND_SOC_DAIFMT_CBS_CFS ; -break ; -case SND_SOC_DAIFMT_CBM_CFS : - inv_dai_fmt |=SND_SOC_DAIFMT_CBS_CFM ; -break ; -case SND_SOC_DAIFMT_CBS_CFM : - inv_dai_fmt |=SND_SOC_DAIFMT_CBM_CFS ; -break ; -case SND_SOC_DAIFMT_CBS_CFS : - inv_dai_fmt |=SND_SOC_DAIFMT_CBM_CFM ; -break ; - } -for_each_rtd_cpu_dais (rtd, i, cpu_dai) { -unsigned int fmt = dai_fmt; - -if (cpu_dai->component->driver->non_legacy_dai_naming) - fmt = inv_dai_fmt; - - ret =snd_soc_dai_set_fmt (cpu_dai, fmt); -if (ret !=0 && ret != -ENOTSUPP ) -return ret; - } - -return 0 ; -} -EXPORT_SYMBOL_GPL (snd_soc_runtime_set_dai_fmt); -#ifdef CONFIG_DMI /* * If a DMI filed contain strings in this blacklist (e.g.
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 68/491 ASoC: soc-core: add snd_soc_runtime_get_dai_fmt()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuninori Morimoto <[email protected]>
[ Upstream commit ba9e82a1c8919340bee0dd7f7cafb8749810aabe ]
ASoC is using dai_link which specify DAI format (= dai_link->dai_fmt), and it is selected by "Sound Card" driver in corrent implementation. In other words, Sound Card *needs* to setup it.
But, it should be possible to automatically selected from CPU and Codec driver settings.
This patch adds new .auto_selectable_formats support at snd_soc_dai_ops.
By this patch, dai_fmt can be automatically selected from each driver if both CPU / Codec driver had it. Automatically selectable *field* is depends on each drivers.
For example, some driver want to select format "automatically", but want to select other fields "manually", because of complex limitation. Or other example, in case of both CPU and Codec are possible to be clock provider, but the quality was different.
In these case, user need/want to *manually* select each fields from Sound Card driver.
This .auto_selectable_formats can set priority.
For example, no limitaion format can be HI priority, supported but has picky limitation format can be next priority, etc.
It uses Sound Card specified fields preferentially, and try to select non-specific fields from CPU and Codec driver automatically if all drivers have .auto_selectable_formats.
In other words, we can select all dai_fmt via Sound Card driver same as before.
Stable-dep-of: 95bc5c225513 ("ASoC: soc-core: flush delayed work before removing DAIs and widgets")
--- include/sound/soc-dai.h | 55 ++++++++++++++ sound/soc/soc-core.c | 164 ++++++++++++++++++++++++++++++++++++++++ sound/soc/soc-dai.c | 63 +++++++++++++++ sound/soc/soc-utils.c | 29 +++++++ 4 files changed, 311 insertions(+)
include/sound/soc-dai.h +55 -0
@@ -36,6 +36,22 @@ struct snd_compr_stream;#define SND_SOC_DAIFMT_MSB SND_SOC_DAIFMT_LEFT_J#define SND_SOC_DAIFMT_LSB SND_SOC_DAIFMT_RIGHT_J +/* Describes the possible PCM format */ +/* +* use SND_SOC_DAI_FORMAT_xx as eash shift. +* see +* snd_soc_runtime_get_dai_fmt() +*/ +#define SND_SOC_POSSIBLE_DAIFMT_FORMAT_SHIFT 0 +#define SND_SOC_POSSIBLE_DAIFMT_FORMAT_MASK (0xFFFF << SND_SOC_POSSIBLE_DAIFMT_FORMAT_SHIFT) +#define SND_SOC_POSSIBLE_DAIFMT_I2S (1 << SND_SOC_DAI_FORMAT_I2S) +#define SND_SOC_POSSIBLE_DAIFMT_RIGHT_J (1 << SND_SOC_DAI_FORMAT_RIGHT_J) +#define SND_SOC_POSSIBLE_DAIFMT_LEFT_J (1 << SND_SOC_DAI_FORMAT_LEFT_J) +#define SND_SOC_POSSIBLE_DAIFMT_DSP_A (1 << SND_SOC_DAI_FORMAT_DSP_A) +#define SND_SOC_POSSIBLE_DAIFMT_DSP_B (1 << SND_SOC_DAI_FORMAT_DSP_B) +#define SND_SOC_POSSIBLE_DAIFMT_AC97 (1 << SND_SOC_DAI_FORMAT_AC97) +#define SND_SOC_POSSIBLE_DAIFMT_PDM (1 << SND_SOC_DAI_FORMAT_PDM) +/* * DAI Clock gating. *
@@ -45,6 +61,17 @@ struct snd_compr_stream;#define SND_SOC_DAIFMT_CONT (1 << 4)/* continuous clock */ #define SND_SOC_DAIFMT_GATED (0 << 4)/* clock is gated */ +/* Describes the possible PCM format */ +/* +* define GATED -> CONT. GATED will be selected if both are selected. +* see +* snd_soc_runtime_get_dai_fmt() +*/ +#define SND_SOC_POSSIBLE_DAIFMT_CLOCK_SHIFT 16 +#define SND_SOC_POSSIBLE_DAIFMT_CLOCK_MASK (0xFFFF << SND_SOC_POSSIBLE_DAIFMT_CLOCK_SHIFT) +#define SND_SOC_POSSIBLE_DAIFMT_GATED (0x1ULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_SHIFT) +#define SND_SOC_POSSIBLE_DAIFMT_CONT (0x2ULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_SHIFT) +/* * DAI hardware signal polarity. *
@@ -71,6 +98,14 @@ struct snd_compr_stream;#define SND_SOC_DAIFMT_IB_NF (3 << 8)/* invert BCLK + nor FRM */ #define SND_SOC_DAIFMT_IB_IF (4 << 8)/* invert BCLK + FRM */ +/* Describes the possible PCM format */ +#define SND_SOC_POSSIBLE_DAIFMT_INV_SHIFT 32 +#define SND_SOC_POSSIBLE_DAIFMT_INV_MASK (0xFFFFULL << SND_SOC_POSSIBLE_DAIFMT_INV_SHIFT) +#define SND_SOC_POSSIBLE_DAIFMT_NB_NF (0x1ULL << SND_SOC_POSSIBLE_DAIFMT_INV_SHIFT) +#define SND_SOC_POSSIBLE_DAIFMT_NB_IF (0x2ULL << SND_SOC_POSSIBLE_DAIFMT_INV_SHIFT) +#define SND_SOC_POSSIBLE_DAIFMT_IB_NF (0x4ULL << SND_SOC_POSSIBLE_DAIFMT_INV_SHIFT) +#define SND_SOC_POSSIBLE_DAIFMT_IB_IF (0x8ULL << SND_SOC_POSSIBLE_DAIFMT_INV_SHIFT) +/* * DAI hardware clock providers/consumers *
@@ -89,6 +124,14 @@ struct snd_compr_stream;#define SND_SOC_DAIFMT_CBM_CFS SND_SOC_DAIFMT_CBP_CFC#define SND_SOC_DAIFMT_CBS_CFS SND_SOC_DAIFMT_CBC_CFC +/* Describes the possible PCM format */ +#define SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT 48 +#define SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_MASK (0xFFFFULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT) +#define SND_SOC_POSSIBLE_DAIFMT_CBP_CFP (0x1ULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT) +#define SND_SOC_POSSIBLE_DAIFMT_CBC_CFP (0x2ULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT) +#define SND_SOC_POSSIBLE_DAIFMT_CBP_CFC (0x4ULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT) +#define SND_SOC_POSSIBLE_DAIFMT_CBC_CFC (0x8ULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT) +#define SND_SOC_DAIFMT_FORMAT_MASK 0x000f#define SND_SOC_DAIFMT_CLOCK_MASK 0x00f0#define SND_SOC_DAIFMT_INV_MASK 0x0f00
@@ -131,6 +174,8 @@ int snd_soc_dai_set_pll(struct snd_soc_dai *dai,int snd_soc_dai_set_bclk_ratio (struct snd_soc_dai *dai,unsigned int ratio);/* Digital Audio interface formatting */ +int snd_soc_dai_get_fmt_max_priority (struct snd_soc_pcm_runtime *rtd); +u64 snd_soc_dai_get_fmt (struct snd_soc_dai *dai,int priority);int snd_soc_dai_set_fmt (struct snd_soc_dai *dai,unsigned int fmt); int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai,
@@ -289,6 +334,16 @@ struct snd_soc_dai_ops {snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *,struct snd_soc_dai *); +/* +* Format list for auto selection. +* Format will be increased if priority format was +* not selected. +* see +* snd_soc_dai_get_fmt() +*/ +u64 *auto_selectable_formats; +int num_auto_selectable_formats; +/* bit field */ unsigned int no_capture_mute:1; };
sound/soc/soc-core.c +164 -0
176 lines not on this page · raw message
sound/soc/soc-dai.c +63 -0
69 lines not on this page · raw message
sound/soc/soc-utils.c +29 -0
@@ -97,6 +97,34 @@ static const struct snd_soc_component_driver dummy_codec = { SNDRV_PCM_FMTBIT_S32_LE | \ SNDRV_PCM_FMTBIT_U32_LE | \ SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE) + +/* +* Select these from Sound Card Manually +* SND_SOC_POSSIBLE_DAIFMT_CBP_CFP +* SND_SOC_POSSIBLE_DAIFMT_CBP_CFC +* SND_SOC_POSSIBLE_DAIFMT_CBC_CFP +* SND_SOC_POSSIBLE_DAIFMT_CBC_CFC +*/ +static u64 dummy_dai_formats = +SND_SOC_POSSIBLE_DAIFMT_I2S | +SND_SOC_POSSIBLE_DAIFMT_RIGHT_J | +SND_SOC_POSSIBLE_DAIFMT_LEFT_J | +SND_SOC_POSSIBLE_DAIFMT_DSP_A | +SND_SOC_POSSIBLE_DAIFMT_DSP_B | +SND_SOC_POSSIBLE_DAIFMT_AC97 | +SND_SOC_POSSIBLE_DAIFMT_PDM | +SND_SOC_POSSIBLE_DAIFMT_GATED | +SND_SOC_POSSIBLE_DAIFMT_CONT | +SND_SOC_POSSIBLE_DAIFMT_NB_NF | +SND_SOC_POSSIBLE_DAIFMT_NB_IF | +SND_SOC_POSSIBLE_DAIFMT_IB_NF | +SND_SOC_POSSIBLE_DAIFMT_IB_IF ; + +static const struct snd_soc_dai_ops dummy_dai_ops = { + .auto_selectable_formats = &dummy_dai_formats, + .num_auto_selectable_formats =1 , +}; +/* * The dummy CODEC is only meant to be used in situations where there is no * actual hardware.
@@ -122,6 +150,7 @@ static struct snd_soc_dai_driver dummy_dai = { .rates = STUB_RATES, .formats = STUB_FORMATS, }, + .ops = &dummy_dai_ops, };int snd_soc_dai_is_dummy (struct snd_soc_dai *dai)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 38/491 can: bcm: fix locking for bcm_op runtime updates
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Hartkopp <[email protected]>
[ Upstream commit c35636e91e392e1540949bbc67932167cb48bc3a ]
Commit c2aba69d0c36 ("can: bcm: add locking for bcm_op runtime updates") added a locking for some variables that can be modified at runtime when updating the sending bcm_op with a new TX_SETUP command in bcm_tx_setup().
Usually the RX_SETUP only handles and filters incoming traffic with one
exception: When the RX_RTR_FRAME flag is set a predefined CAN frame is sent when a specific RTR frame is received. Therefore the rx bcm_op uses bcm_can_tx() which uses the bcm_tx_lock that was only initialized in bcm_tx_setup(). Add the missing spin_lock_init() when allocating the bcm_op in bcm_rx_setup() to handle the RTR case properly.
--- net/can/bcm.c | 1 + 1 file changed, 1 insertion(+)
net/can/bcm.c +1 -0
@@ -1123,6 +1123,7 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,if (!op)return -ENOMEM ; +spin_lock_init (&op->bcm_tx_lock); op->can_id = msg_head->can_id; op->nframes = msg_head->nframes; op->cfsiz =CFSIZ (msg_head->flags);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 39/491 can: mcp251x: fix deadlock in error path of mcp251x_open
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alban Bedel <[email protected]>
[ Upstream commit ab3f894de216f4a62adc3b57e9191888cbf26885 ]
The mcp251x_open() function call free_irq() in its error path with the mpc_lock mutex held. But if an interrupt already occurred the interrupt handler will be waiting for the mpc_lock and free_irq() will deadlock waiting for the handler to finish.
This issue is similar to the one fixed in commit 7dd9c26bd6cf ("can:
mcp251x: fix deadlock if an interrupt occurs during mcp251x_open") but for the error path.
To solve this issue move the call to free_irq() after the lock is released. Setting priv->force_quit = 1 beforehand ensure that the IRQ handler will exit right away once it acquired the lock.
--- drivers/net/can/spi/mcp251x.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/net/can/spi/mcp251x.c +14 -1
@@ -1207,6 +1207,7 @@ static int mcp251x_open(struct net_device *net) {struct mcp251x_priv *priv =netdev_priv (net);struct spi_device *spi = priv->spi; +bool release_irq = false;unsigned long flags =0 ;int ret;
@@ -1252,12 +1253,24 @@ static int mcp251x_open(struct net_device *net)return 0 ; out_free_irq: -free_irq (spi->irq, priv); +/* The IRQ handler might be running, and if so it will be waiting +* for the lock. But free_irq() must wait for the handler to finish +* so calling it here would deadlock. +* +* Setting priv->force_quit will let the handler exit right away +* without any access to the hardware. This make it safe to call +* free_irq() after the lock is released. +*/ + priv->force_quit =1 ; + release_irq = true; +mcp251x_hw_sleep (spi); out_close:mcp251x_power_enable (priv->transceiver,0 );close_candev (net);mutex_unlock (&priv->mcp_lock); +if (release_irq) +free_irq (spi->irq, priv);return ret; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 40/491 wifi: cw1200: Fix locking in error paths
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit d98c24617a831e92e7224a07dcaed2dd0b02af96 ]
cw1200_wow_suspend() must only return with priv->conf_mutex locked if it returns zero. This mutex must be unlocked if an error is returned. Add mutex_unlock() calls to the error paths from which that call is missing. This has been detected by the Clang thread-safety analyzer.
--- drivers/net/wireless/st/cw1200/pm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/st/cw1200/pm.c +2 -0
@@ -264,12 +264,14 @@ int cw1200_wow_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)wiphy_err (priv->hw->wiphy,"PM request failed: %d. WoW is disabled.\n" , ret);cw1200_wow_resume (hw); +mutex_unlock (&priv->conf_mutex);return -EBUSY ; }/* Force resume if event is coming from the device. */ if (atomic_read (&priv->bh_rx)) {cw1200_wow_resume (hw); +mutex_unlock (&priv->conf_mutex);return -EAGAIN ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 41/491 wifi: wlcore: Fix a locking bug
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit 72c6df8f284b3a49812ce2ac136727ace70acc7c ]
Make sure that wl->mutex is locked before it is unlocked. This has been detected by the Clang thread-safety analyzer.
--- drivers/net/wireless/ti/wlcore/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ti/wlcore/main.c +2 -2
@@ -1813,6 +1813,8 @@ static int __maybe_unused wl1271_op_resume(struct ieee80211_hw *hw) wl->wow_enabled);WARN_ON (!wl->wow_enabled); +mutex_lock (&wl->mutex); + ret =pm_runtime_force_resume (wl->dev);if (ret <0 ) {wl1271_error ("ELP wakeup failure!" );
@@ -1829,8 +1831,6 @@ static int __maybe_unused wl1271_op_resume(struct ieee80211_hw *hw) run_irq_work = true;spin_unlock_irqrestore (&wl->wl_lock, flags); -mutex_lock (&wl->mutex); -/* test the recovery flag before calling any SDIO functions */ pending_recovery =test_bit (WL1271_FLAG_RECOVERY_IN_PROGRESS , &wl->flags);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 42/491 indirect_call_wrapper: do not reevaluate function pointer
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 710f5c76580306cdb9ec51fac8fcf6a8faff7821 ]
We have an increasing number of READ_ONCE(xxx->function) combined with INDIRECT_CALL_[1234]() helpers.
Unfortunately this forces INDIRECT_CALL_[1234]() to read xxx->function many times, which is not what we wanted.
Fix these macros so that xxx->function value is not reloaded.
$ scripts/bloat-o-meter -t vmlinux.0 vmlinux add/remove: 0/0 grow/shrink: 1/65 up/down: 122/-1084 (-962) Function old new delta ip_push_pending_frames 59 181 +122 ip6_finish_output 687 681 -6 __udp_enqueue_schedule_skb 1078 1072 -6 ioam6_output 2319 2312 -7 xfrm4_rcv_encap_finish2 64 56 -8 xfrm4_output 297 289 -8 vrf_ip_local_out 278 270 -8 vrf_ip6_local_out 278 270 -8 seg6_input_finish 64 56 -8 rpl_output 700 692 -8 ipmr_forward_finish 124 116 -8 ip_forward_finish 143 135 -8 ip6mr_forward2_finish 100 92 -8 ip6_forward_finish 73 65 -8 input_action_end_bpf 1091 1083 -8 dst_input 52 44 -8 __xfrm6_output 801 793 -8 __xfrm4_output 83 75 -8 bpf_input 500 491 -9 __tcp_check_space 530 521 -9 input_action_end_dt6 291 280 -11 vti6_tnl_xmit 1634 1622 -12 bpf_xmit 1203 1191 -12 rpl_input 497 483 -14 rawv6_send_hdrinc 1355 1341 -14 ndisc_send_skb 1030 1016 -14 ipv6_srh_rcv 1377 1363 -14 ip_send_unicast_reply 1253 1239 -14 ip_rcv_finish 226 212 -14 ip6_rcv_finish 300 286 -14 input_action_end_x_core 205 191 -14 input_action_end_x 355 341 -14 input_action_end_t 205 191 -14 input_action_end_dx6_finish 127 113 -14 input_action_end_dx4_finish 373 359 -14 input_action_end_dt4 426 412 -14 input_action_end_core 186 172 -14 input_action_end_b6_encap 292 278 -14 input_action_end_b6 198 184 -14 igmp6_send 1332 1318 -14 ip_sublist_rcv 864 848 -16 ip6_sublist_rcv 1091 1075 -16 ipv6_rpl_srh_rcv 1937 1920 -17 xfrm_policy_queue_process 1246 1228 -18 seg6_output_core 903 885 -18 mld_sendpack 856 836 -20 NF_HOOK 756 736 -20 vti_tunnel_xmit 1447 1426 -21 input_action_end_dx6 664 642 -22 input_action_end 1502 1480 -22 sock_sendmsg_nosec 134 111 -23 ip6mr_forward2 388 364 -24 sock_recvmsg_nosec 134 109 -25 seg6_input_core 836 810 -26 ip_send_skb 172 146 -26 ip_local_out 140 114 -26 ip6_local_out 140 114 -26 __sock_sendmsg 162 136 -26 __ip_queue_xmit 1196 1170 -26 __ip_finish_output 405 379 -26 ipmr_queue_fwd_xmit 373 346 -27 sock_recvmsg 173 145 -28 ip6_xmit 1635 1607 -28 xfrm_output_resume 1418 1389 -29 ip_build_and_send_pkt 625 591 -34 dst_output 504 432 -72 Total: Before=25217686, After=25216724, chg -0.00%
--- include/linux/indirect_call_wrapper.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
include/linux/indirect_call_wrapper.h +11 -7
@@ -16,22 +16,26 @@*/ #define INDIRECT_CALL_1 (f, f1, ...) \ ({ \ - likely(f == f1) ? f1(__VA_ARGS__) : f(__VA_ARGS__); \ + typeof(f) __f1 = (f); \ + likely(__f1 == f1) ? f1(__VA_ARGS__) : __f1(__VA_ARGS__); \ })#define INDIRECT_CALL_2 (f, f2, f1, ...) \ ({ \ - likely(f == f2) ? f2(__VA_ARGS__) : \ - INDIRECT_CALL_1(f, f1, __VA_ARGS__); \ + typeof(f) __f2 = (f); \ + likely(__f2 == f2) ? f2(__VA_ARGS__) : \ + INDIRECT_CALL_1(__f2, f1, __VA_ARGS__); \ })#define INDIRECT_CALL_3 (f, f3, f2, f1, ...) \ ({ \ - likely(f == f3) ? f3(__VA_ARGS__) : \ - INDIRECT_CALL_2(f, f2, f1, __VA_ARGS__); \ + typeof(f) __f3 = (f); \ + likely(__f3 == f3) ? f3(__VA_ARGS__) : \ + INDIRECT_CALL_2(__f3, f2, f1, __VA_ARGS__); \ })#define INDIRECT_CALL_4 (f, f4, f3, f2, f1, ...) \ ({ \ - likely(f == f4) ? f4(__VA_ARGS__) : \ - INDIRECT_CALL_3(f, f3, f2, f1, __VA_ARGS__); \ + typeof(f) __f4 = (f); \ + likely(__f4 == f4) ? f4(__VA_ARGS__) : \ + INDIRECT_CALL_3(__f4, f3, f2, f1, __VA_ARGS__); \ })#define INDIRECT_CALLABLE_DECLARE (f) f
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 43/491 xen/acpi-processor: fix _CST detection using undersized evaluation buffer
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Thomson <[email protected]>
[ Upstream commit 8b57227d59a86fc06d4f09de08f98133680f2cae ]
read_acpi_id() attempts to evaluate _CST using a stack buffer of sizeof(union acpi_object) (48 bytes), but _CST returns a nested Package of sub-Packages (one per C-state, each containing a register descriptor, type, latency, and power) requiring hundreds of bytes. The evaluation always fails with AE_BUFFER_OVERFLOW.
On modern systems using FFH/MWAIT entry (where pblk is zero), this causes the function to return before setting the acpi_id_cst_present bit. In check_acpi_ids(), flags.power is then zero for all Phase 2 CPUs (physical CPUs beyond dom0's vCPU count), so push_cxx_to_hypervisor() is never called for them.
On a system with dom0_max_vcpus=2 and 8 physical CPUs, only PCPUs 0-1 receive C-state data. PCPUs 2-7 are stuck in C0/C1 idle, unable to enter C2/C3. This costs measurable wall power (4W observed on an Intel Core Ultra 7 265K with Xen 4.20).
The function never uses the _CST return value -- it only needs to know whether _CST exists. Replace the broken acpi_evaluate_object() call with acpi_has_method(), which correctly detects _CST presence using acpi_get_handle() without any buffer allocation. This brings C-state detection to parity with the P-state path, which already works correctly for Phase 2 CPUs.
Message-ID: <[email protected]>
--- drivers/xen/xen-acpi-processor.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/xen/xen-acpi-processor.c +2 -5
@@ -378,11 +378,8 @@ read_acpi_id(acpi_handle handle, u32 lvl, void *context, void **rv) acpi_psd[acpi_id].domain); } - status =acpi_evaluate_object (handle,"_CST" ,NULL , &buffer); -if (ACPI_FAILURE (status)) { -if (!pblk) -return AE_OK ; - } +if (!pblk && !acpi_has_method (handle,"_CST" )) +return AE_OK ;/* .. and it has a C-state */ __set_bit (acpi_id, acpi_id_cst_present);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 34/491 selftests: mptcp: more stable simult_flows tests
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
commit 8c09412e584d9bcc0e71d758ec1008d1c8d1a326 upstream.
By default, the netem qdisc can keep up to 1000 packets under its belly to deal with the configured rate and delay. The simult flows test-case simulates very low speed links, to avoid problems due to slow CPUs and the TCP stack tend to transmit at a slightly higher rate than the (virtual) link constraints.
All the above causes a relatively large amount of packets being enqueued in the netem qdiscs - the longer the transfer, the longer the queue - producing increasingly high TCP RTT samples and consequently increasingly larger receive buffer size due to DRS.
When the receive buffer size becomes considerably larger than the needed size, the tests results can flake, i.e. because minimal inaccuracy in the pacing rate can lead to a single subflow usage towards the end of the connection for a considerable amount of data.
Address the issue explicitly setting netem limits suitable for the configured link speeds and unflake all the affected tests.
--- tools/testing/selftests/net/mptcp/simult_flows.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
tools/testing/selftests/net/mptcp/simult_flows.sh +7 -4
@@ -235,10 +235,13 @@ run_test() for dev in ns2eth1 ns2eth2; do tc -n $ns2 qdisc del dev $dev root >/dev/null 2>&1 done - tc -n $ns1 qdisc add dev ns1eth1 root netem rate ${rate1}mbit $delay1 - tc -n $ns1 qdisc add dev ns1eth2 root netem rate ${rate2}mbit $delay2 - tc -n $ns2 qdisc add dev ns2eth1 root netem rate ${rate1}mbit $delay1 - tc -n $ns2 qdisc add dev ns2eth2 root netem rate ${rate2}mbit $delay2 + + # keep the queued pkts number low, or the RTT estimator will see + # increasing latency over time. + tc -n $ns1 qdisc add dev ns1eth1 root netem rate ${rate1}mbit $delay1 limit 50 + tc -n $ns1 qdisc add dev ns1eth2 root netem rate ${rate2}mbit $delay2 limit 50 + tc -n $ns2 qdisc add dev ns2eth1 root netem rate ${rate1}mbit $delay1 limit 50 + tc -n $ns2 qdisc add dev ns2eth2 root netem rate ${rate2}mbit $delay2 limit 50 # time is measure in ms local time=$((size * 8 * 1000 / (( $rate1 + $rate2) * 1024 *1024) ))
Greg Kroah-Hartman
maintainerPATCH 70/491 ASoC: core: Exit all links before removing their components
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit c7eb967d70446971413061effca3226578cb4dab ]
Flows leading to link->init() and link->exit() are not symmetric. Currently the relevant part of card probe sequence goes as:
for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->probe() for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->probe() for_each_card_rtds(card, rtd) rtd->init()
On the other side, equivalent remove sequence goes as:
for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->remove() for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->remove() for_each_card_rtds(card, rtd) rtd->exit()
what can lead to errors as link->exit() may still operate on resources owned by its components despite the probability of them being freed during the component->remove().
This change modifies the remove sequence to:
for_each_card_rtds(card, rtd) rtd->exit() for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->remove() for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->remove()
so code found in link->exit() is safe to touch any component stuff as component->remove() has not been called yet.
Stable-dep-of: 95bc5c225513 ("ASoC: soc-core: flush delayed work before removing DAIs and widgets")
--- sound/soc/soc-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/soc-core.c +3 -3
@@ -962,9 +962,6 @@ void snd_soc_remove_pcm_runtime(struct snd_soc_card *card,lockdep_assert_held (&client_mutex); -/* release machine specific resources */ -snd_soc_link_exit (rtd); -/* * Notify the machine driver for extra destruction */
@@ -1928,6 +1925,9 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)snd_soc_dapm_shutdown (card); +/* release machine specific resources */ +for_each_card_rtds (card, rtd) +snd_soc_link_exit (rtd);/* remove and free each DAI */ soc_remove_link_dais (card);soc_remove_link_components (card);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 79/491 netfilter: xt_IDLETIMER: reject rev0 reuse of ALARM timer labels
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuan Tan <[email protected]>
[ Upstream commit 329f0b9b48ee6ab59d1ab72fef55fe8c6463a6cf ]
IDLETIMER revision 0 rules reuse existing timers by label and always call mod_timer() on timer->timer.
If the label was created first by revision 1 with XT_IDLETIMER_ALARM, the object uses alarm timer semantics and timer->timer is never initialized. Reusing that object from revision 0 causes mod_timer() on an uninitialized timer_list, triggering debugobjects warnings and possible panic when panic_on_warn=1.
Fix this by rejecting revision 0 rule insertion when an existing timer with the same label is of ALARM type.
--- net/netfilter/xt_IDLETIMER.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/netfilter/xt_IDLETIMER.c +6 -0
@@ -320,6 +320,12 @@ static int idletimer_tg_checkentry(const struct xt_tgchk_param *par) info->timer =__idletimer_tg_find_by_label (info->label);if (info->timer) { +if (info->timer->timer_type &XT_IDLETIMER_ALARM ) { +pr_debug ("Adding/Replacing rule with same label and different timer type is not allowed\n" ); +mutex_unlock (&list_mutex); +return -EINVAL ; + } + info->timer->refcnt++;mod_timer (&info->timer->timer,msecs_to_jiffies (info->timeout *1000 ) + jiffies);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 80/491 regulator: pca9450: Make IRQ optional
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frieder Schrempf <[email protected]>
[ Upstream commit 83808c54064eef620ad8645dfdcaffe125551532 ]
The IRQ line might not be connected on some boards. Allow the driver to be probed without it.
Stable-dep-of: 5d0efaf47ee9 ("regulator: pca9450: Correct interrupt type")
--- drivers/regulator/pca9450-regulator.c | 41 +++++++++++++-------------- 1 file changed, 19 insertions(+), 22 deletions(-)
drivers/regulator/pca9450-regulator.c +19 -22
@@ -704,11 +704,6 @@ static int pca9450_i2c_probe(struct i2c_client *i2c,unsigned int device_id, i;int ret; -if (!i2c->irq) { -dev_err (&i2c->dev,"No IRQ configured?\n" ); -return -EINVAL ; - } - pca9450 =devm_kzalloc (&i2c->dev,sizeof (struct pca9450 ),GFP_KERNEL );if (!pca9450)return -ENOMEM ;
@@ -775,23 +770,25 @@ static int pca9450_i2c_probe(struct i2c_client *i2c, } } - ret =devm_request_threaded_irq (pca9450->dev, pca9450->irq,NULL , - pca9450_irq_handler, - (IRQF_TRIGGER_FALLING |IRQF_ONESHOT ), -"pca9450-irq" , pca9450); -if (ret !=0 ) { -dev_err (pca9450->dev,"Failed to request IRQ: %d\n" , - pca9450->irq); -return ret; - } -/* Unmask all interrupt except PWRON/WDOG/RSVD */ - ret =regmap_update_bits (pca9450->regmap,PCA9450_REG_INT1_MSK , -IRQ_VR_FLT1 |IRQ_VR_FLT2 |IRQ_LOWVSYS | -IRQ_THERM_105 |IRQ_THERM_125 , -IRQ_PWRON |IRQ_WDOGB |IRQ_RSVD ); -if (ret) { -dev_err (&i2c->dev,"Unmask irq error\n" ); -return ret; +if (pca9450->irq) { + ret =devm_request_threaded_irq (pca9450->dev, pca9450->irq,NULL , + pca9450_irq_handler, + (IRQF_TRIGGER_FALLING |IRQF_ONESHOT ), +"pca9450-irq" , pca9450); +if (ret !=0 ) { +dev_err (pca9450->dev,"Failed to request IRQ: %d\n" , + pca9450->irq); +return ret; + } +/* Unmask all interrupt except PWRON/WDOG/RSVD */ + ret =regmap_update_bits (pca9450->regmap,PCA9450_REG_INT1_MSK , +IRQ_VR_FLT1 |IRQ_VR_FLT2 |IRQ_LOWVSYS | +IRQ_THERM_105 |IRQ_THERM_125 , +IRQ_PWRON |IRQ_WDOGB |IRQ_RSVD ); +if (ret) { +dev_err (&i2c->dev,"Unmask irq error\n" ); +return ret; + } }/* Clear PRESET_EN bit in BUCK123_DVS to use DVS registers */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 81/491 regulator: pca9450: Correct interrupt type
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit 5d0efaf47ee90ac60efae790acee3a3ed99ebf80 ]
Kernel warning on i.MX8MP-EVK when doing module test:
irq: type mismatch, failed to map hwirq-3 for gpio@30200000!
Per PCA945[X] specification: The IRQ_B pin is pulled low when any unmasked interrupt bit status is changed and it is released high once application processor read INT1 register.
So the interrupt should be configured as IRQF_TRIGGER_LOW, not IRQF_TRIGGER_FALLING.
--- drivers/regulator/pca9450-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/pca9450-regulator.c +1 -1
@@ -773,7 +773,7 @@ static int pca9450_i2c_probe(struct i2c_client *i2c,if (pca9450->irq) { ret =devm_request_threaded_irq (pca9450->dev, pca9450->irq,NULL , pca9450_irq_handler, - (IRQF_TRIGGER_FALLING |IRQF_ONESHOT ), + (IRQF_TRIGGER_LOW |IRQF_ONESHOT ),"pca9450-irq" , pca9450);if (ret !=0 ) { dev_err(pca9450->dev, "Failed to request IRQ: %d\n",
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 82/491 sched: idle: Make skipping governor callbacks more consistent
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit d557640e4ce589a24dca5ca7ce3b9680f471325f ]
If the cpuidle governor .select() callback is skipped because there is only one idle state in the cpuidle driver, the .reflect() callback should be skipped as well, at least for consistency (if not for correctness), so do it.
--- drivers/cpuidle/cpuidle.c | 10 ---------- kernel/sched/idle.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 11 deletions(-)
drivers/cpuidle/cpuidle.c +0 -10
@@ -319,16 +319,6 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,int cpuidle_select (struct cpuidle_driver *drv,struct cpuidle_device *dev,bool *stop_tick) { -/* -* If there is only a single idle state (or none), there is nothing -* meaningful for the governor to choose. Skip the governor and -* always use state 0 with the tick running. -*/ -if (drv->state_count <=1 ) { - *stop_tick = false; -return 0 ; - } -return cpuidle_curr_governor->select (drv, dev, stop_tick); }
kernel/sched/idle.c +10 -1
@@ -223,7 +223,7 @@ static void cpuidle_idle_call(void) next_state =cpuidle_find_deepest_state (drv, dev, max_latency_ns);call_cpuidle (drv, dev, next_state); - }else { + }else if (drv->state_count >1 ) {bool stop_tick = true;/*
@@ -241,6 +241,15 @@ static void cpuidle_idle_call(void)* Give the governor an opportunity to reflect on the outcome */ cpuidle_reflect (dev, entered_state); + }else { +tick_nohz_idle_retain_tick (); + +/* +* If there is only a single idle state (or none), there is +* nothing meaningful for the governor to choose. Skip the +* governor and always use state 0. +*/ +call_cpuidle (drv, dev,0 ); } exit_idle:
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 83/491 nvme-pci: Fix slab-out-of-bounds in nvme_dbbuf_set
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sungwoo Kim <[email protected]>
[ Upstream commit b4e78f1427c7d6859229ae9616df54e1fc05a516 ]
dev->online_queues is a count incremented in nvme_init_queue. Thus, valid indices are 0 through dev->online_queues − 1.
This patch fixes the loop condition to ensure the index stays within the valid range. Index 0 is excluded because it is the admin queue.
KASAN splat:
==================================================================
BUG: KASAN: slab-out-of-bounds in nvme_dbbuf_free drivers/nvme/host/pci.c:377 [inline] BUG: KASAN: slab-out-of-bounds in nvme_dbbuf_set+0x39c/0x400 drivers/nvme/host/pci.c:404 Read of size 2 at addr ffff88800592a574 by task kworker/u8:5/74 CPU: 0 UID: 0 PID: 74 Comm: kworker/u8:5 Not tainted 6.19.0-dirty #10 PREEMPT(voluntary) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.3-0-ga6ed6b701f0a-prebuilt.qemu.org 04/01/2014 Workqueue: nvme-reset-wq nvme_reset_work Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0xea/0x150 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:378 [inline] print_report+0xce/0x5d0 mm/kasan/report.c:482 kasan_report+0xdc/0x110 mm/kasan/report.c:595 __asan_report_load2_noabort+0x18/0x20 mm/kasan/report_generic.c:379 nvme_dbbuf_free drivers/nvme/host/pci.c:377 [inline] nvme_dbbuf_set+0x39c/0x400 drivers/nvme/host/pci.c:404 nvme_reset_work+0x36b/0x8c0 drivers/nvme/host/pci.c:3252 process_one_work+0x956/0x1aa0 kernel/workqueue.c:3257 process_scheduled_works kernel/workqueue.c:3340 [inline] worker_thread+0x65c/0xe60 kernel/workqueue.c:3421 kthread+0x41a/0x930 kernel/kthread.c:463 ret_from_fork+0x6f8/0x8c0 arch/x86/kernel/process.c:158 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:246 </TASK> Allocated by task 34 on cpu 1 at 4.241550s: kasan_save_stack+0x2c/0x60 mm/kasan/common.c:57 kasan_save_track+0x1c/0x70 mm/kasan/common.c:78 kasan_save_alloc_info+0x3c/0x50 mm/kasan/generic.c:570 poison_kmalloc_redzone mm/kasan/common.c:398 [inline] __kasan_kmalloc+0xb5/0xc0 mm/kasan/common.c:415 kasan_kmalloc include/linux/kasan.h:263 [inline] __do_kmalloc_node mm/slub.c:5657 [inline] __kmalloc_node_noprof+0x2bf/0x8d0 mm/slub.c:5663 kmalloc_array_node_noprof include/linux/slab.h:1075 [inline] nvme_pci_alloc_dev drivers/nvme/host/pci.c:3479 [inline] nvme_probe+0x2f1/0x1820 drivers/nvme/host/pci.c:3534 local_pci_probe+0xef/0x1c0 drivers/pci/pci-driver.c:324 pci_call_probe drivers/pci/pci-driver.c:392 [inline] __pci_device_probe drivers/pci/pci-driver.c:417 [inline] pci_device_probe+0x743/0x920 drivers/pci/pci-driver.c:451 call_driver_probe drivers/base/dd.c:583 [inline] really_probe+0x29b/0xb70 drivers/base/dd.c:661 __driver_probe_device+0x3b0/0x4a0 drivers/base/dd.c:803 driver_probe_device+0x56/0x1f0 drivers/base/dd.c:833 __driver_attach_async_helper+0x155/0x340 drivers/base/dd.c:1159 async_run_entry_fn+0xa6/0x4b0 kernel/async.c:129 process_one_work+0x956/0x1aa0 kernel/workqueue.c:3257 process_scheduled_works kernel/workqueue.c:3340 [inline] worker_thread+0x65c/0xe60 kernel/workqueue.c:3421 kthread+0x41a/0x930 kernel/kthread.c:463 ret_from_fork+0x6f8/0x8c0 arch/x86/kernel/process.c:158 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:246 The buggy address belongs to the object at ffff88800592a000 which belongs to the cache kmalloc-2k of size 2048
The buggy address is located 244 bytes to the right of
allocated 1152-byte region [ffff88800592a000, ffff88800592a480)
The buggy address belongs to the physical page: page: refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x5928 head: order:3 mapcount:0 entire_mapcount:0 nr_pages_mapped:0 pincount:0 anon flags: 0xfffffc0000040(head|node=0|zone=1|lastcpupid=0x1fffff) page_type: f5(slab) raw: 000fffffc0000040 ffff888001042000 0000000000000000 dead000000000001 raw: 0000000000000000 0000000000080008 00000000f5000000 0000000000000000
head: 000fffffc0000040 ffff888001042000 0000000000000000 dead000000000001
head: 0000000000000000 0000000000080008 00000000f5000000 0000000000000000
head: 000fffffc0000003 ffffea0000164a01 00000000ffffffff 00000000ffffffff
head: ffffffffffffffff 0000000000000000 00000000ffffffff 0000000000000008
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff88800592a400: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
ffff88800592a480: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
>ffff88800592a500: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
^
ffff88800592a580: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff88800592a600: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
==================================================================--- drivers/nvme/host/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/pci.c +1 -1
@@ -324,7 +324,7 @@ static void nvme_dbbuf_set(struct nvme_dev *dev)/* Free memory and continue on */ nvme_dbbuf_dma_free (dev); -for (i =1 ; i <= dev->online_queues; i++) +for (i =1 ; i < dev->online_queues; i++)nvme_dbbuf_free (&dev->queues[i]); } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 84/491 i40e: fix src IP mask checks and memcpy argument names in cloud filter
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit e809085f492842ce7a519c9ef72d40f4bca89c13 ]
Fix following issues in the IPv4 and IPv6 cloud filter handling logic in both the add and delete paths:
- The source-IP mask check incorrectly compares mask.src_ip[0] against tcf.dst_ip[0]. Update it to compare against tcf.src_ip[0]. This likely goes unnoticed because the check is in an "else if" path that only executes when dst_ip is not set, most cloud filter use cases focus on destination-IP matching, and the buggy condition can accidentally evaluate true in some cases.
- memcpy() for the IPv4 source address incorrectly uses ARRAY_SIZE(tcf.dst_ip) instead of ARRAY_SIZE(tcf.src_ip), although both arrays are the same size.
- The IPv4 memcpy operations used ARRAY_SIZE(tcf.dst_ip) and ARRAY_SIZE (tcf.src_ip), Update these to use sizeof(cfilter->ip.v4.dst_ip) and sizeof(cfilter->ip.v4.src_ip) to ensure correct and explicit copy size.
- In the IPv6 delete path, memcmp() uses sizeof(src_ip6) when comparing dst_ip6 fields. Replace this with sizeof(dst_ip6) to make the intent explicit, even though both fields are struct in6_addr.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +7 -7
@@ -3655,10 +3655,10 @@ static int i40e_vc_del_cloud_filter(struct i40e_vf *vf, u8 *msg) cfilter.n_proto =ETH_P_IP ;if (mask.dst_ip[0 ] & tcf.dst_ip[0 ])memcpy (&cfilter.ip.v4.dst_ip, tcf.dst_ip, -ARRAY_SIZE (tcf.dst_ip)); -else if (mask.src_ip[0 ] & tcf.dst_ip[0 ]) +sizeof (cfilter.ip.v4.dst_ip)); +else if (mask.src_ip[0 ] & tcf.src_ip[0 ])memcpy (&cfilter.ip.v4.src_ip, tcf.src_ip, -ARRAY_SIZE (tcf.dst_ip)); +sizeof (cfilter.ip.v4.src_ip));break ;case VIRTCHNL_TCP_V6_FLOW : cfilter.n_proto =ETH_P_IPV6 ;
@@ -3713,7 +3713,7 @@ static int i40e_vc_del_cloud_filter(struct i40e_vf *vf, u8 *msg)/* for ipv6, mask is set for all sixteen bytes (4 words) */ if (cfilter.n_proto ==ETH_P_IPV6 && mask.dst_ip[3 ])if (memcmp (&cfilter.ip.v6.dst_ip6, &cf->ip.v6.dst_ip6, -sizeof (cfilter.ip.v6.src_ip6))) +sizeof (cfilter.ip.v6.dst_ip6)))continue ;if (mask.vlan_id)if (cfilter.vlan_id != cf->vlan_id)
@@ -3799,10 +3799,10 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg) cfilter->n_proto =ETH_P_IP ;if (mask.dst_ip[0 ] & tcf.dst_ip[0 ])memcpy (&cfilter->ip.v4.dst_ip, tcf.dst_ip, -ARRAY_SIZE (tcf.dst_ip)); -else if (mask.src_ip[0 ] & tcf.dst_ip[0 ]) +sizeof (cfilter->ip.v4.dst_ip)); +else if (mask.src_ip[0 ] & tcf.src_ip[0 ])memcpy (&cfilter->ip.v4.src_ip, tcf.src_ip, -ARRAY_SIZE (tcf.dst_ip)); +sizeof (cfilter->ip.v4.src_ip));break ;case VIRTCHNL_TCP_V6_FLOW : cfilter->n_proto =ETH_P_IPV6 ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 85/491 e1000/e1000e: Fix leak in DMA error cleanup
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Vollrath <[email protected]>
[ Upstream commit e94eaef11142b01f77bf8ba4d0b59720b7858109 ]
If an error is encountered while mapping TX buffers, the driver should unmap any buffers already mapped for that skb.
Because count is incremented after a successful mapping, it will always match the correct number of unmappings needed when dma_error is reached. Decrementing count before the while loop in dma_error causes an off-by-one error. If any mapping was successful before an unsuccessful mapping, exactly one DMA mapping would leak.
In these commits, a faulty while condition caused an infinite loop in dma_error:
Commit 03b1320dfcee ("e1000e: remove use of skb_dma_map from e1000e driver")
Commit 602c0554d7b0 ("e1000: remove use of skb_dma_map from e1000 driver")
Commit c1fa347f20f1 ("e1000/e1000e/igb/igbvf/ixgb/ixgbe: Fix tests of unsigned in *_tx_map()") fixed the infinite loop, but introduced the off-by-one error.
This issue may still exist in the igbvf driver, but I did not address it in this patch.
--- drivers/net/ethernet/intel/e1000/e1000_main.c | 2 -- drivers/net/ethernet/intel/e1000e/netdev.c | 2 -- 2 files changed, 4 deletions(-)
drivers/net/ethernet/intel/e1000/e1000_main.c +0 -2
@@ -2951,8 +2951,6 @@ static int e1000_tx_map(struct e1000_adapter *adapter, dma_error:dev_err (&pdev->dev,"TX DMA map failed\n" ); buffer_info->dma =0 ; -if (count) - count--;while (count--) {if (i ==0 )
drivers/net/ethernet/intel/e1000e/netdev.c +0 -2
@@ -5633,8 +5633,6 @@ static int e1000_tx_map(struct e1000_ring *tx_ring, struct sk_buff *skb, dma_error:dev_err (&pdev->dev,"Tx DMA map failed\n" ); buffer_info->dma =0 ; -if (count) - count--;while (count--) {if (i ==0 )
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 86/491 ACPI: OSL: fix __iomem type on return from acpi_os_map_generic_address()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Dooks <[email protected]>
[ Upstream commit 393815f57651101f1590632092986d1d5a3a41bd ]
The pointer returned from acpi_os_map_generic_address() is tagged with __iomem, so make the rv it is returned to also of void __iomem * type.
Fixes the following sparse warning:
drivers/acpi/osl.c:1686:20: warning: incorrect type in assignment (different address spaces)drivers/acpi/osl.c:1686:20: expected void *rvdrivers/acpi/osl.c:1686:20: got void [noderef] __iomem *
--- drivers/acpi/osl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/osl.c +1 -1
@@ -1755,7 +1755,7 @@ acpi_status __init acpi_os_initialize(void)* Use acpi_os_map_generic_address to pre-map the reset * register if it's in system memory. */ -void *rv; +void __iomem *rv; rv =acpi_os_map_generic_address (&acpi_gbl_FADT.reset_register); pr_debug(PREFIX "%s: map reset_reg %s\n", __func__,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 87/491 ASoC: amd: acp3x-rt5682-max9836: Add missing error check for clock acquisition
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ni <[email protected]>
[ Upstream commit 53f3a900e9a383d47af7253076e19f510c5708d0 ]
The acp3x_5682_init() function did not check the return value of clk_get(), which could lead to dereferencing error pointers in rt5682_clk_enable().
Fix this by:
1. Changing clk_get() to the device-managed devm_clk_get().
2. Adding proper IS_ERR() checks for both clock acquisitions.
--- sound/soc/amd/acp3x-rt5682-max9836.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
sound/soc/amd/acp3x-rt5682-max9836.c +7 -2
@@ -83,8 +83,13 @@ static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd)return ret; } - rt5682_dai_wclk =clk_get (component->dev,"rt5682-dai-wclk" ); - rt5682_dai_bclk =clk_get (component->dev,"rt5682-dai-bclk" ); + rt5682_dai_wclk =devm_clk_get (component->dev,"rt5682-dai-wclk" ); +if (IS_ERR (rt5682_dai_wclk)) +return PTR_ERR (rt5682_dai_wclk); + + rt5682_dai_bclk =devm_clk_get (component->dev,"rt5682-dai-bclk" ); +if (IS_ERR (rt5682_dai_bclk)) +return PTR_ERR (rt5682_dai_bclk); ret = snd_soc_card_jack_new(card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_LINEOUT |
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 88/491 ASoC: detect empty DMI strings
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Casey Connolly <[email protected]>
[ Upstream commit a9683730e8b1d632674f81844ed03ddfbe4821c0 ]
Some bootloaders like recent versions of U-Boot may install some DMI properties with empty values rather than not populate them. This manages to make its way through the validator and cleanup resulting in a rogue hyphen being appended to the card longname.
--- sound/soc/soc-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/soc-core.c +4 -1
@@ -1675,12 +1675,15 @@ static void cleanup_dmi_name(char *name)/* * Check if a DMI field is valid, i.e. not containing any string -* in the black list. +* in the black list and not the empty string. */ static int is_dmi_valid (const char *field) {int i =0 ; +if (!field[0 ]) +return 0 ; +while (dmi_blacklist[i]) {if (strstr (field, dmi_blacklist[i]))return 0 ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 71/491 ASoC: core: Do not call link_exit() on uninitialized rtd objects
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amadeusz Sławiński <[email protected]>
[ Upstream commit dd9f9cc1e6b9391140afa5cf27bb47c9e2a08d02 ]
On init we have sequence:
for_each_card_prelinks(card, i, dai_link) {
ret = snd_soc_add_pcm_runtime(card, dai_link);
ret = init_some_other_things(...);
if (ret)
goto probe_end:
for_each_card_rtds(card, rtd) {
ret = soc_init_pcm_runtime(card, rtd);probe_end:
while on exit:
for_each_card_rtds(card, rtd) snd_soc_link_exit(rtd);
If init_some_other_things() step fails due to error we end up with not fully setup rtds and try to call snd_soc_link_exit on them, which depending on contents on .link_exit handler, can end up dereferencing NULL pointer.
Stable-dep-of: 95bc5c225513 ("ASoC: soc-core: flush delayed work before removing DAIs and widgets")
--- include/sound/soc.h | 2 ++ sound/soc/soc-core.c | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-)
include/sound/soc.h +2 -0
@@ -1177,6 +1177,8 @@ struct snd_soc_pcm_runtime { unsigned int pop_wait:1; unsigned int fe_compr:1; /* for Dynamic PCM */ +bool initialized; +int num_components;struct snd_soc_component *components[];/* CPU/Codec/Platform */ };
sound/soc/soc-core.c +15 -5
@@ -1299,7 +1299,7 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,snd_soc_runtime_get_dai_fmt (rtd); ret =snd_soc_runtime_set_dai_fmt (rtd, dai_link->dai_fmt);if (ret) -return ret; + goto err;/* add DPCM sysfs entries */ soc_dpcm_debugfs_add (rtd);
@@ -1324,17 +1324,26 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,/* create compress_device if possible */ ret =snd_soc_dai_compress_new (cpu_dai, rtd, num);if (ret != -ENOTSUPP ) -return ret; + goto err;/* create the pcm */ ret =soc_new_pcm (rtd, num);if (ret <0 ) {dev_err (card->dev,"ASoC: can't create pcm %s :%d\n" , dai_link->stream_name, ret); -return ret; + goto err; } -return snd_soc_pcm_dai_new (rtd); + ret =snd_soc_pcm_dai_new (rtd); +if (ret <0 ) + goto err; + + rtd->initialized = true; + +return 0 ; +err: +snd_soc_link_exit (rtd); +return ret; } static void soc_set_name_prefix(struct snd_soc_card *card,
@@ -1927,7 +1936,8 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)/* release machine specific resources */ for_each_card_rtds (card, rtd) -snd_soc_link_exit (rtd); +if (rtd->initialized) +snd_soc_link_exit (rtd);/* remove and free each DAI */ soc_remove_link_dais (card);soc_remove_link_components (card);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 89/491 cgroup: fix race between task migration and iteration
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qingye Zhao <[email protected]>
commit 5ee01f1a7343d6a3547b6802ca2d4cdce0edacb1 upstream.
When a task is migrated out of a css_set, cgroup_migrate_add_task() first moves it from cset->tasks to cset->mg_tasks via:
list_move_tail(&task->cg_list, &cset->mg_tasks);
If a css_task_iter currently has it->task_pos pointing to this task, css_set_move_task() calls css_task_iter_skip() to keep the iterator valid. However, since the task has already been moved to ->mg_tasks, the iterator is advanced relative to the mg_tasks list instead of the original tasks list. As a result, remaining tasks on cset->tasks, as well as tasks queued on cset->mg_tasks, can be skipped by iteration.
Fix this by calling css_set_skip_task_iters() before unlinking task->cg_list from cset->tasks. This advances all active iterators to the next task on cset->tasks, so iteration continues correctly even when a task is concurrently being migrated.
This race is hard to hit in practice without instrumentation, but it can be reproduced by artificially slowing down cgroup_procs_show(). For example, on an Android device a temporary /sys/kernel/cgroup/cgroup_test knob can be added to inject a delay into cgroup_procs_show(), and then:
1) Spawn three long-running tasks (PIDs 101, 102, 103).
2) Create a test cgroup and move the tasks into it.
3) Enable a large delay via /sys/kernel/cgroup/cgroup_test.
4) In one shell, read cgroup.procs from the test cgroup.
5) Within the delay window, in another shell migrate PID 102 by writing it to a different cgroup.procs file.
Under this setup, cgroup.procs can intermittently show only PID 101 while skipping PID 103. Once the migration completes, reading the file again shows all tasks as expected.
Note that this change does not allow removing the existing css_set_skip_task_iters() call in css_set_move_task(). The new call in cgroup_migrate_add_task() only handles iterators that are racing with migration while the task is still on cset->tasks. Iterators may also start after the task has been moved to cset->mg_tasks. If we dropped css_set_skip_task_iters() from css_set_move_task(), such iterators could keep task_pos pointing to a migrating task, causing css_task_iter_advance() to malfunction on the destination css_set, up to and including crashes or infinite loops.
The race window between migration and iteration is very small, and css_task_iter is not on a hot path. In the worst case, when an iterator is positioned on the first thread of the migrating process, cgroup_migrate_add_task() may have to skip multiple tasks via css_set_skip_task_iters(). However, this only happens when migration and iteration actually race, so the performance impact is negligible compared to the correctness fix provided here.
--- kernel/cgroup/cgroup.c | 1 + 1 file changed, 1 insertion(+)
kernel/cgroup/cgroup.c +1 -0
@@ -2413,6 +2413,7 @@ static void cgroup_migrate_add_task(stru mgctx->tset.nr_tasks++; +css_set_skip_task_iters (cset, task);list_move_tail (&task->cg_list, &cset->mg_tasks);if (list_empty (&cset->mg_node)) list_add_tail(&cset->mg_node,
Greg Kroah-Hartman
maintainerPATCH 90/491 net: usb: lan78xx: fix silent drop of packets with checksum errors
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
commit e4f774a0cc955ce762aec91c66915a6e15087ab7 upstream.
Do not drop packets with checksum errors at the USB driver level; pass them to the network stack.
Previously, the driver dropped all packets where the 'Receive Error Detected' (RED) bit was set, regardless of the specific error type. This caused packets with only IP or TCP/UDP checksum errors to be dropped before reaching the kernel, preventing the network stack from accounting for them or performing software fallback.
Add a mask for hard hardware errors to safely drop genuinely corrupt frames, while allowing checksum-errored frames to pass with their ip_summed field explicitly set to CHECKSUM_NONE.
--- drivers/net/usb/lan78xx.c | 4 +++- drivers/net/usb/lan78xx.h | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/net/usb/lan78xx.c +3 -1
@@ -3279,6 +3279,7 @@ static void lan78xx_rx_csum_offload(stru*/ if (!(dev->net->features &NETIF_F_RXCSUM ) ||unlikely (rx_cmd_a &RX_CMD_A_ICSM_ ) || +unlikely (rx_cmd_a &RX_CMD_A_CSE_MASK_ ) || ((rx_cmd_a &RX_CMD_A_FVTG_ ) && !(dev->net->features &NETIF_F_HW_VLAN_CTAG_RX ))) { skb->ip_summed =CHECKSUM_NONE ;
@@ -3346,7 +3347,8 @@ static int lan78xx_rx(struct lan78xx_net size = (rx_cmd_a &RX_CMD_A_LEN_MASK_ ); align_count = (4 - ((size +RXW_PADDING ) %4 )) %4 ; -if (unlikely (rx_cmd_a &RX_CMD_A_RED_ )) { +if (unlikely (rx_cmd_a &RX_CMD_A_RED_ ) && + (rx_cmd_a &RX_CMD_A_RX_HARD_ERRS_MASK_ )) {netif_dbg (dev, rx_err, dev->net,"Error rx_cmd_a=0x%08x" , rx_cmd_a); }else {
drivers/net/usb/lan78xx.h +3 -0
@@ -74,6 +74,9 @@#define RX_CMD_A_ICSM_ (0x00004000)#define RX_CMD_A_LEN_MASK_ (0x00003FFF) +#define RX_CMD_A_RX_HARD_ERRS_MASK_ \ + (RX_CMD_A_RX_ERRS_MASK_ & ~RX_CMD_A_CSE_MASK_) +/* Rx Command B */ #define RX_CMD_B_CSUM_SHIFT_ (16)#define RX_CMD_B_CSUM_MASK_ (0xFFFF0000)
Greg Kroah-Hartman
maintainerPATCH 91/491 net: usb: lan78xx: skip LTM configuration for LAN7850
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
commit d9cc0e440f0664f6f3e2c26e39ab9dd5f3badba7 upstream.
Do not configure Latency Tolerance Messaging (LTM) on USB 2.0 hardware.
The LAN7850 is a High-Speed (USB 2.0) only device and does not support SuperSpeed features like LTM. Currently, the driver unconditionally attempts to configure LTM registers during initialization. On the LAN7850, these registers do not exist, resulting in writes to invalid or undocumented memory space.
This issue was identified during a port to the regmap API with strict register validation enabled. While no functional issues or crashes have been observed from these invalid writes, bypassing LTM initialization on the LAN7850 ensures the driver strictly adheres to the hardware's valid register map.
--- drivers/net/usb/lan78xx.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/usb/lan78xx.c +4 -0
@@ -2463,6 +2463,10 @@ static void lan78xx_init_ltm(struct lan7u32 buf;u32 regs[6 ] = {0 }; +/* LAN7850 is USB 2.0 and does not support LTM */ +if (dev->chipid ==ID_REV_CHIP_ID_7850_ ) +return ; + ret =lan78xx_read_reg (dev,USB_CFG1 , &buf);if (buf &USB_CFG1_LTM_ENABLE_ ) {u8 temp[2 ];
Greg Kroah-Hartman
maintainerPATCH 92/491 usb/core/quirks: Add Huawei ME906S-device to wakeup quirk
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoffer Sandberg <[email protected]>
commit 0326ff28d56b4fa202de36ffc8462a354f383a64 upstream.
Similar to other Huawei LTE modules using this quirk, this version with another vid/pid suffers from spurious wakeups.
Setting the quirk fixes the issue for this device as well.
--- drivers/usb/core/quirks.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/core/quirks.c +4 -0
@@ -205,6 +205,10 @@ static const struct usb_device_id usb_qu/* HP v222w 16GB Mini USB Drive */ { USB_DEVICE(0x03f0, 0x3f40), .driver_info = USB_QUIRK_DELAY_INIT }, + /* Huawei 4G LTE module ME906S */ + { USB_DEVICE(0x03f0, 0xa31d), .driver_info = + USB_QUIRK_DISCONNECT_SUSPEND }, + /* Creative SB Audigy 2 NX */ { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
Greg Kroah-Hartman
maintainerPATCH 93/491 usb: xhci: Fix memory leak in xhci_disable_slot()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zilin Guan <[email protected]>
commit c1c8550e70401159184130a1afc6261db01fc0ce upstream.
xhci_alloc_command() allocates a command structure and, when the second argument is true, also allocates a completion structure. Currently, the error handling path in xhci_disable_slot() only frees the command structure using kfree(), causing the completion structure to leak.
Use xhci_free_command() instead of kfree(). xhci_free_command() correctly frees both the command structure and the associated completion structure. Since the command structure is allocated with zero-initialization, command->in_ctx is NULL and will not be erroneously freed by xhci_free_command().
This bug was found using an experimental static analysis tool we are developing. The tool is based on the LLVM framework and is specifically designed to detect memory management issues. It is currently under active development and not yet publicly available, but we plan to open-source it after our research is published.
The bug was originally detected on v6.13-rc1 using our static analysis tool, and we have verified that the issue persists in the latest mainline kernel.
We performed build testing on x86_64 with allyesconfig using GCC=11.4.0. Since triggering these error paths in xhci_disable_slot() requires specific hardware conditions or abnormal state, we were unable to construct a test case to reliably trigger these specific error paths at runtime.
--- drivers/usb/host/xhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/host/xhci.c +2 -2
@@ -3982,7 +3982,7 @@ int xhci_disable_slot(struct xhci_hcd *xif (state ==0xffffffff || (xhci->xhc_state &XHCI_STATE_DYING ) || (xhci->xhc_state &XHCI_STATE_HALTED )) {spin_unlock_irqrestore (&xhci->lock, flags); -kfree (command); +xhci_free_command (xhci, command);return -ENODEV ; }
@@ -3990,7 +3990,7 @@ int xhci_disable_slot(struct xhci_hcd *x slot_id);if (ret) {spin_unlock_irqrestore (&xhci->lock, flags); -kfree (command); +xhci_free_command (xhci, command);return ret; }xhci_ring_cmd_db (xhci);
Greg Kroah-Hartman
maintainerPATCH 94/491 usb: yurex: fix race in probe
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 7a875c09899ba0404844abfd8f0d54cdc481c151 upstream.
The bbu member of the descriptor must be set to the value standing for uninitialized values before the URB whose completion handler sets bbu is submitted. Otherwise there is a window during which probing can overwrite already retrieved data.
--- drivers/usb/misc/yurex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/yurex.c +1 -1
@@ -271,6 +271,7 @@ static int yurex_probe(struct usb_interf dev->int_buffer,YUREX_BUF_SIZE , yurex_interrupt, dev, 1); dev->urb->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ; + dev->bbu =-1 ;if (usb_submit_urb (dev->urb,GFP_KERNEL )) { retval = -EIO ;dev_err (&interface->dev,"Could not submitting URB\n" );
@@ -279,7 +280,6 @@ static int yurex_probe(struct usb_interf/* save our data pointer in this interface device */ usb_set_intfdata (interface, dev); - dev->bbu =-1 ;/* we can register the device now, as it is ready */ retval =usb_register_dev (interface, &yurex_class);
Greg Kroah-Hartman
maintainerPATCH 95/491 usb: misc: uss720: properly clean up reference in uss720_probe()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 45dba8011efac11a2f360383221b541f5ea53ce5 upstream.
If get_1284_register() fails, the usb device reference count is incorrect and needs to be properly dropped before returning. That will happen when the kref is dropped in the call to destroy_priv(), so jump to that error path instead of returning directly.
--- drivers/usb/misc/uss720.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/uss720.c +1 -1
@@ -733,7 +733,7 @@ static int uss720_probe(struct usb_inter ret =get_1284_register (pp,0 , ®,GFP_KERNEL );dev_dbg (&intf->dev,"reg: %7ph\n" , priv->reg);if (ret <0 ) -return ret; + goto probe_abort; ret =usb_find_last_int_in_endpoint (interface, &epd);if (!ret) {
Greg Kroah-Hartman
maintainerPATCH 96/491 usb: core: dont power off roothub PHYs if phy_set_mode() fails
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
commit e293015ba76eb96ce4ebed7e3b2cb1a7d319f3e9 upstream.
Remove the error path from the usb_phy_roothub_set_mode() function. The code is clearly wrong, because phy_set_mode() calls can't be balanced with phy_power_off() calls.
Additionally, the usb_phy_roothub_set_mode() function is called only from usb_add_hcd() before it powers on the PHYs, so powering off those makes no sense anyway.
Presumably, the code is copy-pasted from the phy_power_on() function without adjusting the error handling.
--- drivers/usb/core/phy.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/usb/core/phy.c +1 -7
@@ -138,16 +138,10 @@ int usb_phy_roothub_set_mode(struct usb_list_for_each_entry (roothub_entry, head, list) { err =phy_set_mode (roothub_entry->phy, mode);if (err) - goto err_out; +return err; }return 0 ; - -err_out: -list_for_each_entry_continue_reverse (roothub_entry, head, list) -phy_power_off (roothub_entry->phy); - -return err; }EXPORT_SYMBOL_GPL (usb_phy_roothub_set_mode);
Greg Kroah-Hartman
maintainerPATCH 97/491 usb: cdc-acm: Restore CAP_BRK functionnality to CH343
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
commit 14ae24cba291bddfdc296bbcbfd00cd09d0498ef upstream.
The CH343 USB/serial adapter is as buggy as it is popular (very). One of its quirks is that despite being capable of signalling a BREAK condition, it doesn't advertise it.
This used to work nonetheless until 66aad7d8d3ec5 ("usb: cdc-acm:
return correct error code on unsupported break") applied some reasonable restrictions, preventing breaks from being emitted on devices that do not advertise CAP_BRK.
Add a quirk for this particular device, so that breaks can still be produced on some of my machines attached to my console server.
--- drivers/usb/class/cdc-acm.c | 5 +++++ drivers/usb/class/cdc-acm.h | 1 + 2 files changed, 6 insertions(+)
drivers/usb/class/cdc-acm.c +5 -0
@@ -1379,6 +1379,8 @@ made_compressed_probe: acm->ctrl_caps = h.usb_cdc_acm_descriptor->bmCapabilities;if (quirks &NO_CAP_LINE ) acm->ctrl_caps &= ~USB_CDC_CAP_LINE ; +if (quirks &MISSING_CAP_BRK ) + acm->ctrl_caps |=USB_CDC_CAP_BRK ; acm->ctrlsize = ctrlsize; acm->readsize = readsize; acm->rx_buflimit = num_rx_buf;
@@ -1990,6 +1992,9 @@ static const struct usb_device_id acm_id .driver_info = IGNORE_DEVICE, }, +/* CH343 supports CAP_BRK, but doesn't advertise it */ + { USB_DEVICE(0x1a86, 0x55d3), .driver_info = MISSING_CAP_BRK, }, + /* control interfaces without any protocol set */ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, USB_CDC_PROTO_NONE) },
drivers/usb/class/cdc-acm.h +1 -0
@@ -141,3 +141,4 @@ struct acm {#define CLEAR_HALT_CONDITIONS BIT(5)#define SEND_ZERO_PACKET BIT(6)#define DISABLE_ECHO BIT(7) +#define MISSING_CAP_BRK BIT(8)
Greg Kroah-Hartman
maintainerPATCH 98/491 USB: usbcore: Introduce usb_bulk_msg_killable()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 416909962e7cdf29fd01ac523c953f37708df93d upstream.
The synchronous message API in usbcore (usb_control_msg(), usb_bulk_msg(), and so on) uses uninterruptible waits. However, drivers may call these routines in the context of a user thread, which means it ought to be possible to at least kill them.
For this reason, introduce a new usb_bulk_msg_killable() function which behaves the same as usb_bulk_msg() except for using wait_for_completion_killable_timeout() instead of wait_for_completion_timeout(). The same can be done later for usb_control_msg() later on, if it turns out to be needed.
--- drivers/usb/core/message.c | 79 +++++++++++++++++++++++++++++++++++++++------ include/linux/usb.h | 5 +- 2 files changed, 72 insertions(+), 12 deletions(-)
drivers/usb/core/message.c +69 -10
@@ -41,16 +41,17 @@ static void usb_api_blocking_completion(/* -* Starts urb and waits for completion or timeout. Note that this call -* is NOT interruptible. Many device driver i/o requests should be -* interruptible and therefore these drivers should implement their -* own interruptible routines. +* Starts urb and waits for completion or timeout. +* Whether or not the wait is killable depends on the flag passed in. +* For example, compare usb_bulk_msg() and usb_bulk_msg_killable(). */ -static int usb_start_wait_urb (struct urb *urb,int timeout,int *actual_length) +static int usb_start_wait_urb (struct urb *urb,int timeout,int *actual_length, +bool killable) {struct api_context ctx;unsigned long expire;int retval; +long rc;init_completion (&ctx.done); urb->context = &ctx;
@@ -60,12 +61,21 @@ static int usb_start_wait_urb(struct urb goto out; expire = timeout ?msecs_to_jiffies (timeout) :MAX_SCHEDULE_TIMEOUT ; -if (!wait_for_completion_timeout (&ctx.done, expire)) { +if (killable) + rc =wait_for_completion_killable_timeout (&ctx.done, expire); +else + rc =wait_for_completion_timeout (&ctx.done, expire); +if (rc <=0 ) {usb_kill_urb (urb); - retval = (ctx.status == -ENOENT ? -ETIMEDOUT : ctx.status); +if (ctx.status != -ENOENT ) + retval = ctx.status; +else if (rc ==0 ) + retval = -ETIMEDOUT ; +else + retval = rc; dev_dbg(&urb->dev->dev, - "%s timed out on ep%d%s len=%u/%u\n", + "%s timed out or killed on ep%d%s len=%u/%u\n", current->comm, usb_endpoint_num(&urb->ep->desc), usb_urb_dir_in(urb) ? "in" : "out",
@@ -99,7 +109,7 @@ static int usb_internal_control_msg(struusb_fill_control_urb (urb, usb_dev, pipe, (unsigned char *)cmd, data, len, usb_api_blocking_completion,NULL ); - retv =usb_start_wait_urb (urb, timeout, &length); + retv =usb_start_wait_urb (urb, timeout, &length, false);if (retv <0 )return retv;else
@@ -388,10 +398,59 @@ int usb_bulk_msg(struct usb_device *usb_usb_fill_bulk_urb (urb, usb_dev, pipe, data, len, usb_api_blocking_completion,NULL ); -return usb_start_wait_urb (urb, timeout, actual_length); +return usb_start_wait_urb (urb, timeout, actual_length, false); }EXPORT_SYMBOL_GPL (usb_bulk_msg); +/** +* usb_bulk_msg_killable - Builds a bulk urb, sends it off and waits for completion in a killable state +* @usb_dev: pointer to the usb device to send the message to +* @pipe: endpoint "pipe" to send the message to +* @data: pointer to the data to send +* @len: length in bytes of the data to send +* @actual_length: pointer to a location to put the actual length transferred +* in bytes +* @timeout: time in msecs to wait for the message to complete before +* timing out (if 0 the wait is forever) +* +* Context: task context, might sleep. +* +* This function is just like usb_blk_msg() except that it waits in a +* killable state. +* +* Return: +* If successful, 0. Otherwise a negative error number. The number of actual +* bytes transferred will be stored in the @actual_length parameter. +* +*/ +int usb_bulk_msg_killable (struct usb_device *usb_dev,unsigned int pipe, +void *data,int len,int *actual_length,int timeout) +{ +struct urb *urb; +struct usb_host_endpoint *ep; + + ep =usb_pipe_endpoint (usb_dev, pipe); +if (!ep || len <0 ) +return -EINVAL ; + + urb =usb_alloc_urb (0 ,GFP_KERNEL ); +if (!urb) +return -ENOMEM ; + +if ((ep->desc.bmAttributes &USB_ENDPOINT_XFERTYPE_MASK ) == +USB_ENDPOINT_XFER_INT ) { + pipe = (pipe & ~(3 <<30 )) | (PIPE_INTERRUPT <<30 ); +usb_fill_int_urb (urb, usb_dev, pipe, data, len, + usb_api_blocking_completion,NULL , + ep->desc.bInterval); + }else +usb_fill_bulk_urb (urb, usb_dev, pipe, data, len, + usb_api_blocking_completion,NULL ); + +return usb_start_wait_urb (urb, timeout, actual_length, true); +} +EXPORT_SYMBOL_GPL (usb_bulk_msg_killable); +/*-------------------------------------------------------------------*/ static void sg_clean (struct usb_sg_request *io)
include/linux/usb.h +3 -2
@@ -1804,8 +1804,9 @@ extern int usb_control_msg(struct usb_deextern int usb_interrupt_msg (struct usb_device *usb_dev,unsigned int pipe,void *data,int len,int *actual_length,int timeout);extern int usb_bulk_msg (struct usb_device *usb_dev,unsigned int pipe, -void *data,int len,int *actual_length, -int timeout); +void *data,int len,int *actual_length,int timeout); +extern int usb_bulk_msg_killable (struct usb_device *usb_dev,unsigned int pipe, +void *data,int len,int *actual_length,int timeout);/* wrappers around usb_control_msg() for the most common standard requests */ int usb_control_msg_send(struct usb_device *dev, __u8 endpoint, __u8 request,
Greg Kroah-Hartman
maintainerPATCH 72/491 ASoC: soc-core: flush delayed work before removing DAIs and widgets
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: matteo.cotifava <[email protected]>
[ Upstream commit 95bc5c225513fc3c4ce169563fb5e3929fbb938b ]
When a sound card is unbound while a PCM stream is open, a use-after-free can occur in snd_soc_dapm_stream_event(), called from the close_delayed_work workqueue handler.
During unbind, snd_soc_unbind_card() flushes delayed work and then calls soc_cleanup_card_resources(). Inside cleanup, snd_card_disconnect_sync() releases all PCM file descriptors, and the resulting PCM close path can call snd_soc_dapm_stream_stop() which schedules new delayed work with a pmdown_time timer delay. Since this happens after the flush in snd_soc_unbind_card(), the new work is not caught. soc_remove_link_components() then frees DAPM widgets before this work fires, leading to the use-after-free.
The existing flush in soc_free_pcm_runtime() also cannot help as it runs after soc_remove_link_components() has already freed the widgets.
Add a flush in soc_cleanup_card_resources() after snd_card_disconnect_sync() (after which no new PCM closes can schedule further delayed work) and before soc_remove_link_dais() and soc_remove_link_components() (which tear down the structures the delayed work accesses).
--- sound/soc/soc-core.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/soc-core.c +3 -0
@@ -1938,6 +1938,9 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)for_each_card_rtds (card, rtd)if (rtd->initialized)snd_soc_link_exit (rtd); +/* flush delayed work before removing DAIs and DAPM widgets */ +snd_soc_flush_all_delayed_work (card); +/* remove and free each DAI */ soc_remove_link_dais (card);soc_remove_link_components (card);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 99/491 USB: usbtmc: Use usb_bulk_msg_killable() with user-specified timeouts
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 7784caa413a89487dd14dd5c41db8753483b2acb upstream.
The usbtmc driver accepts timeout values specified by the user in an ioctl command, and uses these timeouts for some usb_bulk_msg() calls. Since the user can specify arbitrarily long timeouts and usb_bulk_msg() uses unkillable waits, call usb_bulk_msg_killable() instead to avoid the possibility of the user hanging a kernel thread indefinitely.
--- drivers/usb/class/usbtmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/class/usbtmc.c +3 -3
@@ -696,7 +696,7 @@ static int usbtmc488_ioctl_trigger(struc buffer[1 ] = data->bTag; buffer[2 ] = ~data->bTag; - retval = usb_bulk_msg(data->usb_dev, + retval = usb_bulk_msg_killable(data->usb_dev, usb_sndbulkpipe(data->usb_dev, data->bulk_out), buffer, USBTMC_HEADER_SIZE,
@@ -1316,7 +1316,7 @@ static int send_request_dev_dep_msg_in(s buffer[11 ] =0 ;/* Reserved */ /* Send bulk URB */ - retval = usb_bulk_msg(data->usb_dev, + retval = usb_bulk_msg_killable(data->usb_dev, usb_sndbulkpipe(data->usb_dev, data->bulk_out), buffer, USBTMC_HEADER_SIZE,
@@ -1388,7 +1388,7 @@ static ssize_t usbtmc_read(struct file * actual =0 ;/* Send bulk URB */ - retval = usb_bulk_msg(data->usb_dev, + retval = usb_bulk_msg_killable(data->usb_dev, usb_rcvbulkpipe(data->usb_dev, data->bulk_in), buffer, bufsize, &actual,
Greg Kroah-Hartman
maintainerPATCH 100/491 USB: core: Limit the length of unkillable synchronous timeouts
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 1015c27a5e1a63efae2b18a9901494474b4d1dc3 upstream.
The usb_control_msg(), usb_bulk_msg(), and usb_interrupt_msg() APIs in usbcore allow unlimited timeout durations. And since they use uninterruptible waits, this leaves open the possibility of hanging a task for an indefinitely long time, with no way to kill it short of unplugging the target device.
To prevent this sort of problem, enforce a maximum limit on the length of these unkillable timeouts. The limit chosen here, somewhat arbitrarily, is 60 seconds. On many systems (although not all) this is short enough to avoid triggering the kernel's hung-task detector.
In addition, clear up the ambiguity of negative timeout values by treating them the same as 0, i.e., using the maximum allowed timeout.
--- drivers/usb/core/message.c | 24 ++++++++++++------------ include/linux/usb.h | 3 +++ 2 files changed, 15 insertions(+), 12 deletions(-)
drivers/usb/core/message.c +12 -12
@@ -44,6 +44,8 @@ static void usb_api_blocking_completion(* Starts urb and waits for completion or timeout. * Whether or not the wait is killable depends on the flag passed in. * For example, compare usb_bulk_msg() and usb_bulk_msg_killable(). +* +* For non-killable waits, we enforce a maximum limit on the timeout value. */ static int usb_start_wait_urb (struct urb *urb,int timeout,int *actual_length,bool killable)
@@ -60,7 +62,9 @@ static int usb_start_wait_urb(struct urbif (unlikely (retval)) goto out; - expire = timeout ?msecs_to_jiffies (timeout) :MAX_SCHEDULE_TIMEOUT ; +if (!killable && (timeout <=0 || timeout >USB_MAX_SYNCHRONOUS_TIMEOUT )) + timeout =USB_MAX_SYNCHRONOUS_TIMEOUT ; + expire = (timeout >0 ) ?msecs_to_jiffies (timeout) :MAX_SCHEDULE_TIMEOUT ;if (killable) rc =wait_for_completion_killable_timeout (&ctx.done, expire);else
@@ -126,8 +130,7 @@ static int usb_internal_control_msg(stru* @index: USB message index value * @data: pointer to the data to send * @size: length in bytes of the data to send -* @timeout: time in msecs to wait for the message to complete before timing -* out (if 0 the wait is forever) +* @timeout: time in msecs to wait for the message to complete before timing out * * Context: !in_interrupt () *
@@ -182,8 +185,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);* @index: USB message index value * @driver_data: pointer to the data to send * @size: length in bytes of the data to send -* @timeout: time in msecs to wait for the message to complete before timing -* out (if 0 the wait is forever) +* @timeout: time in msecs to wait for the message to complete before timing out * @memflags: the flags for memory allocation for buffers * * Context: !in_interrupt ()
@@ -245,8 +247,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg_send);* @index: USB message index value * @driver_data: pointer to the data to be filled in by the message * @size: length in bytes of the data to be received -* @timeout: time in msecs to wait for the message to complete before timing -* out (if 0 the wait is forever) +* @timeout: time in msecs to wait for the message to complete before timing out * @memflags: the flags for memory allocation for buffers * * Context: !in_interrupt ()
@@ -317,8 +318,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg_recv);* @len: length in bytes of the data to send * @actual_length: pointer to a location to put the actual length transferred * in bytes -* @timeout: time in msecs to wait for the message to complete before -* timing out (if 0 the wait is forever) +* @timeout: time in msecs to wait for the message to complete before timing out * * Context: !in_interrupt () *
@@ -411,12 +411,12 @@ EXPORT_SYMBOL_GPL(usb_bulk_msg);* @actual_length: pointer to a location to put the actual length transferred * in bytes * @timeout: time in msecs to wait for the message to complete before -* timing out (if 0 the wait is forever) +* timing out (if <= 0, the wait is as long as possible) * * Context: task context, might sleep. * -* This function is just like usb_blk_msg() except that it waits in a -* killable state. +* This function is just like usb_blk_msg(), except that it waits in a +* killable state and there is no limit on the timeout length. * * Return: * If successful, 0. Otherwise a negative error number. The number of actual
include/linux/usb.h +3 -0
@@ -1798,6 +1798,9 @@ void usb_buffer_unmap_sg(const struct us* SYNCHRONOUS CALL SUPPORT * *-------------------------------------------------------------------*/ +/* Maximum value allowed for timeout in synchronous routines below */ +#define USB_MAX_SYNCHRONOUS_TIMEOUT 60000/* ms */ +extern int usb_control_msg (struct usb_device *dev,unsigned int pipe,__u8 request,__u8 requesttype,__u16 value,__u16 index,void *data,__u16 size,int timeout);
Greg Kroah-Hartman
maintainerPATCH 101/491 usb: class: cdc-wdm: fix reordering issue in read code path
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 8df672bfe3ec2268c2636584202755898e547173 upstream.
Quoting the bug report:
Due to compiler optimization or CPU out-of-order execution, the desc->length update can be reordered before the memmove. If this happens, wdm_read() can see the new length and call copy_to_user() on uninitialized memory. This also violates LKMM data race rules [1].
Fix it by using WRITE_ONCE and memory barriers.
--- drivers/usb/class/cdc-wdm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/class/cdc-wdm.c +3 -1
@@ -212,7 +212,8 @@ static void wdm_in_callback(struct urb */* we may already be in overflow */ if (!test_bit (WDM_OVERFLOW , &desc->flags)) {memmove (desc->ubuf + desc->length, desc->inbuf, length); - desc->length += length; +smp_wmb ();/* against wdm_read() */ +WRITE_ONCE (desc->length, desc->length + length); } } skip_error:
@@ -519,6 +520,7 @@ static ssize_t wdm_readreturn -ERESTARTSYS ; cntr =READ_ONCE (desc->length); +smp_rmb ();/* against wdm_in_callback() */ if (cntr ==0 ) { desc->read =0 ; retry:
Greg Kroah-Hartman
maintainerPATCH 102/491 usb: renesas_usbhs: fix use-after-free in ISR during device removal
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fan Wu <[email protected]>
commit 3cbc242b88c607f55da3d0d0d336b49bf1e20412 upstream.
In usbhs_remove(), the driver frees resources (including the pipe array) while the interrupt handler (usbhs_interrupt) is still registered. If an interrupt fires after usbhs_pipe_remove() but before the driver is fully unbound, the ISR may access freed memory, causing a use-after-free.
Fix this by calling devm_free_irq() before freeing resources. This ensures the interrupt handler is both disabled and synchronized (waits for any running ISR to complete) before usbhs_pipe_remove() is called.
--- drivers/usb/renesas_usbhs/common.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/usb/renesas_usbhs/common.c +9 -0
@@ -804,6 +804,15 @@ static int usbhs_remove(struct platform_usbhs_platform_call (priv, hardware_exit, pdev);reset_control_assert (priv->rsts); + +/* +* Explicitly free the IRQ to ensure the interrupt handler is +* disabled and synchronized before freeing resources. +* devm_free_irq() calls free_irq() which waits for any running +* ISR to complete, preventing UAF. +*/ +devm_free_irq (&pdev->dev, priv->irq, priv); +usbhs_mod_remove (priv);usbhs_fifo_remove (priv);usbhs_pipe_remove (priv);
Greg Kroah-Hartman
maintainerPATCH 103/491 usb: mdc800: handle signal and read racing
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 2d6d260e9a3576256fe9ef6d1f7930c9ec348723 upstream.
If a signal arrives after a read has partially completed, we need to return the number of bytes read. -EINTR is correct only if that number is zero.
--- drivers/usb/image/mdc800.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/image/mdc800.c +1 -1
@@ -708,7 +708,7 @@ static ssize_t mdc800_device_read (strucif (signal_pending (current)) {mutex_unlock (&mdc800->io_lock); -return -EINTR ; +return len == left ? -EINTR : len-left; } sts=left > (mdc800->out_count-mdc800->out_ptr)?mdc800->out_count-mdc800->out_ptr:left;
Greg Kroah-Hartman
maintainerPATCH 73/491 serial: caif: hold tty->link reference in ldisc_open and ser_release
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuangpeng Bai <[email protected]>
[ Upstream commit 288598d80a068a0e9281de35bcb4ce495f189e2a ]
A reproducer triggers a KASAN slab-use-after-free in pty_write_room() when caif_serial's TX path calls tty_write_room(). The faulting access is on tty->link->port.
Hold an extra kref on tty->link for the lifetime of the caif_serial line
discipline: get it in ldisc_open() and drop it in ser_release(), and also drop it on the ldisc_open() error path.
With this change applied, the reproducer no longer triggers the UAF in my testing.
--- drivers/net/caif/caif_serial.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/caif/caif_serial.c +3 -0
@@ -312,6 +312,7 @@ static void ser_release(struct work_struct *work)dev_close (ser->dev);unregister_netdevice (ser->dev);debugfs_deinit (ser); +tty_kref_put (tty->link);tty_kref_put (tty); }rtnl_unlock ();
@@ -346,6 +347,7 @@ static int ldisc_open(struct tty_struct *tty) ser =netdev_priv (dev); ser->tty =tty_kref_get (tty); +tty_kref_get (tty->link); ser->dev = dev;debugfs_init (ser, tty); tty->receive_room =N_TTY_BUF_SIZE ;
@@ -354,6 +356,7 @@ static int ldisc_open(struct tty_struct *tty)rtnl_lock (); result =register_netdevice (dev);if (result) { +tty_kref_put (tty->link);tty_kref_put (tty);rtnl_unlock ();free_netdev (dev);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 74/491 can: hi311x: hi3110_open(): add check for hi3110_power_enable() return value
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wenyuan Li <[email protected]>
[ Upstream commit 47bba09b14fa21712398febf36cb14fd4fc3bded ]
In hi3110_open(), the return value of hi3110_power_enable() is not checked. If power enable fails, the device may not function correctly, while the driver still returns success.
Add a check for the return value and propagate the error accordingly.
--- drivers/net/can/spi/hi311x.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/can/spi/hi311x.c +4 -1
@@ -751,7 +751,9 @@ static int hi3110_open(struct net_device *net)return ret;mutex_lock (&priv->hi3110_lock); -hi3110_power_enable (priv->transceiver,1 ); + ret =hi3110_power_enable (priv->transceiver,1 ); +if (ret) + goto out_close_candev; priv->force_quit =0 ; priv->tx_skb =NULL ;
@@ -798,6 +800,7 @@ static int hi3110_open(struct net_device *net)hi3110_hw_sleep (spi); out_close:hi3110_power_enable (priv->transceiver,0 ); + out_close_candev:close_candev (net);mutex_unlock (&priv->hi3110_lock);return ret;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 75/491 netfilter: nft_set_pipapo: fix stack out-of-bounds read in pipapo_drop()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jenny Guanni Qu <[email protected]>
[ Upstream commit d6d8cd2db236a9dd13dbc2d05843b3445cc964b5 ]
pipapo_drop() passes rulemap[i + 1].n to pipapo_unmap() as the to_offset argument on every iteration, including the last one where i == m->field_count - 1. This reads one element past the end of the stack-allocated rulemap array (declared as rulemap[NFT_PIPAPO_MAX_FIELDS] with NFT_PIPAPO_MAX_FIELDS == 16).
Although pipapo_unmap() returns early when is_last is true without using the to_offset value, the argument is evaluated at the call site before the function body executes, making this a genuine out-of-bounds stack read confirmed by KASAN:
BUG: KASAN: stack-out-of-bounds in pipapo_drop+0x50c/0x57c [nf_tables] Read of size 4 at addr ffff8000810e71a4
This frame has 1 object:
[32, 160) 'rulemap'
The buggy address is at offset 164 -- exactly 4 bytes past the end of the rulemap array.
Pass 0 instead of rulemap[i + 1].n on the last iteration to avoid the out-of-bounds read.
--- net/netfilter/nft_set_pipapo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nft_set_pipapo.c +2 -1
@@ -1539,6 +1539,7 @@ static void pipapo_drop(struct nft_pipapo_match *m,int i;nft_pipapo_for_each_field (f, i, m) { +bool last = i == m->field_count -1 ;int g;for (g =0 ; g < f->groups; g++) {
@@ -1558,7 +1559,7 @@ static void pipapo_drop(struct nft_pipapo_match *m, }pipapo_unmap (f->mt, f->rules, rulemap[i].to, rulemap[i].n, - rulemap[i +1 ].n, i == m->field_count -1 ); + last ?0 : rulemap[i +1 ].n, last);if (pipapo_resize (f, f->rules, f->rules - rulemap[i].n)) {/* We can ignore this, a failure to shrink tables down * doesn't make tables invalid.
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 76/491 netfilter: x_tables: guard option walkers against 1-byte tail reads
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Dull <[email protected]>
[ Upstream commit cfe770220ac2dbd3e104c6b45094037455da81d4 ]
When the last byte of options is a non-single-byte option kind, walkers that advance with i += op[i + 1] ? : 1 can read op[i + 1] past the end of the option area.
Add an explicit i == optlen - 1 check before dereferencing op[i + 1] in xt_tcpudp and xt_dccp option walkers.
--- net/netfilter/xt_dccp.c | 4 ++-- net/netfilter/xt_tcpudp.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-)
net/netfilter/xt_dccp.c +2 -2
@@ -62,10 +62,10 @@ dccp_find_option(u_int8_t option,return true; } -if (op[i] <2 ) +if (op[i] <2 || i == optlen -1 ) i++;else - i += op[i+1 ]?:1 ; + i += op[i +1 ] ? :1 ; }spin_unlock_bh (&dccp_buflock);
net/netfilter/xt_tcpudp.c +4 -2
@@ -56,8 +56,10 @@ tcp_find_option(u_int8_t option,for (i =0 ; i < optlen; ) {if (op[i] == option)return !invert; -if (op[i] <2 ) i++; -else i += op[i+1 ]?:1 ; +if (op[i] <2 || i == optlen -1 ) + i++; +else + i += op[i +1 ] ? :1 ; }return invert;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 77/491 netfilter: nfnetlink_queue: fix entry leak in bridge verdict error path
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hyunwoo Kim <[email protected]>
[ Upstream commit f1ba83755d81c6fc66ac7acd723d238f974091e9 ]
nfqnl_recv_verdict() calls find_dequeue_entry() to remove the queue entry from the queue data structures, taking ownership of the entry. For PF_BRIDGE packets, it then calls nfqa_parse_bridge() to parse VLAN attributes. If nfqa_parse_bridge() returns an error (e.g. NFQA_VLAN present but NFQA_VLAN_TCI missing), the function returns immediately without freeing the dequeued entry or its sk_buff.
This leaks the nf_queue_entry, its associated sk_buff, and all held references (net_device refcounts, struct net refcount). Repeated triggering exhausts kernel memory.
Fix this by dropping the entry via nfqnl_reinject() with NF_DROP verdict on the error path, consistent with other error handling in this file.
--- net/netfilter/nfnetlink_queue.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/netfilter/nfnetlink_queue.c +3 -1
@@ -1209,8 +1209,10 @@ static int nfqnl_recv_verdict(struct net *net, struct sock *ctnl,if (entry->state.pf ==PF_BRIDGE ) { err =nfqa_parse_bridge (entry, nfqa); -if (err <0 ) +if (err <0 ) { +nfqnl_reinject (entry,NF_DROP );return err; + } }if (nfqa[NFQA_PAYLOAD ]) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 78/491 netfilter: nfnetlink_cthelper: fix OOB read in nfnl_cthelper_dump_table()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hyunwoo Kim <[email protected]>
[ Upstream commit 6dcee8496d53165b2d8a5909b3050b62ae71fe89 ]
nfnl_cthelper_dump_table() has a 'goto restart' that jumps to a label inside the for loop body. When the "last" helper saved in cb->args[1] is deleted between dump rounds, every entry fails the (cur != last) check, so cb->args[1] is never cleared. The for loop finishes with cb->args[0] == nf_ct_helper_hsize, and the 'goto restart' jumps back into the loop body bypassing the bounds check, causing an 8-byte out-of-bounds read on nf_ct_helper_hash[nf_ct_helper_hsize].
The 'goto restart' block was meant to re-traverse the current bucket when "last" is no longer found, but it was placed after the for loop instead of inside it. Move the block into the for loop body so that the restart only occurs while cb->args[0] is still within bounds.
BUG: KASAN: slab-out-of-bounds in nfnl_cthelper_dump_table+0x9f/0x1b0 Read of size 8 at addr ffff888104ca3000 by task poc_cthelper/131 Call Trace: nfnl_cthelper_dump_table+0x9f/0x1b0 netlink_dump+0x333/0x880 netlink_recvmsg+0x3e2/0x4b0 sock_recvmsg+0xde/0xf0 __sys_recvfrom+0x150/0x200 __x64_sys_recvfrom+0x76/0x90 do_syscall_64+0xc3/0x6e0 Allocated by task 1: __kvmalloc_node_noprof+0x21b/0x700 nf_ct_alloc_hashtable+0x65/0xd0 nf_conntrack_helper_init+0x21/0x60 nf_conntrack_init_start+0x18d/0x300 nf_conntrack_standalone_init+0x12/0xc0
--- net/netfilter/nfnetlink_cthelper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/nfnetlink_cthelper.c +4 -4
@@ -601,10 +601,10 @@ nfnl_cthelper_dump_table(struct sk_buff *skb, struct netlink_callback *cb) goto out; } } - } -if (cb->args[1 ]) { - cb->args[1 ] =0 ; - goto restart; +if (cb->args[1 ]) { + cb->args[1 ] =0 ; + goto restart; + } } out:rcu_read_unlock ();
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 69/491 ASoC: soc-core: accept zero format at snd_soc_runtime_set_dai_fmt()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuninori Morimoto <[email protected]>
[ Upstream commit 7db07e37e13cfd46039d82aed91092185eac6565 ]
Do nothing if format was zero at snd_soc_runtime_set_dai_fmt(). soc-core.c can be more simple code by this patch.
Stable-dep-of: 95bc5c225513 ("ASoC: soc-core: flush delayed work before removing DAIs and widgets")
--- sound/soc/meson/meson-codec-glue.c | 3 --- sound/soc/soc-core.c | 11 ++++++----- 2 files changed, 6 insertions(+), 8 deletions(-)
sound/soc/meson/meson-codec-glue.c +0 -3
@@ -113,9 +113,6 @@ int meson_codec_glue_output_startup(struct snd_pcm_substream *substream,/* Replace link params with the input params */ rtd->dai_link->params = &in_data->params; -if (!in_data->fmt) -return 0 ; -return snd_soc_runtime_set_dai_fmt (rtd, in_data->fmt); }EXPORT_SYMBOL_GPL (meson_codec_glue_output_startup);
sound/soc/soc-core.c +6 -5
@@ -1240,6 +1240,9 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,unsigned int i;int ret; +if (!dai_fmt) +return 0 ; +for_each_rtd_codec_dais (rtd, i, codec_dai) { ret =snd_soc_dai_set_fmt (codec_dai, dai_fmt);if (ret !=0 && ret != -ENOTSUPP )
@@ -1297,11 +1300,9 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,return ret;snd_soc_runtime_get_dai_fmt (rtd); -if (dai_link->dai_fmt) { - ret =snd_soc_runtime_set_dai_fmt (rtd, dai_link->dai_fmt); -if (ret) -return ret; - } + ret =snd_soc_runtime_set_dai_fmt (rtd, dai_link->dai_fmt); +if (ret) +return ret;/* add DPCM sysfs entries */ soc_dpcm_debugfs_add (rtd);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 105/491 mm/tracing: rss_stat: ensure curr is false from kthread context
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kalesh Singh <[email protected]>
commit 079c24d5690262e83ee476e2a548e416f3237511 upstream.
The rss_stat trace event allows userspace tools, like Perfetto [1], to inspect per-process RSS metric changes over time.
The curr field was introduced to rss_stat in commit e4dcad204d3a ("rss_stat: add support to detect RSS updates of external mm"). Its intent is to indicate whether the RSS update is for the mm_struct of the current execution context; and is set to false when operating on a remote mm_struct (e.g., via kswapd or a direct reclaimer).
However, an issue arises when a kernel thread temporarily adopts a user process's mm_struct. Kernel threads do not have their own mm_struct and normally have current->mm set to NULL. To operate on user memory, they can "borrow" a memory context using kthread_use_mm(), which sets current->mm to the user process's mm.
This can be observed, for example, in the USB Function Filesystem (FFS) driver. The ffs_user_copy_worker() handles AIO completions and uses kthread_use_mm() to copy data to a user-space buffer. If a page fault occurs during this copy, the fault handler executes in the kthread's context.
At this point, current is the kthread, but current->mm points to the user process's mm. Since the rss_stat event (from the page fault) is for that same mm, the condition current->mm == mm becomes true, causing curr to be incorrectly set to true when the trace event is emitted.
This is misleading because it suggests the mm belongs to the kthread, confusing userspace tools that track per-process RSS changes and corrupting their mm_id-to-process association.
Fix this by ensuring curr is always false when the trace event is emitted from a kthread context by checking for the PF_KTHREAD flag.
--- include/trace/events/kmem.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
include/trace/events/kmem.h +7 -1
@@ -352,7 +352,13 @@ TRACE_EVENT(rss_stat,TP_fast_assign ( __entry->mm_id = mm_ptr_to_hash(mm); - __entry->curr = !!(current->mm == mm); +/* +* curr is true if the mm matches the current task's mm_struct. +* Since kthreads (PF_KTHREAD) have no mm_struct of their own +* but can borrow one via kthread_use_mm(), we must filter them +* out to avoid incorrectly attributing the RSS update to them. +*/ + __entry->curr = current->mm == mm && !(current->flags &PF_KTHREAD ); __entry->member = member; __entry->size = (count <<PAGE_SHIFT ); ),
Greg Kroah-Hartman
maintainerPATCH 114/491 staging: rtl8723bs: properly validate the data in rtw_get_ie_ex()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit f0109b9d3e1e455429279d602f6276e34689750a upstream.
Just like in commit 154828bf9559 ("staging: rtl8723bs: fix out-of-bounds read in rtw_get_ie() parser"), we don't trust the data in the frame so we should check the length better before acting on it
--- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +10 -6
@@ -194,21 +194,25 @@ u8 *rtw_get_ie_ex(u8 *in_ie, uint in_len cnt =0 ; -while (cnt < in_len) { +while (cnt +2 <= in_len) { +u8 ie_len = in_ie[cnt +1 ]; + +if (cnt +2 + ie_len > in_len) +break ; +if (eid == in_ie[cnt] - && (!oui || !memcmp (&in_ie[cnt+2 ], oui, oui_len))) { + && (!oui || (ie_len >= oui_len && !memcmp (&in_ie[cnt +2 ], oui, oui_len)))) { target_ie = &in_ie[cnt];if (ie) -memcpy (ie, &in_ie[cnt], in_ie[cnt+1 ]+2 ); +memcpy (ie, &in_ie[cnt], ie_len +2 );if (ielen) - *ielen = in_ie[cnt+1 ]+2 ; + *ielen = ie_len +2 ;break ; - }else { - cnt += in_ie[cnt+1 ]+2 ;/* goto next */ } + cnt += ie_len +2 ;/* goto next */ }return target_ie;
Greg Kroah-Hartman
maintainerPATCH 115/491 media: dvb-net: fix OOB access in ULE extension header tables
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ariel Silver <[email protected]>
commit 24d87712727a5017ad142d63940589a36cd25647 upstream.
The ule_mandatory_ext_handlers[] and ule_optional_ext_handlers[] tables in handle_one_ule_extension() are declared with 255 elements (valid indices 0-254), but the index htype is derived from network-controlled data as (ule_sndu_type & 0x00FF), giving a range of 0-255. When htype equals 255, an out-of-bounds read occurs on the function pointer table, and the OOB value may be called as a function pointer.
Add a bounds check on htype against the array size before either table is accessed. Out-of-range values now cause the SNDU to be discarded.
--- drivers/media/dvb-core/dvb_net.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/dvb-core/dvb_net.c +3 -0
@@ -228,6 +228,9 @@ static int handle_one_ule_extension( strunsigned char hlen = (p->ule_sndu_type &0x0700 ) >>8 ;unsigned char htype = p->ule_sndu_type &0x00FF ; +if (htype >=ARRAY_SIZE (ule_mandatory_ext_handlers)) +return -1 ; +/* Discriminate mandatory and optional extension headers. */ if (hlen ==0 ) {/* Mandatory extension header */
Greg Kroah-Hartman
maintainerPATCH 116/491 batman-adv: Avoid double-rtnl_lock ELP metric worker
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Eckelmann <[email protected]>
commit cfc83a3c71517b59c1047db57da31e26a9dc2f33 upstream.
batadv_v_elp_get_throughput() might be called when the RTNL lock is already held. This could be problematic when the work queue item is cancelled via cancel_delayed_work_sync() in batadv_v_elp_iface_disable(). In this case, an rtnl_lock() would cause a deadlock.
To avoid this, rtnl_trylock() was used in this function to skip the retrieval of the ethtool information in case the RTNL lock was already held.
But for cfg80211 interfaces, batadv_get_real_netdev() was called - which also uses rtnl_lock(). The approach for __ethtool_get_link_ksettings() must also be used instead and the lockless version __batadv_get_real_netdev() has to be called.
--- net/batman-adv/bat_v_elp.c | 10 +++++++++- net/batman-adv/hard-interface.c | 8 ++++---- net/batman-adv/hard-interface.h | 1 + 3 files changed, 14 insertions(+), 5 deletions(-)
net/batman-adv/bat_v_elp.c +9 -1
@@ -113,7 +113,15 @@ static bool batadv_v_elp_get_throughput(/* unsupported WiFi driver version */ goto default_throughput; - real_netdev =batadv_get_real_netdev (hard_iface->net_dev); +/* only use rtnl_trylock because the elp worker will be cancelled while +* the rntl_lock is held. the cancel_delayed_work_sync() would otherwise +* wait forever when the elp work_item was started and it is then also +* trying to rtnl_lock +*/ +if (!rtnl_trylock ()) +return false; + real_netdev =__batadv_get_real_netdev (hard_iface->net_dev); +rtnl_unlock ();if (!real_netdev) goto default_throughput;
net/batman-adv/hard-interface.c +4 -4
@@ -204,7 +204,7 @@ static bool batadv_is_valid_iface(const }/** -* batadv_get_real_netdevice() - check if the given netdev struct is a virtual +* __batadv_get_real_netdev() - check if the given netdev struct is a virtual * interface on top of another 'real' interface * @netdev: the device to check *
@@ -214,7 +214,7 @@ static bool batadv_is_valid_iface(const* Return: the 'real' net device or the original net device and NULL in case * of an error. */ -static struct net_device *batadv_get_real_netdevice (struct net_device *netdev) +struct net_device *__batadv_get_real_netdev (struct net_device *netdev) {struct batadv_hard_iface *hard_iface =NULL ;struct net_device *real_netdev =NULL ;
@@ -268,7 +268,7 @@ struct net_device *batadv_get_real_netdestruct net_device *real_netdev;rtnl_lock (); - real_netdev =batadv_get_real_netdevice (net_device); + real_netdev =__batadv_get_real_netdev (net_device);rtnl_unlock ();return real_netdev;
@@ -335,7 +335,7 @@ static u32 batadv_wifi_flags_evaluate(stif (batadv_is_cfg80211_netdev (net_device)) wifi_flags |=BATADV_HARDIF_WIFI_CFG80211_DIRECT ; - real_netdev =batadv_get_real_netdevice (net_device); + real_netdev =__batadv_get_real_netdev (net_device);if (!real_netdev)return wifi_flags;
net/batman-adv/hard-interface.h +1 -0
@@ -91,6 +91,7 @@ enum batadv_hard_if_cleanup {extern struct notifier_block batadv_hard_if_notifier; +struct net_device *__batadv_get_real_netdev (struct net_device *net_device);struct net_device *batadv_get_real_netdev (struct net_device *net_device);bool batadv_is_cfg80211_hardif (struct batadv_hard_iface *hard_iface);bool batadv_is_wifi_hardif (struct batadv_hard_iface *hard_iface);
Greg Kroah-Hartman
maintainerPATCH 117/491 parisc: Increase initial mapping to 64 MB with KALLSYMS
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 8e732934fb81282be41602550e7e07baf265e972 upstream.
The 32MB initial kernel mapping can become too small when CONFIG_KALLSYMS is used. Increase the mapping to 64 MB in this case.
--- arch/parisc/include/asm/pgtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/parisc/include/asm/pgtable.h +1 -1
@@ -109,7 +109,7 @@ extern void __update_cache(pte_t pte);printk ("%s:%d: bad pgd %08lx.\n" , __FILE__, __LINE__, (unsigned long )pgd_val (e)) /* This is the size of the initially mapped kernel memory */ -#if defined(CONFIG_64BIT ) +#if defined(CONFIG_64BIT ) || defined(CONFIG_KALLSYMS )#define KERNEL_INITIAL_ORDER 26/* 1<<26 = 64MB */ #else #define KERNEL_INITIAL_ORDER 25/* 1<<25 = 32MB */
Greg Kroah-Hartman
maintainerPATCH 118/491 nouveau/dpcd: return EBUSY for aux xfer if the device is asleep
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
commit 8f3c6f08ababad2e3bdd239728cf66a9949446b4 upstream.
If we have runtime suspended, and userspace wants to use /dev/drm_dp_* then just tell it the device is busy instead of crashing in the GSP code.
WARNING: CPU: 2 PID: 565741 at drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c:164 r535_gsp_msgq_wait+0x9a/0xb0 [nouveau] CPU: 2 UID: 0 PID: 565741 Comm: fwupd Not tainted 6.18.10-200.fc43.x86_64 #1 PREEMPT(lazy) Hardware name: LENOVO 20QTS0PQ00/20QTS0PQ00, BIOS N2OET65W (1.52 ) 08/05/2024 RIP: 0010:r535_gsp_msgq_wait+0x9a/0xb0 [nouveau]
This is a simple fix to get backported. We should probably engineer a proper power domain solution to wake up devices and keep them awake while fw updates are happening.
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/nouveau/nouveau_connector.c +3 -0
@@ -1176,6 +1176,9 @@ nouveau_connector_aux_xfer(struct drm_dpu8 size = msg->size;int ret; +if (pm_runtime_suspended (nv_connector->base.dev->dev)) +return -EBUSY ; + nv_encoder =find_encoder (&nv_connector->base,DCB_OUTPUT_DP );if (!nv_encoder || !(aux = nv_encoder->aux))return -ENODEV ;
Greg Kroah-Hartman
maintainerPATCH 119/491 parisc: Fix initial page table creation for boot
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 8475d8fe21ec9c7eb2faca555fbc5b68cf0d2597 upstream.
The KERNEL_INITIAL_ORDER value defines the initial size (usually 32 or 64 MB) of the page table during bootup. Up until now the whole area was initialized with PTE entries, but there was no check if we filled too many entries. Change the code to fill up with so many entries that the "_end" symbol can be reached by the kernel, but not more entries than actually fit into the initial PTE tables.
--- arch/parisc/kernel/head.S | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/parisc/kernel/head.S +6 -1
@@ -55,6 +55,7 @@ ENTRY(parisc_kernel_start) .import __bss_start,data .import __bss_stop,data + .import __end,data load32 PA(__bss_start),%r3 load32 PA(__bss_stop),%r4
@@ -148,7 +149,11 @@ $cpu_ok: * everything ... it will get remapped correctly later */ ldo 0+_PAGE_KERNEL_RWX(%r0),%r3 /* Hardwired 0 phys addr start */ load32 (1<<(KERNEL_INITIAL_ORDER-PAGE_SHIFT)),%r11 /* PFN count */ - load32 PA(pg0),%r1 + load32 PA(_end),%r1 + SHRREG %r1,PAGE_SHIFT,%r1 /* %r1 is PFN count for _end symbol */ + cmpb,<<,n %r11,%r1,1f + copy %r1,%r11 /* %r1 PFN count smaller than %r11 */ +1: load32 PA(pg0),%r1 $pgt_fill_loop: STREGM %r3,ASM_PTE_ENTRY_SIZE(%r1)
Greg Kroah-Hartman
maintainerPATCH 120/491 net: ncsi: fix skb leak in error paths
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jian Zhang <[email protected]>
commit 5c3398a54266541610c8d0a7082e654e9ff3e259 upstream.
Early return paths in NCSI RX and AEN handlers fail to release the received skb, resulting in a memory leak.
Specifically, ncsi_aen_handler() returns on invalid AEN packets without consuming the skb. Similarly, ncsi_rcv_rsp() exits early when failing to resolve the NCSI device, response handler, or request, leaving the skb unfreed.
--- net/ncsi/ncsi-aen.c | 3 ++- net/ncsi/ncsi-rsp.c | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-)
net/ncsi/ncsi-aen.c +2 -1
@@ -224,7 +224,8 @@ int ncsi_aen_handler(struct ncsi_dev_priif (!nah) {netdev_warn (ndp->ndev.dev,"Invalid AEN (0x%x) received\n" , h->type); -return -ENOENT ; + ret = -ENOENT ; + goto out; } ret =ncsi_validate_aen_pkt (h, nah->payload);
net/ncsi/ncsi-rsp.c +12 -4
@@ -1146,8 +1146,10 @@ int ncsi_rcv_rsp(struct sk_buff *skb, st/* Find the NCSI device */ nd =ncsi_find_dev (orig_dev); ndp = nd ?TO_NCSI_DEV_PRIV (nd) :NULL ; -if (!ndp) -return -ENODEV ; +if (!ndp) { + ret = -ENODEV ; + goto err_free_skb; + }/* Check if it is AEN packet */ hdr = (struct ncsi_pkt_hdr *)skb_network_header (skb);
@@ -1169,7 +1171,8 @@ int ncsi_rcv_rsp(struct sk_buff *skb, stif (!nrh) {netdev_err (nd->dev,"Received unrecognized packet (0x%x)\n" , hdr->type); -return -ENOENT ; + ret = -ENOENT ; + goto err_free_skb; }/* Associate with the request */
@@ -1177,7 +1180,8 @@ int ncsi_rcv_rsp(struct sk_buff *skb, st nr = &ndp->requests[hdr->id];if (!nr->used) {spin_unlock_irqrestore (&ndp->lock, flags); -return -ENODEV ; + ret = -ENODEV ; + goto err_free_skb; } nr->rsp = skb;
@@ -1231,4 +1235,8 @@ out_netlink: out:ncsi_free_request (nr);return ret; + +err_free_skb: +kfree_skb (skb); +return ret; }
Greg Kroah-Hartman
maintainerPATCH 121/491 net: ethernet: arc: emac: quiesce interrupts before requesting IRQ
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fan Wu <[email protected]>
commit 2503d08f8a2de618e5c3a8183b250ff4a2e2d52c upstream.
Normal RX/TX interrupts are enabled later, in arc_emac_open(), so probe should not see interrupt delivery in the usual case. However, hardware may still present stale or latched interrupt status left by firmware or the bootloader.
If probe later unwinds after devm_request_irq() has installed the handler, such a stale interrupt can still reach arc_emac_intr() during teardown and race with release of the associated net_device.
Avoid that window by putting the device into a known quiescent state before requesting the IRQ: disable all EMAC interrupt sources and clear any pending EMAC interrupt status bits. This keeps the change hardware-focused and minimal, while preventing spurious IRQ delivery from leftover state.
--- drivers/net/ethernet/arc/emac_main.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/net/ethernet/arc/emac_main.c +11 -0
@@ -935,6 +935,17 @@ int arc_emac_probe(struct net_device *nd/* Set poll rate so that it polls every 1 ms */ arc_reg_set (priv,R_POLLRATE , clock_frequency /1000000 ); +/* +* Put the device into a known quiescent state before requesting +* the IRQ. Clear only EMAC interrupt status bits here; leave the +* MDIO completion bit alone and avoid writing TXPL_MASK, which is +* used to force TX polling rather than acknowledge interrupts. +*/ +arc_reg_set (priv,R_ENABLE ,0 ); +arc_reg_set (priv,R_STATUS ,RXINT_MASK |TXINT_MASK |ERR_MASK | +TXCH_MASK |MSER_MASK |RXCR_MASK | +RXFR_MASK |RXFL_MASK ); + ndev->irq = irq;dev_info (dev,"IRQ is %d\n" , ndev->irq);
Greg Kroah-Hartman
maintainerPATCH 122/491 drm/amdgpu: Fix use-after-free race in VM acquire
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alysa Liu <[email protected]>
commit 2c1030f2e84885cc58bffef6af67d5b9d2e7098f upstream.
Replace non-atomic vm->process_info assignment with cmpxchg() to prevent race when parent/child processes sharing a drm_file both try to acquire the same VM after fork().
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +5 -1
@@ -932,7 +932,10 @@ static int init_kfd_vm(struct amdgpu_vm *ef =dma_fence_get (&info->eviction_fence->base); } - vm->process_info = *process_info; +if (cmpxchg (&vm->process_info,NULL , *process_info) !=NULL ) { + ret = -EINVAL ; + goto already_acquired; + }/* Validate page directory and attach eviction fence */ ret =amdgpu_bo_reserve (vm->root.base.bo, true);
@@ -969,6 +972,7 @@ validate_pd_fail:amdgpu_bo_unreserve (vm->root.base.bo); reserve_pd_fail: vm->process_info =NULL ; +already_acquired:if (info) {/* Two fence references: one in info and one in *ef */ dma_fence_put (&info->eviction_fence->base);
Greg Kroah-Hartman
maintainerPATCH 123/491 tracing: Fix trace_buf_size= cmdline parameter with sizes >= 2G
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Calvin Owens <[email protected]>
commit d008ba8be8984760e36d7dcd4adbd5a41a645708 upstream.
Some of the sizing logic through tracer_alloc_buffers() uses int internally, causing unexpected behavior if the user passes a value that does not fit in an int (on my x86 machine, the result is uselessly tiny buffers).
Fix by plumbing the parameter's real type (unsigned long) through to the ring buffer allocation functions, which already use unsigned long.
It has always been possible to create larger ring buffers via the sysfs
interface: this only affects the cmdline parameter.
--- kernel/trace/trace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/trace/trace.c +3 -3
@@ -8771,7 +8771,7 @@ static void init_tracer_tracefs(struct trace_array *tr, struct dentry *d_tracer);static int -allocate_trace_buffer (struct trace_array *tr,struct array_buffer *buf,int size) +allocate_trace_buffer (struct trace_array *tr,struct array_buffer *buf,unsigned long size) {enum ring_buffer_flags rb_flags;
@@ -8797,7 +8797,7 @@ allocate_trace_buffer(struct trace_arrayreturn 0 ; } -static int allocate_trace_buffers (struct trace_array *tr,int size) +static int allocate_trace_buffers (struct trace_array *tr,unsigned long size) {int ret;
@@ -9728,7 +9728,7 @@ out:__init static int tracer_alloc_buffers (void ) { -int ring_buf_size; +unsigned long ring_buf_size;int ret = -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 106/491 mmc: mmci: Fix device_node reference leak in of_get_dml_pipe_index()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Gu <[email protected]>
commit af12e64ae0661546e8b4f5d30d55c5f53a11efe7 upstream.
When calling of_parse_phandle_with_args(), the caller is responsible to call of_node_put() to release the reference of device node. In of_get_dml_pipe_index(), it does not release the reference.
--- drivers/mmc/host/mmci_qcom_dml.c | 1 + 1 file changed, 1 insertion(+)
drivers/mmc/host/mmci_qcom_dml.c +1 -0
@@ -109,6 +109,7 @@ static int of_get_dml_pipe_index(struct &dma_spec))return -ENODEV ; +of_node_put (dma_spec.np);if (dma_spec.args_count)return dma_spec.args[0 ];
Greg Kroah-Hartman
maintainerPATCH 124/491 lib/bootconfig: fix off-by-one in xbc_verify_tree() unclosed brace error
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Law <[email protected]>
commit 39ebc8d7f561e1b64eca87353ef9b18e2825e591 upstream.
__xbc_open_brace() pushes entries with post-increment (open_brace[brace_index++]), so brace_index always points one past the last valid entry. xbc_verify_tree() reads open_brace[brace_index] to report which brace is unclosed, but this is one past the last pushed entry and contains stale/zero data, causing the error message to reference the wrong node.
Use open_brace[brace_index - 1] to correctly identify the unclosed brace. brace_index is known to be > 0 here since we are inside the if (brace_index) guard.
--- lib/bootconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/bootconfig.c +1 -1
@@ -685,7 +685,7 @@ static int __init xbc_verify_tree(void)/* Brace closing */ if (brace_index) { - n = &xbc_nodes[open_brace[brace_index]]; + n = &xbc_nodes[open_brace[brace_index -1 ]];return xbc_parse_error ("Brace is not closed" ,xbc_node_get_data (n)); }
Greg Kroah-Hartman
maintainerPATCH 125/491 x86/apic: Disable x2apic on resume if the kernel expects so
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shashank Balaji <[email protected]>
commit 8cc7dd77a1466f0ec58c03478b2e735a5b289b96 upstream.
When resuming from s2ram, firmware may re-enable x2apic mode, which may have been disabled by the kernel during boot either because it doesn't support IRQ remapping or for other reasons. This causes the kernel to continue using the xapic interface, while the hardware is in x2apic mode, which causes hangs. This happens on defconfig + bare metal + s2ram.
Fix this in lapic_resume() by disabling x2apic if the kernel expects it to be disabled, i.e. when x2apic_mode = 0.
The ACPI v6.6 spec, Section 16.3 [1] says firmware restores either the pre-sleep configuration or initial boot configuration for each CPU, including MSR state:
When executing from the power-on reset vector as a result of waking from an S2 or S3 sleep state, the platform firmware performs only the hardware initialization required to restore the system to either the state the platform was in prior to the initial operating system boot, or to the pre-sleep configuration state. In multiprocessor systems, non-boot processors should be placed in the same state as prior to the initial operating system boot.
(further ahead)
If this is an S2 or S3 wake, then the platform runtime firmware restores minimum context of the system before jumping to the waking vector. This includes:
CPU configuration. Platform runtime firmware restores the pre-sleep configuration or initial boot configuration of each CPU (MSR, MTRR, firmware update, SMBase, and so on). Interrupts must be disabled (for IA-32 processors, disabled by CLI instruction).
(and other things)
So at least as per the spec, re-enablement of x2apic by the firmware is allowed if "x2apic on" is a part of the initial boot configuration.
[1] https://uefi.org/specs/ACPI/6.6/16_Waking_and_Sleeping.html#initialization
[ bp: Massage. ]
--- arch/x86/kernel/apic/apic.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/kernel/apic/apic.c +6 -0
@@ -1901,6 +1901,7 @@ early_initcall(validate_x2apic);static inline void try_to_enable_x2apic (int remap_mode) { }static inline void __x2apic_enable (void ) { } +static inline void __x2apic_disable (void ) { }#endif /* !CONFIG_X86_X2APIC */ void __init enable_IR_x2apic (void )
@@ -2664,6 +2665,11 @@ static void lapic_resume(void)if (x2apic_mode) {__x2apic_enable (); }else { +if (x2apic_enabled ()) { +pr_warn_once ("x2apic: re-enabled by firmware during resume. Disabling\n" ); +__x2apic_disable (); + } +/* * Make sure the APICBASE points to the right address *
Greg Kroah-Hartman
maintainerPATCH 126/491 lib/bootconfig: fix snprintf truncation check in xbc_node_compose_key_after()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Law <[email protected]>
commit 1120a36bb1e9b9e22de75ecb4ef0b998f73a97f1 upstream.
snprintf() returns the number of characters that would have been written excluding the NUL terminator. Output is truncated when the return value is >= the buffer size, not just > the buffer size.
When ret == size, the current code takes the non-truncated path, advancing buf by ret and reducing size to 0. This is wrong because the output was actually truncated (the last character was replaced by NUL). Fix by using >= so the truncation path is taken correctly.
--- lib/bootconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/bootconfig.c +1 -1
@@ -250,7 +250,7 @@ int __init xbc_node_compose_key_after(st depth ? "." : "");if (ret <0 )return ret; -if (ret > size) { +if (ret >= size) { size =0 ; }else { size -= ret;
Greg Kroah-Hartman
maintainerPATCH 127/491 lib/bootconfig: check bounds before writing in __xbc_open_brace()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Law <[email protected]>
commit 560f763baa0f2c9a44da4294c06af071405ac46f upstream.
The bounds check for brace_index happens after the array write. While the current call pattern prevents an actual out-of-bounds access (the previous call would have returned an error), the write-before-check pattern is fragile and would become a real out-of-bounds write if the error return were ever not propagated.
Move the bounds check before the array write so the function is self-contained and safe regardless of caller behavior.
--- lib/bootconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/bootconfig.c +1 -1
@@ -436,9 +436,9 @@ static char *skip_spaces_until_newline(cstatic int __init __xbc_open_brace (char *p) {/* Push the last key as open brace */ - open_brace[brace_index++] =xbc_node_index (last_parent);if (brace_index >=XBC_DEPTH_MAX )return xbc_parse_error ("Exceed max depth of braces" , p); + open_brace[brace_index++] =xbc_node_index (last_parent);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 128/491 btrfs: abort transaction on failure to update root in the received subvol ioctl
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit 0f475ee0ebce5c9492b260027cd95270191675fa upstream.
If we failed to update the root we don't abort the transaction, which is wrong since we already used the transaction to remove an item from the uuid tree.
--- fs/btrfs/ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/ioctl.c +2 -1
@@ -4524,7 +4524,8 @@ static long _btrfs_ioctl_set_received_su ret =btrfs_update_root (trans, fs_info->tree_root, &root->root_key, &root->root_item); -if (ret <0 ) { +if (unlikely (ret <0 )) { +btrfs_abort_transaction (trans, ret);btrfs_end_transaction (trans); goto out; }
Greg Kroah-Hartman
maintainerPATCH 129/491 iio: dac: ds4424: reject -128 RAW value
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
commit 5187e03b817c26c1c3bcb2645a612ea935c4be89 upstream.
The DS442x DAC uses sign-magnitude encoding, so -128 cannot be represented in hardware (7-bit magnitude).
Previously, passing -128 resulted in a truncated value that programmed 0mA (magnitude 0) instead of the expected maximum negative current, effectively failing silently.
Reject -128 to avoid producing the wrong current.
--- drivers/iio/dac/ds4424.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ds4424.c +1 -1
@@ -141,7 +141,7 @@ static int ds4424_write_raw(struct iio_dswitch (mask) {case IIO_CHAN_INFO_RAW : -if (val <S8_MIN || val >S8_MAX ) +if (val <=S8_MIN || val >S8_MAX )return -EINVAL ;if (val >0 ) {
Greg Kroah-Hartman
maintainerPATCH 130/491 iio: potentiometer: mcp4131: fix double application of wiper shift
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukas Schmid <[email protected]>
commit 85e4614524dca6c0a43874f475a17de2b9725648 upstream.
The MCP4131 wiper address is shifted twice when preparing the SPI command in mcp4131_write_raw().
The address is already shifted when assigned to the local variable "address", but is then shifted again when written to data->buf[0]. This results in an incorrect command being sent to the device and breaks wiper writes to the second channel.
Remove the second shift and use the pre-shifted address directly when composing the SPI transfer.
--- drivers/iio/potentiometer/mcp4131.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/potentiometer/mcp4131.c +1 -1
@@ -222,7 +222,7 @@ static int mcp4131_write_raw(struct iio_mutex_lock (&data->lock); - data->buf[0 ] = address <<MCP4131_WIPER_SHIFT ; + data->buf[0 ] = address; data->buf[0 ] |=MCP4131_WRITE | (val >>8 ); data->buf[1 ] = val &0xFF ;/* 8 bits here */
Greg Kroah-Hartman
maintainerPATCH 131/491 iio: chemical: bme680: Fix measurement wait duration calculation
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Spencer <[email protected]>
commit f55b9510cd9437da3a0efa08b089caeb47595ff1 upstream.
This function refers to the Bosch BME680 API as the source of the calculation, but one of the constants does not match the Bosch implementation. This appears to be a simple transposition of two digits, resulting in a wait time that is too short. This can cause the following 'device measurement cycle incomplete' check to occasionally fail, returning EBUSY to user space.
Adjust the constant to match the Bosch implementation and resolve the EBUSY errors.
--- drivers/iio/chemical/bme680_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/chemical/bme680_core.c +1 -1
@@ -548,7 +548,7 @@ static int bme680_wait_for_eoc(struct bm* + heater duration */ int wait_eoc_us = ((data->oversampling_temp + data->oversampling_press + - data->oversampling_humid) *1936 ) + (477 *4 ) + + data->oversampling_humid) *1963 ) + (477 *4 ) + (477 *5 ) +1000 + (data->heater_dur *1000 );usleep_range (wait_eoc_us, wait_eoc_us +100 );
Greg Kroah-Hartman
maintainerPATCH 132/491 iio: gyro: mpu3050-core: fix pm_runtime error handling
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antoniu Miclaus <[email protected]>
commit acc3949aab3e8094641a9c7c2768de1958c88378 upstream.
The return value of pm_runtime_get_sync() is not checked, allowing the driver to access hardware that may fail to resume. The device usage count is also unconditionally incremented. Use pm_runtime_resume_and_get() which propagates errors and avoids incrementing the usage count on failure.
In preenable, add pm_runtime_put_autosuspend() on set_8khz_samplerate() failure since postdisable does not run when preenable fails.
--- drivers/iio/gyro/mpu3050-core.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/iio/gyro/mpu3050-core.c +13 -5
@@ -320,7 +320,9 @@ static int mpu3050_read_raw(struct iio_d }case IIO_CHAN_INFO_RAW :/* Resume device */ -pm_runtime_get_sync (mpu3050->dev); + ret =pm_runtime_resume_and_get (mpu3050->dev); +if (ret) +return ret;mutex_lock (&mpu3050->lock); ret =mpu3050_set_8khz_samplerate (mpu3050);
@@ -651,14 +653,20 @@ out_trigger_unlock:static int mpu3050_buffer_preenable (struct iio_dev *indio_dev) {struct mpu3050 *mpu3050 =iio_priv (indio_dev); +int ret; -pm_runtime_get_sync (mpu3050->dev); + ret =pm_runtime_resume_and_get (mpu3050->dev); +if (ret) +return ret;/* Unless we have OUR trigger active, run at full speed */ -if (!mpu3050->hw_irq_trigger) -return mpu3050_set_8khz_samplerate (mpu3050); +if (!mpu3050->hw_irq_trigger) { + ret =mpu3050_set_8khz_samplerate (mpu3050); +if (ret) +pm_runtime_put_autosuspend (mpu3050->dev); + } -return 0 ; +return ret; }static int mpu3050_buffer_postdisable (struct iio_dev *indio_dev)
Greg Kroah-Hartman
maintainerPATCH 133/491 iio: gyro: mpu3050-i2c: fix pm_runtime error handling
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antoniu Miclaus <[email protected]>
commit 91f950b4cbb1aa9ea4eb3999f1463e8044b717fb upstream.
The return value of pm_runtime_get_sync() is not checked, and the function always returns success. This allows I2C mux operations to proceed even when the device fails to resume.
Use pm_runtime_resume_and_get() and propagate its return value to properly handle resume failures.
--- drivers/iio/gyro/mpu3050-i2c.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/iio/gyro/mpu3050-i2c.c +1 -2
@@ -19,8 +19,7 @@ static int mpu3050_i2c_bypass_select(strstruct mpu3050 *mpu3050 =i2c_mux_priv (mux);/* Just power up the device, that is all that is needed */ -pm_runtime_get_sync (mpu3050->dev); -return 0 ; +return pm_runtime_resume_and_get (mpu3050->dev); }static int mpu3050_i2c_bypass_deselect (struct i2c_mux_core *mux,u32 chan_id)
Greg Kroah-Hartman
maintainerPATCH 107/491 tipc: fix divide-by-zero in tipc_sk_filter_connect()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mehul Rao <[email protected]>
commit 6c5a9baa15de240e747263aba435a0951da8d8d2 upstream.
A user can set conn_timeout to any value via setsockopt(TIPC_CONN_TIMEOUT), including values less than 4. When a SYN is rejected with TIPC_ERR_OVERLOAD and the retry path in tipc_sk_filter_connect() executes:
delay %= (tsk->conn_timeout / 4);
If conn_timeout is in the range [0, 3], the integer division yields 0, and the modulo operation triggers a divide-by-zero exception, causing a kernel oops/panic.
Fix this by clamping conn_timeout to a minimum of 4 at the point of use in tipc_sk_filter_connect().
Oops: divide error: 0000 [#1] SMP KASAN NOPTI CPU: 0 UID: 0 PID: 119 Comm: poc-F144 Not tainted 7.0.0-rc2+ RIP: 0010:tipc_sk_filter_rcv (net/tipc/socket.c:2236 net/tipc/socket.c:2362) Call Trace: tipc_sk_backlog_rcv (include/linux/instrumented.h:82 include/linux/atomic/atomic-instrumented.h:32 include/net/sock.h:2357 net/tipc/socket.c:2406) __release_sock (include/net/sock.h:1185 net/core/sock.c:3213) release_sock (net/core/sock.c:3797) tipc_connect (net/tipc/socket.c:2570) __sys_connect (include/linux/file.h:62 include/linux/file.h:83 net/socket.c:2098)
--- net/tipc/socket.c | 2 ++ 1 file changed, 2 insertions(+)
net/tipc/socket.c +2 -0
@@ -2233,6 +2233,8 @@ static bool tipc_sk_filter_connect(strucif (skb_queue_empty (&sk->sk_write_queue))break ;get_random_bytes (&delay,2 ); +if (tsk->conn_timeout <4 ) + tsk->conn_timeout =4 ; delay %= (tsk->conn_timeout /4 ); delay =msecs_to_jiffies (delay +100 );sk_reset_timer (sk, &sk->sk_timer, jiffies + delay);
Greg Kroah-Hartman
maintainerPATCH 134/491 iio: imu: inv_icm42600: fix odr switch to the same value
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jean-Baptiste Maneyrol <[email protected]>
commit c9f3a593137d862d424130343e77d4b5260a4f5a upstream.
ODR switch is done in 2 steps when FIFO is on : change the ODR register value and acknowledge change when reading the FIFO ODR change flag. When we are switching to the same odr value, we end up waiting for a FIFO ODR flag that is never happening.
Fix the issue by doing nothing and exiting properly when we are switching to the same ODR value.
--- drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 2 ++ drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c +2 -0
@@ -322,6 +322,8 @@ static int inv_icm42600_accel_write_odr(return -EINVAL ; conf.odr = inv_icm42600_accel_odr_conv[idx /2 ]; +if (conf.odr == st->conf.accel.odr) +return 0 ;pm_runtime_get_sync (dev);mutex_lock (&st->lock);
drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c +2 -0
@@ -334,6 +334,8 @@ static int inv_icm42600_gyro_write_odr(sreturn -EINVAL ; conf.odr = inv_icm42600_gyro_odr_conv[idx /2 ]; +if (conf.odr == st->conf.gyro.odr) +return 0 ;pm_runtime_get_sync (dev);mutex_lock (&st->lock);
Greg Kroah-Hartman
maintainerPATCH 135/491 bpf: Forget ranges when refining tnum after JSET
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Chaignon <[email protected]>
commit 6279846b9b2532e1b04559ef8bd0dec049f29383 upstream.
Syzbot reported a kernel warning due to a range invariant violation on the following BPF program.
0: call bpf_get_netns_cookie
1: if r0 == 0 goto <exit>
2: if r0 & Oxffffffff goto <exit>
The issue is on the path where we fall through both jumps.
That path is unreachable at runtime: after insn 1, we know r0 != 0, but with the sign extension on the jset, we would only fallthrough insn 2 if r0 == 0. Unfortunately, is_branch_taken() isn't currently able to figure this out, so the verifier walks all branches. The verifier then refines the register bounds using the second condition and we end up with inconsistent bounds on this unreachable path:
1: if r0 == 0 goto <exit>
r0: u64=[0x1, 0xffffffffffffffff] var_off=(0, 0xffffffffffffffff)
2: if r0 & 0xffffffff goto <exit>
r0 before reg_bounds_sync: u64=[0x1, 0xffffffffffffffff] var_off=(0, 0)
r0 after reg_bounds_sync: u64=[0x1, 0] var_off=(0, 0)Improving the range refinement for JSET to cover all cases is tricky. We also don't expect many users to rely on JSET given LLVM doesn't generate those instructions. So instead of improving the range refinement for JSETs, Eduard suggested we forget the ranges whenever we're narrowing tnums after a JSET. This patch implements that approach.
[ shung-hsi.yu: no detection or kernel warning for invariant violation before
6.8, but the same umin=1,umax=0 state can occur when jset is preceed by r0 < 1. Changes were made to adapt to older range refinement logic before commit 67420501e868 ("bpf: generalize reg_set_min_max() to handle non-const register comparisons"). ]
--- kernel/bpf/verifier.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/bpf/verifier.c +4 -0
@@ -7823,6 +7823,10 @@ static void reg_set_min_max(struct bpf_r }break ;case BPF_JSET : +/* Forget the ranges before narrowing tnums, to avoid invariant +* violations if we're on a dead branch. +*/ +__mark_reg_unbounded (false_reg);if (is_jmp32) { false_32off =tnum_and (false_32off,tnum_const (~val32));if (is_power_of_2 (val32))
Greg Kroah-Hartman
maintainerPATCH 136/491 l2tp: do not use sock_hold() in pppol2tp_session_get_sock()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit 9b8c88f875c04d4cb9111bd5dd9291c7e9691bf5 upstream.
pppol2tp_session_get_sock() is using RCU, it must be ready for sk_refcnt being zero.
Commit ee40fb2e1eb5 ("l2tp: protect sock pointer of
struct pppol2tp_session with RCU") was correct because it
had a call_rcu(..., pppol2tp_put_sk) which was later removed in blamed commit.
pppol2tp_recv() can use pppol2tp_session_get_sock() as well.
--- net/l2tp/l2tp_ppp.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-)
net/l2tp/l2tp_ppp.c +8 -17
@@ -130,22 +130,12 @@ static const struct ppp_channel_ops pppostatic const struct proto_ops pppol2tp_ops; -/* Retrieves the pppol2tp socket associated to a session. -* A reference is held on the returned socket, so this function must be paired -* with sock_put(). -*/ +/* Retrieves the pppol2tp socket associated to a session. */ static struct sock *pppol2tp_session_get_sock (struct l2tp_session *session) {struct pppol2tp_session *ps =l2tp_session_priv (session); -struct sock *sk; -rcu_read_lock (); - sk =rcu_dereference (ps->sk); -if (sk) -sock_hold (sk); -rcu_read_unlock (); - -return sk; +return rcu_dereference (ps->sk); }/* Helpers to obtain tunnel/session contexts from sockets.
@@ -212,14 +202,13 @@ end:static void pppol2tp_recv (struct l2tp_session *session,struct sk_buff *skb,int data_len) { -struct pppol2tp_session *ps =l2tp_session_priv (session); -struct sock *sk =NULL ; +struct sock *sk;/* If the socket is bound, send it in to PPP's input queue. Otherwise * queue it on the session socket. */ rcu_read_lock (); - sk =rcu_dereference (ps->sk); + sk =pppol2tp_session_get_sock (session);if (!sk) goto no_sock;
@@ -529,13 +518,14 @@ static void pppol2tp_show(struct seq_filstruct l2tp_session *session = arg;struct sock *sk; +rcu_read_lock (); sk =pppol2tp_session_get_sock (session);if (sk) {struct pppox_sock *po =pppox_sk (sk);seq_printf (m," interface %s\n" ,ppp_dev_name (&po->chan)); -sock_put (sk); } +rcu_read_unlock (); }static void pppol2tp_session_init (struct l2tp_session *session)
@@ -1541,6 +1531,7 @@ static void pppol2tp_seq_session_show(st port =ntohs (inet->inet_sport); } +rcu_read_lock (); sk =pppol2tp_session_get_sock (session);if (sk) { state = sk->sk_state;
@@ -1576,8 +1567,8 @@ static void pppol2tp_seq_session_show(ststruct pppox_sock *po =pppox_sk (sk);seq_printf (m," interface %s\n" ,ppp_dev_name (&po->chan)); -sock_put (sk); } +rcu_read_unlock (); }static int pppol2tp_seq_show (struct seq_file *m,void *v)
Greg Kroah-Hartman
maintainerPATCH 137/491 io_uring/io-wq: check IO_WQ_BIT_EXIT inside work run loop
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit 10dc959398175736e495f71c771f8641e1ca1907 upstream.
Currently this is checked before running the pending work. Normally this is quite fine, as work items either end up blocking (which will create a new worker for other items), or they complete fairly quickly. But syzbot reports an issue where io-wq takes seemingly forever to exit, and with a bit of debugging, this turns out to be because it queues a bunch of big (2GB - 4096b) reads with a /dev/msr* file. Since this file type doesn't support ->read_iter(), loop_rw_iter() ends up handling them. Each read returns 16MB of data read, which takes 20 (!!) seconds. With a bunch of these pending, processing the whole chain can take a long time. Easily longer than the syzbot uninterruptible sleep timeout of 140 seconds. This then triggers a complaint off the io-wq exit path:
INFO: task syz.4.135:6326 blocked for more than 143 seconds.
Not tainted syzkaller #0
Blocked by coredump.
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:syz.4.135 state:D stack:26824 pid:6326 tgid:6324 ppid:5957 task_flags:0x400548 flags:0x00080000
Call Trace:
<TASK>
context_switch kernel/sched/core.c:5256 [inline]
__schedule+0x1139/0x6150 kernel/sched/core.c:6863
__schedule_loop kernel/sched/core.c:6945 [inline]
schedule+0xe7/0x3a0 kernel/sched/core.c:6960
schedule_timeout+0x257/0x290 kernel/time/sleep_timeout.c:75
do_wait_for_common kernel/sched/completion.c:100 [inline]
__wait_for_common+0x2fc/0x4e0 kernel/sched/completion.c:121
io_wq_exit_workers io_uring/io-wq.c:1328 [inline]
io_wq_put_and_exit+0x271/0x8a0 io_uring/io-wq.c:1356
io_uring_clean_tctx+0x10d/0x190 io_uring/tctx.c:203
io_uring_cancel_generic+0x69c/0x9a0 io_uring/cancel.c:651
io_uring_files_cancel include/linux/io_uring.h:19 [inline]
do_exit+0x2ce/0x2bd0 kernel/exit.c:911
do_group_exit+0xd3/0x2a0 kernel/exit.c:1112
get_signal+0x2671/0x26d0 kernel/signal.c:3034
arch_do_signal_or_restart+0x8f/0x7e0 arch/x86/kernel/signal.c:337
__exit_to_user_mode_loop kernel/entry/common.c:41 [inline]
exit_to_user_mode_loop+0x8c/0x540 kernel/entry/common.c:75
__exit_to_user_mode_prepare include/linux/irq-entry-common.h:226 [inline]
syscall_exit_to_user_mode_prepare include/linux/irq-entry-common.h:256 [inline]
syscall_exit_to_user_mode_work include/linux/entry-common.h:159 [inline]
syscall_exit_to_user_mode include/linux/entry-common.h:194 [inline]
do_syscall_64+0x4ee/0xf80 arch/x86/entry/syscall_64.c:100
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7fa02738f749
RSP: 002b:00007fa0281ae0e8 EFLAGS: 00000246 ORIG_RAX: 00000000000000ca
RAX: fffffffffffffe00 RBX: 00007fa0275e6098 RCX: 00007fa02738f749
RDX: 0000000000000000 RSI: 0000000000000080 RDI: 00007fa0275e6098
RBP: 00007fa0275e6090 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
R13: 00007fa0275e6128 R14: 00007fff14e4fcb0 R15: 00007fff14e4fd98There's really nothing wrong here, outside of processing these reads will take a LONG time. However, we can speed up the exit by checking the IO_WQ_BIT_EXIT inside the io_worker_handle_work() loop, as syzbot will exit the ring after queueing up all of these reads. Then once the first item is processed, io-wq will simply cancel the rest. That should avoid syzbot running into this complaint again.
--- io_uring/io-wq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/io-wq.c +1 -1
@@ -554,9 +554,9 @@ static void io_worker_handle_work(structstruct io_wqe_acct *acct =io_wqe_get_acct (worker);struct io_wqe *wqe = worker->wqe;struct io_wq *wq = wqe->wq; -bool do_kill =test_bit (IO_WQ_BIT_EXIT , &wq->state); do { + bool do_kill = test_bit(IO_WQ_BIT_EXIT, &wq->state); struct io_wq_work *work; get_next: /*
Greg Kroah-Hartman
maintainerPATCH 138/491 sunrpc: fix cache_request leak in cache_release
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton <[email protected]>
commit 17ad31b3a43b72aec3a3d83605891e1397d0d065 upstream.
When a reader's file descriptor is closed while in the middle of reading a cache_request (rp->offset != 0), cache_release() decrements the request's readers count but never checks whether it should free the request.
In cache_read(), when readers drops to 0 and CACHE_PENDING is clear, the cache_request is removed from the queue and freed along with its buffer and cache_head reference. cache_release() lacks this cleanup.
The only other path that frees requests with readers == 0 is cache_dequeue(), but it runs only when CACHE_PENDING transitions from set to clear. If that transition already happened while readers was still non-zero, cache_dequeue() will have skipped the request, and no subsequent call will clean it up.
Add the same cleanup logic from cache_read() to cache_release(): after decrementing readers, check if it reached 0 with CACHE_PENDING clear, and if so, dequeue and free the cache_request.
--- net/sunrpc/cache.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)
net/sunrpc/cache.c +21 -5
@@ -1056,14 +1056,25 @@ static int cache_release(struct inode *istruct cache_reader *rp = filp->private_data;if (rp) { +struct cache_request *rq =NULL ; +spin_lock (&queue_lock);if (rp->offset) {struct cache_queue *cq; -for (cq= &rp->q; &cq->list != &cd->queue; - cq = list_entry(cq->list.next, struct cache_queue, list)) +for (cq = &rp->q; &cq->list != &cd->queue; + cq =list_entry (cq->list.next, + struct cache_queue, list))if (!cq->reader) { - container_of(cq, struct cache_request, q) - ->readers--; +struct cache_request *cr = +container_of (cq, + struct cache_request, q); + cr->readers--; +if (cr->readers ==0 && + !test_bit (CACHE_PENDING , + &cr->item->flags)) { +list_del (&cr->q.list); + rq = cr; + }break ; } rp->offset =0 ;
@@ -1071,9 +1082,14 @@ static int cache_release(struct inode *ilist_del (&rp->q.list);spin_unlock (&queue_lock); +if (rq) { +cache_put (rq->item, cd); +kfree (rq->buf); +kfree (rq); + } + filp->private_data =NULL ;kfree (rp); - }if (filp->f_mode &FMODE_WRITE ) {atomic_dec (&cd->writers);
Greg Kroah-Hartman
maintainerPATCH 108/491 libceph: Fix potential out-of-bounds access in ceph_handle_auth_reply()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raphael Zimmer <[email protected]>
commit b282c43ed156ae15ea76748fc15cd5c39dc9ab72 upstream.
This patch fixes an out-of-bounds access in ceph_handle_auth_reply() that can be triggered by a message of type CEPH_MSG_AUTH_REPLY. In ceph_handle_auth_reply(), the value of the payload_len field of such a message is stored in a variable of type int. A value greater than INT_MAX leads to an integer overflow and is interpreted as a negative value. This leads to decrementing the pointer address by this value and subsequently accessing it because ceph_decode_need() only checks that the memory access does not exceed the end address of the allocation.
This patch fixes the issue by changing the data type of payload_len to u32. Additionally, the data type of result_msg_len is changed to u32, as it is also a variable holding a non-negative length.
Also, an additional layer of sanity checks is introduced, ensuring that directly after reading it from the message, payload_len and result_msg_len are not greater than the overall segment length.
BUG: KASAN: slab-out-of-bounds in ceph_handle_auth_reply+0x642/0x7a0 [libceph] Read of size 4 at addr ffff88811404df14 by task kworker/20:1/262 CPU: 20 UID: 0 PID: 262 Comm: kworker/20:1 Not tainted 6.19.2 #5 PREEMPT(voluntary) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 Workqueue: ceph-msgr ceph_con_workfn [libceph] Call Trace: <TASK> dump_stack_lvl+0x76/0xa0 print_report+0xd1/0x620 ? __pfx__raw_spin_lock_irqsave+0x10/0x10 ? kasan_complete_mode_report_info+0x72/0x210 kasan_report+0xe7/0x130 ? ceph_handle_auth_reply+0x642/0x7a0 [libceph] ? ceph_handle_auth_reply+0x642/0x7a0 [libceph] __asan_report_load_n_noabort+0xf/0x20 ceph_handle_auth_reply+0x642/0x7a0 [libceph] mon_dispatch+0x973/0x23d0 [libceph] ? apparmor_socket_recvmsg+0x6b/0xa0 ? __pfx_mon_dispatch+0x10/0x10 [libceph] ? __kasan_check_write+0x14/0x30i ? mutex_unlock+0x7f/0xd0 ? __pfx_mutex_unlock+0x10/0x10 ? __pfx_do_recvmsg+0x10/0x10 [libceph] ceph_con_process_message+0x1f1/0x650 [libceph] process_message+0x1e/0x450 [libceph] ceph_con_v2_try_read+0x2e48/0x6c80 [libceph] ? __pfx_ceph_con_v2_try_read+0x10/0x10 [libceph] ? save_fpregs_to_fpstate+0xb0/0x230 ? raw_spin_rq_unlock+0x17/0xa0 ? finish_task_switch.isra.0+0x13b/0x760 ? __switch_to+0x385/0xda0 ? __kasan_check_write+0x14/0x30 ? mutex_lock+0x8d/0xe0 ? __pfx_mutex_lock+0x10/0x10 ceph_con_workfn+0x248/0x10c0 [libceph] process_one_work+0x629/0xf80 ? __kasan_check_write+0x14/0x30 worker_thread+0x87f/0x1570 ? __pfx__raw_spin_lock_irqsave+0x10/0x10 ? __pfx_try_to_wake_up+0x10/0x10 ? kasan_print_address_stack_frame+0x1f7/0x280 ? __pfx_worker_thread+0x10/0x10 kthread+0x396/0x830 ? __pfx__raw_spin_lock_irq+0x10/0x10 ? __pfx_kthread+0x10/0x10 ? __kasan_check_write+0x14/0x30 ? recalc_sigpending+0x180/0x210 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x3f7/0x610 ? __pfx_ret_from_fork+0x10/0x10 ? __switch_to+0x385/0xda0 ? __pfx_kthread+0x10/0x10 ret_from_fork_asm+0x1a/0x30 </TASK>
[ idryomov: replace if statements with ceph_decode_need() for
payload_len and result_msg_len ]
--- net/ceph/auth.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/ceph/auth.c +4 -2
@@ -185,9 +185,9 @@ int ceph_handle_auth_reply(struct ceph_as32 result;u64 global_id;void *payload, *payload_end; -int payload_len; +u32 payload_len;char *result_msg; -int result_msg_len; +u32 result_msg_len;int ret = -EINVAL ;mutex_lock (&ac->mutex);
@@ -197,10 +197,12 @@ int ceph_handle_auth_reply(struct ceph_a result =ceph_decode_32 (&p); global_id =ceph_decode_64 (&p); payload_len =ceph_decode_32 (&p); +ceph_decode_need (&p, end, payload_len, bad); payload = p; p += payload_len;ceph_decode_need (&p, end,sizeof (u32), bad); result_msg_len =ceph_decode_32 (&p); +ceph_decode_need (&p, end, result_msg_len, bad); result_msg = p; p += result_msg_len;if (p != end)
Greg Kroah-Hartman
maintainerPATCH 109/491 ceph: fix i_nlink underrun during async unlink
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Kellermann <[email protected]>
commit ce0123cbb4a40a2f1bbb815f292b26e96088639f upstream.
During async unlink, we drop the i_nlink counter before we receive the completion (that will eventually update the i_nlink) because "we assume that the unlink will succeed". That is not a bad idea, but it races against deletions by other clients (or against the completion of our own unlink) and can lead to an underrun which emits a WARNING like this one:
WARNING: CPU: 85 PID: 25093 at fs/inode.c:407 drop_nlink+0x50/0x68 Modules linked in: CPU: 85 UID: 3221252029 PID: 25093 Comm: php-cgi8.1 Not tainted 6.14.11-cm4all1-ampere #655 Hardware name: Supermicro ARS-110M-NR/R12SPD-A, BIOS 1.1b 10/17/2023 pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : drop_nlink+0x50/0x68 lr : ceph_unlink+0x6c4/0x720 sp : ffff80012173bc90 x29: ffff80012173bc90 x28: ffff086d0a45aaf8 x27: ffff0871d0eb5680 x26: ffff087f2a64a718 x25: 0000020000000180 x24: 0000000061c88647 x23: 0000000000000002 x22: ffff07ff9236d800 x21: 0000000000001203 x20: ffff07ff9237b000 x19: ffff088b8296afc0 x18: 00000000f3c93365 x17: 0000000000070000 x16: ffff08faffcbdfe8 x15: ffff08faffcbdfec x14: 0000000000000000 x13: 45445f65645f3037 x12: 34385f6369706f74 x11: 0000a2653104bb20 x10: ffffd85f26d73290 x9 : ffffd85f25664f94 x8 : 00000000000000c0 x7 : 0000000000000000 x6 : 0000000000000002 x5 : 0000000000000081 x4 : 0000000000000481 x3 : 0000000000000000 x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff08727d3f91e8 Call trace: drop_nlink+0x50/0x68 (P) vfs_unlink+0xb0/0x2e8 do_unlinkat+0x204/0x288 __arm64_sys_unlinkat+0x3c/0x80 invoke_syscall.constprop.0+0x54/0xe8 do_el0_svc+0xa4/0xc8 el0_svc+0x18/0x58 el0t_64_sync_handler+0x104/0x130 el0t_64_sync+0x154/0x158
In ceph_unlink(), a call to ceph_mdsc_submit_request() submits the CEPH_MDS_OP_UNLINK to the MDS, but does not wait for completion.
Meanwhile, between this call and the following drop_nlink() call, a worker thread may process a CEPH_CAP_OP_IMPORT, CEPH_CAP_OP_GRANT or just a CEPH_MSG_CLIENT_REPLY (the latter of which could be our own completion). These will lead to a set_nlink() call, updating the i_nlink counter to the value received from the MDS. If that new i_nlink value happens to be zero, it is illegal to decrement it further. But that is exactly what ceph_unlink() will do then.
The WARNING can be reproduced this way:
1. Force async unlink; only the async code path is affected. Having no real clue about Ceph internals, I was unable to find out why the MDS wouldn't give me the "Fxr" capabilities, so I patched get_caps_for_async_unlink() to always succeed.
(Note that the WARNING dump above was found on an unpatched kernel, without this kludge - this is not a theoretical bug.)
2. Add a sleep call after ceph_mdsc_submit_request() so the unlink completion gets handled by a worker thread before drop_nlink() is called. This guarantees that the i_nlink is already zero before drop_nlink() runs.
The solution is to skip the counter decrement when it is already zero, but doing so without a lock is still racy (TOCTOU). Since ceph_fill_inode() and handle_cap_grant() both hold the ceph_inode_info.i_ceph_lock spinlock while set_nlink() runs, this seems like the proper lock to protect the i_nlink updates.
I found prior art in NFS and SMB (using inode.i_lock) and AFS (using afs_vnode.cb_lock). All three have the zero check as well.
--- fs/ceph/dir.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
fs/ceph/dir.c +14 -1
@@ -1129,6 +1129,7 @@ static int ceph_unlink(struct inode *dirstruct ceph_fs_client *fsc =ceph_sb_to_client (dir->i_sb);struct ceph_mds_client *mdsc = fsc->mdsc;struct inode *inode =d_inode (dentry); +struct ceph_inode_info *ci =ceph_inode (inode);struct ceph_mds_request *req;bool try_async =ceph_test_mount_opt (fsc,ASYNC_DIROPS );int err = -EROFS ;
@@ -1173,7 +1174,19 @@ retry:* We have enough caps, so we assume that the unlink * will succeed. Fix up the target inode and dcache. */ -drop_nlink (inode); + +/* +* Protect the i_nlink update with i_ceph_lock +* to precent racing against ceph_fill_inode() +* handling our completion on a worker thread +* and don't decrement if i_nlink has already +* been updated to zero by this completion. +*/ +spin_lock (&ci->i_ceph_lock); +if (inode->i_nlink >0 ) +drop_nlink (inode); +spin_unlock (&ci->i_ceph_lock); +d_delete (dentry); }else if (err == -EJUKEBOX ) { try_async = false;
Greg Kroah-Hartman
maintainerPATCH 110/491 time: add kernel-doc in time.c
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 67b3f564cb1e769ef8e45835129a4866152fcfdb ]
Add kernel-doc for all APIs that do not already have it.
Stable-dep-of: 755a648e78f1 ("time/jiffies: Mark jiffies_64_to_clock_t() notrace")
--- kernel/time/time.c | 169 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 158 insertions(+), 11 deletions(-)
kernel/time/time.c +158 -11
@@ -365,11 +365,14 @@ SYSCALL_DEFINE1(adjtimex_time32, struct old_timex32 __user *, utp) }#endif -/* -* Convert jiffies to milliseconds and back. +/** +* jiffies_to_msecs - Convert jiffies to milliseconds +* @j: jiffies value * * Avoid unnecessary multiplications/divisions in the -* two most common HZ cases: +* two most common HZ cases. +* +* Return: milliseconds value */ unsigned int jiffies_to_msecs (const unsigned long j) {
@@ -388,6 +391,12 @@ unsigned int jiffies_to_msecs(const unsigned long j) }EXPORT_SYMBOL (jiffies_to_msecs); +/** +* jiffies_to_usecs - Convert jiffies to microseconds +* @j: jiffies value +* +* Return: microseconds value +*/ unsigned int jiffies_to_usecs (const unsigned long j) {/*
@@ -408,8 +417,15 @@ unsigned int jiffies_to_usecs(const unsigned long j) }EXPORT_SYMBOL (jiffies_to_usecs); -/* +/** * mktime64 - Converts date to seconds. +* @year0: year to convert +* @mon0: month to convert +* @day: day to convert +* @hour: hour to convert +* @min: minute to convert +* @sec: second to convert +* * Converts Gregorian date to seconds since 1970-01-01 00:00:00. * Assumes input in normal date format, i.e. 1980-12-31 23:59:59 * => year=1980, mon=12, day=31, hour=23, min=59, sec=59.
@@ -427,6 +443,8 @@ EXPORT_SYMBOL(jiffies_to_usecs);* * An encoding of midnight at the end of the day as 24:00:00 - ie. midnight * tomorrow - (allowable under ISO 8601) is supported. +* +* Return: seconds since the epoch time for the given input date */ time64_t mktime64(const unsigned int year0, const unsigned int mon0, const unsigned int day, const unsigned int hour,
@@ -471,8 +489,7 @@ EXPORT_SYMBOL(ns_to_kernel_old_timeval);* Set seconds and nanoseconds field of a timespec variable and * normalize to the timespec storage format * -* Note: The tv_nsec part is always in the range of -* 0 <= tv_nsec < NSEC_PER_SEC +* Note: The tv_nsec part is always in the range of 0 <= tv_nsec < NSEC_PER_SEC. * For negative values only the tv_sec field is negative ! */ void set_normalized_timespec64 (struct timespec64 *ts,time64_t sec,s64 nsec)
@@ -501,7 +518,7 @@ EXPORT_SYMBOL(set_normalized_timespec64);* ns_to_timespec64 - Convert nanoseconds to timespec64 * @nsec: the nanoseconds value to be converted * -* Returns the timespec64 representation of the nsec parameter. +* Return: the timespec64 representation of the nsec parameter. */ struct timespec64 ns_to_timespec64 (const s64 nsec) {
@@ -548,6 +565,8 @@ EXPORT_SYMBOL(ns_to_timespec64);* runtime. * the _msecs_to_jiffies helpers are the HZ dependent conversion * routines found in include/linux/jiffies.h +* +* Return: jiffies value */ unsigned long __msecs_to_jiffies (const unsigned int m) {
@@ -560,6 +579,12 @@ unsigned long __msecs_to_jiffies(const unsigned int m) }EXPORT_SYMBOL (__msecs_to_jiffies); +/** +* __usecs_to_jiffies: - convert microseconds to jiffies +* @u: time in milliseconds +* +* Return: jiffies value +*/ unsigned long __usecs_to_jiffies (const unsigned int u) {if (u >jiffies_to_usecs (MAX_JIFFY_OFFSET ))
@@ -568,7 +593,10 @@ unsigned long __usecs_to_jiffies(const unsigned int u) }EXPORT_SYMBOL (__usecs_to_jiffies); -/* +/** +* timespec64_to_jiffies - convert a timespec64 value to jiffies +* @value: pointer to &struct timespec64 +* * The TICK_NSEC - 1 rounds up the value to the next resolution. Note * that a remainder subtract here would not do the right thing as the * resolution values don't fall on second boundries. I.e. the line:
@@ -582,8 +610,9 @@ EXPORT_SYMBOL(__usecs_to_jiffies);* * The >> (NSEC_JIFFIE_SC - SEC_JIFFIE_SC) converts the scaled nsec * value to a scaled second value. +* +* Return: jiffies value */ -unsigned long timespec64_to_jiffies (const struct timespec64 *value) {
@@ -601,6 +630,11 @@ timespec64_to_jiffies(const struct timespec64 *value) }EXPORT_SYMBOL (timespec64_to_jiffies); +/** +* jiffies_to_timespec64 - convert jiffies value to &struct timespec64 +* @jiffies: jiffies value +* @value: pointer to &struct timespec64 +*/ void jiffies_to_timespec64 (const unsigned long jiffies,struct timespec64 *value) {
@@ -618,6 +652,13 @@ EXPORT_SYMBOL(jiffies_to_timespec64);/* * Convert jiffies/jiffies_64 to clock_t and back. */ + +/** +* jiffies_to_clock_t - Convert jiffies to clock_t +* @x: jiffies value +* +* Return: jiffies converted to clock_t (CLOCKS_PER_SEC) +*/ clock_t jiffies_to_clock_t (unsigned long x) {#if (TICK_NSEC % (NSEC_PER_SEC /USER_HZ )) ==0
@@ -632,6 +673,12 @@ clock_t jiffies_to_clock_t(unsigned long x) }EXPORT_SYMBOL (jiffies_to_clock_t); +/** +* clock_t_to_jiffies - Convert clock_t to jiffies +* @x: clock_t value +* +* Return: clock_t value converted to jiffies +*/ unsigned long clock_t_to_jiffies (unsigned long x) {#if (HZ %USER_HZ )==0
@@ -649,6 +696,12 @@ unsigned long clock_t_to_jiffies(unsigned long x) }EXPORT_SYMBOL (clock_t_to_jiffies); +/** +* jiffies_64_to_clock_t - Convert jiffies_64 to clock_t +* @x: jiffies_64 value +* +* Return: jiffies_64 value converted to 64-bit "clock_t" (CLOCKS_PER_SEC) +*/ u64 jiffies_64_to_clock_t (u64 x) {#if (TICK_NSEC % (NSEC_PER_SEC /USER_HZ )) ==0
@@ -671,6 +724,12 @@ u64 jiffies_64_to_clock_t(u64 x) }EXPORT_SYMBOL (jiffies_64_to_clock_t); +/** +* nsec_to_clock_t - Convert nsec value to clock_t +* @x: nsec value +* +* Return: nsec value converted to 64-bit "clock_t" (CLOCKS_PER_SEC) +*/ u64 nsec_to_clock_t (u64 x) {#if (NSEC_PER_SEC %USER_HZ ) ==0
@@ -687,6 +746,12 @@ u64 nsec_to_clock_t(u64 x)#endif } +/** +* jiffies64_to_nsecs - Convert jiffies64 to nanoseconds +* @j: jiffies64 value +* +* Return: nanoseconds value +*/ u64 jiffies64_to_nsecs (u64 j) {#if !(NSEC_PER_SEC %HZ )
@@ -697,6 +762,12 @@ u64 jiffies64_to_nsecs(u64 j) }EXPORT_SYMBOL (jiffies64_to_nsecs); +/** +* jiffies64_to_msecs - Convert jiffies64 to milliseconds +* @j: jiffies64 value +* +* Return: milliseconds value +*/ u64 jiffies64_to_msecs (const u64 j) {#if HZ <=MSEC_PER_SEC && !(MSEC_PER_SEC %HZ )
@@ -719,6 +790,8 @@ EXPORT_SYMBOL(jiffies64_to_msecs);* note: * NSEC_PER_SEC = 10^9 = (5^9 * 2^9) = (1953125 * 512) * ULLONG_MAX ns = 18446744073.709551615 secs = about 584 years +* +* Return: nsecs converted to jiffies64 value */ u64 nsecs_to_jiffies64 (u64 n) {
@@ -750,6 +823,8 @@ EXPORT_SYMBOL(nsecs_to_jiffies64);* note: * NSEC_PER_SEC = 10^9 = (5^9 * 2^9) = (1953125 * 512) * ULLONG_MAX ns = 18446744073.709551615 secs = about 584 years +* +* Return: nsecs converted to jiffies value */ unsigned long nsecs_to_jiffies (u64 n) {
@@ -757,10 +832,16 @@ unsigned long nsecs_to_jiffies(u64 n) }EXPORT_SYMBOL_GPL (nsecs_to_jiffies); -/* -* Add two timespec64 values and do a safety check for overflow. +/** +* timespec64_add_safe - Add two timespec64 values and do a safety check +* for overflow. +* @lhs: first (left) timespec64 to add +* @rhs: second (right) timespec64 to add +* * It's assumed that both values are valid (>= 0). * And, each timespec64 is in normalized form. +* +* Return: sum of @lhs + @rhs */ struct timespec64 timespec64_add_safe (const struct timespec64 lhs,const struct timespec64 rhs)
@@ -778,6 +859,15 @@ struct timespec64 timespec64_add_safe(const struct timespec64 lhs,return res; } +/** +* get_timespec64 - get user's time value into kernel space +* @ts: destination &struct timespec64 +* @uts: user's time value as &struct __kernel_timespec +* +* Handles compat or 32-bit modes. +* +* Return: %0 on success or negative errno on error +*/ int get_timespec64 (struct timespec64 *ts,const struct __kernel_timespec __user *uts) {
@@ -801,6 +891,14 @@ int get_timespec64(struct timespec64 *ts, }EXPORT_SYMBOL_GPL (get_timespec64); +/** +* put_timespec64 - convert timespec64 value to __kernel_timespec format and +* copy the latter to userspace +* @ts: input &struct timespec64 +* @uts: user's &struct __kernel_timespec +* +* Return: %0 on success or negative errno on error +*/ int put_timespec64 (const struct timespec64 *ts,struct __kernel_timespec __user *uts) {
@@ -839,6 +937,15 @@ static int __put_old_timespec32(const struct timespec64 *ts64,return copy_to_user (cts, &ts,sizeof (ts)) ? -EFAULT :0 ; } +/** +* get_old_timespec32 - get user's old-format time value into kernel space +* @ts: destination &struct timespec64 +* @uts: user's old-format time value (&struct old_timespec32) +* +* Handles X86_X32_ABI compatibility conversion. +* +* Return: %0 on success or negative errno on error +*/ int get_old_timespec32 (struct timespec64 *ts,const void __user *uts) {if (COMPAT_USE_64BIT_TIME )
@@ -848,6 +955,16 @@ int get_old_timespec32(struct timespec64 *ts, const void __user *uts) }EXPORT_SYMBOL_GPL (get_old_timespec32); +/** +* put_old_timespec32 - convert timespec64 value to &struct old_timespec32 and +* copy the latter to userspace +* @ts: input &struct timespec64 +* @uts: user's &struct old_timespec32 +* +* Handles X86_X32_ABI compatibility conversion. +* +* Return: %0 on success or negative errno on error +*/ int put_old_timespec32 (const struct timespec64 *ts,void __user *uts) {if (COMPAT_USE_64BIT_TIME )
@@ -857,6 +974,13 @@ int put_old_timespec32(const struct timespec64 *ts, void __user *uts) }EXPORT_SYMBOL_GPL (put_old_timespec32); +/** +* get_itimerspec64 - get user's &struct __kernel_itimerspec into kernel space +* @it: destination &struct itimerspec64 +* @uit: user's &struct __kernel_itimerspec +* +* Return: %0 on success or negative errno on error +*/ int get_itimerspec64 (struct itimerspec64 *it,const struct __kernel_itimerspec __user *uit) {
@@ -872,6 +996,14 @@ int get_itimerspec64(struct itimerspec64 *it, }EXPORT_SYMBOL_GPL (get_itimerspec64); +/** +* put_itimerspec64 - convert &struct itimerspec64 to __kernel_itimerspec format +* and copy the latter to userspace +* @it: input &struct itimerspec64 +* @uit: user's &struct __kernel_itimerspec +* +* Return: %0 on success or negative errno on error +*/ int put_itimerspec64 (const struct itimerspec64 *it,struct __kernel_itimerspec __user *uit) {
@@ -887,6 +1019,13 @@ int put_itimerspec64(const struct itimerspec64 *it, }EXPORT_SYMBOL_GPL (put_itimerspec64); +/** +* get_old_itimerspec32 - get user's &struct old_itimerspec32 into kernel space +* @its: destination &struct itimerspec64 +* @uits: user's &struct old_itimerspec32 +* +* Return: %0 on success or negative errno on error +*/ int get_old_itimerspec32 (struct itimerspec64 *its,const struct old_itimerspec32 __user *uits) {
@@ -898,6 +1037,14 @@ int get_old_itimerspec32(struct itimerspec64 *its, }EXPORT_SYMBOL_GPL (get_old_itimerspec32); +/** +* put_old_itimerspec32 - convert &struct itimerspec64 to &struct +* old_itimerspec32 and copy the latter to userspace +* @its: input &struct itimerspec64 +* @uits: user's &struct old_itimerspec32 +* +* Return: %0 on success or negative errno on error +*/ int put_old_itimerspec32 (const struct itimerspec64 *its,struct old_itimerspec32 __user *uits) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 111/491 time/jiffies: Mark jiffies_64_to_clock_t() notrace
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
[ Upstream commit 755a648e78f12574482d4698d877375793867fa1 ]
The trace_clock_jiffies() function that handles the "uptime" clock for tracing calls jiffies_64_to_clock_t(). This causes the function tracer to constantly recurse when the tracing clock is set to "uptime". Mark it notrace to prevent unnecessary recursion when using the "uptime" clock.
--- kernel/time/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/time.c +1 -1
@@ -702,7 +702,7 @@ EXPORT_SYMBOL(clock_t_to_jiffies);* * Return: jiffies_64 value converted to 64-bit "clock_t" (CLOCKS_PER_SEC) */ -u64 jiffies_64_to_clock_t (u64 x) +notrace u64 jiffies_64_to_clock_t(u64 x) {#if (TICK_NSEC % (NSEC_PER_SEC /USER_HZ )) ==0 # if HZ <USER_HZ
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 112/491 irqchip/gic-v3-its: Limit number of per-device MSIs to the range the ITS supports
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
commit ce9e40a9a5e5cff0b1b0d2fa582b3d71a8ce68e8 upstream.
The ITS driver blindly assumes that EventIDs are in abundant supply, to the point where it never checks how many the hardware actually supports.
It turns out that some pretty esoteric integrations make it so that only a few bits are available, all the way down to a single bit.
Enforce the advertised limitation at the point of allocating the device structure, and hope that the endpoint driver can deal with such limitation.
--- drivers/irqchip/irq-gic-v3-its.c | 4 ++++ include/linux/irqchip/arm-gic-v3.h | 1 + 2 files changed, 5 insertions(+)
drivers/irqchip/irq-gic-v3-its.c +4 -0
@@ -3382,6 +3382,7 @@ static struct its_device *its_create_devint lpi_base;int nr_lpis;int nr_ites; +int id_bits;int sz;if (!its_alloc_device_table (its, dev_id))
@@ -3394,7 +3395,10 @@ static struct its_device *its_create_dev/* * Even if the device wants a single LPI, the ITT must be * sized as a power of two (and you need at least one bit...). +* Also honor the ITS's own EID limit. */ + id_bits =FIELD_GET (GITS_TYPER_IDBITS , its->typer) +1 ; + nvecs = min_t(unsigned int, nvecs, BIT(id_bits)); nr_ites =max (2 , nvecs); sz = nr_ites * (FIELD_GET (GITS_TYPER_ITT_ENTRY_SIZE , its->typer) +1 ); sz =max (sz,ITS_ITT_ALIGN ) +ITS_ITT_ALIGN -1 ;
include/linux/irqchip/arm-gic-v3.h +1 -0
@@ -392,6 +392,7 @@#define GITS_TYPER_VLPIS (1UL << 1)#define GITS_TYPER_ITT_ENTRY_SIZE_SHIFT 4#define GITS_TYPER_ITT_ENTRY_SIZE GENMASK_ULL(7, 4) +#define GITS_TYPER_IDBITS GENMASK_ULL(12, 8)#define GITS_TYPER_IDBITS_SHIFT 8#define GITS_TYPER_DEVBITS_SHIFT 13#define GITS_TYPER_DEVBITS GENMASK_ULL(17, 13)