Fix buffer size warning for strcpy
PATCH v3 1/1 Fix buffer size warning for strcpy
To meet requirements of Common Criteria certification vulnerability assessment. Static code analysis has been run and found the following error:buffer_size_warning: Calling "strncpy" with a maximum size argument of 16 bytes on destination array "ve->name" of size 16 bytes might leave the destination string unterminated.
The change is to make the destination size to fit the allocated size.
V3: Doc change only:
The code change from filling ve->name with spaces to filling it with null-terminated is to comform to the SNIA - Common RAID Disk Data Format Specification. The format for VD_Name (ve->name) specifies the field to be either ASCII or UNICODE. Bit 2 of the VD_Type field MUST be used to determine the Unicode or ASCII format of this field. If this field is not used, all bytes MUST be set to zero.
V2: Change from zero-terminated to zero-padded on memset and change from using strncpy to memcpy, feedback from Neil Brown.
--- super-ddf.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
super-ddf.c +7 -3
@@ -2637,9 +2637,13 @@ static int init_super_ddf_bvd(struct supertype *st, ve->init_state = DDF_init_not;memset (ve->pad1,0xff ,14 ); -memset (ve->name,' ' ,16 ); -if (name) -strncpy (ve->name, name,16 ); +memset (ve->name,'\0' ,sizeof (ve->name)); +if (name) { +int l =strlen (ve->name); +if (l >16 ) + l =16 ; +memcpy (ve->name, name, l); + } ddf->virt->populated_vdes =cpu_to_be16 (be16_to_cpu (ddf->virt->populated_vdes)+1 );
Signature · 1 line
2.29.2
Quoted 7 lines · Nigel Croxon
To meet requirements of Common Criteria certification vulnerability assessment. Static code analysis has been run and found the following error:
buffer_size_warning: Calling "strncpy" with a maximum size argument of 16 bytes on destination array "ve->name" of size 16 bytes might leave the destination string unterminated.
Yeah, please ignore my comment to v2- the task here it remove error, not to acknowledge it.
super-ddf.c static int init_super_ddf_bvd(struct supertype *st, · line 2644
Quoted 3 lines
super-ddf.c +3
-0+int l =strlen (ve->name); +if (l >16 ) + l =16 ;
I think that whole "if" statement can be replaced by:strnlen(ve->name, sizeof(ve->name))
Quoted 2 lines
super-ddf.c +2
-0+memcpy (ve->name, name, l); + }
Hello Nigel,
It current form it is not working. See my finding below.
Quoted 2 lines · Mariusz
Quoted 2 lines
+ int l =
strlen(ve->name);
i think that you want to use name instead of ve->name. length of ve->name is zero after memset.
Quoted 4 lines
Quoted 2 lines
+ if (l > 16)
+ l = 16;I think that whole "if" statement can be replaced by:
strnlen(ve->name, sizeof(ve->name))
I did a mistake here.
I want to suggest usage of:
l = strnlen(name, sizeof(ve->name));
Quoted 3 lines
Quoted 2 lines
+
memcpy(ve->name, name, l);
+ }
Thanks,
Mariusz