diff options
| author | Kinga Tanska <kinga.tanska@intel.com> | 2022-07-14 09:02:10 +0200 |
|---|---|---|
| committer | Jes Sorensen <jsorensen@fb.com> | 2022-07-28 23:10:22 +0200 |
| commit | c8d1c398505b62d9129a4e711f17e4469f4327ff (patch) | |
| tree | 780e9e27726b48eff4a1411199d8397201a4189f /Monitor.c | |
| parent | mdadm: Remove dead code in imsm_fix_size_mismatch (diff) | |
| download | mdadm-c8d1c398505b62d9129a4e711f17e4469f4327ff.tar.xz mdadm-c8d1c398505b62d9129a4e711f17e4469f4327ff.zip | |
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.
Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Diffstat (limited to 'Monitor.c')
| -rw-r--r-- | Monitor.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -190,9 +190,11 @@ int Monitor(struct mddev_dev *devlist, 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); + /* length of "/dev/md/" + device name + terminating byte */ + size_t _len = sizeof("/dev/md/") + strnlen(mdlist->devname, PATH_MAX); + + st->devname = xcalloc(_len, sizeof(char)); + snprintf(st->devname, _len, "/dev/md/%s", mdlist->devname); } if (!is_mddev(mdlist->devname)) return 1; |