Monitor: use devname as char array instead of pointer
PATCH v2 1/1 Monitor: use devname as char array instead of pointer
Device name wasn't filled properly due to incorrect use of strcpy. Strcpy was used twice. Firstly to fill devname with "/dev/md/" and then to add chosen name. First strcpy result was overwritten by second one (as a result <device_name> instead of "/dev/md/<device_name>" was assigned). This commit changes this implementation to use snprintf and devname with fixed size. Also safer string functions are propagated.
--- Monitor.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-)
Monitor.c +11 -19
@@ -33,8 +33,8 @@#endif struct state { -char *devname; -char devnm[32 ];/* to sync with mdstat info */ +char devname[MD_NAME_MAX +9 ];/* length of "/dev/md/" + device name + terminating byte */ +char devnm[MD_NAME_MAX ];/* to sync with mdstat info */ unsigned int utime;int err;char *spare_group;
@@ -45,7 +45,7 @@ struct state {int devstate[MAX_DISKS ];dev_t devid[MAX_DISKS ];int percent; -char parent_devnm[32 ];/* For subarray, devnm of parent. +char parent_devnm[MD_NAME_MAX ];/* For subarray, devnm of parent. * For others, "" */ struct supertype *metadata;
@@ -183,13 +183,7 @@ int Monitor(struct mddev_dev *devlist,if (strcasecmp (mdlist->devname,"<ignore>" ) ==0 )continue ; st =xcalloc (1 ,sizeof *st); -if (mdlist->devname[0 ] =='/' ) - st->devname =xstrdup (mdlist->devname); -else { - st->devname =xmalloc (8 +strlen (mdlist->devname)+1 ); -strcpy (strcpy (st->devname,"/dev/md/" ), - mdlist->devname); - } +snprintf (st->devname,MD_NAME_MAX +9 ,"/dev/md/%s" ,basename (mdlist->devname)); st->next = statelist; st->devnm[0 ] =0 ; st->percent =RESYNC_UNKNOWN ;
@@ -205,7 +199,7 @@ int Monitor(struct mddev_dev *devlist,for (dv = devlist; dv; dv = dv->next) {struct state *st =xcalloc (1 ,sizeof *st); mdlist =conf_get_ident (dv->devname); - st->devname =xstrdup (dv->devname); +snprintf (st->devname,MD_NAME_MAX +9 ,"%s" , dv->devname); st->next = statelist; st->devnm[0 ] =0 ; st->percent =RESYNC_UNKNOWN ;
@@ -288,7 +282,6 @@ int Monitor(struct mddev_dev *devlist,for (stp = &statelist; (st = *stp) !=NULL ; ) {if (st->from_auto && st->err >5 ) { *stp = st->next; -free (st->devname);free (st->spare_group);free (st); }else
@@ -541,7 +534,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat, goto disappeared;if (st->devnm[0 ] ==0 ) -strcpy (st->devnm,fd2devnm (fd)); +snprintf (st->devnm,MD_NAME_MAX ,"%s" ,fd2devnm (fd));for (mse2 = mdstat; mse2; mse2 = mse2->next)if (strcmp (mse2->devnm, st->devnm) ==0 ) {
@@ -671,7 +664,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat, strncmp(mse->metadata_version, "external:", 9) == 0 && is_subarray(mse->metadata_version+9)) {char *sl; -strcpy (st->parent_devnm, mse->metadata_version +10 ); +snprintf (st->parent_devnm,MD_NAME_MAX ,"%s" , mse->metadata_version +10 ); sl =strchr (st->parent_devnm,'/' );if (sl) *sl =0 ;
@@ -759,14 +752,13 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,continue ; } - st->devname =xstrdup (name); +snprintf (st->devname,MD_NAME_MAX +9 ,"%s" , name);if ((fd =open (st->devname,O_RDONLY )) <0 ||md_get_array_info (fd, &array) <0 ) {/* no such array */ if (fd >=0 )close (fd);put_md_name (st->devname); -free (st->devname);if (st->metadata) { st->metadata->ss->free_super (st->metadata);free (st->metadata);
@@ -778,7 +770,7 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist, st->next = *statelist; st->err =1 ; st->from_auto =1 ; -strcpy (st->devnm, mse->devnm); +snprintf (st->devnm,MD_NAME_MAX ,"%s" , mse->devnm); st->percent =RESYNC_UNKNOWN ; st->expected_spares =-1 ; if (mse->metadata_version &&
@@ -786,8 +778,8 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist, "external:", 9) == 0 && is_subarray(mse->metadata_version+9)) {char *sl; -strcpy (st->parent_devnm, - mse->metadata_version+10 ); +snprintf (st->parent_devnm,MD_NAME_MAX , +"%s" , mse->metadata_version +10 ); sl =strchr (st->parent_devnm,'/' ); *sl =0 ; } else
Signature · 1 line
2.26.2
Quoted 11 lines · Kinga Tanska
Device name wasn't filled properly due to incorrect use of strcpy. Strcpy was used twice. Firstly to fill devname with "
/dev/md/" and then to add chosen name. First strcpy result was overwritten by second one (as a result <device_name> instead of "/dev/md/<device_name>" was assigned). This commit changes this implementation to use snprintf and devname with fixed size. Also safer string functions are propagated.Signed-off-by Kinga Tanska <[email protected]>--- Monitor.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-)
This doesn't seem to apply cleanly. Mind sending an updated version?
Thanks,
Jes