mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-10-22 23:13:01 +02:00
This is the 5.14.21 stable release
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmGaQEoACgkQONu9yGCS aT7CWRAAwL5EqnaN4WAvRnjemZqwAK1LjiguM9XshNUSGn2r28CUsv6JEW0XOCLQ C+spmhTIiLrlqNIRxF7YuE8h0PqkHuew7ZQxBj3deLvCmjyBDpbFc29qmLtDrE8S LPptw2MzerZ1Dqf/THl3NXCcIplMElMEsBSVXVDGuSKQ7LrfQbC2Vf+WFz7nZntz RyJUim4JhSLIRVXiL30lnQz7ae1YUN9yF3UcEypuZ+wgpqmgUdMgBPyt98Xansg2 8N8FsJ4L6FlXsZECHXoi5ejB00uOZVm3V4UFe5lMlG0pFk7dvHB/dO5MD2WKji8r ogsdbuu/btkomHGJC24xzBZ31MqqqxlijNP9eyNKidA54Jj2tCSUj3+5mZc0LAnt A4ZA6/pQ/LxQj382KJFTVbTr+z9qBbP7aIASES3I+OLPWUGJi9O93nYYGPeA9DZK l4rD63JZvBp3dbcvRuNwSuMttjL2xmBYm4phXh6wml/nmFezihULRn071Bw1qO+x vbM1whOBR3cqo7Op+3La5XRqkHyWA6pw0SpUwEV3/45oI6KWDTraApB9pZrmRG+d vWU+nvxiW3vIHOOvCYpY02Xk9uJW4aT1Ais5U2+duGcHwsihOPTXMVXpqACDK/6L KZHQUkaLyYNlbZe5pRapmF/oXSnZajU0o6uBKMGRqL5Xg6Uijrs= =Jd0r -----END PGP SIGNATURE----- Merge tag 'v5.14.21' into v5.14/standard/base This is the 5.14.21 stable release # gpg: Signature made Sun 21 Nov 2021 07:49:14 AM EST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
This commit is contained in:
commit
9d5572038e
2
Makefile
2
Makefile
|
@ -1,7 +1,7 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
VERSION = 5
|
VERSION = 5
|
||||||
PATCHLEVEL = 14
|
PATCHLEVEL = 14
|
||||||
SUBLEVEL = 20
|
SUBLEVEL = 21
|
||||||
EXTRAVERSION =
|
EXTRAVERSION =
|
||||||
NAME = Opossums on Parade
|
NAME = Opossums on Parade
|
||||||
|
|
||||||
|
|
|
@ -1835,7 +1835,7 @@ syscall_restore:
|
||||||
|
|
||||||
/* Are we being ptraced? */
|
/* Are we being ptraced? */
|
||||||
LDREG TI_FLAGS-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r19
|
LDREG TI_FLAGS-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r19
|
||||||
ldi _TIF_SYSCALL_TRACE_MASK,%r2
|
ldi _TIF_SINGLESTEP|_TIF_BLOCKSTEP,%r2
|
||||||
and,COND(=) %r19,%r2,%r0
|
and,COND(=) %r19,%r2,%r0
|
||||||
b,n syscall_restore_rfi
|
b,n syscall_restore_rfi
|
||||||
|
|
||||||
|
|
|
@ -3237,9 +3237,9 @@ static void record_steal_time(struct kvm_vcpu *vcpu)
|
||||||
"xor %1, %1\n"
|
"xor %1, %1\n"
|
||||||
"2:\n"
|
"2:\n"
|
||||||
_ASM_EXTABLE_UA(1b, 2b)
|
_ASM_EXTABLE_UA(1b, 2b)
|
||||||
: "+r" (st_preempted),
|
: "+q" (st_preempted),
|
||||||
"+&r" (err)
|
"+&r" (err),
|
||||||
: "m" (st->preempted));
|
"+m" (st->preempted));
|
||||||
if (err)
|
if (err)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
|
|
@ -363,28 +363,3 @@ int acpi_platform_notify(struct device *dev, enum kobject_action action)
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int acpi_dev_turn_off_if_unused(struct device *dev, void *not_used)
|
|
||||||
{
|
|
||||||
struct acpi_device *adev = to_acpi_device(dev);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Skip device objects with device IDs, because they may be in use even
|
|
||||||
* if they are not companions of any physical device objects.
|
|
||||||
*/
|
|
||||||
if (adev->pnp.type.hardware_id)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
mutex_lock(&adev->physical_node_lock);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Device objects without device IDs are not in use if they have no
|
|
||||||
* corresponding physical device objects.
|
|
||||||
*/
|
|
||||||
if (list_empty(&adev->physical_node_list))
|
|
||||||
acpi_device_set_power(adev, ACPI_STATE_D3_COLD);
|
|
||||||
|
|
||||||
mutex_unlock(&adev->physical_node_lock);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
|
@ -117,7 +117,6 @@ bool acpi_device_is_battery(struct acpi_device *adev);
|
||||||
bool acpi_device_is_first_physical_node(struct acpi_device *adev,
|
bool acpi_device_is_first_physical_node(struct acpi_device *adev,
|
||||||
const struct device *dev);
|
const struct device *dev);
|
||||||
int acpi_bus_register_early_device(int type);
|
int acpi_bus_register_early_device(int type);
|
||||||
int acpi_dev_turn_off_if_unused(struct device *dev, void *not_used);
|
|
||||||
|
|
||||||
/* --------------------------------------------------------------------------
|
/* --------------------------------------------------------------------------
|
||||||
Device Matching and Notification
|
Device Matching and Notification
|
||||||
|
|
|
@ -2560,12 +2560,6 @@ int __init acpi_scan_init(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Make sure that power management resources are not blocked by ACPI
|
|
||||||
* device objects with no users.
|
|
||||||
*/
|
|
||||||
bus_for_each_dev(&acpi_bus_type, NULL, NULL, acpi_dev_turn_off_if_unused);
|
|
||||||
|
|
||||||
acpi_turn_off_unused_power_resources();
|
acpi_turn_off_unused_power_resources();
|
||||||
|
|
||||||
acpi_scan_initialized = true;
|
acpi_scan_initialized = true;
|
||||||
|
|
|
@ -272,19 +272,6 @@ static void __loop_update_dio(struct loop_device *lo, bool dio)
|
||||||
blk_mq_unfreeze_queue(lo->lo_queue);
|
blk_mq_unfreeze_queue(lo->lo_queue);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* loop_validate_block_size() - validates the passed in block size
|
|
||||||
* @bsize: size to validate
|
|
||||||
*/
|
|
||||||
static int
|
|
||||||
loop_validate_block_size(unsigned short bsize)
|
|
||||||
{
|
|
||||||
if (bsize < 512 || bsize > PAGE_SIZE || !is_power_of_2(bsize))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* loop_set_size() - sets device size and notifies userspace
|
* loop_set_size() - sets device size and notifies userspace
|
||||||
* @lo: struct loop_device to set the size for
|
* @lo: struct loop_device to set the size for
|
||||||
|
@ -1253,7 +1240,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config->block_size) {
|
if (config->block_size) {
|
||||||
error = loop_validate_block_size(config->block_size);
|
error = blk_validate_block_size(config->block_size);
|
||||||
if (error)
|
if (error)
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
}
|
}
|
||||||
|
@ -1779,7 +1766,7 @@ static int loop_set_block_size(struct loop_device *lo, unsigned long arg)
|
||||||
if (lo->lo_state != Lo_bound)
|
if (lo->lo_state != Lo_bound)
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
|
|
||||||
err = loop_validate_block_size(arg);
|
err = blk_validate_block_size(arg);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
|
|
@ -434,6 +434,10 @@ static const struct usb_device_id blacklist_table[] = {
|
||||||
{ USB_DEVICE(0x0bda, 0xb009), .driver_info = BTUSB_REALTEK },
|
{ USB_DEVICE(0x0bda, 0xb009), .driver_info = BTUSB_REALTEK },
|
||||||
{ USB_DEVICE(0x2ff8, 0xb011), .driver_info = BTUSB_REALTEK },
|
{ USB_DEVICE(0x2ff8, 0xb011), .driver_info = BTUSB_REALTEK },
|
||||||
|
|
||||||
|
/* Additional Realtek 8761B Bluetooth devices */
|
||||||
|
{ USB_DEVICE(0x2357, 0x0604), .driver_info = BTUSB_REALTEK |
|
||||||
|
BTUSB_WIDEBAND_SPEECH },
|
||||||
|
|
||||||
/* Additional Realtek 8761BU Bluetooth devices */
|
/* Additional Realtek 8761BU Bluetooth devices */
|
||||||
{ USB_DEVICE(0x0b05, 0x190e), .driver_info = BTUSB_REALTEK |
|
{ USB_DEVICE(0x0b05, 0x190e), .driver_info = BTUSB_REALTEK |
|
||||||
BTUSB_WIDEBAND_SPEECH },
|
BTUSB_WIDEBAND_SPEECH },
|
||||||
|
|
|
@ -97,8 +97,9 @@ config DRM_DEBUG_DP_MST_TOPOLOGY_REFS
|
||||||
|
|
||||||
config DRM_FBDEV_EMULATION
|
config DRM_FBDEV_EMULATION
|
||||||
bool "Enable legacy fbdev support for your modesetting driver"
|
bool "Enable legacy fbdev support for your modesetting driver"
|
||||||
depends on DRM_KMS_HELPER
|
depends on DRM
|
||||||
depends on FB=y || FB=DRM_KMS_HELPER
|
depends on FB
|
||||||
|
select DRM_KMS_HELPER
|
||||||
select FB_CFB_FILLRECT
|
select FB_CFB_FILLRECT
|
||||||
select FB_CFB_COPYAREA
|
select FB_CFB_COPYAREA
|
||||||
select FB_CFB_IMAGEBLIT
|
select FB_CFB_IMAGEBLIT
|
||||||
|
|
|
@ -368,18 +368,6 @@ static void free_msi_irqs(struct pci_dev *dev)
|
||||||
for (i = 0; i < entry->nvec_used; i++)
|
for (i = 0; i < entry->nvec_used; i++)
|
||||||
BUG_ON(irq_has_action(entry->irq + i));
|
BUG_ON(irq_has_action(entry->irq + i));
|
||||||
|
|
||||||
pci_msi_teardown_msi_irqs(dev);
|
|
||||||
|
|
||||||
list_for_each_entry_safe(entry, tmp, msi_list, list) {
|
|
||||||
if (entry->msi_attrib.is_msix) {
|
|
||||||
if (list_is_last(&entry->list, msi_list))
|
|
||||||
iounmap(entry->mask_base);
|
|
||||||
}
|
|
||||||
|
|
||||||
list_del(&entry->list);
|
|
||||||
free_msi_entry(entry);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dev->msi_irq_groups) {
|
if (dev->msi_irq_groups) {
|
||||||
sysfs_remove_groups(&dev->dev.kobj, dev->msi_irq_groups);
|
sysfs_remove_groups(&dev->dev.kobj, dev->msi_irq_groups);
|
||||||
msi_attrs = dev->msi_irq_groups[0]->attrs;
|
msi_attrs = dev->msi_irq_groups[0]->attrs;
|
||||||
|
@ -395,6 +383,18 @@ static void free_msi_irqs(struct pci_dev *dev)
|
||||||
kfree(dev->msi_irq_groups);
|
kfree(dev->msi_irq_groups);
|
||||||
dev->msi_irq_groups = NULL;
|
dev->msi_irq_groups = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pci_msi_teardown_msi_irqs(dev);
|
||||||
|
|
||||||
|
list_for_each_entry_safe(entry, tmp, msi_list, list) {
|
||||||
|
if (entry->msi_attrib.is_msix) {
|
||||||
|
if (list_is_last(&entry->list, msi_list))
|
||||||
|
iounmap(entry->mask_base);
|
||||||
|
}
|
||||||
|
|
||||||
|
list_del(&entry->list);
|
||||||
|
free_msi_entry(entry);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pci_intx_for_msi(struct pci_dev *dev, int enable)
|
static void pci_intx_for_msi(struct pci_dev *dev, int enable)
|
||||||
|
@ -585,6 +585,9 @@ msi_setup_entry(struct pci_dev *dev, int nvec, struct irq_affinity *affd)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control);
|
pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control);
|
||||||
|
/* Lies, damned lies, and MSIs */
|
||||||
|
if (dev->dev_flags & PCI_DEV_FLAGS_HAS_MSI_MASKING)
|
||||||
|
control |= PCI_MSI_FLAGS_MASKBIT;
|
||||||
|
|
||||||
entry->msi_attrib.is_msix = 0;
|
entry->msi_attrib.is_msix = 0;
|
||||||
entry->msi_attrib.is_64 = !!(control & PCI_MSI_FLAGS_64BIT);
|
entry->msi_attrib.is_64 = !!(control & PCI_MSI_FLAGS_64BIT);
|
||||||
|
|
|
@ -5760,3 +5760,9 @@ static void apex_pci_fixup_class(struct pci_dev *pdev)
|
||||||
}
|
}
|
||||||
DECLARE_PCI_FIXUP_CLASS_HEADER(0x1ac1, 0x089a,
|
DECLARE_PCI_FIXUP_CLASS_HEADER(0x1ac1, 0x089a,
|
||||||
PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class);
|
PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class);
|
||||||
|
|
||||||
|
static void nvidia_ion_ahci_fixup(struct pci_dev *pdev)
|
||||||
|
{
|
||||||
|
pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
|
||||||
|
}
|
||||||
|
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);
|
||||||
|
|
|
@ -89,7 +89,7 @@ static int of_thermal_get_temp(struct thermal_zone_device *tz,
|
||||||
{
|
{
|
||||||
struct __thermal_zone *data = tz->devdata;
|
struct __thermal_zone *data = tz->devdata;
|
||||||
|
|
||||||
if (!data->ops->get_temp)
|
if (!data->ops || !data->ops->get_temp)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
return data->ops->get_temp(data->sensor_data, temp);
|
return data->ops->get_temp(data->sensor_data, temp);
|
||||||
|
@ -186,6 +186,9 @@ static int of_thermal_set_emul_temp(struct thermal_zone_device *tz,
|
||||||
{
|
{
|
||||||
struct __thermal_zone *data = tz->devdata;
|
struct __thermal_zone *data = tz->devdata;
|
||||||
|
|
||||||
|
if (!data->ops || !data->ops->set_emul_temp)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
return data->ops->set_emul_temp(data->sensor_data, temp);
|
return data->ops->set_emul_temp(data->sensor_data, temp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -194,7 +197,7 @@ static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip,
|
||||||
{
|
{
|
||||||
struct __thermal_zone *data = tz->devdata;
|
struct __thermal_zone *data = tz->devdata;
|
||||||
|
|
||||||
if (!data->ops->get_trend)
|
if (!data->ops || !data->ops->get_trend)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
return data->ops->get_trend(data->sensor_data, trip, trend);
|
return data->ops->get_trend(data->sensor_data, trip, trend);
|
||||||
|
@ -301,7 +304,7 @@ static int of_thermal_set_trip_temp(struct thermal_zone_device *tz, int trip,
|
||||||
if (trip >= data->ntrips || trip < 0)
|
if (trip >= data->ntrips || trip < 0)
|
||||||
return -EDOM;
|
return -EDOM;
|
||||||
|
|
||||||
if (data->ops->set_trip_temp) {
|
if (data->ops && data->ops->set_trip_temp) {
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = data->ops->set_trip_temp(data->sensor_data, trip, temp);
|
ret = data->ops->set_trip_temp(data->sensor_data, trip, temp);
|
||||||
|
|
|
@ -240,6 +240,14 @@ struct request {
|
||||||
void *end_io_data;
|
void *end_io_data;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static inline int blk_validate_block_size(unsigned int bsize)
|
||||||
|
{
|
||||||
|
if (bsize < 512 || bsize > PAGE_SIZE || !is_power_of_2(bsize))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static inline bool blk_op_is_passthrough(unsigned int op)
|
static inline bool blk_op_is_passthrough(unsigned int op)
|
||||||
{
|
{
|
||||||
op &= REQ_OP_MASK;
|
op &= REQ_OP_MASK;
|
||||||
|
|
|
@ -227,6 +227,8 @@ enum pci_dev_flags {
|
||||||
PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10),
|
PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10),
|
||||||
/* Don't use Relaxed Ordering for TLPs directed at this device */
|
/* Don't use Relaxed Ordering for TLPs directed at this device */
|
||||||
PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11),
|
PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11),
|
||||||
|
/* Device does honor MSI masking despite saying otherwise */
|
||||||
|
PCI_DEV_FLAGS_HAS_MSI_MASKING = (__force pci_dev_flags_t) (1 << 12),
|
||||||
};
|
};
|
||||||
|
|
||||||
enum pci_irq_reroute_variant {
|
enum pci_irq_reroute_variant {
|
||||||
|
|
|
@ -382,6 +382,7 @@ static char * __init xbc_make_cmdline(const char *key)
|
||||||
ret = xbc_snprint_cmdline(new_cmdline, len + 1, root);
|
ret = xbc_snprint_cmdline(new_cmdline, len + 1, root);
|
||||||
if (ret < 0 || ret > len) {
|
if (ret < 0 || ret > len) {
|
||||||
pr_err("Failed to print extra kernel cmdline.\n");
|
pr_err("Failed to print extra kernel cmdline.\n");
|
||||||
|
memblock_free(__pa(new_cmdline), len + 1);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7141,7 +7141,6 @@ void perf_output_sample(struct perf_output_handle *handle,
|
||||||
static u64 perf_virt_to_phys(u64 virt)
|
static u64 perf_virt_to_phys(u64 virt)
|
||||||
{
|
{
|
||||||
u64 phys_addr = 0;
|
u64 phys_addr = 0;
|
||||||
struct page *p = NULL;
|
|
||||||
|
|
||||||
if (!virt)
|
if (!virt)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -7160,14 +7159,15 @@ static u64 perf_virt_to_phys(u64 virt)
|
||||||
* If failed, leave phys_addr as 0.
|
* If failed, leave phys_addr as 0.
|
||||||
*/
|
*/
|
||||||
if (current->mm != NULL) {
|
if (current->mm != NULL) {
|
||||||
|
struct page *p;
|
||||||
|
|
||||||
pagefault_disable();
|
pagefault_disable();
|
||||||
if (get_user_page_fast_only(virt, 0, &p))
|
if (get_user_page_fast_only(virt, 0, &p)) {
|
||||||
phys_addr = page_to_phys(p) + virt % PAGE_SIZE;
|
phys_addr = page_to_phys(p) + virt % PAGE_SIZE;
|
||||||
|
put_page(p);
|
||||||
|
}
|
||||||
pagefault_enable();
|
pagefault_enable();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p)
|
|
||||||
put_page(p);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return phys_addr;
|
return phys_addr;
|
||||||
|
|
|
@ -191,6 +191,9 @@ config HARDENED_USERCOPY_PAGESPAN
|
||||||
config FORTIFY_SOURCE
|
config FORTIFY_SOURCE
|
||||||
bool "Harden common str/mem functions against buffer overflows"
|
bool "Harden common str/mem functions against buffer overflows"
|
||||||
depends on ARCH_HAS_FORTIFY_SOURCE
|
depends on ARCH_HAS_FORTIFY_SOURCE
|
||||||
|
# https://bugs.llvm.org/show_bug.cgi?id=50322
|
||||||
|
# https://bugs.llvm.org/show_bug.cgi?id=41459
|
||||||
|
depends on !CC_IS_CLANG
|
||||||
help
|
help
|
||||||
Detect overflows of buffers in common string and memory functions
|
Detect overflows of buffers in common string and memory functions
|
||||||
where the compiler can determine and validate the buffer sizes.
|
where the compiler can determine and validate the buffer sizes.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user