@@ -450,10 +450,8 @@ int dprc_get_obj(struct fsl_mc_io *mc_io,
450
450
obj_desc -> ver_major = le16_to_cpu (rsp_params -> version_major );
451
451
obj_desc -> ver_minor = le16_to_cpu (rsp_params -> version_minor );
452
452
obj_desc -> flags = le16_to_cpu (rsp_params -> flags );
453
- strncpy (obj_desc -> type , rsp_params -> type , 16 );
454
- obj_desc -> type [15 ] = '\0' ;
455
- strncpy (obj_desc -> label , rsp_params -> label , 16 );
456
- obj_desc -> label [15 ] = '\0' ;
453
+ strscpy_pad (obj_desc -> type , rsp_params -> type , 16 );
454
+ strscpy_pad (obj_desc -> label , rsp_params -> label , 16 );
457
455
return 0 ;
458
456
}
459
457
EXPORT_SYMBOL_GPL (dprc_get_obj );
@@ -491,8 +489,7 @@ int dprc_set_obj_irq(struct fsl_mc_io *mc_io,
491
489
cmd_params -> irq_addr = cpu_to_le64 (irq_cfg -> paddr );
492
490
cmd_params -> irq_num = cpu_to_le32 (irq_cfg -> irq_num );
493
491
cmd_params -> obj_id = cpu_to_le32 (obj_id );
494
- strncpy (cmd_params -> obj_type , obj_type , 16 );
495
- cmd_params -> obj_type [15 ] = '\0' ;
492
+ strscpy_pad (cmd_params -> obj_type , obj_type , 16 );
496
493
497
494
/* send command to mc*/
498
495
return mc_send_command (mc_io , & cmd );
@@ -564,8 +561,7 @@ int dprc_get_obj_region(struct fsl_mc_io *mc_io,
564
561
cmd_params = (struct dprc_cmd_get_obj_region * )cmd .params ;
565
562
cmd_params -> obj_id = cpu_to_le32 (obj_id );
566
563
cmd_params -> region_index = region_index ;
567
- strncpy (cmd_params -> obj_type , obj_type , 16 );
568
- cmd_params -> obj_type [15 ] = '\0' ;
564
+ strscpy_pad (cmd_params -> obj_type , obj_type , 16 );
569
565
570
566
/* send command to mc*/
571
567
err = mc_send_command (mc_io , & cmd );
0 commit comments