Skip to content

Replace strncpy() with strscpy helpers #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jserv merged 1 commit into from
Aug 6, 2026
Merged

Replace strncpy() with strscpy helpers #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions inode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ struct inode *simplefs_iget(struct super_block *sb, unsigned long ino)
inode->i_fop = &simplefs_file_ops;
inode->i_mapping->a_ops = &simplefs_aops;
} else if (S_ISLNK(inode->i_mode)) {
strncpy(ci->i_data, cinode->i_data, sizeof(ci->i_data));
strscpy(ci->i_data, cinode->i_data, sizeof(ci->i_data));
inode->i_link = ci->i_data;
inode->i_op = &symlink_inode_ops;
}
Expand Down Expand Up @@ -448,18 +448,15 @@ static void simplefs_set_file_into_dir(struct simplefs_dir_block *dblock,
}
dblock->files[fi + 1].inode = inode_no;
dblock->files[fi + 1].nr_blk = dblock->files[fi].nr_blk - 1;
strncpy(dblock->files[fi + 1].filename, name,
SIMPLEFS_FILENAME_LEN - 1);
dblock->files[fi + 1].filename[SIMPLEFS_FILENAME_LEN - 1] = '\0';
strscpy_pad(dblock->files[fi + 1].filename, name,
SIMPLEFS_FILENAME_LEN);
dblock->files[fi].nr_blk = 1;
} else if (dblock->nr_files == 0) {
dblock->files[0].inode = inode_no;
strncpy(dblock->files[0].filename, name, SIMPLEFS_FILENAME_LEN - 1);
dblock->files[0].filename[SIMPLEFS_FILENAME_LEN - 1] = '\0';
strscpy(dblock->files[0].filename, name, SIMPLEFS_FILENAME_LEN);
} else {
dblock->files[0].inode = inode_no;
strncpy(dblock->files[0].filename, name, SIMPLEFS_FILENAME_LEN - 1);
dblock->files[0].filename[SIMPLEFS_FILENAME_LEN - 1] = '\0';
strscpy_pad(dblock->files[0].filename, name, SIMPLEFS_FILENAME_LEN);
}
dblock->nr_files++;
}
Expand Down Expand Up @@ -932,9 +929,8 @@ static int simplefs_rename(struct inode *src_dir,

dblock = (struct simplefs_dir_block *) src_bi_bh->b_data;

strncpy(dblock->files[fi].filename, dest_dentry->d_name.name,
SIMPLEFS_FILENAME_LEN - 1);
dblock->files[fi].filename[SIMPLEFS_FILENAME_LEN - 1] = '\0';
strscpy_pad(dblock->files[fi].filename, dest_dentry->d_name.name,
SIMPLEFS_FILENAME_LEN);
mark_buffer_dirty(src_bi_bh);

RELEASE_BUFFER_HEAD(src_bi_bh);
Expand Down
2 changes: 1 addition & 1 deletion super.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static int simplefs_write_inode(struct inode *inode,
disk_inode->i_blocks = inode->i_blocks;
disk_inode->i_nlink = inode->i_nlink;
disk_inode->ei_block = ci->ei_block;
strncpy(disk_inode->i_data, ci->i_data, sizeof(ci->i_data));
strscpy(disk_inode->i_data, ci->i_data, sizeof(ci->i_data));

mark_buffer_dirty(bh);
sync_dirty_buffer(bh);
Expand Down
Loading