diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2021-04-05 12:30:03 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2021-04-05 12:30:03 -0400 |
| commit | a3eaa3687cb616a9d0d458191cb9140e6d5e3703 (patch) | |
| tree | ce2ba13fac00124c4b6388b4455d203de086b513 /drivers/pci | |
| parent | 31d29d82e8059154c1b03a4ac91a832a6bb9d495 (diff) | |
| parent | 472493c8a425f62200882c2c6acb1be2e29b3c03 (diff) | |
| download | linux-rt-a3eaa3687cb616a9d0d458191cb9140e6d5e3703.tar.gz | |
Merge tag 'v5.10.27' into v5.10-rt
This is the 5.10.27 stable release
Conflicts:
include/linux/u64_stats_sync.h
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/rpadlpar_sysfs.c | 14 | ||||
| -rw-r--r-- | drivers/pci/hotplug/s390_pci_hpc.c | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/drivers/pci/hotplug/rpadlpar_sysfs.c b/drivers/pci/hotplug/rpadlpar_sysfs.c index cdbfa5df3a51..dbfa0b55d31a 100644 --- a/drivers/pci/hotplug/rpadlpar_sysfs.c +++ b/drivers/pci/hotplug/rpadlpar_sysfs.c @@ -34,12 +34,11 @@ static ssize_t add_slot_store(struct kobject *kobj, struct kobj_attribute *attr, if (nbytes >= MAX_DRC_NAME_LEN) return 0; - memcpy(drc_name, buf, nbytes); + strscpy(drc_name, buf, nbytes + 1); end = strchr(drc_name, '\n'); - if (!end) - end = &drc_name[nbytes]; - *end = '\0'; + if (end) + *end = '\0'; rc = dlpar_add_slot(drc_name); if (rc) @@ -65,12 +64,11 @@ static ssize_t remove_slot_store(struct kobject *kobj, if (nbytes >= MAX_DRC_NAME_LEN) return 0; - memcpy(drc_name, buf, nbytes); + strscpy(drc_name, buf, nbytes + 1); end = strchr(drc_name, '\n'); - if (!end) - end = &drc_name[nbytes]; - *end = '\0'; + if (end) + *end = '\0'; rc = dlpar_remove_slot(drc_name); if (rc) diff --git a/drivers/pci/hotplug/s390_pci_hpc.c b/drivers/pci/hotplug/s390_pci_hpc.c index c9e790c74051..a047c421debe 100644 --- a/drivers/pci/hotplug/s390_pci_hpc.c +++ b/drivers/pci/hotplug/s390_pci_hpc.c @@ -93,8 +93,9 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) pci_dev_put(pdev); return -EBUSY; } + pci_dev_put(pdev); - zpci_remove_device(zdev); + zpci_remove_device(zdev, false); rc = zpci_disable_device(zdev); if (rc) |