tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'platform-drivers-x86-v5.8-2' of git://git.infradead.org/linux-platform-drivers-x86 into master

Pull x86 platform driver fixes from Andriy Shevchenko:
"Small fixes for this cycle:

- Fix procfs handling in Thinkpad ACPI driver

- Fix battery management on new ASUS laptops

- New IDs (Sapphire Rapids) in ISST tool"

* tag 'platform-drivers-x86-v5.8-2' of git://git.infradead.org/linux-platform-drivers-x86:
platform/x86: asus-wmi: allow BAT1 battery name
platform/x86: ISST: Add new PCI device ids
platform/x86: thinkpad_acpi: Revert "Use strndup_user() in dispatch_proc_write()"

Linus Torvalds 994e99a9 0665a4e9

+17 -3
+1
drivers/platform/x86/asus-wmi.c
··· 441 441 * battery is named BATT. 442 442 */ 443 443 if (strcmp(battery->desc->name, "BAT0") != 0 && 444 + strcmp(battery->desc->name, "BAT1") != 0 && 444 445 strcmp(battery->desc->name, "BATT") != 0) 445 446 return -ENODEV; 446 447
+3
drivers/platform/x86/intel_speed_select_if/isst_if_common.h
··· 13 13 #define INTEL_RAPL_PRIO_DEVID_0 0x3451 14 14 #define INTEL_CFG_MBOX_DEVID_0 0x3459 15 15 16 + #define INTEL_RAPL_PRIO_DEVID_1 0x3251 17 + #define INTEL_CFG_MBOX_DEVID_1 0x3259 18 + 16 19 /* 17 20 * Validate maximum commands in a single request. 18 21 * This is enough to handle command to every core in one ioctl, or all
+1
drivers/platform/x86/intel_speed_select_if/isst_if_mbox_pci.c
··· 147 147 148 148 static const struct pci_device_id isst_if_mbox_ids[] = { 149 149 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, INTEL_CFG_MBOX_DEVID_0)}, 150 + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, INTEL_CFG_MBOX_DEVID_1)}, 150 151 { 0 }, 151 152 }; 152 153 MODULE_DEVICE_TABLE(pci, isst_if_mbox_ids);
+1
drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c
··· 72 72 73 73 static const struct pci_device_id isst_if_ids[] = { 74 74 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, INTEL_RAPL_PRIO_DEVID_0)}, 75 + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, INTEL_RAPL_PRIO_DEVID_1)}, 75 76 { 0 }, 76 77 }; 77 78 MODULE_DEVICE_TABLE(pci, isst_if_ids);
+11 -3
drivers/platform/x86/thinkpad_acpi.c
··· 885 885 886 886 if (!ibm || !ibm->write) 887 887 return -EINVAL; 888 + if (count > PAGE_SIZE - 1) 889 + return -EINVAL; 888 890 889 - kernbuf = strndup_user(userbuf, PAGE_SIZE); 890 - if (IS_ERR(kernbuf)) 891 - return PTR_ERR(kernbuf); 891 + kernbuf = kmalloc(count + 1, GFP_KERNEL); 892 + if (!kernbuf) 893 + return -ENOMEM; 892 894 895 + if (copy_from_user(kernbuf, userbuf, count)) { 896 + kfree(kernbuf); 897 + return -EFAULT; 898 + } 899 + 900 + kernbuf[count] = 0; 893 901 ret = ibm->write(kernbuf); 894 902 if (ret == 0) 895 903 ret = count;