projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kvm-sev-cgroup' into HEAD
[linux-2.6-microblaze.git]
/
drivers
/
pci
/
hotplug
/
rpadlpar_sysfs.c
diff --git
a/drivers/pci/hotplug/rpadlpar_sysfs.c
b/drivers/pci/hotplug/rpadlpar_sysfs.c
index
cdbfa5d
..
dbfa0b5
100644
(file)
--- 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;
if (nbytes >= MAX_DRC_NAME_LEN)
return 0;
-
memcpy(drc_name, buf, nbytes
);
+
strscpy(drc_name, buf, nbytes + 1
);
end = strchr(drc_name, '\n');
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)
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;
if (nbytes >= MAX_DRC_NAME_LEN)
return 0;
-
memcpy(drc_name, buf, nbytes
);
+
strscpy(drc_name, buf, nbytes + 1
);
end = strchr(drc_name, '\n');
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)
rc = dlpar_remove_slot(drc_name);
if (rc)