fat: Change device_name to B_DEV_NAME_LENGTH bytes and use strlcpy().
Change-Id: Icd07bb4c23ce27d2f1361c66b1634c7f2be5d131 Reviewed-on: https://review.haiku-os.org/c/haiku/+/9891 Reviewed-by: Oscar Lesta <[email protected]> Tested-by: Commit checker robot <[email protected]> Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
committed by
Adrien Destugues
parent
9d432d1b00
commit
3e7a109936
@@ -83,11 +83,11 @@ _remount_ro(void* voidVolume)
|
||||
struct msdosfsmount* fatVolume = VFSTOMSDOSFS(bsdVolume);
|
||||
|
||||
char mntpoint[B_PATH_NAME_LENGTH];
|
||||
strncpy(mntpoint, bsdVolume->mnt_stat.f_mntonname, B_PATH_NAME_LENGTH - 1);
|
||||
char device[B_PATH_NAME_LENGTH];
|
||||
strncpy(device, fatVolume->pm_dev->si_device, B_PATH_NAME_LENGTH - 1);
|
||||
strlcpy(mntpoint, bsdVolume->mnt_stat.f_mntonname, B_PATH_NAME_LENGTH);
|
||||
char device[B_DEV_NAME_LENGTH];
|
||||
strlcpy(device, fatVolume->pm_dev->si_device, B_DEV_NAME_LENGTH);
|
||||
char fs_name[B_FILE_NAME_LENGTH];
|
||||
strncpy(fs_name, bsdVolume->mnt_fsvolume->file_system_name, B_FILE_NAME_LENGTH - 1);
|
||||
strlcpy(fs_name, bsdVolume->mnt_fsvolume->file_system_name, B_FILE_NAME_LENGTH);
|
||||
|
||||
status_t status = _kern_unmount(bsdVolume->mnt_stat.f_mntonname, B_FORCE_UNMOUNT);
|
||||
if (status == B_OK)
|
||||
|
||||
@@ -47,7 +47,7 @@ struct cdev {
|
||||
char si_name[SPECNAMELEN + 1];
|
||||
|
||||
// Members added for Haiku port
|
||||
char si_device[B_PATH_NAME_LENGTH + 1];
|
||||
char si_device[B_DEV_NAME_LENGTH];
|
||||
int si_fd;
|
||||
off_t si_mediasize;
|
||||
dev_t si_id;
|
||||
|
||||
@@ -3244,7 +3244,7 @@ bsd_device_init(mount* bsdVolume, const dev_t devID, const char* deviceFile, cde
|
||||
device->si_refcount = 0;
|
||||
device->si_mountpt = bsdVolume;
|
||||
device->si_name[0] = '\0';
|
||||
strncpy(device->si_device, deviceFile, B_PATH_NAME_LENGTH - 1);
|
||||
strlcpy(device->si_device, deviceFile, B_DEV_NAME_LENGTH);
|
||||
device->si_mediasize = 0;
|
||||
device->si_id = devID;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user