Commit 94c457de authored by Rickard Strandqvist's avatar Rickard Strandqvist Committed by Helge Deller

parisc: pdc_stable.c: Cleaning up unnecessary use of memset in conjunction with strncpy

Using memset before strncpy just to ensure a trailing null character is
an unnecessary double writing of a string

Patch modified by Helge Deller to additionally reduce stack usage.
Signed-off-by: default avatarRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent fe5c8734
...@@ -755,7 +755,7 @@ static ssize_t pdcs_auto_write(struct kobject *kobj, ...@@ -755,7 +755,7 @@ static ssize_t pdcs_auto_write(struct kobject *kobj,
{ {
struct pdcspath_entry *pathentry; struct pdcspath_entry *pathentry;
unsigned char flags; unsigned char flags;
char in[count+1], *temp; char in[8], *temp;
char c; char c;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
...@@ -765,8 +765,9 @@ static ssize_t pdcs_auto_write(struct kobject *kobj, ...@@ -765,8 +765,9 @@ static ssize_t pdcs_auto_write(struct kobject *kobj,
return -EINVAL; return -EINVAL;
/* We'll use a local copy of buf */ /* We'll use a local copy of buf */
memset(in, 0, count+1); count = min_t(size_t, count, 7);
strncpy(in, buf, count); strncpy(in, buf, count);
in[count] = '\0';
/* Current flags are stored in primary boot path entry */ /* Current flags are stored in primary boot path entry */
pathentry = &pdcspath_entry_primary; pathentry = &pdcspath_entry_primary;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment